From 869c09ac3c2d635c60adab9cb9fcb638464f3cd6 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 25 Oct 2023 16:23:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BD=AF=E4=BB=B6=E7=AE=A1=E7=90=86>?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=BC=96=E5=8F=B7=E7=A7=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/software-history.vue           |  5 ++++
 .../configManage/softwareManage/index.vue     | 25 +++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/views/configManage/softwareManage/components/software-history.vue b/src/views/configManage/softwareManage/components/software-history.vue
index 23364b55..8d815282 100644
--- a/src/views/configManage/softwareManage/components/software-history.vue
+++ b/src/views/configManage/softwareManage/components/software-history.vue
@@ -284,6 +284,11 @@ watch(
       :scroll="{ y: 400, x: true }"
       :pagination="tablePagination"
     >
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'status'">
+          <DictTag :options="dict.neVersionStatus" :value="record.status" />
+        </template>
+      </template>
     </a-table>
   </a-modal>
 </template>
diff --git a/src/views/configManage/softwareManage/index.vue b/src/views/configManage/softwareManage/index.vue
index 74a741ae..759eedd4 100644
--- a/src/views/configManage/softwareManage/index.vue
+++ b/src/views/configManage/softwareManage/index.vue
@@ -72,11 +72,6 @@ let tableState: TabeStateType = reactive({
 
 /**表格字段列 */
 let tableColumns: ColumnsType = [
-  {
-    title: t('common.rowId'),
-    dataIndex: 'id',
-    align: 'center',
-  },
   {
     title: t('views.configManage.softwareManage.neType'),
     dataIndex: 'neType',
@@ -198,20 +193,20 @@ function fnFileModalVisible(type: string | number, row: Record<string, any>) {
     fileModalState.title = t('views.configManage.softwareManage.sendTitle');
     fileModalState.content = t(
       'views.configManage.softwareManage.sendContent',
-      { num: row.id }
+      { fileName: row.fileName }
     );
   }
   if (type === 'run') {
     fileModalState.title = t('views.configManage.softwareManage.runTitle');
     fileModalState.content = t('views.configManage.softwareManage.runContent', {
-      num: row.id,
+      fileName: row.fileName,
     });
   }
   if (type === 'back') {
     fileModalState.title = t('views.configManage.softwareManage.backTitle');
     fileModalState.content = t(
       'views.configManage.softwareManage.backContent',
-      { num: row.id }
+      { fileName: row.fileName }
     );
   }
   if (!fileModalState.content) {
@@ -301,7 +296,9 @@ function fnFileModalCancel() {
 function fnDownloadFile(row: Record<string, any>) {
   Modal.confirm({
     title: '提示',
-    content: `确认下载记录编号为 【${row.id}】 的数据项文件?`,
+    content: t('views.configManage.softwareManage.downloadTip', {
+      fileName: row.fileName,
+    }),
     onOk() {
       const key = 'downloadNeSoftware';
       message.loading({ content: t('common.loading'), key });
@@ -331,8 +328,10 @@ function fnDownloadFile(row: Record<string, any>) {
  */
 function fnRecordDelete(row: Record<string, any>) {
   Modal.confirm({
-    title: t('commont.tipTitle'),
-    content: t('views.configManage.softwareManage.deleteTip', { num: row.id }),
+    title: t('common.tipTitle'),
+    content: t('views.configManage.softwareManage.deleteTip', {
+      fileName: row.fileName,
+    }),
     onOk() {
       const key = 'delNeSoftware';
       message.loading({ content: t('common.loading'), key });
@@ -391,7 +390,7 @@ type ModalStateType = {
 let modalState: ModalStateType = reactive({
   visibleByEdit: false,
   visibleByHistory: false,
-  title: '任务设置',
+  title: '上传更新',
   from: {
     neType: undefined,
     version: '',
@@ -534,7 +533,7 @@ function fnBeforeUploadCms(file: FileType) {
   const fileName = file.name;
   const suff = fileName.substring(fileName.lastIndexOf('.'));
   if (!['.cms'].includes(suff)) {
-    message.error('只支持上传文件格式（.deb、.rpm）', 3);
+    message.error('只支持上传文件格式（.cms）', 3);
     return false;
   }
   return true;