diff --git a/src/components/Image.vue b/src/components/Image.vue index 61c225f..672fb7f 100644 --- a/src/components/Image.vue +++ b/src/components/Image.vue @@ -68,6 +68,7 @@
+ import { onMounted } from 'vue' import { transNumberToEn } from '@/utils/common' -import { useTaskStore, useImageStore } from '@/store' +import { useTaskStore, useImageStore, useCameraStore } from '@/store' const taskStore = useTaskStore() const imageStore = useImageStore() +const cameraStore = useCameraStore() const handleSerialNumber = serialNumber => { if (serialNumber) { diff --git a/src/components/Task.vue b/src/components/Task.vue index 8cdf742..7960bf4 100644 --- a/src/components/Task.vue +++ b/src/components/Task.vue @@ -410,6 +410,7 @@ export default { ], } }, + props: ['startCaptureFunc'], components: { PathPlan, }, @@ -535,6 +536,7 @@ export default { if (flag == 1 && canUpload) { return } + this.startCaptureFunc() taskStore.updateTaskStatus(row.status) taskStore.updateCurrentCoord(row.currentCoord) imageStore.updateNuclearCoreName(coreName) diff --git a/src/pages/index.vue b/src/pages/index.vue index 1928993..87bf915 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -335,7 +335,7 @@
- +
{ } } +const startCaptureFunc = () => { + websocketsend(startCapture) +} + const isCameraOpen = ref(false) const check = async () => { if (!checked.value) { @@ -639,7 +649,7 @@ const websocketonmessage = async e => { taskStore.getExcelList(taskStore.currentTaskId) MessagePlugin('success', { content: '核查完毕' }) // 自动跳转下一个 - nextBtn() + // nextBtn() } break case 'getCameraState': @@ -647,6 +657,10 @@ const websocketonmessage = async e => { const { isOpen } = cameraState isCameraOpen.value = isOpen break + case 'startCapture': + // 改变相机状态 + cameraStore.updateCameraState(true) + break default: break } diff --git a/src/store/index.js b/src/store/index.js index 58c78c1..3c1e4bd 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -3,7 +3,14 @@ import { useAccountStore } from './modules/account' import { useTaskStore } from './modules/task' import { useImageStore } from './modules/image' import { useCheckStore } from './modules/check' +import { useCameraStore } from './modules/camera' const store = createPinia() export default store -export { useAccountStore, useTaskStore, useImageStore, useCheckStore } +export { + useAccountStore, + useTaskStore, + useImageStore, + useCheckStore, + useCameraStore, +} diff --git a/src/store/modules/camera.js b/src/store/modules/camera.js new file mode 100644 index 0000000..c693c3b --- /dev/null +++ b/src/store/modules/camera.js @@ -0,0 +1,16 @@ +import { defineStore } from 'pinia' +export const useCameraStore = defineStore({ + id: 'camera', // id必填,且需要唯一 + // state + state: () => { + return { + cameraState: false, + } + }, + // actions + actions: { + updateCameraState(cameraState) { + this.cameraState = cameraState + }, + }, +})