From cef82f01dafa530654f41d99baa9c1c892f6fb5b Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Tue, 4 Jul 2023 18:07:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=B4=E7=95=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Image.vue |  8 ++++++--
 src/components/Task.vue  |  1 +
 src/pages/index.vue      | 24 +++++++++++++++++++++---
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/components/Image.vue b/src/components/Image.vue
index faaa2de..2e7e2a1 100644
--- a/src/components/Image.vue
+++ b/src/components/Image.vue
@@ -60,8 +60,12 @@
         <!-- <p>A-8</p> -->
       </div>
       <div class="tag_wrap">
-        <p>T0DB</p>
-        <p>0T1U</p>
+        <p>
+          {{ imageStore?.coreInfo?.resultSerial?.split('-')[0]?.substr(-4) }}
+        </p>
+        <p>
+          {{ imageStore?.coreInfo?.resultSerial?.split('-')[1]?.substr(-4) }}
+        </p>
       </div>
     </div>
   </div>
diff --git a/src/components/Task.vue b/src/components/Task.vue
index f821f3b..f972b39 100644
--- a/src/components/Task.vue
+++ b/src/components/Task.vue
@@ -151,6 +151,7 @@ export default {
       accountStore.changePage(0)
       taskStore.getExcelList(taskId)
       taskStore.updateCurrentTaskId(taskId)
+      taskStore.updateCurrentDetailTaskId(null)
     },
     viewDetail(taskId, nuclearCoreName) {
       imageStore.updateNuclearCoreName(nuclearCoreName)
diff --git a/src/pages/index.vue b/src/pages/index.vue
index c49e538..4c7c834 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -193,7 +193,10 @@
         <Image />
         <Excel :excelData="taskStore.excelData" />
       </div>
-      <div class="bottom_operation_container" v-if="false">
+      <div
+        class="bottom_operation_container"
+        v-if="!taskStore.currentDetailTaskId"
+      >
         <div
           :class="
             taskStore.currentTaskId == null ? 'auto_btn cant_btn' : 'auto_btn'
@@ -291,8 +294,10 @@
           <DetailTable />
         </div>
         <div class="progress_btn">
-          <p class="title">核查进度</p>
-          <t-progress theme="plump" :percentage="30" />
+          <p class="title">
+            核查进度（{{ hasTestedLength }} / {{ testArrLength }}）
+          </p>
+          <t-progress theme="plump" :percentage="detailProcess" />
         </div>
       </div>
     </div>
@@ -343,6 +348,19 @@ const accountStore = useAccountStore()
 const taskStore = useTaskStore()
 const imageStore = useImageStore()
 
+const hasTestedLength = ref(0)
+const testArrLength = ref(121)
+
+const detailProcess = computed(() => {
+  const testArr = taskStore.excelData.filter(
+    item => item.firstSign && item.secondSign,
+  )
+  testArrLength.value = testArr.length
+  const hasTested = testArr.filter(item => item.result != 0)
+  hasTestedLength.value = hasTested.length
+  return parseInt((hasTested.length / testArr.length) * 100)
+})
+
 const checked = ref(false)
 
 const onChange = val => {