From b1c7a068cf211df6059fc9679eb308d39f431978 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 24 May 2024 17:41:08 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E7=BD=91=E5=85=83=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E5=8B=BE=E9=80=89=E5=A4=9A=E4=B8=8A=E4=BC=A0=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts                     |   1 +
 src/i18n/locales/zh-CN.ts                     |   1 +
 .../components/UploadLicenseFile.vue          | 170 ++++++------------
 3 files changed, 61 insertions(+), 111 deletions(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 0b4f1be0..ff87e588 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -736,6 +736,7 @@ export default {
         licensePathTip: "Please upload license file",
         upload: 'Upload',
         uploadBatch: "Upload License",
+        uploadChangeFail: "Some network elements failed to update the license, please check whether the service terminal environment is available!",
       },
       neConfPara5G: {
         title: 'Save Info',
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 8d92d7c9..dcbcb44f 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -736,6 +736,7 @@ export default {
         licensePathTip: "请上传许可证文件",
         upload: '上传',
         uploadBatch: "上传许可证",
+        uploadChangeFail: "部分网元更新许可证失败，请检查服务终端环境是否可用！",
       },
       neConfPara5G: {
         title: '保存信息',
diff --git a/src/views/ne/neLicense/components/UploadLicenseFile.vue b/src/views/ne/neLicense/components/UploadLicenseFile.vue
index 867ad4c5..6c59b5bd 100644
--- a/src/views/ne/neLicense/components/UploadLicenseFile.vue
+++ b/src/views/ne/neLicense/components/UploadLicenseFile.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import { reactive, onMounted, watch, PropType, computed } from 'vue';
-import { message, Upload } from 'ant-design-vue/lib';
+import { reactive, onMounted, watch, PropType, h } from 'vue';
+import { message, notification, Upload } from 'ant-design-vue/lib';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
 import { FileType } from 'ant-design-vue/lib/upload/interface';
 import { uploadFile } from '@/api/tool/file';
-import { changeNeLicense, listNeLicense } from '@/api/ne/neLicense';
+import { changeNeLicense } from '@/api/ne/neLicense';
 const { t } = useI18n();
 const emit = defineEmits(['ok', 'cancel', 'update:visible']);
 const props = defineProps({
@@ -27,10 +27,6 @@ type ModalStateType = {
   visibleByUploadFile: boolean;
   /**标题 */
   title: string;
-  /**模式 */
-  mode: 'Universal' | 'AUSF-UDM-IMS';
-  /**指定网元 */
-  selectNe: any[];
   /**授权文件路径 */
   licensePath: string;
   /**上传文件 */
@@ -42,8 +38,6 @@ type ModalStateType = {
 /**对话框对象信息状态 */
 let modalState: ModalStateType = reactive({
   visibleByUploadFile: false,
-  mode: 'Universal',
-  selectNe: [],
   licensePath: '',
   uploadFiles: [],
   title: '授权文件',
@@ -56,41 +50,60 @@ let modalState: ModalStateType = reactive({
  */
 async function fnModalOk() {
   if (!modalState.licensePath) {
-    message.warning('请上传授权文件', 3);
+    message.warning(t('views.ne.neLicense.licensePathTip'), 3);
     return;
   }
   if (modalState.confirmLoading) return;
   modalState.confirmLoading = true;
-  const hide = message.loading(t('common.loading'), 0);
 
-  let reqArr: any = calcSelectNe.value.map(s => {
-    s.reload = true; // 重启网元
-    s.licensePath = modalState.licensePath;
-    return changeNeLicense(s);
+  const notificationKey = 'NE_LICENSE_MORE';
+  notification.info({
+    key: notificationKey,
+    message: modalState.title,
+    description: t('common.loading'),
+    duration: 0,
   });
-  if (reqArr.length === 0) {
-    message.warning('没有对应的网元对象', 3);
-    hide();
+
+  if (props.licenseList.length === 0) {
+    notification.close(notificationKey);
     modalState.confirmLoading = false;
     return;
   }
 
-  Promise.all(reqArr)
-    .then(resArr => {
-      for (const res of resArr) {
-        if (res.code === RESULT_CODE_SUCCESS) {
-          message.success(t('common.operateOk'), 3);
-        } else {
-          message.success(res.msg, 3);
-        }
+  const hasFailNeType: string[] = [];
+  for (const item of props.licenseList) {
+    try {
+      const res = await changeNeLicense({
+        neType: item.neType,
+        neId: item.neId,
+        licensePath: modalState.licensePath,
+        reload: true, // 重启网元
+      });
+      if (res.code !== RESULT_CODE_SUCCESS) {
+        hasFailNeType.push(item.neType);
       }
-      emit('ok', resArr);
-      fnModalCancel();
-    })
-    .finally(() => {
-      hide();
-      modalState.confirmLoading = false;
+    } catch (error) {
+      console.error(error);
+    }
+  }
+
+  // 存在错误网元提示
+  if (hasFailNeType.length > 0) {
+    notification.warning({
+      message: modalState.title,
+      description: h('div', {}, [
+        h('p', t('views.ne.neLicense.uploadChangeFail')),
+        h('div', { style: { color: '#f5222d' } }, hasFailNeType.join('、')),
+      ]),
+      duration: 4.5,
     });
+  }
+
+  // 结束
+  emit('ok', hasFailNeType);
+  fnModalCancel();
+  notification.close(notificationKey);
+  modalState.confirmLoading = false;
 }
 
 /**
@@ -100,8 +113,6 @@ async function fnModalOk() {
 function fnModalCancel() {
   modalState.visibleByUploadFile = false;
   modalState.confirmLoading = false;
-  modalState.mode = 'Universal';
-  modalState.selectNe = [];
   modalState.licensePath = '';
   modalState.uploadFiles = [];
   emit('cancel');
@@ -136,7 +147,6 @@ function fnUploadFile(up: UploadRequestOption) {
   uploadFile(formData)
     .then(res => {
       if (res.code === RESULT_CODE_SUCCESS) {
-        message.success('upload success', 3);
         // 改为完成状态
         const file = modalState.uploadFiles[0];
         file.percent = 100;
@@ -159,43 +169,12 @@ watch(
   () => props.visible,
   val => {
     if (val) {
-      // 传入授权列表
-      if (props.licenseList.length === 0) {
-        listNeLicense({
-          neType: undefined,
-          neId: '',
-          version: '',
-          pageNum: 1,
-          pageSize: 20,
-        }).then(res => {
-          if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
-            modalState.selectNe = res.rows;
-          }
-        });
-      } else {
-        modalState.selectNe = props.licenseList;
-      }
-
-      modalState.title = 'Upload License File';
+      modalState.title = t('views.ne.neLicense.updateTtile');
       modalState.visibleByUploadFile = true;
     }
   }
 );
 
-/**授权模式选择 */
-const calcSelectNe = computed(() => {
-  if (!Array.isArray(modalState.selectNe)) return [];
-  if (modalState.mode === 'AUSF-UDM-IMS') {
-    return modalState.selectNe.filter(s =>
-      ['AUSF', 'UDM', 'IMS'].includes(s.neType)
-    );
-  }
-
-  return modalState.selectNe.filter(
-    s => !['OMC', 'AUSF', 'UDM', 'IMS'].includes(s.neType)
-  );
-});
-
 onMounted(() => {});
 </script>
 
@@ -207,30 +186,31 @@ onMounted(() => {});
     :visible="modalState.visibleByUploadFile"
     :title="modalState.title"
     :confirm-loading="modalState.confirmLoading"
+    :cancel-button-props="{ disabled: modalState.confirmLoading }"
+    :closable="false"
     @ok="fnModalOk"
     @cancel="fnModalCancel"
   >
     <a-form
       name="modalStateFrom"
       layout="horizontal"
-      :validate-on-rule-change="false"
-      :validateTrigger="[]"
       :wrapper-col="{ span: 18 }"
       :label-col="{ span: 6 }"
       :labelWrap="true"
     >
-      <a-form-item label="NE Type" v-if="calcSelectNe.length > 0">
-        <a-tag color="default" v-for="s in calcSelectNe">
+      <a-form-item :label="t('views.ne.common.neType')">
+        <a-tag color="processing" v-for="s in props.licenseList">
           {{ s.neType }}
         </a-tag>
       </a-form-item>
-      <a-form-item label="License Mode" name="mode">
-        <a-select v-model:value="modalState.mode">
-          <a-select-option value="Universal">Universal</a-select-option>
-          <a-select-option value="AUSF-UDM-IMS">AUSF-UDM-IMS</a-select-option>
-        </a-select>
-      </a-form-item>
-      <a-form-item label="License File" name="file" :required="true">
+
+      <a-form-item
+        :label="t('views.ne.neLicense.licensePath')"
+        name="file"
+        :required="true"
+        :validate-on-rule-change="false"
+        :validateTrigger="[]"
+      >
         <a-upload
           name="file"
           v-model:file-list="modalState.uploadFiles"
@@ -251,42 +231,10 @@ onMounted(() => {});
             <template #icon>
               <UploadOutlined />
             </template>
-            Upload
+            {{ t('views.ne.neLicense.upload') }}
           </a-button>
         </a-upload>
       </a-form-item>
-
-      <a-form-item label="License File" name="file" v-if="false">
-        <a-input-group compact>
-          <a-upload
-            name="file"
-            v-model:file-list="modalState.uploadFiles"
-            accept=".ini"
-            list-type="text"
-            :multiple="true"
-            :max-count="1"
-            :show-upload-list="{
-              showPreviewIcon: false,
-              showRemoveIcon: false,
-              showDownloadIcon: false,
-            }"
-            :before-upload="fnBeforeUploadFile"
-            :custom-request="fnUploadFile"
-            :disabled="modalState.confirmLoading"
-          >
-            <a-button type="primary">
-              <template #icon>
-                <UploadOutlined />
-              </template>
-              Upload
-            </a-button>
-          </a-upload>
-          <a-select v-model:value="modalState.mode" style="width: 142px">
-            <a-select-option value="Other">Other</a-select-option>
-            <a-select-option value="AUSF-UDM-IMS">AUSF-UDM-IMS</a-select-option>
-          </a-select>
-        </a-input-group>
-      </a-form-item>
     </a-form>
   </a-modal>
 </template>