From 6b94960459129e5774af83335597d8144f6ee57d Mon Sep 17 00:00:00 2001
From: wkl505997900 <2313665567@qq.com>
Date: Tue, 30 May 2023 17:17:45 +0800
Subject: [PATCH] Resolve issues such as abnormal display
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/leaks/LeakTaskDetail.vue            | 14 ++--
 src/views/leaks/LeakTaskList.vue              | 10 ++-
 .../components/CreateRepairTaskDrawer.vue     |  6 ++
 src/views/leaks/components/CvesTable.vue      |  4 +-
 .../components/HostStatusInTaskDrawer.vue     | 22 +++++--
 src/views/leaks/components/HostTable.vue      |  4 +-
 6 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/views/leaks/LeakTaskDetail.vue b/src/views/leaks/LeakTaskDetail.vue
index ca3debd..5a3a6cf 100644
--- a/src/views/leaks/LeakTaskDetail.vue
+++ b/src/views/leaks/LeakTaskDetail.vue
@@ -156,8 +156,9 @@
       </a-table>
     </a-card>
     <host-status-in-task-drawer
-    :visible="hostListUnderCveVisible"
-    @close="closeHostListUnderCve"
+      :visible="hostListUnderCveVisible"
+      :taskType="taskType"
+      @close="closeHostListUnderCve"
       :taskId="taskId"
       :cveId="hostListOfCveId" />
   </page-header-wrapper>
@@ -339,11 +340,16 @@ export default {
           width: 140,
           scopedSlots: {customRender: 'status'},
           filteredValue: filters.status || null,
-          filters: [
+          filters: this.taskType === 'cve fix' ? [
             {text: '修复成功', value: 'succeed'},
             {text: '待修复', value: 'fail'},
             {text: '运行中', value: 'running'},
             {text: '未知', value: 'unknown'}
+          ] : [
+            {text: '回滚成功', value: 'succeed'},
+            {text: '待回滚', value: 'fail'},
+            {text: '运行中', value: 'running'},
+            {text: '未知', value: 'unknown'}
           ]
         }
       ];
@@ -705,7 +711,7 @@ export default {
       if (!this.filters) {
         this.filters = {};
       }
-      if (this.taskType === 'cve fix') {
+      if (this.taskType === 'cve fix' || this.taskType === 'cve rollback') {
         if (text !== '') {
           this.filters.cveId = text;
         } else {
diff --git a/src/views/leaks/LeakTaskList.vue b/src/views/leaks/LeakTaskList.vue
index 9cf3d34..d40d8d8 100644
--- a/src/views/leaks/LeakTaskList.vue
+++ b/src/views/leaks/LeakTaskList.vue
@@ -30,9 +30,9 @@
           </a-row>
         </a-row>
         <a-table
-        rowKey="task_id"
-        :columns="columns"
-        :data-source="tableData"
+          rowKey="task_id"
+          :columns="columns"
+          :data-source="tableData"
           :pagination="pagination"
           :row-selection="rowSelection"
           @change="handleTableChange"
@@ -204,6 +204,10 @@ export default {
             {
               text: 'repo set',
               value: 'repo set'
+            },
+            {
+              text: 'cve rollback',
+              value: 'cve rollback'
             }
           ]
         },
diff --git a/src/views/leaks/components/CreateRepairTaskDrawer.vue b/src/views/leaks/components/CreateRepairTaskDrawer.vue
index e25cd89..79d4920 100644
--- a/src/views/leaks/components/CreateRepairTaskDrawer.vue
+++ b/src/views/leaks/components/CreateRepairTaskDrawer.vue
@@ -40,6 +40,12 @@
               <a-icon slot="unCheckedChildren" type="close" />
             </a-switch>
           </a-form-item> -->
+          <a-form-item label="是否accept" v-if="taskType === 'cve fix'">
+            <a-switch :checked="isResetChecked" @click="handleResetChanage">
+              <a-icon slot="checkedChildren" type="check" />
+              <a-icon slot="unCheckedChildren" type="close" />
+            </a-switch>
+          </a-form-item>
           <a-form-item label="选择REPO" v-if="taskType === 'repo set'">
             <a-select
             v-decorator="['repo', {rules: [{required: true, message: '请选择REPO'}]}]"
diff --git a/src/views/leaks/components/CvesTable.vue b/src/views/leaks/components/CvesTable.vue
index 2922fe7..bca7fcd 100644
--- a/src/views/leaks/components/CvesTable.vue
+++ b/src/views/leaks/components/CvesTable.vue
@@ -392,7 +392,7 @@ export default {
         }
         this.selectedRowKeys = []
         this.getCvesAll()
-        this.getCves();
+        this.handleReset();
       } else {
       }
     },
@@ -404,7 +404,7 @@ export default {
         }
       this.selectedRowKeys = []
       this.getCvesAll()
-      this.getCves();
+      this.handleReset();
     },
     handleTableChange(pagination, filters, sorter) {
       // 存储翻页状态
diff --git a/src/views/leaks/components/HostStatusInTaskDrawer.vue b/src/views/leaks/components/HostStatusInTaskDrawer.vue
index b31435b..68f04b5 100644
--- a/src/views/leaks/components/HostStatusInTaskDrawer.vue
+++ b/src/views/leaks/components/HostStatusInTaskDrawer.vue
@@ -4,7 +4,10 @@
     <a-table rowKey="host_id" :columns="columns" :data-source="tableData" :pagination="false"
       :loading="tableIsLoading" bordered>
       <div slot="status" slot-scope="status">
-        <span><a-badge :status="statusValueMap[status]" />{{ statusTextMap[status] }}</span>
+        <span>
+          <a-badge :status="statusValueMap[status]" />
+          {{ taskType === 'cve fix' ? fixStatusTextMap[status] : rollbackStatusTextMap[status] }}
+        </span>
       </div>
     </a-table>
   </a-drawer>
@@ -17,13 +20,20 @@
 
 import {getHostOfCveInCveTask} from '@/api/leaks';
 
-const statusTextMap = {
+const fixStatusTextMap = {
   succeed: '已修复',
   fail: '未修复',
   running: '运行中',
   unknown: '未知'
 };
 
+const rollbackStatusTextMap = {
+  succeed: '已回滚',
+  fail: '待回滚',
+  running: '运行中',
+  unknown: '未知'
+};
+
 const statusValueMap = {
   succeed: 'success',
   fail: 'error',
@@ -45,14 +55,18 @@ export default {
     cveId: {
       type: String,
       default: null
+    },
+    taskType: {
+      type: String,
+      default: 'cve fix'
     }
   },
   data() {
     return {
       tableData: [],
       tableIsLoading: false,
-
-      statusTextMap,
+      rollbackStatusTextMap,
+      fixStatusTextMap,
       statusValueMap
     };
   },
diff --git a/src/views/leaks/components/HostTable.vue b/src/views/leaks/components/HostTable.vue
index 5011b21..079f786 100644
--- a/src/views/leaks/components/HostTable.vue
+++ b/src/views/leaks/components/HostTable.vue
@@ -281,7 +281,7 @@ export default {
         {
           dataIndex: 'hotpatch',
           key: 'hotpatch',
-          title: '热补丁支持',
+          title: '热补丁修复/状态',
           scopedSlots: {customRender: 'hotpatch'}
         },
         {
@@ -376,7 +376,7 @@ export default {
         }
       this.selectedRowKeys = []
       // 切换修复状态后重新请求受影响主机列表
-      this.getHostList();
+      this.handleReset();
     },
     handleExport() {
       if (this.selectedRowKeys.length !== 0) {
-- 
2.33.0