diff --git a/.env b/.env index 9599f6b..537b441 100644 --- a/.env +++ b/.env @@ -1,15 +1,15 @@ # 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_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_WEBSOCKET_JAVA_URL=ws://192.168.1.111:8899/websocket/nuclear diff --git a/src/components/Debug.vue b/src/components/Debug.vue index 0e86c60..d9babe9 100644 --- a/src/components/Debug.vue +++ b/src/components/Debug.vue @@ -416,6 +416,9 @@ const websocketonopen = () => { websocketsend(getCameraParametersInteger) // 无法获取当前闪光灯是开是关。建议上层代码,初始化时候关闭闪光灯,然后在本地保存一个当前状态 handleCloseFlashLight(false) + }, 500) + setTimeout(() => { + websocketsend(openFlashLight) websocketsend(getFlashBrightnessAnalog) }, 1000) } diff --git a/src/components/Excel.vue b/src/components/Excel.vue index c49d485..a15a97f 100644 --- a/src/components/Excel.vue +++ b/src/components/Excel.vue @@ -30,6 +30,7 @@ const showCoreDetail = index => { checkStore.updateCheckNumber(item.serialNumber) } } + // 只有正确或者错误的才可以点击出详情 if (arr?.length > 0) { imageStore.updateShowImage(true) diff --git a/src/components/Task.vue b/src/components/Task.vue index 0d1e5a6..f788cc8 100644 --- a/src/components/Task.vue +++ b/src/components/Task.vue @@ -480,6 +480,7 @@ export default { } }, props: [ + 'closeAll', 'startCaptureFunc', 'handleSimulationBrightness', 'handleExposureTime', @@ -648,6 +649,7 @@ export default { }, 1000) // websocketsend(openFlashLight) // 需要设置相机的参数 根据核堆id获取 + imageStore.updateNuclearCoreId(row.nuclearCoreId) const res = await getCameraConfig(row.nuclearCoreId) if (res?.code == 200) { if (res?.data?.exposure) { @@ -683,13 +685,12 @@ export default { if (flag == 1 && canUpload) { return } - this.startCaptureFunc() - this.startFlashLight() - setTimeout(() => { - this.startFlashLight() - }, 1000) + this.closeAll() + // this.startCaptureFunc() + // this.startFlashLight() // websocketsend(openFlashLight) // 需要设置相机的参数 根据核堆id获取 + imageStore.updateNuclearCoreId(row.nuclearCoreId) const res = await getCameraConfig(row.nuclearCoreId) if (res?.code == 200) { if (res?.data?.exposure) { diff --git a/src/pages/index.vue b/src/pages/index.vue index 51ce08b..ce6fdba 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -320,6 +320,7 @@