From 54cf296d2f3633324462c23abeffab2d200da221 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 12 Sep 2025 18:05:09 +0800 Subject: [PATCH] =?UTF-8?q?ref:=20v3=E5=8F=98=E6=9B=B4,=EF=BC=8C=E5=90=8C?= =?UTF-8?q?=E6=AD=A5v2.2509.2=20-250912?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/locales/en-US.ts | 8 ++++---- src/i18n/locales/zh-CN.ts | 8 ++++---- src/views/neData/sgwc-cdr/index.vue | 23 +++++++++++++++-------- src/views/neData/udm-auth/index.vue | 2 ++ src/views/neData/udm-sub/index.vue | 2 ++ src/views/neData/udm-voip/index.vue | 2 ++ src/views/neData/udm-volte/index.vue | 4 +++- src/views/system/menu/index.vue | 4 ++-- 8 files changed, 34 insertions(+), 19 deletions(-) diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 579d9ab8..4098deec 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -826,7 +826,7 @@ export default { passwordPlease: "Please enter your password correctly", addTitle: 'Add VOIP subscriber', delTip: 'Confirm that you want to delete the information of VOIP user as [{num}]?', - exportTip: "Confirm exporting xlsx table files based on search criteria?", + exportTip: "Confirm exporting all VOIP user data based on the current search criteria?", }, udmVolteIMS: { startMSISDN: 'Starting MSISDN', @@ -835,7 +835,7 @@ export default { vniTip: 'Example: ims.mnc000.mcc000.3gppnetwork.org', vniPlease: 'Please enter VNI correctly', delTip: 'Are you sure you want to delete the information of IMS signing as [{num}]?', - exportTip: "Confirm exporting xlsx table files based on search criteria?", + exportTip: "Confirm exporting all VoLTE user data based on the current search criteria?", }, pcfSub: { exportTip: 'Confirm exporting all user policy control information data?', @@ -886,7 +886,7 @@ export default { neTypePlease: 'Query network element Object', neType: 'UDM Object', export: 'Export', - exportConfirm: 'Are you sure to export all authentication user data?', + exportConfirm: 'Confirm exporting all Authentication user data based on the current search criteria?', checkExport : 'Check Export', checkExportConfirm: 'Confirm exporting the checked authenticated user data?', import: 'Import', @@ -915,7 +915,7 @@ export default { subInfo:' Subscription Info', neType: 'UDM Object', export: 'Export', - exportConfirm: 'Are you sure to export all signed user data?', + exportConfirm: 'Confirm exporting all Subscribers user data based on the current search criteria?', checkExport : 'Check Export', checkExportConfirm: 'Are you sure to export the data of the checked subscribers?', import: 'Import', diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index ad11d0ef..432093b4 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -826,7 +826,7 @@ export default { passwordPlease: "请正确输入密码", addTitle: '新增VOIP用户', delTip: '确认要删除VOIP用户为【{num}】的信息吗？', - exportTip: "确认根据搜索条件导出xlsx表格文件吗?", + exportTip: "确认根据当前搜索条件导出全部VoIP用户数据吗？", }, udmVolteIMS: { startMSISDN: '起始MSISDN', @@ -835,7 +835,7 @@ export default { vniTip: '示例：ims.mnc000.mcc000.3gppnetwork.org', vniPlease: '请正确输入VNI', delTip: '确认要删除IMS签约为【{num}】的信息吗？', - exportTip: "确认根据搜索条件导出xlsx表格文件吗?", + exportTip: "确认根据当前搜索条件导出全部VoLTE用户数据吗？", }, pcfSub: { exportTip: '确认导出全部用户策略控制信息数据吗?', @@ -886,7 +886,7 @@ export default { neTypePlease: '查询网元类型', neType: 'UDM网元对象', export: '导出', - exportConfirm: '确认导出全部鉴权用户数据吗？', + exportConfirm: '确认根据当前搜索条件导出全部鉴权用户数据吗？', checkExport : '勾选导出', checkExportConfirm: '确认导出已勾选的鉴权用户数据吗？', import: '导入', @@ -915,7 +915,7 @@ export default { subInfo:'签约信息', neType: 'UDM网元类型', export: '导出', - exportConfirm: '确认导出全部签约用户数据吗？', + exportConfirm: '确认根据当前搜索条件导出全部签约用户数据吗？', checkExport : '勾选导出', checkExportConfirm: '确认导出已勾选的签约用户数据吗？', import: '导入', diff --git a/src/views/neData/sgwc-cdr/index.vue b/src/views/neData/sgwc-cdr/index.vue index 37b08b8a..68bb4897 100644 --- a/src/views/neData/sgwc-cdr/index.vue +++ b/src/views/neData/sgwc-cdr/index.vue @@ -21,6 +21,8 @@ import dayjs, { type Dayjs } from 'dayjs'; import PQueue from 'p-queue'; import saveAs from 'file-saver'; import { useClipboard } from '@vueuse/core'; +import { currentCoreUid } from '@/hooks/useCoreUid'; +import { WS_GROUP_SGWC_CDR } from '@/constants/ne-constants'; const { copy } = useClipboard({ legacy: true }); const { t } = useI18n(); const neStore = useNeStore(); @@ -53,9 +55,10 @@ let rangePickerPresets = ref([ /**查询参数 */ let queryParams = reactive({ - /**网元类型 */ - neType: 'SGWC', - neId: '001', + /**核心网标识 */ + coreUid: currentCoreUid(), + /**网元标识 */ + neUid: undefined, imsi: '', msisdn: '', sortField: 'timestamp', @@ -414,6 +417,8 @@ const realTimeData = ref(false); function fnRealTime() { realTimeData.value = !realTimeData.value; if (realTimeData.value) { + const neUid = queryParams.neUid; + const coreUid = queryParams.coreUid; tableState.seached = false; // 建立链接 const options: OptionsType = { @@ -423,7 +428,7 @@ function fnRealTime() { * * CDR会话事件-SGWC (GroupID:1008_neId) */ - subGroupID: `1008_${queryParams.neId}`, + subGroupID: `${WS_GROUP_SGWC_CDR}_${coreUid}_${neUid}`, }, onmessage: wsMessage, onerror: (ev: any) => { @@ -450,8 +455,10 @@ function wsMessage(res: Record) { if (!data?.groupId) { return; } + const neUid = queryParams.neUid; + const coreUid = queryParams.coreUid; // cdrEvent CDR会话事件 - if (data.groupId === `1008_${queryParams.neId}`) { + if (data.groupId === `${WS_GROUP_SGWC_CDR}_${coreUid}_${neUid}`) { const cdrEvent = data.data; let cdrJSON = {}; try { @@ -490,7 +497,7 @@ onMounted(() => { return; } if (neOtions.value.length > 0) { - queryParams.neId = neOtions.value[0].value; + queryParams.neUid = neOtions.value[0].value; } else { message.warning({ content: t('common.noData'), @@ -520,9 +527,9 @@ onBeforeUnmount(() => { - + { if (res.code === RESULT_CODE_SUCCESS) { diff --git a/src/views/neData/udm-sub/index.vue b/src/views/neData/udm-sub/index.vue index 8428193d..5d156a48 100644 --- a/src/views/neData/udm-sub/index.vue +++ b/src/views/neData/udm-sub/index.vue @@ -883,6 +883,8 @@ function fnExportList(type: string) { const coreUid = queryParams.coreUid; if (!neUid || !coreUid) return; const hide = message.loading(t('common.loading'), 0); + queryParams.pageNum = 1; + queryParams.pageSize = tablePagination.total; exportUDMSub(Object.assign({ type: type }, queryParams)) .then(res => { if (res.code === RESULT_CODE_SUCCESS) { diff --git a/src/views/neData/udm-voip/index.vue b/src/views/neData/udm-voip/index.vue index c788d567..6842cf87 100644 --- a/src/views/neData/udm-voip/index.vue +++ b/src/views/neData/udm-voip/index.vue @@ -361,6 +361,8 @@ function fnExportList(type: string) { const coreUid = queryParams.coreUid; if (!neUid || !coreUid) return; const hide = message.loading(t('common.loading'), 0); + queryParams.pageNum = 1; + queryParams.pageSize = tablePagination.total; exportUDMVoIP(Object.assign({ type: type }, queryParams)) .then(res => { if (res.code === RESULT_CODE_SUCCESS) { diff --git a/src/views/neData/udm-volte/index.vue b/src/views/neData/udm-volte/index.vue index c1e25b71..6237b467 100644 --- a/src/views/neData/udm-volte/index.vue +++ b/src/views/neData/udm-volte/index.vue @@ -447,6 +447,8 @@ function fnExportList(type: string) { const coreUid = queryParams.coreUid; if (!neUid || !coreUid) return; const hide = message.loading(t('common.loading'), 0); + queryParams.pageNum = 1; + queryParams.pageSize = tablePagination.total; exportUDMVolteIMS(Object.assign({ type: type }, queryParams)) .then(res => { if (res.code === RESULT_CODE_SUCCESS) { @@ -454,7 +456,7 @@ function fnExportList(type: string) { content: t('common.operateOk'), duration: 2, }); - saveAs(res.data, `UDM_VOLTE_${Date.now()}.${type}`); + saveAs(res.data, `UDM_VoLTE_${Date.now()}.${type}`); } else { message.error({ content: `${res.msg}`, diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 4a550bbf..fa3dccfa 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -234,7 +234,7 @@ let modalState: ModalStateType = reactive({ title: '菜单', from: { menuId: undefined, - parentId: '0', + parentId: 0, menuName: '', menuSort: 0, menuType: MENU_TYPE_BUTTON, @@ -474,7 +474,7 @@ function fnGetList() { // 转换树状数据 treeDataAll = [ { - menuId: '0', + menuId: 0, menuName: t('views.system.dept.node'), children: parseDataToTreeExclude( data,