Browse Source

some bug

master
maochaoying 2 years ago
parent
commit
6400a59e29
  1. 20
      .env
  2. 26
      src/pages/index.vue

20
.env

@ -1,17 +1,17 @@
# VITE_BASE_URL=http://192.168.1.194:8899 # VITE_BASE_URL=http://192.168.1.194:8899
VITE_WEBSOCKET_JAVA_URL=ws://192.168.1.194:8899/websocket/nuclear
VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8899/websocket/nuclear
VITE_WEBSOCKET_CAMERA_URL=ws://192.168.1.194:8081/ws/cmd
VITE_HOST_URL=http://192.168.1.194:8081/
# VITE_WEBSOCKET_JAVA_URL=ws://192.168.1.194:8899/websocket/nuclear
# VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8899/websocket/nuclear
# VITE_WEBSOCKET_CAMERA_URL=ws://192.168.1.194:8081/ws/cmd
# 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:8081/ws/cmd
# VITE_HOST_URL=http://127.0.0.1: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:8081/ws/cmd
VITE_HOST_URL=http://127.0.0.1:8081/
VITE_BASE_URL=http://192.168.1.111:8899
# VITE_BASE_URL=http://192.168.1.111:8899
# VITE_WEBSOCKET_JAVA_URL=ws://192.168.1.111:8899/websocket/nuclear # VITE_WEBSOCKET_JAVA_URL=ws://192.168.1.111: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://192.168.1.111:8899/ws/cmd # VITE_WEBSOCKET_CAMERA_URL=ws://192.168.1.111:8899/ws/cmd

26
src/pages/index.vue

@ -419,6 +419,7 @@ const onChange = async val => {
// //
if (val) { if (val) {
taskStore.updateCheckStatus(false) taskStore.updateCheckStatus(false)
checkStore.updateCheckNumber('1-6')
if (taskStore.currentTaskId) { if (taskStore.currentTaskId) {
const res = await breakOffAutoCheckApi(taskStore.currentTaskId) const res = await breakOffAutoCheckApi(taskStore.currentTaskId)
} }
@ -533,7 +534,16 @@ const preBtn = async () => {
MessagePlugin('error', { content: '已到达检测边缘' }) MessagePlugin('error', { content: '已到达检测边缘' })
return return
} }
checkStore.updateCheckNumber(res?.data?.result)
if (
res?.data?.result == 'start' ||
res?.data?.result == 'finish' ||
res?.data?.result == null
) {
MessagePlugin('error', { content: '已到达检测边缘' })
} else {
checkStore.updateCheckNumber(res?.data?.result)
}
const arr = taskStore.excelData.filter( const arr = taskStore.excelData.filter(
item => item.serialNumber == res?.data?.result, item => item.serialNumber == res?.data?.result,
) )
@ -566,7 +576,15 @@ const nextBtn = async () => {
MessagePlugin('error', { content: '已到达检测边缘' }) MessagePlugin('error', { content: '已到达检测边缘' })
return return
} }
checkStore.updateCheckNumber(res?.data?.result)
if (
res?.data?.result == 'start' ||
res?.data?.result == 'finish' ||
res?.data?.result == null
) {
MessagePlugin('error', { content: '已到达检测边缘' })
} else {
checkStore.updateCheckNumber(res?.data?.result)
}
const arr = taskStore.excelData.filter( const arr = taskStore.excelData.filter(
item => item.serialNumber == res?.data?.result, item => item.serialNumber == res?.data?.result,
) )
@ -848,7 +866,7 @@ initWebSocket()
} }
.main_content { .main_content {
flex: 1; flex: 1;
padding: 30px;
padding: 10px 30px;
background: #f4f2f8; background: #f4f2f8;
display: flex; display: flex;
box-sizing: border-box; box-sizing: border-box;
@ -1015,7 +1033,7 @@ initWebSocket()
.bottom_detail_card { .bottom_detail_card {
width: 100%; width: 100%;
height: 110px; height: 110px;
margin-top: 30px;
margin-top: 10px;
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
align-items: center; align-items: center;

Loading…
Cancel
Save