Browse Source

task

master
maochaoying 2 years ago
parent
commit
8959c4c3cc
  1. 4
      src/components/Image.vue
  2. 2
      src/components/Task.vue
  3. 20
      src/pages/index.vue
  4. 9
      src/store/index.js
  5. 16
      src/store/modules/camera.js

4
src/components/Image.vue

@ -68,6 +68,7 @@
</div>
</div>
<div class="no_image" v-else>
<!-- 根据相机是否开启切换不同的icon -->
<svg
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
@ -92,9 +93,10 @@
<script setup>
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) {

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

20
src/pages/index.vue

@ -335,7 +335,7 @@
</div>
</div>
<div class="task_container" v-if="accountStore.activePage == 1">
<Task />
<Task :startCaptureFunc="startCaptureFunc" />
</div>
<div
class="publish_container"
@ -367,6 +367,7 @@ import {
useTaskStore,
useImageStore,
useCheckStore,
useCameraStore,
} from '@/store'
import socket from '@/utils/websocket'
import Cookie from '@/utils/cookie'
@ -382,11 +383,16 @@ import DetailTable from 'cpns/DetailTable'
import Debug from 'cpns/Debug'
import { startAutoCheckApi, breakOffAutoCheckApi, saveCheckResult } from '@/api'
import { getProcessTaskInfoApi, getNextCoordApi } from '@/api/task'
import { getCharacterRecognitionResult, getCameraState } from '@/command'
import {
getCharacterRecognitionResult,
getCameraState,
startCapture,
} from '@/command'
const accountStore = useAccountStore()
const taskStore = useTaskStore()
const imageStore = useImageStore()
const checkStore = useCheckStore()
const cameraStore = useCameraStore()
const hasTestedLength = ref(0)
const testArrLength = ref(121)
@ -542,6 +548,10 @@ const nextBtn = async () => {
}
}
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
}

9
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,
}

16
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
},
},
})
Loading…
Cancel
Save