finish

.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

src/components/Debug.vue

@@ -416,6 +416,9 @@ const websocketonopen = () => {
     websocketsend(getCameraParametersInteger)
     // 无法获取当前闪光灯是开是关。建议上层代码，初始化时候关闭闪光灯，然后在本地保存一个当前状态
     handleCloseFlashLight(false)
+  }, 500)
+  setTimeout(() => {
+    websocketsend(openFlashLight)
     websocketsend(getFlashBrightnessAnalog)
   }, 1000)
 }

src/components/Excel.vue

@@ -30,6 +30,7 @@ const showCoreDetail = index => {
       checkStore.updateCheckNumber(item.serialNumber)
     }
   }
+
   // 只有正确或者错误的才可以点击出详情
   if (arr?.length > 0) {
     imageStore.updateShowImage(true)

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) {

src/pages/index.vue

@@ -320,6 +320,7 @@
     </div>
     <div class="task_container" v-if="accountStore.activePage == 1">
       <Task
+        :closeAll="closeAll"
         :startFlashLight="startFlashLight"
         :startCaptureFunc="startCaptureFunc"
         :handleSimulationBrightness="handleSimulationBrightness"
@@ -381,10 +382,13 @@ import {
   getCharacterRecognitionResult,
   getCameraState,
   startCapture,
+  closeFlashLight,
+  stopCapture,
   setFlashBrightnessAnalog,
   setExposureTimeRaw,
   openFlashLight,
 } from '@/command'
+import { getCameraConfig } from '@/api/camera'
 const accountStore = useAccountStore()
 const taskStore = useTaskStore()
 const imageStore = useImageStore()
@@ -395,6 +399,11 @@ const loading = ref(false)
 const hasTestedLength = ref(0)
 const testArrLength = ref(121)
 
+const closeAll = () => {
+  websocketsend(closeFlashLight)
+  websocketsend(stopCapture)
+}
+
 const changeTaskStatusThree = () => {}
 
 // websocket
@@ -471,8 +480,25 @@ const clickLogo = () => {
   // taskStore.updateType(0)
   // getInitData()
 }
-const continueWork = () => {
+const continueWork = async () => {
   // 重置图片
+  startCaptureFunc()
+  startFlashLight()
+  setTimeout(() => {
+    startFlashLight()
+  }, 1000)
+  // 设置相机
+  const res = await getCameraConfig(imageStore.nuclearCoreId)
+  if (res?.code == 200) {
+    if (res?.data?.exposure) {
+      // 改变相机的exposure
+      handleExposureTime(res?.data?.exposure)
+    }
+    if (res?.data?.brightness) {
+      // 改变相机的simulation_brightness
+      handleSimulationBrightness(res?.data?.brightness)
+    }
+  }
   imageStore.reset()
   taskStore.updateCurrentDetailTaskId(null)
   accountStore.changePage(0)
@@ -660,11 +686,7 @@ onMounted(async () => {
 
 const catCurrentTaskDetail = () => {
   cameraStore.updateContinueTask(true)
-  startCaptureFunc()
-  startFlashLight()
-  setTimeout(() => {
-    startFlashLight()
-  }, 1000)
+  closeAll()
   const currentTaskId = taskStore.currentTaskId
   // 查看当前进行任务的详情
   taskStore.updateCurrentDetailTaskId(currentTaskId)

src/store/modules/image.js

@@ -8,10 +8,14 @@ export const useImageStore = defineStore({
       showImage: false,
       operatorName: '',
       nuclearStationName: '',
+      nuclearCoreId: '',
     }
   },
   // actions
   actions: {
+    updateNuclearCoreId(nuclearCoreId) {
+      this.nuclearCoreId = nuclearCoreId
+    },
     updateNuclearStationName(nuclearStationName) {
       this.nuclearStationName = nuclearStationName
     },