Browse Source

wome bug

master
maochaoying 2 years ago
parent
commit
869f4b62a2
  1. 20
      .env
  2. 24
      src/components/Task.vue
  3. 5
      src/pages/index.vue

20
.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

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

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

Loading…
Cancel
Save