From 869f4b62a28b849449a83fd9499eb9f394c42a9e Mon Sep 17 00:00:00 2001 From: maochaoying <925670706@qq.com> Date: Sat, 26 Aug 2023 13:16:46 +0800 Subject: [PATCH] wome bug --- .env | 20 ++++++++++---------- src/components/Task.vue | 24 +++++++++++++++++++++++- src/pages/index.vue | 5 +++++ 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/.env b/.env index 537b441..8e41f01 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_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_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_WEBSOCKET_JAVA_URL=ws://192.168.1.111:8899/websocket/nuclear diff --git a/src/components/Task.vue b/src/components/Task.vue index 34a38fc..82b2754 100644 --- a/src/components/Task.vue +++ b/src/components/Task.vue @@ -379,6 +379,8 @@ export default { 2, row.nuclearStationName, row.operatorName, + false, + row, ) } > @@ -427,6 +429,7 @@ export default { row.nuclearStationName, row.operatorName, row.canUpload, + row, ) } class={ @@ -613,17 +616,36 @@ export default { taskStore.updateCurrentTaskId(row.id) taskStore.updateCurrentDetailTaskId(null) }, - viewDetail( + async viewDetail( taskId, nuclearCoreName, flag, nuclearStationName, operatorName, canUpload, + row, ) { if (flag == 1 && canUpload) { return } + this.startCaptureFunc() + this.startFlashLight() + setTimeout(() => { + this.startFlashLight() + }, 1000) + // websocketsend(openFlashLight) + // 需要设置相机的参数 根据核堆id获取 + const res = await getCameraConfig(row.nuclearCoreId) + if (res?.code == 200) { + if (res?.data?.exposure) { + // 改变相机的exposure + this.handleExposureTime(res?.data?.exposure) + } + if (res?.data?.brightness) { + // 改变相机的simulation_brightness + this.handleSimulationBrightness(res?.data?.brightness) + } + } // 直接取消继续任务按钮 cameraStore.updateContinueTask(false) imageStore.updateNuclearStationName(nuclearStationName) diff --git a/src/pages/index.vue b/src/pages/index.vue index 552b1a4..f363af6 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -658,6 +658,11 @@ onMounted(async () => { const catCurrentTaskDetail = () => { cameraStore.updateContinueTask(true) + startCaptureFunc() + startFlashLight() + setTimeout(() => { + startFlashLight() + }, 1000) const currentTaskId = taskStore.currentTaskId // 查看当前进行任务的详情 taskStore.updateCurrentDetailTaskId(currentTaskId)