From 3829d339e785db50e37f8d1d4dff913e78fa9aae Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 27 Jun 2024 17:10:30 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20SMF=20UE=E5=9C=A8=E7=BA=BF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=9B=BA=E5=AE=9A=E7=BF=BB=E9=A1=B550=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/neUser/smf.ts | 8 ++++---- src/views/neUser/ue/index.vue | 16 ++++++---------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/api/neUser/smf.ts b/src/api/neUser/smf.ts index a19f2617..b8f6e135 100644 --- a/src/api/neUser/smf.ts +++ b/src/api/neUser/smf.ts @@ -21,14 +21,14 @@ export async function listUEInfoBySMF(query: Record) { 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; + if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.rows)) { + data.total = result.total; + data.rows = result.rows; } // 模拟数据 // data.code = RESULT_CODE_SUCCESS; + // data.total = 2; // data.rows = [ // { // imsi: 'imsi-460000100000090', diff --git a/src/views/neUser/ue/index.vue b/src/views/neUser/ue/index.vue index 08c6e77c..50d622aa 100644 --- a/src/views/neUser/ue/index.vue +++ b/src/views/neUser/ue/index.vue @@ -25,7 +25,7 @@ let queryParams = reactive({ /**当前页数 */ pageNum: 1, /**每页条数 */ - pageSize: 20, + pageSize: 50, }); /**查询参数重置 */ @@ -34,10 +34,10 @@ function fnQueryReset() { imsi: '', msisdn: '', pageNum: 1, - pageSize: 20, + pageSize: 50, }); tablePagination.current = 1; - tablePagination.pageSize = 20; + tablePagination.pageSize = 50; fnGetList(); } @@ -59,7 +59,7 @@ type TabeStateType = { let tableState: TabeStateType = reactive({ loading: false, size: 'middle', - seached: false, + seached: true, data: [], selectedRowKeys: [], }); @@ -130,17 +130,13 @@ let tablePagination = reactive({ /**当前页数 */ current: 1, /**每页条数 */ - pageSize: 20, - /**默认的每页条数 */ - defaultPageSize: 20, - /**指定每页可以显示多少条 */ - pageSizeOptions: ['10', '20', '50', '100'], + pageSize: 50, /**只有一页时是否隐藏分页器 */ hideOnSinglePage: false, /**是否可以快速跳转至某页 */ showQuickJumper: true, /**是否可以改变 pageSize */ - showSizeChanger: true, + showSizeChanger: false, /**数据总数 */ total: 0, showTotal: (total: number) => t('common.tablePaginationTotal', { total }), From d96e1ad259b2be722a91bef43bda6924b04461b1 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 27 Jun 2024 17:28:23 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20SMF=20UE=E5=9C=A8=E7=BA=BF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=9B=BA=E5=AE=9A=E7=BF=BB=E9=A1=B550=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/neUser/smf.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/api/neUser/smf.ts b/src/api/neUser/smf.ts index b8f6e135..a226f982 100644 --- a/src/api/neUser/smf.ts +++ b/src/api/neUser/smf.ts @@ -1,6 +1,5 @@ import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import { request } from '@/plugins/http-fetch'; -import { parseObjLineToHump } from '@/utils/parse-utils'; /** * 查询列表 @@ -21,9 +20,8 @@ export async function listUEInfoBySMF(query: Record) { msg: result.msg, }; // 解析数据 - if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.rows)) { - data.total = result.total; - data.rows = result.rows; + if (result.code === RESULT_CODE_SUCCESS && result.data) { + Object.assign(data, result.data); } // 模拟数据 From e69f43a0c21e86900c2c1ffd2aac945fe0110a4e Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 27 Jun 2024 18:02:16 +0800 Subject: [PATCH 3/9] =?UTF-8?q?style:=20SMFCDR=E5=A4=9A=E8=AF=AD=E8=A8=80s?= =?UTF-8?q?mfSubscriptionID=E8=AE=A2=E9=98=85=20ID?= 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/dashboard/smfCDR/index.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 1dbb6f43..a3a346c4 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -572,8 +572,8 @@ export default { delTip: "Confirm deletion of the data item numbered [{msg}]?", exportTip: "Do you confirm to export the current query conditions of the CDR data? (Maximum 10,000 items can be exported.)", smfChargingID: 'Charging ID', - smfSubscriptionIDData: 'Subscriber ID Data', - smfSubscriptionIDType: 'Subscriber ID Type', + smfSubscriptionIDData: 'Subscription ID Data', + smfSubscriptionIDType: 'Subscription ID Type', smfDataVolumeUplink: 'Data Volume Uplink', smfDataVolumeDownlink: 'Data Volume Downlink', smfDataTotalVolume: 'Data Total Volume', diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index 38441a2c..05280857 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -572,8 +572,8 @@ export default { delTip: "确认删除编号为【{msg}】的数据项?", exportTip: "确认导出当前查询条件的话单数据吗？（导出最大支持一万条）", smfChargingID: '计费ID', - smfSubscriptionIDData: '用户 ID 数据', - smfSubscriptionIDType: '用户 ID 类型', + smfSubscriptionIDData: '订阅 ID 数据', + smfSubscriptionIDType: '订阅 ID 类型', smfDataVolumeUplink: '数据量上行链路', smfDataVolumeDownlink: '数据量下行链路', smfDataTotalVolume: '数据总量', diff --git a/src/views/dashboard/smfCDR/index.vue b/src/views/dashboard/smfCDR/index.vue index a4330ed4..ad726ee6 100644 --- a/src/views/dashboard/smfCDR/index.vue +++ b/src/views/dashboard/smfCDR/index.vue @@ -101,7 +101,7 @@ let tableColumns: ColumnsType = [ }, }, { - title: t('views.dashboard.cdr.smfSubscriptionIDType'), // 用户 ID 类型 + title: t('views.dashboard.cdr.smfSubscriptionIDType'), // 订阅 ID 类型 dataIndex: 'cdrJSON', align: 'left', width: 150, @@ -111,7 +111,7 @@ let tableColumns: ColumnsType = [ }, }, { - title: t('views.dashboard.cdr.smfSubscriptionIDData'), // 用户 ID 数据 + title: t('views.dashboard.cdr.smfSubscriptionIDData'), // 订阅 ID 数据 dataIndex: 'cdrJSON', align: 'left', width: 150, From 847bae4c7755755a47cd9f79ede41e2f638a4b2e Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 27 Jun 2024 18:31:22 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=20SMF=20UE=E5=9C=A8=E7=BA=BF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=85=BC=E5=AE=B9=E6=97=A7=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/neUser/smf.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/api/neUser/smf.ts b/src/api/neUser/smf.ts index a226f982..3a848850 100644 --- a/src/api/neUser/smf.ts +++ b/src/api/neUser/smf.ts @@ -21,7 +21,13 @@ export async function listUEInfoBySMF(query: Record) { }; // 解析数据 if (result.code === RESULT_CODE_SUCCESS && result.data) { - Object.assign(data, result.data); + if (Array.isArray(result.data.data)) { + const rows = result.data.data; + data.total = rows.length; + data.rows = rows; + } else { + Object.assign(data, result.data); + } } // 模拟数据 From e31c85835dd9bba33b532c70e0b855c0f88f6fd6 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 27 Jun 2024 18:32:02 +0800 Subject: [PATCH 5/9] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7240627?= 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 91541e4d..dd1252ea 100644 --- a/.env.development +++ b/.env.development @@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS" VITE_APP_CODE = "CN EMS" # 应用版本 -VITE_APP_VERSION = "2.240626" +VITE_APP_VERSION = "2.240627" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" diff --git a/.env.production b/.env.production index 58441d82..ab00a551 100644 --- a/.env.production +++ b/.env.production @@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS" VITE_APP_CODE = "CN EMS" # 应用版本 -VITE_APP_VERSION = "2.240626" +VITE_APP_VERSION = "2.240627" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" From 95931b2b6e02d16a508d289165abb480c9fea65c Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 27 Jun 2024 20:45:26 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E6=97=A0=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E4=B8=80=E6=AE=B5=E6=97=B6=E9=97=B4=E5=90=8E=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E9=94=81=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/GlobalMask/index.vue | 31 +++++++++++++++++------------ 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/components/GlobalMask/index.vue b/src/components/GlobalMask/index.vue index 9948332d..f250061d 100644 --- a/src/components/GlobalMask/index.vue +++ b/src/components/GlobalMask/index.vue @@ -14,23 +14,28 @@ const { t } = useI18n(); /**显示遮罩 */ const isVisible = computed(() => !['none', 'lock'].includes(maskStore.type)); -// 等待指定的时间后触发事件的函数 +// 用户无操作一段时间后进行锁屏 function idleTimeout(time: number, callback: Function) { if (time === 0) return; let timeoutId: any; - - function resetTimer() { - clearTimeout(timeoutId); - timeoutId = setTimeout(callback, time); + let idleTime = 0; + function resetIdleTime() { + idleTime = 0; } - - // 监听浏览器标签是否活动 - window.addEventListener('blur', useThrottleFn(resetTimer, 300)); - window.addEventListener('focus', useThrottleFn(resetTimer, 300)); - document.addEventListener('visibilitychange', useThrottleFn(resetTimer, 300)); - - // 初始化定时器 - resetTimer(); + // 监听用户活动事件 + document.addEventListener('mousemove', useThrottleFn(resetIdleTime, 1000)); + document.addEventListener('keydown', useThrottleFn(resetIdleTime, 1000)); + document.addEventListener('click', useThrottleFn(resetIdleTime, 1000)); + // 定时检查用户是否长时间无操作 + timeoutId = setInterval(() => { + idleTime += 1000; + console.log('idleTime', idleTime, idleTime >= time); + if (idleTime >= time) { + clearTimeout(timeoutId); + // 达到设定的无操作时间，执行锁屏操作 + callback(); + } + }, 1000); } /**组件实例挂载之后调用 */ From 946139facb3d5e09ad9f07b9b1494c973cdab29f Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 27 Jun 2024 20:46:58 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E6=97=A0=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E4=B8=80=E6=AE=B5=E6=97=B6=E9=97=B4=E5=90=8E=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E9=94=81=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/GlobalMask/index.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/GlobalMask/index.vue b/src/components/GlobalMask/index.vue index f250061d..8173500e 100644 --- a/src/components/GlobalMask/index.vue +++ b/src/components/GlobalMask/index.vue @@ -29,10 +29,8 @@ function idleTimeout(time: number, callback: Function) { // 定时检查用户是否长时间无操作 timeoutId = setInterval(() => { idleTime += 1000; - console.log('idleTime', idleTime, idleTime >= time); if (idleTime >= time) { clearTimeout(timeoutId); - // 达到设定的无操作时间，执行锁屏操作 callback(); } }, 1000); From c5f62e8d7640a284f4c3d3da7f027105add627d1 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 28 Jun 2024 11:11:41 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=96=B0=E5=A2=9EOMC=E9=85=8D=E7=BD=AE=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E6=B2=A1=E6=9C=89telnet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ne/neInfo/components/EditModal.vue | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/views/ne/neInfo/components/EditModal.vue b/src/views/ne/neInfo/components/EditModal.vue index 28ff15e6..085a580a 100644 --- a/src/views/ne/neInfo/components/EditModal.vue +++ b/src/views/ne/neInfo/components/EditModal.vue @@ -223,12 +223,6 @@ function fnModalVisibleByEdit(editId: string) { modalState.confirmLoading = false; hide(); if (res.code === RESULT_CODE_SUCCESS) { - // OMC没有telnet - if (res.data.neType === 'OMC') { - res.data.hosts = res.data.hosts.filter( - (s: any) => s.hostType === 'ssh' - ); - } Object.assign(modalState.from, res.data); modalState.title = t('views.ne.neInfo.editTitle'); modalState.visibleByEdit = true; @@ -292,10 +286,6 @@ function fnModalCancel() { */ function fnNeTypeChange(v: any) { const hostsLen = modalState.from.hosts.length; - // OMC没有telnet - if (hostsLen >= 2 && v === 'OMC') { - modalState.from.hosts.splice(1, hostsLen); - } // 网元默认只含22和4100 if (hostsLen === 3 && v !== 'UPF') { modalState.from.hosts.pop(); @@ -626,7 +616,9 @@ onMounted(() => { From 953a36f142fd704dc8627058fb216ae092387c43 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 28 Jun 2024 12:01:07 +0800 Subject: [PATCH 9/9] =?UTF-8?q?style:=20=E7=BD=91=E5=85=83=E8=BD=AF?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=8C=89=E9=92=AE=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/locales/en-US.ts | 2 +- src/i18n/locales/zh-CN.ts | 2 +- src/views/ne/neSoftware/index.vue | 9 +++++++-- src/views/ne/neVersion/index.vue | 9 +++++++-- .../quick-start/components/NeInfoSoftwareInstall.vue | 2 +- .../quick-start/components/NeInfoSoftwareLicense.vue | 2 +- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index a3a346c4..ee36d593 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -766,7 +766,7 @@ export default { licensePath: "License File", licensePathTip: "Please upload license file", upload: 'Upload', - uploadBatch: "Upload License", + uploadFile: "Upload License", uploadChangeOk: 'Network Element renewed license successfully and is being calibrated in the background!', uploadChangeFail: "Some network elements failed to update the license, please check whether the service terminal environment is available!", }, diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index 05280857..424f4104 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -766,7 +766,7 @@ export default { licensePath: "许可证文件", licensePathTip: "请上传许可证文件", upload: '上传', - uploadBatch: "上传许可证", + uploadFile: "上传许可证", uploadChangeOk: '网元更新许可证成功，正在后台校验！', uploadChangeFail: "部分网元更新许可证失败，请检查服务终端环境是否可用！", }, diff --git a/src/views/ne/neSoftware/index.vue b/src/views/ne/neSoftware/index.vue index bcdeab03..361e955a 100644 --- a/src/views/ne/neSoftware/index.vue +++ b/src/views/ne/neSoftware/index.vue @@ -434,8 +434,13 @@ onMounted(() => { " > - {{ t('views.ne.neSoftware.uploadBatch') }} - {{ tableState.selectedRowOne.neType }} + + { " > - {{ t('views.ne.neSoftware.uploadBatch') }} - {{ tableState.selectedRowOne.neType }} + + { " > - {{ t('views.ne.neSoftware.uploadBatch') }} + {{ t('views.ne.neSoftware.upload') }} {{ state.selectedRowOne.neType }} diff --git a/src/views/system/quick-start/components/NeInfoSoftwareLicense.vue b/src/views/system/quick-start/components/NeInfoSoftwareLicense.vue index 06173771..ddd627a0 100644 --- a/src/views/system/quick-start/components/NeInfoSoftwareLicense.vue +++ b/src/views/system/quick-start/components/NeInfoSoftwareLicense.vue @@ -296,7 +296,7 @@ onMounted(() => { @click.prevent="fnModalOpen" > - {{ t('views.ne.neLicense.uploadBatch') }} + {{ t('views.ne.neLicense.uploadFile') }}