From 93841a02ea368b9eb595c5c87c08da5d328f06de Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 26 Jun 2025 20:40:31 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=B8=AD=E6=97=B6=E9=97=B4=E5=88=86=E7=BB=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/perfManage/goldTarget/index.vue | 14 +++++++------- src/views/perfManage/kpiCReport/index.vue | 6 +++++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/views/perfManage/goldTarget/index.vue b/src/views/perfManage/goldTarget/index.vue index a1829b78..6d8f1b85 100644 --- a/src/views/perfManage/goldTarget/index.vue +++ b/src/views/perfManage/goldTarget/index.vue @@ -336,7 +336,11 @@ function fnRecordExport() { for (const key of keys) { if (tableColumnsKeyArr[i] === key) { const title = tableColumnsTitleArr[i]; - kpiData[title] = item[key]; + if (key === 'timeGroup') { + kpiData[title] = parseDateToStr(item[key]); + } else { + kpiData[title] = item[key]; + } } } } @@ -1288,9 +1292,7 @@ function handleSearch() { // 检查是否选择了网元类型和网元ID if (!state.neType) { message.warning({ - content: - t('views.perfManage.goldTarget.selectNeTypeFirst') || - '请先选择网元类型', + content: 'Please select the network element type first', duration: 2, }); return; @@ -1298,9 +1300,7 @@ function handleSearch() { if (state.neIds.length === 0) { message.warning({ - content: - t('views.perfManage.goldTarget.selectNeIdsFirst') || - '请选择至少一个网元', + content: 'Please select at least one network element', duration: 2, }); return; diff --git a/src/views/perfManage/kpiCReport/index.vue b/src/views/perfManage/kpiCReport/index.vue index eea03e9b..47998ee2 100644 --- a/src/views/perfManage/kpiCReport/index.vue +++ b/src/views/perfManage/kpiCReport/index.vue @@ -334,7 +334,11 @@ function fnRecordExport() { for (const key of keys) { if (tableColumnsKeyArr[i] === key) { const title = tableColumnsTitleArr[i]; - kpiData[title] = item[key]; + if (key === 'timeGroup') { + kpiData[title] = parseDateToStr(item[key]); + } else { + kpiData[title] = item[key]; + } } } } From c5d7026fc56ff00e5a0ed25bc3bef44046a37ffc Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 26 Jun 2025 20:41:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E9=80=89=E6=8B=A9=E5=99=A8=E4=BB=A5=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=BD=93=E5=A4=A9=E7=9A=84=E5=BC=80=E5=A7=8B=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/perfManage/goldTarget/index.vue | 2 +- src/views/perfManage/kpiCReport/index.vue | 2 +- src/views/perfManage/kpiKeyTarget/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/perfManage/goldTarget/index.vue b/src/views/perfManage/goldTarget/index.vue index 6d8f1b85..1515c8aa 100644 --- a/src/views/perfManage/goldTarget/index.vue +++ b/src/views/perfManage/goldTarget/index.vue @@ -87,7 +87,7 @@ let queryRangePicker = ref<[string, string]>(['', '']); const ranges = ref([ { label: t('views.perfManage.customTarget.toDay'), - value: [dayjs().startOf('hour'), dayjs()], + value: [dayjs().startOf('day'), dayjs()], }, { label: t('views.perfManage.customTarget.ago1Hour'), diff --git a/src/views/perfManage/kpiCReport/index.vue b/src/views/perfManage/kpiCReport/index.vue index 47998ee2..c128ccaf 100644 --- a/src/views/perfManage/kpiCReport/index.vue +++ b/src/views/perfManage/kpiCReport/index.vue @@ -87,7 +87,7 @@ let queryRangePicker = ref<[string, string]>(['', '']); const ranges = ref([ { label: t('views.perfManage.customTarget.toDay'), - value: [dayjs().startOf('hour'), dayjs()], + value: [dayjs().startOf('day'), dayjs()], }, { label: t('views.perfManage.customTarget.ago1Hour'), diff --git a/src/views/perfManage/kpiKeyTarget/index.vue b/src/views/perfManage/kpiKeyTarget/index.vue index 710b582f..d3db5068 100644 --- a/src/views/perfManage/kpiKeyTarget/index.vue +++ b/src/views/perfManage/kpiKeyTarget/index.vue @@ -37,7 +37,7 @@ const neInfoStore = useNeInfoStore(); const ranges = ref([ { label: t('views.perfManage.customTarget.toDay'), - value: [dayjs().startOf('hour'), dayjs()], + value: [dayjs().startOf('day'), dayjs()], }, { label: t('views.perfManage.customTarget.ago1Hour'), From a54de8a9bb55daad204bf1a26ce5bac66e73a214 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 27 Jun 2025 11:53:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E5=85=B3=E9=97=ADUDM=E9=89=B4?= =?UTF-8?q?=E6=9D=83=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/neUser/auth/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/neUser/auth/index.vue b/src/views/neUser/auth/index.vue index 51987cc7..0598a71a 100644 --- a/src/views/neUser/auth/index.vue +++ b/src/views/neUser/auth/index.vue @@ -866,7 +866,7 @@ onMounted(() => { {{ t('views.neUser.auth.import') }} - { {{ t('views.neUser.auth.export') }} - + --> { {{ t('views.neUser.auth.checkDel') }} - { {{ t('views.neUser.auth.checkExport') }} - + --> From b9bcd4c265d509b5f055188194008702545b138d Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 27 Jun 2025 15:46:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83PLMN=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BF=AE=E6=94=B9=E4=BD=BF=E7=94=A8=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ne/neConfig/components/Base.vue | 62 ++++++++++------------- 1 file changed, 27 insertions(+), 35 deletions(-) diff --git a/src/views/ne/neConfig/components/Base.vue b/src/views/ne/neConfig/components/Base.vue index 489539f8..7420a7d5 100644 --- a/src/views/ne/neConfig/components/Base.vue +++ b/src/views/ne/neConfig/components/Base.vue @@ -215,14 +215,14 @@ const supportMapper = { name: 'guami', display: 'GUAMI List', key: ['plmnId'], - item: (index, param) => { + item: (index, param, lastItem) => { const plmn = `${param.plmnId.mcc}${param.plmnId.mnc}`; return { index: index, plmnId: plmn, - pointer: 1, - regionId: 1, - setId: 1, + pointer: lastItem.pointer, + regionId: lastItem.regionId, + setId: lastItem.setId, }; }, }, @@ -231,7 +231,7 @@ const supportMapper = { name: 'tai', display: 'TAI List', key: ['plmnId'], - item: (index, param) => { + item: (index, param, lastItem) => { const plmn = `${param.plmnId.mcc}${param.plmnId.mnc}`; return { index: index, @@ -245,12 +245,12 @@ const supportMapper = { name: 'slice', display: 'Slice List', key: ['plmnId'], - item: (index, param) => { + item: (index, param, lastItem) => { const plmn = `${param.plmnId.mcc}${param.plmnId.mnc}`; return { index: index, plmnId: plmn, - sd: param.snssai.sd, + sd: parseInt(param.snssai.sd), sst: param.snssai.sst, }; }, @@ -262,9 +262,10 @@ const supportMapper = { name: 'plmn', display: 'PLMN List', key: ['mcc', 'mnc'], - item: (index, param) => { + item: (index, param, lastItem) => { const plmn = `${param.plmnId.mcc}${param.plmnId.mnc}`; - const domain = `ims.mnc${param.plmnId.mnc}.mcc${param.plmnId.mcc}.3gppnetwork.org`; + const mccDomain = param.plmnId.mcc.padStart(3, '0'); + const domain = `ims.mnc${param.plmnId.mnc}.mcc${mccDomain}.3gppnetwork.org`; return { index: index, domain: domain, @@ -293,14 +294,12 @@ const supportMapper = { name: 'gummei', display: 'Gummei List', key: ['plmnId'], - item: (index, param) => { + item: (index, param, lastItem) => { const plmn = `${param.plmnId.mcc}${param.plmnId.mnc}`; - return { + return Object.assign(lastItem, { index: index, plmnId: plmn, - groupId: 1, - code: 1, - }; + }); }, }, { @@ -308,7 +307,7 @@ const supportMapper = { name: 'tai', display: 'TAI List', key: ['plmnId'], - item: (index, param) => { + item: (index, param, lastItem) => { const plmn = `${param.plmnId.mcc}${param.plmnId.mnc}`; return { index: index, @@ -322,16 +321,12 @@ const supportMapper = { name: 'hss', display: 'HSS List', key: ['imsiPre'], - item: (index, param) => { + item: (index, param, lastItem) => { const plmn = `${param.plmnId.mcc}${param.plmnId.mnc}`; - const Hostname = `hss.ims.mnc${param.plmnId.mnc}.mcc${param.plmnId.mcc}.3gppnetwork.org`; - return { + return Object.assign(lastItem, { index: index, - hssHostname: Hostname, - hssPort: 3868, imsiPre: plmn, - protocol: 'SCTP', - }; + }); }, }, { @@ -339,14 +334,13 @@ const supportMapper = { name: 'sgw', display: 'SGW List', key: ['plmnId'], - item: (index, param) => { + item: (index, param, lastItem) => { const plmn = `${param.plmnId.mcc}${param.plmnId.mnc}`; - return { + return Object.assign(lastItem, { index: index, plmnId: plmn, - sgwIp: '172.16.5.150', - tac: param.tac, - }; + tac: parseInt(param.tac), + }); }, }, ], @@ -441,7 +435,7 @@ async function toConfig( continue; } const index = item.index; - const updateItem = rule.item(index, param); + const updateItem = rule.item(index, param, item); // console.log('存在修改', rule.name, index, updateItem); const resList = await editNeConfigData({ neType: ntType, @@ -454,14 +448,12 @@ async function toConfig( resList.code != RESULT_CODE_SUCCESS ? 'failed' : 'success'; errMsgArr.push(`${ntType}_${neId} ${rule.display} modify ${state}`); } else { - const item = res.data.sort((a, b) => b.index - a.index); - if (!item) { - // console.log('没有找到', rule.name, index); - errMsgArr.push(`${ntType}_${neId} ${rule.display} not found`); - continue; + let lastIndex = 0; + const arr = res.data.sort((a, b) => b.index - a.index); + if (arr.length != 0) { + lastIndex = arr[0].index + 1; } - const lastIndex = item[0].index + 1; - const addItem = rule.item(lastIndex, param); + const addItem = rule.item(lastIndex, param, arr[0]); // console.log('不存在新增', rule.name, lastIndex, addItem); const resList = await addNeConfigData({ neType: ntType,