From 6400a59e290d842387325b124b0519442007d431 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Fri, 25 Aug 2023 18:44:10 +0800
Subject: [PATCH] some bug

---
 .env                | 20 ++++++++++----------
 src/pages/index.vue | 26 ++++++++++++++++++++++----
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/.env b/.env
index b2991ad..537b441 100644
--- a/.env
+++ b/.env
@@ -1,17 +1,17 @@
 # VITE_BASE_URL=http://192.168.1.194:8899
-VITE_WEBSOCKET_JAVA_URL=ws://192.168.1.194:8899/websocket/nuclear
-VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8899/websocket/nuclear
-VITE_WEBSOCKET_CAMERA_URL=ws://192.168.1.194:8081/ws/cmd
-VITE_HOST_URL=http://192.168.1.194:8081/
+# VITE_WEBSOCKET_JAVA_URL=ws://192.168.1.194:8899/websocket/nuclear
+# VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8899/websocket/nuclear
+# VITE_WEBSOCKET_CAMERA_URL=ws://192.168.1.194:8081/ws/cmd
+# 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:8081/ws/cmd
-# VITE_HOST_URL=http://127.0.0.1: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:8081/ws/cmd
+VITE_HOST_URL=http://127.0.0.1:8081/
 
-VITE_BASE_URL=http://192.168.1.111:8899
+# VITE_BASE_URL=http://192.168.1.111:8899
 # VITE_WEBSOCKET_JAVA_URL=ws://192.168.1.111:8899/websocket/nuclear
 # # VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8899/websocket/nuclear
 # VITE_WEBSOCKET_CAMERA_URL=ws://192.168.1.111:8899/ws/cmd
diff --git a/src/pages/index.vue b/src/pages/index.vue
index c690cbc..40f16d5 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -419,6 +419,7 @@ const onChange = async val => {
   // 终止自动核查任务
   if (val) {
     taskStore.updateCheckStatus(false)
+    checkStore.updateCheckNumber('1-6')
     if (taskStore.currentTaskId) {
       const res = await breakOffAutoCheckApi(taskStore.currentTaskId)
     }
@@ -533,7 +534,16 @@ const preBtn = async () => {
         MessagePlugin('error', { content: '已到达检测边缘' })
         return
       }
-      checkStore.updateCheckNumber(res?.data?.result)
+      if (
+        res?.data?.result == 'start' ||
+        res?.data?.result == 'finish' ||
+        res?.data?.result == null
+      ) {
+        MessagePlugin('error', { content: '已到达检测边缘' })
+      } else {
+        checkStore.updateCheckNumber(res?.data?.result)
+      }
+
       const arr = taskStore.excelData.filter(
         item => item.serialNumber == res?.data?.result,
       )
@@ -566,7 +576,15 @@ const nextBtn = async () => {
         MessagePlugin('error', { content: '已到达检测边缘' })
         return
       }
-      checkStore.updateCheckNumber(res?.data?.result)
+      if (
+        res?.data?.result == 'start' ||
+        res?.data?.result == 'finish' ||
+        res?.data?.result == null
+      ) {
+        MessagePlugin('error', { content: '已到达检测边缘' })
+      } else {
+        checkStore.updateCheckNumber(res?.data?.result)
+      }
       const arr = taskStore.excelData.filter(
         item => item.serialNumber == res?.data?.result,
       )
@@ -848,7 +866,7 @@ initWebSocket()
   }
   .main_content {
     flex: 1;
-    padding: 30px;
+    padding: 10px 30px;
     background: #f4f2f8;
     display: flex;
     box-sizing: border-box;
@@ -1015,7 +1033,7 @@ initWebSocket()
     .bottom_detail_card {
       width: 100%;
       height: 110px;
-      margin-top: 30px;
+      margin-top: 10px;
       box-sizing: border-box;
       display: flex;
       align-items: center;