From a76c595c4cd51283236fe79276c6d05013774467 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 18 Jul 2025 21:23:24 +0800 Subject: [PATCH 01/10] =?UTF-8?q?del:=20=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/logManage/exportFile.ts | 55 ---------------- src/api/neUser/base5G.ts | 34 ---------- src/api/neUser/ims.ts | 66 ------------------- src/api/neUser/smf.ts | 113 -------------------------------- src/store/modules/neinfo.ts | 93 -------------------------- 5 files changed, 361 deletions(-) delete mode 100644 src/api/logManage/exportFile.ts delete mode 100644 src/api/neUser/base5G.ts delete mode 100644 src/api/neUser/ims.ts delete mode 100644 src/api/neUser/smf.ts delete mode 100644 src/store/modules/neinfo.ts diff --git a/src/api/logManage/exportFile.ts b/src/api/logManage/exportFile.ts deleted file mode 100644 index 2ce72877..00000000 --- a/src/api/logManage/exportFile.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { CACHE_SESSION_CRYPTO_API } from '@/constants/cache-keys-constants'; -import { sessionGet } from '@/utils/cache-session-utils'; -import { request } from '@/plugins/http-fetch'; - -/** - * 获取下拉框数据 - * @returns object - */ -export function getBakFile() { - return request({ - url: '/lm/table/list', - method: 'GET', - }); -} - -/** - * 获取对应类型的文件列表 - * @param query 查询参数 - * @returns object - */ -export function getBakFileList(query: Record) { - return request({ - url: '/lm/file/list', - method: 'GET', - params: query, - }); -} - -/** - * 下载远端文件 - * @param query 查询参数 - * @returns object - */ -export function downFile(query: Record) { - return request({ - url: `/lm/file/${query.fileName}`, - method: 'GET', - params: query, - responseType: 'blob', - timeout: 180_000, - }); -} - -/** - * 删除远端获取文件 - * @param query 查询参数 - * @returns object - */ -export function delFile(query: Record) { - return request({ - url: `/lm/file/${query.fileName}`, - method: 'DELETE', - params: query, - }); -} diff --git a/src/api/neUser/base5G.ts b/src/api/neUser/base5G.ts deleted file mode 100644 index 662ba2d7..00000000 --- a/src/api/neUser/base5G.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; -import { request } from '@/plugins/http-fetch'; -import { parseObjLineToHump } from '@/utils/parse-utils'; - -/** - * 查询列表 - * @param query 查询参数 - * @returns object - */ -export async function listBase5G(query: Record) { - const result = await request({ - url: `/api/rest/ueManagement/v1/elementType/${query.neType.toLowerCase()}/objectType/nbInfo`, - method: 'GET', - params: query, - }); - let data: DataList = { - total: 0, - rows: [], - code: result.code, - msg: result.msg, - }; - // 解析数据 - if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) { - const rows = parseObjLineToHump(result.data.data); - data.total = rows.length; - data.rows = rows; - } - - // 模拟数据 - // data.rows = [{"address":"192.168.1.137:38412","id":"217","name":"attach-enb-100000-20","ueNum":0}] - // data.rows = [{address: "192.168.8.223", id: 257, name: "SmallCell", ueNum: 0}] - - return data; -} diff --git a/src/api/neUser/ims.ts b/src/api/neUser/ims.ts deleted file mode 100644 index a29e7cea..00000000 --- a/src/api/neUser/ims.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; -import { request } from '@/plugins/http-fetch'; -import { parseObjLineToHump } from '@/utils/parse-utils'; - -/** - * 查询列表 - * @param query 查询参数 - * @returns object - */ -export async function listUEInfoByIMS(query: Record) { - query.nbId = query.id; - const result = await request({ - url: '/api/rest/ueManagement/v1/elementType/ims/objectType/ueInfo', - method: 'GET', - params: query, - }); - let data: DataList = { - total: 0, - rows: [], - code: result.code, - msg: result.msg, - }; - // 解析数据 - if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) { - const rows = parseObjLineToHump(result.data.data); - data.total = rows.length; - data.rows = rows; - } - - // 测试数据 - // data.rows = [ - // { - // activeTime: '2023-11-29 17:04:54', - // barring: 0, - // impu: 'sip:12307551232@ims.mnc000.mcc460.3gppnetwork.org', - // imsi: '460001230000002', - // msisdn: '12307551232', - // regState: 1, - // }, - // ]; - 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) { - let num = result.data['ueNum'] || 0; - if (num === 0) { - num = result.data.data['ueNum'] || 0; - } - return Object.assign(result, { data: num }); - } - - // 模拟数据 - // { "ueNum": 0 } - // result.data = 0 - return result; -} diff --git a/src/api/neUser/smf.ts b/src/api/neUser/smf.ts deleted file mode 100644 index dc436756..00000000 --- a/src/api/neUser/smf.ts +++ /dev/null @@ -1,113 +0,0 @@ -import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; -import { request } from '@/plugins/http-fetch'; - -/** - * 查询列表 - * @param query 查询参数 - * @returns object - */ -export async function listUEInfoBySMF(query: Record) { - query.nbId = query.id; - const result = await request({ - url: '/api/rest/ueManagement/v1/elementType/smf/objectType/ueInfo', - method: 'GET', - params: query, - }); - let data: DataList = { - total: 0, - rows: [], - code: result.code, - msg: result.msg, - }; - // 解析数据 - if (result.code === RESULT_CODE_SUCCESS && result.data) { - if (result.data.total && result.data.data) { - data.total = result.data.total; - data.rows = result.data.data; - } else { - Object.assign(data, { - total: result.data.length, - rows: result.data, - }); - } - } - - // 模拟数据 - // data.code = RESULT_CODE_SUCCESS; - // data.total = 2; - // data.rows = [ - // { - // imsi: 'imsi-460000100000090', - // msisdn: 'msisdn-12307550090', - // pduSessionInfo: [ - // { - // activeTime: '2024-06-19 14:35:26', - // dnn: 'ims', - // ipv4: '10.10.48.8', - // ipv6: '', - // pduSessionID: 6, - // ranN3IP: '192.168.1.137', - // sstSD: '1-000001', - // tai: '46000-001124', - // upState: 'Active', - // upfN3IP: '192.168.1.161', - // }, - // { - // activeTime: '2024-06-19 14:35:26', - // dnn: 'cmnet', - // ipv4: '10.10.48.9', - // ipv6: '2001:4860:4860::/64', - // pduSessionID: 7, - // ranN3IP: '192.168.1.137', - // sstSD: '1-000001', - // tai: '46000-001124', - // upState: 'Active', - // upfN3IP: '192.168.1.161', - // }, - // ], - // ratType: 'NR', - // }, - // { - // imsi: 'imsi-460602072701180', - // msisdn: 'msisdn-123460600080', - // pduSessionInfo: [ - // { - // activeTime: '2024-06-19 14:31:09', - // dnn: 'cmnet', - // ipv4: '10.10.48.4', - // ipv6: '', - // pduSessionID: 5, - // ranN3IP: '192.168.8.223', - // sstSD: '1-000001', - // tai: '46060-0001', - // upState: 'Active', - // upfN3IP: '192.168.1.161', - // }, - // ], - // ratType: 'EUTRAN', - // }, - // ]; - return data; -} - -/** - * 首页查询SMF在线用户数 - * @param query 查询参数 - * @returns neId - */ -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) { - return Object.assign(result, { - data: result.data.data['ueNum'], - }); - } - - // 模拟数据 - // { "data": { "ueNum": 0 } } - // result.data = 0 - return result; -} diff --git a/src/store/modules/neinfo.ts b/src/store/modules/neinfo.ts deleted file mode 100644 index 13bab5ee..00000000 --- a/src/store/modules/neinfo.ts +++ /dev/null @@ -1,93 +0,0 @@ -import { defineStore } from 'pinia'; -import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; -import { listAllNeInfo } from '@/api/ne/neInfo'; -import { parseDataToOptions } from '@/utils/parse-tree-utils'; -import { getNePerformanceList } from '@/api/perfManage/taskManage'; - -/**网元信息类型 */ -type NeInfo = { - /**网元列表 */ - neList: Record[]; - /**级联options树结构 */ - neCascaderOptions: Record[]; - /**选择器单级父类型 */ - neSelectOtions: Record[]; - /**性能测量数据集 */ - perMeasurementList: Record[]; -}; - -const useNeInfoStore = defineStore('neinfo', { - state: (): NeInfo => ({ - neList: [], - neCascaderOptions: [], - neSelectOtions: [], - perMeasurementList: [], - }), - getters: { - /** - * 获取级联options树结构 - * @param state 内部属性不用传入 - * @returns 级联options - */ - getNeCascaderOptions(state) { - return state.neCascaderOptions; - }, - /** - * 选择器单级父类型 - * @param state 内部属性不用传入 - * @returns 级联options - */ - getNeSelectOtions(state) { - return state.neSelectOtions; - }, - }, - actions: { - // 刷新网元列表 - async fnRefreshNelist() { - this.neList = []; - const res = await this.fnNelist(); - return res; - }, - // 获取网元列表 - async fnNelist() { - // 有数据不请求 - if (this.neList.length > 0) { - return { code: 1, data: this.neList, msg: 'success' }; - } - const res = await listAllNeInfo({ - bandStatus: false, - }); - if (res.code === RESULT_CODE_SUCCESS) { - // 原始列表 - this.neList = JSON.parse(JSON.stringify(res.data)); - - // 转级联数据 - const options = parseDataToOptions( - res.data, - 'neType', - 'neName', - 'neId' - ); - this.neCascaderOptions = options; - - // 转选择器单级父类型 - this.neSelectOtions = options.map(item => item); - } - return res; - }, - // 获取性能测量数据集列表 - async fnNeTaskPerformance() { - // 有数据不请求 - if (this.perMeasurementList.length > 0) { - return { code: 1, data: this.perMeasurementList, msg: 'success' }; - } - const res = await getNePerformanceList(); - if (res.code === RESULT_CODE_SUCCESS) { - this.perMeasurementList = res.data; - } - return res; - }, - }, -}); - -export default useNeInfoStore; From a19427e95325913410035e9acf32e2005a2d23c9 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 18 Jul 2025 21:24:58 +0800 Subject: [PATCH 02/10] =?UTF-8?q?fix:=20=E6=8C=87=E6=A0=87=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/perfManage/customData.ts | 2 +- src/api/perfManage/customTarget.ts | 26 +--- .../components/NeResources/index.vue | 142 ++++++++++-------- .../overview2/components/UPFFlow/index.vue | 5 +- src/views/perfManage/customTarget/index.vue | 5 +- src/views/perfManage/kpiCReport/index.vue | 21 +-- src/views/perfManage/overview/index.vue | 4 +- 7 files changed, 102 insertions(+), 103 deletions(-) diff --git a/src/api/perfManage/customData.ts b/src/api/perfManage/customData.ts index d398044b..f35fb27f 100644 --- a/src/api/perfManage/customData.ts +++ b/src/api/perfManage/customData.ts @@ -8,7 +8,7 @@ import { request } from '@/plugins/http-fetch'; export async function listCustomData(query: Record) { // 发起请求 const result = await request({ - url: `/pm/kpiC/report`, + url: `/neData/kpic/data`, method: 'GET', params: query, timeout: 60_000, diff --git a/src/api/perfManage/customTarget.ts b/src/api/perfManage/customTarget.ts index be5c6d05..5e6b5824 100644 --- a/src/api/perfManage/customTarget.ts +++ b/src/api/perfManage/customTarget.ts @@ -1,30 +1,16 @@ import { request } from '@/plugins/http-fetch'; /** - * 新 查询自定义指标 + * 查询自定义指标 * @param query 查询参数 * @returns object */ export async function listCustom(query?: Record) { - // 发起请求 - const result = await request({ - url: `/pm/kpiC/title/totalList`, + return await request({ + url: `/neData/kpic/title/list`, method: 'GET', params: query, }); - return result; -} - -/** - * 查询自定义指标详细 - * @param id 网元ID - * @returns object - */ -export async function getCustom(id: string | number) { - return request({ - url: `/pm/kpiC/title/${id}`, - method: 'GET', - }); } /** @@ -34,7 +20,7 @@ export async function getCustom(id: string | number) { */ export function addCustom(data: Record) { return request({ - url: `/pm/kpiC/title`, + url: `/neData/kpic/title`, method: 'POST', data: data, }); @@ -47,7 +33,7 @@ export function addCustom(data: Record) { */ export function updateCustom(data: Record) { return request({ - url: `/pm/kpiC/title/${data.id}`, + url: `/neData/kpic/title`, method: 'PUT', data: data, }); @@ -59,7 +45,7 @@ export function updateCustom(data: Record) { */ export async function delCustom(data: Record) { return request({ - url: `/pm/kpiC/title/${data.id}`, + url: `/neData/kpic/title?id=${data.id}`, method: 'DELETE', }); } diff --git a/src/views/dashboard/overview2/components/NeResources/index.vue b/src/views/dashboard/overview2/components/NeResources/index.vue index 669214c8..518325e6 100644 --- a/src/views/dashboard/overview2/components/NeResources/index.vue +++ b/src/views/dashboard/overview2/components/NeResources/index.vue @@ -1,7 +1,7 @@