From 5be95a7af67498487b04c2442f4419edba6d4089 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 16 May 2024 14:42:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E5=85=83=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A0=87=E7=AD=BE=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ne/neVersion/index.vue              | 18 +++++++++++---
 .../components/NeInfoSoftwareInstall.vue      | 24 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/views/ne/neVersion/index.vue b/src/views/ne/neVersion/index.vue
index d64252f2..742ffd16 100644
--- a/src/views/ne/neVersion/index.vue
+++ b/src/views/ne/neVersion/index.vue
@@ -5,14 +5,16 @@ import { Modal, TableColumnsType, message } from 'ant-design-vue/lib';
 import { SizeType } from 'ant-design-vue/lib/config-provider';
 import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface';
 import useNeInfoStore from '@/store/modules/neinfo';
-import useI18n from '@/hooks/useI18n';
 import { NE_TYPE_LIST } from '@/constants/ne-constants';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { listNeVersion, operateNeVersion } from '@/api/ne/neVersion';
 import { parseDateToStr } from '@/utils/date-utils';
+import useI18n from '@/hooks/useI18n';
+import useDictStore from '@/store/modules/dict';
 import useLockedStore from '@/store/modules/locked';
 const lockedStore = useLockedStore();
 const { t } = useI18n();
+const { getDict } = useDictStore();
 
 // 异步加载组件
 const EditModal = defineAsyncComponent(
@@ -22,6 +24,9 @@ const UploadMoreFile = defineAsyncComponent(
   () => import('../neSoftware/components/UploadMoreFile.vue')
 );
 
+/**字典数据-状态 */
+let dictStatus = ref<DictType[]>([]);
+
 /**网元参数 */
 let neOtions = ref<Record<string, any>[]>([]);
 
@@ -267,7 +272,7 @@ function fnRecordVersion(
 ) {
   let contentTip = `${action} version packages?`;
   if (action === 'upgrade') {
-    contentTip = t('views.ne.neVersion.upgradeTip')
+    contentTip = t('views.ne.neVersion.upgradeTip');
     if (row.newVersion === '' || row.newVersion === '-') {
       message.warning(t('views.ne.neVersion.upgradeTipEmpty'), 3);
       return;
@@ -278,7 +283,7 @@ function fnRecordVersion(
     }
   }
   if (action === 'rollback') {
-    contentTip = t('views.ne.neVersion.rollbackTip')
+    contentTip = t('views.ne.neVersion.rollbackTip');
     if (row.preVersion === '' || row.preVersion === '-') {
       message.warning(t('views.ne.neVersion.rollbackTipEmpty'), 3);
       return;
@@ -410,6 +415,10 @@ function fnRecordUpgrade() {
 }
 
 onMounted(() => {
+  // 初始字典数据
+  getDict('ne_version_status').then(res => {
+    dictStatus.value = res;
+  });
   // 获取网元网元列表
   useNeInfoStore()
     .fnNelist()
@@ -586,6 +595,9 @@ onMounted(() => {
         }"
       >
         <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'status'">
+            <DictTag :options="dictStatus" :value="record.status" />
+          </template>
           <template v-if="column.key === 'id'">
             <a-space :size="8" align="center">
               <a-tooltip placement="topRight">
diff --git a/src/views/system/quick-start/components/NeInfoSoftwareInstall.vue b/src/views/system/quick-start/components/NeInfoSoftwareInstall.vue
index 51316f46..44a63d92 100644
--- a/src/views/system/quick-start/components/NeInfoSoftwareInstall.vue
+++ b/src/views/system/quick-start/components/NeInfoSoftwareInstall.vue
@@ -3,12 +3,19 @@ import { Modal, TableColumnsType, message } from 'ant-design-vue/lib';
 import { defineAsyncComponent, onMounted, reactive, ref, toRaw } from 'vue';
 import { fnToStepName } from '../hooks/useStep';
 import useI18n from '@/hooks/useI18n';
+import useDictStore from '@/store/modules/dict';
 import { listNeVersion, operateNeVersion } from '@/api/ne/neVersion';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 const { t } = useI18n();
+const { getDict } = useDictStore();
+
 const UploadMoreFile = defineAsyncComponent(
   () => import('../../../ne/neSoftware/components/UploadMoreFile.vue')
 );
+
+/**字典数据-状态 */
+let dictStatus = ref<DictType[]>([]);
+
 /**表格字段列 */
 let tableColumns = ref<TableColumnsType>([
   {
@@ -44,6 +51,7 @@ let tableColumns = ref<TableColumnsType>([
   {
     title: 'status',
     dataIndex: 'status',
+    key: 'status',
     align: 'left',
     width: 100,
   },
@@ -214,7 +222,14 @@ function fnStepNext(stepName: 'NeInfoSoftwareLicense') {
 }
 
 onMounted(() => {
-  fnGetList();
+  // 初始字典数据
+  getDict('ne_version_status')
+    .then(res => {
+      dictStatus.value = res;
+    })
+    .finally(() => {
+      fnGetList();
+    });
 });
 </script>
 
@@ -238,6 +253,11 @@ onMounted(() => {
         onChange: fnTableSelectedRowKeys,
       }"
     >
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'status'">
+          <DictTag :options="dictStatus" :value="record.status" />
+        </template>
+      </template>
     </a-table>
 
     <!-- 新增多文件上传框 -->
@@ -255,6 +275,8 @@ onMounted(() => {
       :visible="state.visibleByUpgrade"
       title="Upgrade Version"
       :confirm-loading="state.confirmLoading"
+      :closable="false"
+      :cancelButtonProps="{ disabled: state.visibleByUpgrade }"
       @ok="fnModalOk"
       @cancel="fnModalCancel"
     >