From 08fdeb89f104130bd090fa335114e7edf938a658 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Sat, 23 Sep 2023 10:55:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20UDM=E7=94=A8=E6=88=B7=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E4=BC=98=E5=8C=96=E5=92=8C=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts       | 20 +++++++++++++++-----
 src/i18n/locales/zh-CN.ts       | 20 +++++++++++++++-----
 src/views/neUser/auth/index.vue | 25 ++++++++++++++-----------
 src/views/neUser/sub/index.vue  | 23 +++++++++++++----------
 4 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 3b962091..0d47a0c8 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -123,18 +123,28 @@ export default {
     },
     neUser: {
       auth: {
+        neTypePlease: 'Query network element type',
+        neType: 'UDM Type',
         export: 'Export',
+        exportConfirm: "Are you sure to export all authentication user data?",
         import: 'Import',
+        loadDataConfirm: "Are you sure you want to reload the data?",
         loadData: "LoadData",
+        loadDataTip: 'Successfully obtained updated data: {num} items. The system is updating the data internally. Please do not click repeatedly to obtain updates!!!',
         num:'Number allocation',
         batchAddText: 'Batch Add',
         batchDelText: 'Batch Del',    
       },
-        sub:{
-          export: 'Export',
-          import: 'Import',
-          loadData: "LoadData"
-        },
+      sub:{
+        neTypePlease: 'Query network element type',
+        neType: 'UDM Type',
+        export: 'Export',
+        exportConfirm: "Are you sure to export all signed user data?",
+        import: 'Import',
+        loadDataConfirm: "Are you sure you want to reload the data?",
+        loadData: "LoadData",
+        loadDataTip: 'Successfully obtained updated data: {num} items. The system is updating the data internally. Please do not click repeatedly to obtain updates!!!',
+      },
       base5G: {
         neTypePlease: 'Query network element type',
         neType: 'AMF Type',
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 0d29b526..e7375a80 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -123,18 +123,28 @@ export default {
     },
     neUser: {
       auth: {
+        neTypePlease: '查询网元类型',
+        neType: 'UDM网元类型',
         export: '导出',
+        exportConfirm: "确认导出全部鉴权用户数据吗?",
         import: '导入',
+        loadDataConfirm: "确认要重新加载数据吗?",
         loadData: "更新数据",
+        loadDataTip: '成功获取更新数据：{num}条，系统内部进行数据更新，请勿重复点击获取更新!!!',
         num:'放号数',
         batchAddText: '批量新增',
         batchDelText: '批量删除',  
       },
-        sub:{
-          export: '导出',
-          import: '导入',
-          loadData: "更新数据"
-        },
+      sub:{
+        neTypePlease: '查询网元类型',
+        neType: 'UDM网元类型',
+        export: '导出',
+        exportConfirm: "确认导出全部签约用户数据吗?",
+        import: '导入',
+        loadDataConfirm: "确认要重新加载数据吗?",
+        loadData: "更新数据",
+        loadDataTip: '成功获取更新数据：{num}条，系统内部进行数据更新，请勿重复点击获取更新!!!',
+      },
       base5G: {
         neTypePlease: '查询网元类型',
         neType: 'AMF网元类型',
diff --git a/src/views/neUser/auth/index.vue b/src/views/neUser/auth/index.vue
index c42d28e4..fb23dfb2 100644
--- a/src/views/neUser/auth/index.vue
+++ b/src/views/neUser/auth/index.vue
@@ -305,7 +305,7 @@ function fnModalOk() {
     .then(e => {
       modalState.confirmLoading = true;
       const from = toRaw(modalState.from);
-      from.neId = neID
+      from.neId = neID;
       const result = from.id ? updateAuth(from) : addAuth(from);
       const hide = message.loading({ content: t('common.loading') });
       result
@@ -461,14 +461,17 @@ function fnLoadData() {
   const neID = queryParams.neId;
   if (tableState.loading || !neID) return;
   modalState.loadDataLoading = true;
+  tableState.loading = true; // 表格loading
   loadAuth(neID).then(res => {
     modalState.loadDataLoading = false;
+    tableState.loading = false; // 表格loading
     if (res.code === RESULT_CODE_SUCCESS) {
       notification.success({
-        message: '更新数据',
-        description: `成功获取更新数据：${res.data}条，系统内部进行数据更新，请勿重复点击获取!!!`,
+        message: t('views.neUser.auth.loadData'),
+        description: t('views.neUser.auth.loadDataTip', { num: res.data }),
         duration: 10,
       });
+      fnQueryReset();
     } else {
       message.error({
         content: `获取数据失败`,
@@ -575,12 +578,12 @@ onMounted(() => {
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
           <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="UDM网元类型" name="neId ">
+            <a-form-item :label="t('views.neUser.auth.neType')" name="neId ">
               <a-select
                 v-model:value="queryParams.neId"
                 :options="neOtions"
                 allow-clear
-                placeholder="请选择网元"
+                :placeholder="t('views.neUser.auth.neTypePlease')"
               />
             </a-form-item>
           </a-col>
@@ -639,9 +642,9 @@ onMounted(() => {
             {{ t('views.neUser.auth.batchDelText') }}
           </a-button>
           <a-popconfirm
-            title="确认要重新加载数据吗?"
-            ok-text="确认"
-            cancel-text="取消"
+            :title="t('views.neUser.auth.loadDataConfirm')"
+            :ok-text="t('common.ok')"
+            :cancel-text="t('common.cancel')"
             :disabled="modalState.loadDataLoading"
             @confirm="fnLoadData"
           >
@@ -662,11 +665,11 @@ onMounted(() => {
           </a-button>
 
           <a-popconfirm
-            title="确认导出全部鉴权用户数据吗?"
-            ok-text="txt文件"
+            :title="t('views.neUser.auth.exportConfirm')"
+            ok-text="TXT"
             ok-type="default"
             @confirm="fnExportList('txt')"
-            cancel-text="csv文件"
+            cancel-text="CSV"
             @cancel="fnExportList('csv')"
           >
             <a-button type="dashed">
diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue
index 6e33b86d..238a3112 100644
--- a/src/views/neUser/sub/index.vue
+++ b/src/views/neUser/sub/index.vue
@@ -377,14 +377,17 @@ function fnLoadData() {
   const neID = queryParams.neId;
   if (tableState.loading || !neID) return;
   modalState.loadDataLoading = true;
+  tableState.loading = true; // 表格loading
   loadSub(neID).then(res => {
     modalState.loadDataLoading = false;
+    tableState.loading = false; // 表格loading
     if (res.code === RESULT_CODE_SUCCESS) {
       notification.success({
-        message: '更新数据',
-        description: `成功获取更新数据：${res.data}条，系统内部进行数据更新，请勿重复点击获取!!!`,
+        message: t('views.neUser.sub.loadData'),
+        description: t('views.neUser.sub.loadDataTip', { num: res.data }),
         duration: 10,
       });
+      fnQueryReset();
     } else {
       message.error({
         content: `获取数据失败`,
@@ -491,12 +494,12 @@ onMounted(() => {
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
           <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="UDM网元类型" name="neId ">
+            <a-form-item :label="t('views.neUser.sub.neType')" name="neId ">
               <a-select
                 v-model:value="queryParams.neId"
                 :options="neOtions"
                 allow-clear
-                placeholder="请选择网元"
+                :placeholder="t('views.neUser.sub.neTypePlease')"
               />
             </a-form-item>
           </a-col>
@@ -546,9 +549,9 @@ onMounted(() => {
           </a-button>
 
           <a-popconfirm
-            title="确认要重新加载数据吗?"
-            ok-text="确认"
-            cancel-text="取消"
+            :title="t('views.neUser.sub.loadDataConfirm')"
+            :ok-text="t('common.ok')"
+            :cancel-text="t('common.cancel')"
             :disabled="modalState.loadDataLoading"
             @confirm="fnLoadData"
           >
@@ -569,11 +572,11 @@ onMounted(() => {
           </a-button>
 
           <a-popconfirm
-            title="确认导出全部签约用户数据吗?"
-            ok-text="txt文件"
+            :title="t('views.neUser.sub.exportConfirm')"
+            ok-text="TXT"
             ok-type="default"
             @confirm="fnExportList('txt')"
-            cancel-text="csv文件"
+            cancel-text="CSV"
             @cancel="fnExportList('csv')"
           >
             <a-button type="dashed">