From 1b41e245a2a6d975a934b7aae432358811a68f3b Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 31 Jan 2024 12:09:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20ims/smf=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/neUser/ims.ts | 24 +++++++++++++++++++++++- src/api/neUser/{ue.ts => smf.ts} | 13 ++++++++----- src/views/neUser/ims/index.vue | 10 +++++++--- src/views/neUser/ue/index.vue | 11 +++++++---- 4 files changed, 45 insertions(+), 13 deletions(-) rename src/api/neUser/{ue.ts => smf.ts} (88%) diff --git a/src/api/neUser/ims.ts b/src/api/neUser/ims.ts index 6d9efc05..71c5bf2c 100644 --- a/src/api/neUser/ims.ts +++ b/src/api/neUser/ims.ts @@ -7,7 +7,7 @@ import { parseObjLineToHump } from '@/utils/parse-utils'; * @param query 查询参数 * @returns object */ -export async function listIMS(query: Record) { +export async function listUEInfoByIMS(query: Record) { query.nbId = query.id; const result = await request({ url: '/api/rest/ueManagement/v1/elementType/ims/objectType/ueInfo', @@ -40,3 +40,25 @@ export async function listIMS(query: Record) { // ]; return data; } + +/** + * 首页查询IMS在线用户数 + * @param query 查询参数 + * @returns neId + */ +export async function listUENumByIMS(neId: String) { + const result = await request({ + url: `/api/rest/ueManagement/v1/elementType/ims/objectType/ueNum?neId=${neId}`, + method: 'get', + }); + if (result.code === RESULT_CODE_SUCCESS) { + return Object.assign(result, { + data: result.data['ueNum'], + }); + } + + // 模拟数据 + // { "ueNum": 0 } + // result.data = 0 + return result; +} diff --git a/src/api/neUser/ue.ts b/src/api/neUser/smf.ts similarity index 88% rename from src/api/neUser/ue.ts rename to src/api/neUser/smf.ts index 46755e46..2bcfbd54 100644 --- a/src/api/neUser/ue.ts +++ b/src/api/neUser/smf.ts @@ -7,7 +7,7 @@ import { parseObjLineToHump } from '@/utils/parse-utils'; * @param query 查询参数 * @returns object */ -export async function listUE(query: Record) { +export async function listUEInfoBySMF(query: Record) { query.nbId = query.id; const result = await request({ url: '/api/rest/ueManagement/v1/elementType/smf/objectType/ueInfo', @@ -62,21 +62,24 @@ export async function listUE(query: Record) { return data; } -// /** * 首页查询SMF在线用户数 * @param query 查询参数 * @returns neId */ -export async function listUENum(neId: String) { +export async function listUENumBySMF(neId: String) { const result = await request({ url: `/api/rest/ueManagement/v1/elementType/smf/objectType/ueNum?neId=${neId}`, method: 'get', }); if (result.code === RESULT_CODE_SUCCESS) { - let data = result.data.data; return Object.assign(result, { - data: parseObjLineToHump(data['ueNum']), + data: result.data.data['ueNum'], }); } + + // 模拟数据 + // { "data": { "ueNum": 0 } } + // result.data = 0 + return result; } diff --git a/src/views/neUser/ims/index.vue b/src/views/neUser/ims/index.vue index c33ec0b1..3a3e2377 100644 --- a/src/views/neUser/ims/index.vue +++ b/src/views/neUser/ims/index.vue @@ -5,7 +5,7 @@ import { message } from 'ant-design-vue/lib'; import { SizeType } from 'ant-design-vue/lib/config-provider'; import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface'; import { ColumnsType } from 'ant-design-vue/lib/table'; -import { listIMS } from '@/api/neUser/ims'; +import { listUEInfoByIMS } from '@/api/neUser/ims'; import useNeInfoStore from '@/store/modules/neinfo'; import useI18n from '@/hooks/useI18n'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; @@ -154,7 +154,7 @@ function fnGetList(pageNum?: number) { if (pageNum) { queryParams.pageNum = pageNum; } - listIMS(toRaw(queryParams)).then(res => { + listUEInfoByIMS(toRaw(queryParams)).then(res => { if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) { // 取消勾选 if (tableState.selectedRowKeys.length > 0) { @@ -162,7 +162,11 @@ function fnGetList(pageNum?: number) { } tablePagination.total = res.total; tableState.data = res.rows; - if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) { + if ( + tablePagination.total <= + (queryParams.pageNum - 1) * tablePagination.pageSize && + queryParams.pageNum !== 1 + ) { tableState.loading = false; fnGetList(queryParams.pageNum - 1); } diff --git a/src/views/neUser/ue/index.vue b/src/views/neUser/ue/index.vue index b41f9377..6513a520 100644 --- a/src/views/neUser/ue/index.vue +++ b/src/views/neUser/ue/index.vue @@ -5,7 +5,7 @@ import { message } from 'ant-design-vue/lib'; import { SizeType } from 'ant-design-vue/lib/config-provider'; import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface'; import { ColumnsType } from 'ant-design-vue/lib/table'; -import { listUE } from '@/api/neUser/ue'; +import { listUEInfoBySMF } from '@/api/neUser/smf'; import useNeInfoStore from '@/store/modules/neinfo'; import useI18n from '@/hooks/useI18n'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; @@ -82,7 +82,6 @@ let tableColumns: ColumnsType = [ return opt.value; }, width: 150, - }, { title: 'MSISDN', @@ -233,7 +232,7 @@ function fnGetList(pageNum?: number) { if (pageNum) { queryParams.pageNum = pageNum; } - listUE(toRaw(queryParams)).then(res => { + listUEInfoBySMF(toRaw(queryParams)).then(res => { if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) { // 取消勾选 if (tableState.selectedRowKeys.length > 0) { @@ -241,7 +240,11 @@ function fnGetList(pageNum?: number) { } tablePagination.total = res.total; tableState.data = res.rows; - if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) { + if ( + tablePagination.total <= + (queryParams.pageNum - 1) * tablePagination.pageSize && + queryParams.pageNum !== 1 + ) { tableState.loading = false; fnGetList(queryParams.pageNum - 1); }