From c488f65b3b4181efef5434fe60ac3d2f222c444b Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Sat, 29 Jul 2023 14:10:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=86=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env | 20 ++++++++++----------
src/pages/index.vue | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/.env b/.env
index 50ac9f0..63bfb08 100644
--- a/.env
+++ b/.env
@@ -1,8 +1,8 @@
-# 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://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
@@ -11,8 +11,8 @@
# 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_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
-VITE_HOST_URL=http://192.168.1.111:8899/
\ No newline at end of file
+# 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
+# VITE_HOST_URL=http://192.168.1.111:8899/
\ No newline at end of file
diff --git a/src/pages/index.vue b/src/pages/index.vue
index e48e919..bd2a3ac 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -361,6 +361,7 @@
>
+
@@ -396,6 +397,7 @@ const taskStore = useTaskStore()
const imageStore = useImageStore()
const checkStore = useCheckStore()
const cameraStore = useCameraStore()
+const loading = ref(false)
const hasTestedLength = ref(0)
const testArrLength = ref(121)
@@ -569,6 +571,7 @@ const check = async () => {
if (!checked.value) {
return
}
+ loading.value = true
// 检查当前坐标点的结果是否正确
// 获取到结果后，传到后端保存
// 通过ws发送检查
@@ -580,6 +583,7 @@ const check = async () => {
if (isCameraOpen.value) {
websocketsend(getCharacterRecognitionResult)
} else {
+ loading.value = false
MessagePlugin('error', { content: '请确保相机处于开机状态' })
}
}, 1000)
@@ -650,6 +654,11 @@ const websocketonmessage = async e => {
const { result: result_serial, srcImagePath } = result
const arr = srcImagePath?.split('//')
const result_img = arr[0] + '/' + arr[1]
+ if (checkNumber == '') {
+ loading.value = false
+ MessagePlugin('error', '请选择核查坐标')
+ return
+ }
const res = await saveCheckResult(
checkNumber,
currentTaskId,
@@ -659,7 +668,31 @@ const websocketonmessage = async e => {
if (res?.code == 200) {
// 核查成功后请求新数据
// 更新exceldata
+ loading.value = false
taskStore.getExcelList(taskStore.currentTaskId)
+ // 将左侧摄像机展现为当前检测的结果
+ const arr = taskStore.excelData.filter(
+ item => item.serialNumber == checkNumber,
+ )
+ const item = arr[0]
+ console.log(item)
+ if (item.firstSign == '' && item.secondSign == '') {
+ return
+ }
+ if (checkStore.manualCheck) {
+ if (arr?.length > 0) {
+ 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])
+ }
MessagePlugin('success', { content: '核查完毕' })
// 自动跳转下一个
// nextBtn()
@@ -678,6 +711,7 @@ const websocketonmessage = async e => {
break
}
} else {
+ loading.value = false
MessagePlugin('error', { content: 'ws发送指令执行错误' })
}
}