From e0531d0c7d0920675a6d5d7fffe38fe869100e79 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 15 May 2025 16:30:24 +0800 Subject: [PATCH 01/10] =?UTF-8?q?fix:=20=E7=BC=96=E8=AF=91=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=A3=80=E6=9F=A5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/traceManage/task/analyze.vue | 2 +- src/views/traceManage/wireshark/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/traceManage/task/analyze.vue b/src/views/traceManage/task/analyze.vue index c8aa3b15..2e426606 100644 --- a/src/views/traceManage/task/analyze.vue +++ b/src/views/traceManage/task/analyze.vue @@ -618,7 +618,7 @@ onBeforeUnmount(() => { return record.msgDirect === 0 ? 'table-striped-recv' : 'table-striped-send'; }" :customRow=" - record => { + (record:any) => { return { onClick: () => fnVisible(record), }; diff --git a/src/views/traceManage/wireshark/index.vue b/src/views/traceManage/wireshark/index.vue index d372d17b..b57a11f5 100644 --- a/src/views/traceManage/wireshark/index.vue +++ b/src/views/traceManage/wireshark/index.vue @@ -705,7 +705,7 @@ onBeforeUnmount(() => { return `table-striped-${record.protocol}` }" :customRow=" - record => { + (record:any) => { return { onClick: () => fnVisible(record), }; From 39d63dea42b68fbce51309a94659b2d2586b61da Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 16 May 2025 09:47:37 +0800 Subject: [PATCH 02/10] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=202.250516?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index 3de53719..c5b0371d 100644 --- a/.env.development +++ b/.env.development @@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network OMC" VITE_APP_CODE = "OMC" # 应用版本 -VITE_APP_VERSION = "2.250509" +VITE_APP_VERSION = "2.250516" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" diff --git a/.env.production b/.env.production index 3de53719..c5b0371d 100644 --- a/.env.production +++ b/.env.production @@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network OMC" VITE_APP_CODE = "OMC" # 应用版本 -VITE_APP_VERSION = "2.250509" +VITE_APP_VERSION = "2.250516" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" From 6a8936a9bac9104770897eac0d0cbf0c49c512f1 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 16 May 2025 17:52:10 +0800 Subject: [PATCH 03/10] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E4=B8=BB?= =?UTF-8?q?=E6=9C=BA=E4=BF=A1=E6=81=AF=E7=BC=96=E8=BE=91=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E4=B8=8D=E9=AA=8C=E8=AF=81=E5=85=8D=E5=AF=86=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=20=E4=B8=BB=E6=9C=BA=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=B1=BB=E5=9E=8B=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ne/neHost/components/EditModal.vue | 4 +-- .../tool/terminal/components/hostList.vue | 35 ++++++++++++++----- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/views/ne/neHost/components/EditModal.vue b/src/views/ne/neHost/components/EditModal.vue index 1dac574a..1b9742e0 100644 --- a/src/views/ne/neHost/components/EditModal.vue +++ b/src/views/ne/neHost/components/EditModal.vue @@ -142,14 +142,14 @@ function fnModalOk() { const validateArr = ['title', 'addr', 'port', 'user']; if (form.authMode === '0') { validateArr.push('password'); - } else { + } else if (form.authMode === '1') { validateArr.push('privateKey'); } modalStateFrom .validate(validateArr) .then(() => { modalState.confirmLoading = true; - const neHost = form.id > 0 ? updateNeHost(form) : addNeHost(form); + const neHost = form.id ? updateNeHost(form) : addNeHost(form); const hide = message.loading(t('common.loading'), 0); neHost .then(res => { diff --git a/src/views/tool/terminal/components/hostList.vue b/src/views/tool/terminal/components/hostList.vue index de413ab7..dc02afe6 100644 --- a/src/views/tool/terminal/components/hostList.vue +++ b/src/views/tool/terminal/components/hostList.vue @@ -289,15 +289,32 @@ onMounted(() => { From 2c67108751c4a1361c35e5dccb67373270e2e622 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 16 May 2025 20:05:51 +0800 Subject: [PATCH 04/10] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E7=9B=98?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BC=9A=E8=AF=9D=E5=B1=9E=E7=B4=AF=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/overview/index.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/dashboard/overview/index.vue b/src/views/dashboard/overview/index.vue index 740ac8d2..b3eb2c2f 100644 --- a/src/views/dashboard/overview/index.vue +++ b/src/views/dashboard/overview/index.vue @@ -192,15 +192,15 @@ async function fnGetSkim() { const results = await Promise.allSettled(requests.map(r => r.promise)); // 重置 - // Object.assign(skimState, { - // udmSubNum: 0, - // smfUeNum: 0, - // imsUeNum: 0, - // gnbNum: 0, - // gnbUeNum: 0, - // enbNum: 0, - // enbUeNum: 0, - // }); + Object.assign(skimState, { + // udmSubNum: 0, + smfUeNum: 0, + imsUeNum: 0, + gnbNum: 0, + gnbUeNum: 0, + enbNum: 0, + enbUeNum: 0, + }); results.forEach((result, index) => { if (result.status === 'fulfilled') { requests[index].process(result.value); From 7439981557f8b31701577d6e8a172920c8cd3b1f Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 20 May 2025 15:43:29 +0800 Subject: [PATCH 05/10] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=88=B7=E6=96=B0=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=AE=B9?= =?UTF-8?q?=E9=87=8F=E4=BB=85UDM/AMF/MME?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/locales/en-US.ts | 2 +- src/views/ne/neLicense/index.vue | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 2f3bb3f1..84ca7fe8 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -624,7 +624,7 @@ export default { change: "Change License", reload: "Refresh Info", reloadTip: "Confirmed to refresh license information?", - reloadBatch: "Batch Refresh", + reloadBatch: "Batch Refresh Info", reloadBatchTip: "Do you do an information refresh on checked records?", updateTtile: "Update License", downCodeTop: "Confirmed to save the license activation code to a file?", diff --git a/src/views/ne/neLicense/index.vue b/src/views/ne/neLicense/index.vue index a9c541b4..1776987c 100644 --- a/src/views/ne/neLicense/index.vue +++ b/src/views/ne/neLicense/index.vue @@ -114,6 +114,12 @@ let tableColumns = ref([ title: t('views.ne.common.capability'), dataIndex: 'capability', align: 'left', + customRender(opt) { + if (['UDM', 'AMF', 'MME'].includes(opt.record.neType)) { + return opt.value; + } + return '-'; + }, width: 100, }, { From 245e33a308a331b554f9f6662f910123e7fc5d89 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 20 May 2025 15:48:31 +0800 Subject: [PATCH 06/10] =?UTF-8?q?fix:=20=E6=B4=BB=E5=8A=A8=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E5=90=AF=E7=94=A8=E5=8E=86=E5=8F=B2=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/locales/zh-CN.ts | 6 +++--- src/views/faultManage/active-alarm/index.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index 8d41aa2a..a68e4f8f 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -226,7 +226,7 @@ export default { version: '软件版本', cpuUse: 'CPU利用率', memoryUse: '内存使用', - capability: '用户容量', + capability: '容量', serialNum: '序列号', expiryDate: '许可证到期日期', neStatus:'状态异常', @@ -474,7 +474,7 @@ export default { ipAddrTip: "支持IPV4/IPV6,同步变更配置地址", port: '服务端口', portTip: "网元服务端口,默认:33030", - capability: '用户容量', + capability: '容量', serialNum: '序列号', expiryDate: '许可证到期日期', normalcy: '正常', @@ -624,7 +624,7 @@ export default { change: "变更许可证", reload: "刷新信息", reloadTip: "确认要刷新许可证信息吗？", - reloadBatch: "批量刷新", + reloadBatch: "批量信息刷新", reloadBatchTip: "对勾选的记录进行信息刷新吗？", updateTtile: "更新许可证", downCodeTop: "确认要将许可激活码保存到文件吗？", diff --git a/src/views/faultManage/active-alarm/index.vue b/src/views/faultManage/active-alarm/index.vue index 9a8eb396..f9ea8c15 100644 --- a/src/views/faultManage/active-alarm/index.vue +++ b/src/views/faultManage/active-alarm/index.vue @@ -956,7 +956,7 @@ onMounted(() => { {{ t('views.faultManage.activeAlarm.updateConfirm') }} - + From 42e71317a23856a1312ad009ceb127030387b789 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 22 May 2025 09:55:31 +0800 Subject: [PATCH 07/10] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E8=AE=B8=E5=8F=AF=E8=AF=81=E7=8A=B6=E6=80=81=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E5=88=B7=E6=96=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/locales/en-US.ts | 4 +-- src/i18n/locales/zh-CN.ts | 4 +-- src/views/ne/neLicense/index.vue | 60 ++++++++------------------------ 3 files changed, 18 insertions(+), 50 deletions(-) diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 84ca7fe8..2571e585 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -624,8 +624,8 @@ export default { change: "Change License", reload: "Refresh Info", reloadTip: "Confirmed to refresh license information?", - reloadBatch: "Batch Refresh Info", - reloadBatchTip: "Do you do an information refresh on checked records?", + reloadBatch: "Refresh License Status", + reloadBatchTip: "Do you perform a license status information refresh for the current list of NE?", updateTtile: "Update License", downCodeTop: "Confirmed to save the license activation code to a file?", activationRequestCode: "License Activation Code", diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index a68e4f8f..740035f4 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -624,8 +624,8 @@ export default { change: "变更许可证", reload: "刷新信息", reloadTip: "确认要刷新许可证信息吗？", - reloadBatch: "批量信息刷新", - reloadBatchTip: "对勾选的记录进行信息刷新吗？", + reloadBatch: "刷新许可证状态", + reloadBatchTip: "对当前列表网元进行许可证状态信息刷新吗？", updateTtile: "更新许可证", downCodeTop: "确认要将许可激活码保存到文件吗？", activationRequestCode: "许可激活码", diff --git a/src/views/ne/neLicense/index.vue b/src/views/ne/neLicense/index.vue index 1776987c..3bb8724e 100644 --- a/src/views/ne/neLicense/index.vue +++ b/src/views/ne/neLicense/index.vue @@ -54,21 +54,15 @@ type TabeStateType = { loading: boolean; /**紧凑型 */ size: SizeType; - /**搜索栏 */ - seached: boolean; /**记录数据 */ data: any[]; - /**勾选记录 */ - selectedRowKeys: (string | number)[]; }; /**表格状态 */ let tableState: TabeStateType = reactive({ loading: false, size: 'middle', - seached: false, data: [], - selectedRowKeys: [], }); /**表格字段列 */ @@ -182,11 +176,6 @@ function fnTableSize({ key }: MenuInfo) { tableState.size = key as SizeType; } -/**表格多选 */ -function fnTableSelectedRowKeys(keys: (string | number)[]) { - tableState.selectedRowKeys = keys; -} - /**查询列表, pageNum初始页数 */ function fnGetList(pageNum?: number) { if (tableState.loading) return; @@ -197,8 +186,16 @@ function fnGetList(pageNum?: number) { listNeLicense(toRaw(queryParams)).then(res => { if (res.code === RESULT_CODE_SUCCESS) { const { total, rows } = res.data; - tablePagination.total = total; - tableState.data = rows.filter((s: any) => s.neType !== 'OMC'); + let totalV = total; + let rowsV = rows.filter((s: any) => { + if (s.neType !== 'OMC') { + return true; + } + totalV -= 1; + return false; + }); + tableState.data = rowsV; + tablePagination.total = totalV; if ( tablePagination.total <= (queryParams.pageNum - 1) * tablePagination.pageSize && @@ -310,8 +307,8 @@ function fnRecordState(row: Record) { }); } -/**刷新网元授权状态 勾选 */ -function fnRecordStateBatch() { +/**刷新网元授权状态 重载 */ +function fnRecordStateReload() { if (modalState.confirmLoading) return; Modal.confirm({ title: t('common.tipTitle'), @@ -319,12 +316,7 @@ function fnRecordStateBatch() { onOk: async () => { modalState.confirmLoading = true; const hide = message.loading(t('common.loading'), 0); - // 勾选的网元数据 - const selectRows = tableState.data.filter(item => - tableState.selectedRowKeys.includes(item.id) - ); - - for (const row of selectRows) { + for (const row of tableState.data) { if (row.neType.toUpperCase() === 'OMC') { continue; } @@ -336,7 +328,6 @@ function fnRecordStateBatch() { } else { row.status = '0'; } - tableState.selectedRowKeys = []; } message.success(t('common.operateOk'), 3); hide(); @@ -361,7 +352,6 @@ onMounted(() => {