diff --git a/.env b/.env index 12b3c55..99b158e 100644 --- a/.env +++ b/.env @@ -7,7 +7,7 @@ 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:8899/websocket/nuclear # VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8081/ws/cmd # VITE_HOST_URL=http://127.0.0.1:8081/ diff --git a/src/components/DetailTable.vue b/src/components/DetailTable.vue index 64f319a..ec1572c 100644 --- a/src/components/DetailTable.vue +++ b/src/components/DetailTable.vue @@ -193,7 +193,9 @@ const columns = ref([ colKey: 'checkTime', title: '核对时间', cell: (h, { row }) => - row.checkTime ? moment(row.checkTime).format('YYYY-MM-DD HH:mm') : '---', + row.checkTime + ? moment(row.checkTime).format('YYYY-MM-DD HH:mm:ss') + : '---', }, { colKey: 'nuclearStationName', diff --git a/src/components/Image.vue b/src/components/Image.vue index 8ef30cd..2241cac 100644 --- a/src/components/Image.vue +++ b/src/components/Image.vue @@ -6,7 +6,8 @@ 图像 { return } checkStore.updateCheckNumber(res?.data?.result) + const arr = taskStore.excelData.filter( + item => item.serialNumber == res?.data?.result, + ) + const item = arr[0] + if (item.firstSign == '' && item.secondSign == '') { + return + } + if (arr?.length > 0) { + // 将item存入store中 + imageStore.updateShowImage(true) + imageStore.updateCoreInfo(item) + } } } else { // 请保证当前正在核查的坐标不为空 @@ -581,6 +593,18 @@ const nextBtn = async () => { return } checkStore.updateCheckNumber(res?.data?.result) + const arr = taskStore.excelData.filter( + item => item.serialNumber == res?.data?.result, + ) + const item = arr[0] + if (item.firstSign == '' && item.secondSign == '') { + return + } + if (arr?.length > 0) { + // 将item存入store中 + imageStore.updateShowImage(true) + imageStore.updateCoreInfo(item) + } } } else { MessagePlugin('error', { content: '请保证当前正在核查的坐标不为空' })