From b0a8630113e0e5a0cd07849643ccc6a5b3ce8a1c Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Mon, 31 Jul 2023 15:08:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E6=9F=A5=E5=9D=90=E6=A0=87=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                |  8 ++++----
 src/api/task.js     | 11 +++++++++++
 src/pages/index.vue | 16 +++++++++++++++-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/.env b/.env
index 63bfb08..12b3c55 100644
--- a/.env
+++ b/.env
@@ -1,12 +1,12 @@
-VITE_BASE_URL=http://192.168.1.194:8899
-VITE_WEBSOCKET_JAVA_URL=ws://192.168.1.194:8899/websocket/nuclear
+# 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_BASE_URL=http://127.0.0.1:8899
-# VITE_WEBSOCKET_JAVA_URL=ws://127.0.0.1:8899/websocket/nuclear
+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/
diff --git a/src/api/task.js b/src/api/task.js
index fd3f7a2..a9c3843 100644
--- a/src/api/task.js
+++ b/src/api/task.js
@@ -59,3 +59,14 @@ export const getNextCoordApi = (coord, taskId, direction) => {
     },
   })
 }
+
+export const checkNumberInPathApi = (currentTaskId, checkNumber) => {
+  return request({
+    url: `/task/checkNumber`,
+    method: 'POST',
+    data: {
+      currentTaskId,
+      checkNumber,
+    },
+  })
+}
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 4947085..618954f 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -396,7 +396,11 @@ import User from 'cpns/User'
 import DetailTable from 'cpns/DetailTable'
 import Debug from 'cpns/Debug'
 import { startAutoCheckApi, breakOffAutoCheckApi, saveCheckResult } from '@/api'
-import { getProcessTaskInfoApi, getNextCoordApi } from '@/api/task'
+import {
+  getProcessTaskInfoApi,
+  getNextCoordApi,
+  checkNumberInPathApi,
+} from '@/api/task'
 import {
   getCharacterRecognitionResult,
   getCameraState,
@@ -592,6 +596,16 @@ const check = async () => {
   if (!checked.value) {
     return
   }
+  const checkNumber = checkStore.checkNumber
+  const currentTaskId = taskStore.currentTaskId
+  // 检查该checkNumber 是否在核查路径中
+  const res = await checkNumberInPathApi(currentTaskId, checkNumber)
+  if (res?.code == 200) {
+    if (!res?.data?.result) {
+      MessagePlugin('error', { content: '当前核查坐标点不在规划路径内' })
+      return
+    }
+  }
   loading.value = true
   // 检查当前坐标点的结果是否正确
   // 获取到结果后，传到后端保存