Browse Source

实现部分上一步下一步

master
maochaoying 2 years ago
parent
commit
a433ee2725
  1. 12
      src/api/task.js
  2. 16
      src/components/Excel.vue
  3. 28
      src/pages/index.vue
  4. 4
      src/store/modules/check.js

12
src/api/task.js

@ -43,3 +43,15 @@ export const getProcessTaskInfoApi = () => {
method: 'GET', method: 'GET',
}) })
} }
export const getNextCoordApi = (coord, taskId, direction) => {
return request({
url: `/task/next`,
method: 'POST',
data: {
coord,
taskId,
direction,
},
})
}

16
src/components/Excel.vue

@ -13,10 +13,11 @@
</template> </template>
<script setup> <script setup>
import { useImageStore, useTaskStore } from '@/store'
import { useImageStore, useTaskStore, useCheckStore } from '@/store'
const imageStore = useImageStore() const imageStore = useImageStore()
const taskStore = useTaskStore() const taskStore = useTaskStore()
const checkStore = useCheckStore()
const props = defineProps({ const props = defineProps({
excelData: { excelData: {
type: Array, type: Array,
@ -25,8 +26,14 @@ const props = defineProps({
}) })
const showCoreDetail = index => { const showCoreDetail = index => {
//
const arr = props.excelData.filter(item => item.num == index) const arr = props.excelData.filter(item => item.num == index)
if (checkStore.manualCheck) {
if (arr?.length > 0) {
const item = arr[0]
checkStore.updateCheckNumber(item.serialNumber)
}
}
//
if (arr?.length > 0) { if (arr?.length > 0) {
const item = arr[0] const item = arr[0]
if ([1, 2].includes(item.result)) { if ([1, 2].includes(item.result)) {
@ -49,6 +56,11 @@ const getClass = index => {
// //
return 'box fail' return 'box fail'
} else if ( } else if (
checkStore.manualCheck &&
checkStore.checkNumber == item.serialNumber
) {
return 'box process'
} else if (
taskStore.currentCoord == item.serialNumber && taskStore.currentCoord == item.serialNumber &&
taskStore.taskStatus == 1 taskStore.taskStatus == 1
) { ) {

28
src/pages/index.vue

@ -248,6 +248,7 @@
? 'check_btn check_active_btn' ? 'check_btn check_active_btn'
: 'check_btn' : 'check_btn'
" "
@click="check"
> >
核查 核查
</div> </div>
@ -255,6 +256,7 @@
:class=" :class="
checkStore.manualCheck ? 'next_btn pre_active_btn' : 'next_btn' checkStore.manualCheck ? 'next_btn pre_active_btn' : 'next_btn'
" "
@click="preBtn"
> >
<svg <svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
@ -281,6 +283,7 @@
:class=" :class="
checkStore.manualCheck ? 'next_btn next_active_btn' : 'next_btn' checkStore.manualCheck ? 'next_btn next_active_btn' : 'next_btn'
" "
@click="nextBtn"
> >
<p>下一个</p> <p>下一个</p>
<svg <svg
@ -372,7 +375,7 @@ import User from 'cpns/User'
import DetailTable from 'cpns/DetailTable' import DetailTable from 'cpns/DetailTable'
import Debug from 'cpns/Debug' import Debug from 'cpns/Debug'
import { startAutoCheckApi, breakOffAutoCheckApi } from '@/api' import { startAutoCheckApi, breakOffAutoCheckApi } from '@/api'
import { getProcessTaskInfoApi } from '@/api/task'
import { getProcessTaskInfoApi, getNextCoordApi } from '@/api/task'
const accountStore = useAccountStore() const accountStore = useAccountStore()
const taskStore = useTaskStore() const taskStore = useTaskStore()
const imageStore = useImageStore() const imageStore = useImageStore()
@ -491,6 +494,29 @@ const getSocketdata = res => {
} }
} }
const preBtn = async () => {
const checkNumber = checkStore.checkNumber
const currentTaskId = taskStore.currentTaskId
const res = await getNextCoordApi(checkNumber, currentTaskId, '0')
if (res?.code == 200) {
}
}
const nextBtn = async () => {
const checkNumber = checkStore.checkNumber
const currentTaskId = taskStore.currentTaskId
const res = await getNextCoordApi(checkNumber, currentTaskId, '1')
if (res?.code == 200) {
checkStore.updateCheckNumber(res?.data?.result)
}
}
const check = () => {
const checkNumber = checkStore.checkNumber
const currentTaskId = taskStore.currentTaskId
//
}
onMounted(async () => { onMounted(async () => {
websocket.value = new socket() websocket.value = new socket()
websocket.value.WebSocketSet(getSocketdata) websocket.value.WebSocketSet(getSocketdata)

4
src/store/modules/check.js

@ -5,10 +5,14 @@ export const useCheckStore = defineStore({
state: () => { state: () => {
return { return {
manualCheck: false, manualCheck: false,
checkNumber: '',
} }
}, },
// actions // actions
actions: { actions: {
updateCheckNumber(checkNumber) {
this.checkNumber = checkNumber
},
handleChangeCheck(manualCheck) { handleChangeCheck(manualCheck) {
this.manualCheck = manualCheck this.manualCheck = manualCheck
}, },

Loading…
Cancel
Save