From 7cdc87a2d279155ef28e1030fa37372a87bba95d Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Mon, 31 Jul 2023 14:33:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=81=AE=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Task.vue   |  3 +--
 src/pages/index.vue       | 20 ++++++++++++--------
 src/store/modules/task.js |  9 +++++++++
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/components/Task.vue b/src/components/Task.vue
index ab74c9b..b5af370 100644
--- a/src/components/Task.vue
+++ b/src/components/Task.vue
@@ -550,7 +550,6 @@ export default {
       this.startCaptureFunc()
       // 需要设置相机的参数 根据核堆id获取
       const res = await getCameraConfig(row.nuclearCoreId)
-      console.log(res)
       if (res?.code == 200) {
         if (res?.data?.exposure) {
           // 改变相机的exposure
@@ -569,7 +568,7 @@ export default {
       imageStore.updateNuclearStationName(row.nuclearCoreName)
       imageStore.updateShowImage(false)
       accountStore.changePage(0)
-      taskStore.getExcelList(row.id)
+      await taskStore.getExcelList(row.id)
       taskStore.updateCurrentTaskId(row.id)
       taskStore.updateCurrentDetailTaskId(null)
     },
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 066b525..4947085 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -366,6 +366,12 @@
       <Nuclear />
     </div>
     <t-loading :loading="loading" text="核查中..." fullscreen size="large" />
+    <t-loading
+      :loading="taskStore.showLoading"
+      text="设置参数中..."
+      fullscreen
+      size="large"
+    />
   </div>
 </template>
 
@@ -683,14 +689,11 @@ const websocketonmessage = async e => {
         if (res?.code == 200) {
           // 核查成功后请求新数据
           // 更新exceldata
-          loading.value = false
-          taskStore.getExcelList(taskStore.currentTaskId)
+
+          const res1 = await taskStore.getExcelList(taskStore.currentTaskId)
           // 将左侧摄像机展现为当前检测的结果
-          const arr = taskStore.excelData.filter(
-            item => item.serialNumber == checkNumber,
-          )
+          const arr = res1.filter(item => item.serialNumber == checkNumber)
           const item = arr[0]
-          console.log(item)
           if (item.firstSign == '' && item.secondSign == '') {
             return
           }
@@ -701,9 +704,10 @@ const websocketonmessage = async e => {
           }
           if (arr?.length > 0) {
             // 将item存入store中
-            // imageStore.updateShowImage(true)
-            // imageStore.updateCoreInfo(item)
+            imageStore.updateShowImage(true)
+            imageStore.updateCoreInfo(item)
           }
+          loading.value = false
           MessagePlugin('success', { content: '核查完毕' })
           // 自动跳转下一个
           // nextBtn()
diff --git a/src/store/modules/task.js b/src/store/modules/task.js
index 57fda87..12e60e5 100644
--- a/src/store/modules/task.js
+++ b/src/store/modules/task.js
@@ -13,6 +13,7 @@ export const useTaskStore = defineStore({
       currentDetailTaskId: null,
       taskStatus: 0,
       pathData: [],
+      showLoading: false,
     }
   },
   // actions
@@ -45,6 +46,10 @@ export const useTaskStore = defineStore({
       this.excelData = excelData
     },
     async getExcelList(taskId) {
+      if (this.excelData.length == 0) {
+        this.showLoading = true
+      }
+
       const res = await getNuclearExcelApi(taskId)
       if (res?.code == 200) {
         // 根据data的serialNumber算出序列号
@@ -54,6 +59,10 @@ export const useTaskStore = defineStore({
           item.num = parseInt(arr[0]) * 14 + parseInt(arr[1]) + 1
         })
         this.excelData = list
+        this.showLoading = false
+        return list
+      } else {
+        this.showLoading = false
       }
     },
   },