From a9419fea090010ff9a8752016b833f8d0bbe1868 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Sat, 29 Jul 2023 14:57:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E6=9C=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Image.vue | 25 ++++++++++++++++++++++---
 src/pages/index.vue      | 12 ++++--------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/components/Image.vue b/src/components/Image.vue
index 672fb7f..df8df6c 100644
--- a/src/components/Image.vue
+++ b/src/components/Image.vue
@@ -1,6 +1,15 @@
 <template>
-  <div class="image_container" v-if="imageStore.showImage">
-    <img :src="imageStore?.coreInfo?.resultImg" alt="图像" class="img" />
+  <div
+    class="image_container"
+    v-if="cameraStore?.cameraState || imageStore.showImage"
+  >
+    <img
+      v-if="cameraStore?.cameraState && !imageStore.showImage"
+      :src="photoUrl"
+      alt="图像"
+      class="img"
+    />
+    <img v-else :src="imageStore?.coreInfo?.resultImg" alt="图像" class="img" />
     <div class="top_info">
       <p class="title">{{ imageStore.nuclearCoreName }}</p>
       <div class="title_left">
@@ -91,12 +100,22 @@
 </template>
 
 <script setup>
-import { onMounted } from 'vue'
+import { onMounted, ref } from 'vue'
 import { transNumberToEn } from '@/utils/common'
 import { useTaskStore, useImageStore, useCameraStore } from '@/store'
 const taskStore = useTaskStore()
 const imageStore = useImageStore()
 const cameraStore = useCameraStore()
+const photoUrl = ref('')
+setInterval(
+  () => {
+    photoUrl.value = `${
+      import.meta.env.VITE_HOST_URL
+    }app/core/realtime_photo/now.png?${Math.random()}`
+  },
+  500,
+  500,
+)
 
 const handleSerialNumber = serialNumber => {
   if (serialNumber) {
diff --git a/src/pages/index.vue b/src/pages/index.vue
index bf52a49..68c62bc 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -527,10 +527,10 @@ const logout = () => {
   window.location.href = '/#/login'
 }
 
-const getSocketdata = res => {
+const getSocketdata = async res => {
   if (res == 'update') {
     // 更新一系列数据
-    taskStore.getExcelList(taskStore.currentTaskId)
+    await taskStore.getExcelList(taskStore.currentTaskId)
     getInitData()
   }
 }
@@ -698,14 +698,10 @@ const websocketonmessage = async e => {
               checkStore.updateCheckNumber(item.serialNumber)
             }
           }
-          // 只有正确或者错误的才可以点击出详情
           if (arr?.length > 0) {
             // 将item存入store中
-            imageStore.updateShowImage(true)
-            const arr1 = taskStore.excelData.filter(
-              item => item.serialNumber == checkNumber,
-            )
-            imageStore.updateCoreInfo(arr1[0])
+            // imageStore.updateShowImage(true)
+            // imageStore.updateCoreInfo(item)
           }
           MessagePlugin('success', { content: '核查完毕' })
           // 自动跳转下一个