Browse Source

上一个下一个

master
maochaoying 2 years ago
parent
commit
cfec2f72ac
  1. 2
      .env
  2. 4
      src/components/DetailTable.vue
  3. 3
      src/components/Image.vue
  4. 24
      src/pages/index.vue

2
.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/

4
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',

3
src/components/Image.vue

@ -6,7 +6,8 @@
<img
v-if="
(cameraStore?.cameraState && !imageStore.showImage) ||
!imageStore?.coreInfo?.resultImg
!imageStore?.coreInfo?.resultImg ||
imageStore?.coreInfo?.result == 0
"
:src="photoUrl"
alt="图像"

24
src/pages/index.vue

@ -560,6 +560,18 @@ const preBtn = 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) {
// itemstore
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) {
// itemstore
imageStore.updateShowImage(true)
imageStore.updateCoreInfo(item)
}
}
} else {
MessagePlugin('error', { content: '请保证当前正在核查的坐标不为空' })

Loading…
Cancel
Save