Merge remote-tracking branch 'origin/main-v2' into main-v2

src/i18n/locales/en-US.ts

@@ -841,7 +841,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',
@@ -850,7 +850,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?',
@@ -901,7 +901,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',
@@ -930,7 +930,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',

src/i18n/locales/zh-CN.ts

@@ -845,7 +845,7 @@ export default {
         passwordPlease: "请正确输入密码",
         addTitle: '新增VOIP用户',
         delTip: '确认要删除VOIP用户为【{num}】的信息吗？',
-        exportTip: "确认根据搜索条件导出xlsx表格文件吗?",
+        exportTip: "确认根据当前搜索条件导出全部VoIP用户数据吗？",
       },
       udmVolteIMS: {
         startMSISDN: '起始MSISDN',
@@ -854,7 +854,7 @@ export default {
         vniTip: '示例：ims.mnc000.mcc000.3gppnetwork.org',
         vniPlease: '请正确输入VNI',
         delTip: '确认要删除IMS签约为【{num}】的信息吗？',
-        exportTip: "确认根据搜索条件导出xlsx表格文件吗?",
+        exportTip: "确认根据当前搜索条件导出全部VoLTE用户数据吗？",
       },
       pcfSub: {
         exportTip: '确认导出全部用户策略控制信息数据吗?',
@@ -905,7 +905,7 @@ export default {
         neTypePlease: '查询网元类型',
         neType: 'UDM网元对象',
         export: '导出',
-        exportConfirm: '确认导出全部鉴权用户数据吗？',
+        exportConfirm: '确认根据当前搜索条件导出全部鉴权用户数据吗？',
         checkExport : '勾选导出',
         checkExportConfirm: '确认导出已勾选的鉴权用户数据吗？',
         import: '导入',
@@ -936,7 +936,7 @@ export default {
         export: '导出',
         exportConfirm: '确认导出全部签约用户数据吗？',
         checkExport : '勾选导出',
-        checkExportConfirm: '确认导出已勾选的签约用户数据吗？',
+        checkExportConfirm: '确认根据当前搜索条件导出全部签约用户数据吗？',
         import: '导入',
         importFail: '失败记录',
         loadDataConfirm: '确认要重新加载数据吗？',

src/views/neData/udm-auth/index.vue

@@ -505,6 +505,8 @@ function fnExportList(type: string) {
   const neId = queryParams.neId;
   if (!neId) return;
   const hide = message.loading(t('common.loading'), 0);
+  queryParams.pageNum = 1;
+  queryParams.pageSize = tablePagination.total;
   exportUDMAuth(Object.assign({ type: type }, queryParams))
     .then(res => {
       if (res.code === RESULT_CODE_SUCCESS) {

src/views/neData/udm-sub/index.vue

@@ -875,6 +875,8 @@ function fnExportList(type: string) {
   const neId = queryParams.neId;
   if (!neId) 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) {

src/views/neData/udm-voip/index.vue

@@ -363,6 +363,8 @@ function fnExportList(type: string) {
   const neId = queryParams.neId;
   if (!neId) 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) {

src/views/neData/udm-volte/index.vue

@@ -442,6 +442,8 @@ function fnExportList(type: string) {
   const neId = queryParams.neId;
   if (!neId) 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) {
@@ -449,7 +451,7 @@ function fnExportList(type: string) {
           content: t('common.operateOk'),
           duration: 2,
         });
-        saveAs(res.data, `UDM_VOLTE_${neId}_${Date.now()}.${type}`);
+        saveAs(res.data, `UDM_VoLTE_${neId}_${Date.now()}.${type}`);
       } else {
         message.error({
           content: `${res.msg}`,