From f6e10a14a04d1a1cbd61257b5ec52961d9f2ac66 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Thu, 9 Jun 2022 14:04:15 +0800
Subject: [PATCH] =?UTF-8?q?CN-599=20fix:=20=E6=96=B0=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../table/report/reportTestTable.vue          | 19 ++++++++++++++++---
 src/router/index.js                           |  4 ----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/table/report/reportTestTable.vue b/src/components/table/report/reportTestTable.vue
index edecb2ed..1e2d8367 100644
--- a/src/components/table/report/reportTestTable.vue
+++ b/src/components/table/report/reportTestTable.vue
@@ -33,7 +33,7 @@
             <div class="expand-cell" v-for="(item, index) in downDataList" :key="index">
               <div class="expand-right">
                 <div class="demo-progress">
-                  <el-progress type="circle" :percentage="item.percent === 1 ? 100 : parseFloat(item.percent * 100).toFixed(2)" :color="item.percent === 1 ? '#21bf9a' : '#50b3ef'">
+                  <el-progress type="circle" :percentage="computePercent(item)" :color="computePercent(item) === 100 ? '#21bf9a' : '#50b3ef'">
                     <template #default="{ percentage }">
                       <span style="font-size: 0.875rem;">{{ percentage }}%</span>
                     </template>
@@ -47,13 +47,13 @@
                   <div>{{dateFormatByAppearance(item.ctime)}}</div>
                 </div>
                 <div class="expand-icon">
-                  <div class="table-operation-item--no-border" :class="{'table-operation-item--disabled': item.percent < 1}" @click="reportOperation(['download', item])">
+                  <div class="table-operation-item--no-border" :class="{'table-operation-item--disabled': computePercent(item) < 100}" @click="reportOperation(['download', item])">
                     <loading :loading="loadingTableId === item.id"></loading>
                     <svg class="icon" aria-hidden="true" :class="{'table-operation-all-loading': loadingTableId}">
                       <use xlink:href="#cn-icon-download2"></use>
                     </svg>
                   </div>
-                  <div class="table-operation-item--no-border" :class="{'table-operation-item--disabled': item.percent < 1}" @click="reportOperation(['preview', item])">
+                  <div class="table-operation-item--no-border" :class="{'table-operation-item--disabled': computePercent(item) < 100}" @click="reportOperation(['preview', item])">
                     <loading :loading="loadingPreviewId === item.id"></loading>
                     <svg class="icon" aria-hidden="true" :class="{'table-operation-all-loading': loadingPreviewId}">
                       <use xlink:href="#cn-icon-preview"></use>
@@ -236,6 +236,19 @@ export default {
         }
         return str
       }
+    },
+    computePercent () {
+      return function (item) {
+        if (item.percent === 1) {
+          if (item.state === 1) {
+            return 100
+          } else {
+            return 99.99
+          }
+        } else {
+          return parseFloat(item.percent * 100).toFixed(2)
+        }
+      }
     }
   },
   methods: {
diff --git a/src/router/index.js b/src/router/index.js
index c35a6794..209ed199 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -32,10 +32,6 @@ const routes = [
       },
       {
         path: '/report/builtIn',
-        component: () => import('@/views/report/builtinReport')
-      },
-      {
-        path: '/report/test',
         component: () => import('@/views/report/reportTest')
       },
       {