From cfec2f72aca3b6598af7407a88ec68a65d6183b2 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Mon, 31 Jul 2023 16:06:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=B8=80=E4=B8=AA=E4=B8=8B=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                           |  2 +-
 src/components/DetailTable.vue |  4 +++-
 src/components/Image.vue       |  3 ++-
 src/pages/index.vue            | 24 ++++++++++++++++++++++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index 12b3c55..99b158e 100644
--- a/.env
+++ b/.env
@@ -7,7 +7,7 @@ VITE_HOST_URL=http://192.168.1.194:8081/
 
 VITE_BASE_URL=http://127.0.0.1:8899
 VITE_WEBSOCKET_JAVA_URL=ws://127.0.0.1:8899/websocket/nuclear
-# # VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8899/websocket/nuclear
+# VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8899/websocket/nuclear
 # VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8081/ws/cmd
 # VITE_HOST_URL=http://127.0.0.1:8081/
 
diff --git a/src/components/DetailTable.vue b/src/components/DetailTable.vue
index 64f319a..ec1572c 100644
--- a/src/components/DetailTable.vue
+++ b/src/components/DetailTable.vue
@@ -193,7 +193,9 @@ const columns = ref([
     colKey: 'checkTime',
     title: '核对时间',
     cell: (h, { row }) =>
-      row.checkTime ? moment(row.checkTime).format('YYYY-MM-DD HH:mm') : '---',
+      row.checkTime
+        ? moment(row.checkTime).format('YYYY-MM-DD HH:mm:ss')
+        : '---',
   },
   {
     colKey: 'nuclearStationName',
diff --git a/src/components/Image.vue b/src/components/Image.vue
index 8ef30cd..2241cac 100644
--- a/src/components/Image.vue
+++ b/src/components/Image.vue
@@ -6,7 +6,8 @@
     <img
       v-if="
         (cameraStore?.cameraState && !imageStore.showImage) ||
-        !imageStore?.coreInfo?.resultImg
+        !imageStore?.coreInfo?.resultImg ||
+        imageStore?.coreInfo?.result == 0
       "
       :src="photoUrl"
       alt="图像"
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 618954f..9fa634f 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -560,6 +560,18 @@ const preBtn = async () => {
         return
       }
       checkStore.updateCheckNumber(res?.data?.result)
+      const arr = taskStore.excelData.filter(
+        item => item.serialNumber == res?.data?.result,
+      )
+      const item = arr[0]
+      if (item.firstSign == '' && item.secondSign == '') {
+        return
+      }
+      if (arr?.length > 0) {
+        // 将item存入store中
+        imageStore.updateShowImage(true)
+        imageStore.updateCoreInfo(item)
+      }
     }
   } else {
     // 请保证当前正在核查的坐标不为空
@@ -581,6 +593,18 @@ const nextBtn = async () => {
         return
       }
       checkStore.updateCheckNumber(res?.data?.result)
+      const arr = taskStore.excelData.filter(
+        item => item.serialNumber == res?.data?.result,
+      )
+      const item = arr[0]
+      if (item.firstSign == '' && item.secondSign == '') {
+        return
+      }
+      if (arr?.length > 0) {
+        // 将item存入store中
+        imageStore.updateShowImage(true)
+        imageStore.updateCoreInfo(item)
+      }
     }
   } else {
     MessagePlugin('error', { content: '请保证当前正在核查的坐标不为空' })