+ @update:webMsgSend="webMsgSend=$event" @sendPause="sendPause" @sendResume="sendResume" @sendReCheck="sendReCheck" @closeWebSocket="closeWebSocket"
+ :stepsActive="stepsActive"/>
-
+
一键检测开始
- 开始检测
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -95,7 +80,6 @@ import socketClient from '@/utils/webSocketClient';
import {useCheckStore} from "@/stores/modules/check";
import {pauseTest, resumeTest, startPreTest} from '@/api/socket/socket'
import {useUserStore} from "@/stores/modules/user";
-import { Device } from '@/api/device/interface/device';
const userStore = useUserStore()
const checkStore = useCheckStore();
@@ -207,7 +191,7 @@ const handleSubmitFast = () => {
ElMessage.error('webSocket连接中断！')
return
}
- console.log("handleSubmit",stepsActive.value,TestStatus.value)
+ console.log("handleSubmit", stepsActive.value, TestStatus.value)
switch (stepsActive.value) {
case 1:
startPreTest({
@@ -215,9 +199,9 @@ const handleSubmitFast = () => {
devIds: deviceIds,
planId: planId,
operateType: '10', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
- userId:userStore.userInfo.id,
- temperature:checkStore.temperature,
- humidity:checkStore.humidity
+ userId: userStore.userInfo.id,
+ temperature: checkStore.temperature,
+ humidity: checkStore.humidity
}).then(res => {
if (res.code === 'A001014') {
ElMessageBox.alert('装置配置异常', '检测失败', {
@@ -241,24 +225,26 @@ const handleSubmitFast = () => {
break;
case 4:
if (TestStatus.value == "waiting") {
- /* startPreTest({
- userPageId: "cdf",
- devIds: deviceIds,
- planId: planId,
- operateType: checkStore.reCheckType ==1 ?'2':'8', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
- userId:userStore.userInfo.id,
- temperature:checkStore.temperature,
- humidity:checkStore.humidity
- }).then(res => {
- console.log(res)
- if (res.code === 'A001014') {
- ElMessageBox.alert('装置配置异常', '初始化失败', {
- confirmButtonText: '确定',
- type: 'error',
- })
- TestStatus.value = 'test_init_fail'
- }
- })*/
+ if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.timeTest && !checkStore.selectTestItems.channelsTest && checkStore.selectTestItems.test) {
+ startPreTest({
+ userPageId: "cdf",
+ devIds: deviceIds,
+ planId: planId,
+ operateType: checkStore.reCheckType == 1 ? '2' : '8', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+ userId: userStore.userInfo.id,
+ temperature: checkStore.temperature,
+ humidity: checkStore.humidity
+ }).then(res => {
+ console.log(res)
+ if (res.code === 'A001014') {
+ ElMessageBox.alert('装置配置异常', '初始化失败', {
+ confirmButtonText: '确定',
+ type: 'error',
+ })
+ TestStatus.value = 'test_init_fail'
+ }
+ })
+ }
TestStatus.value = 'start'
} else if (TestStatus.value == 'paused') {
// 发送继续指令
@@ -279,83 +265,83 @@ const handleSubmitFast = () => {
// let loading;
-const handleSubmit = () => {
- let deviceIds = checkStore.devices.map((item) => item.deviceId)
- let planId = checkStore.plan.id
-
- if (!dataSocket.socketServe.connected) {
- ElMessage.error('webSocket连接中断！')
- return
- }
- console.log("handleSubmit",stepsActive.value,TestStatus.value)
- switch (stepsActive.value) {
- case 1:
- startPreTest({
- userPageId: "cdf",
- devIds: deviceIds,
- planId: planId,
- operateType: '1', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
- userId:userStore.userInfo.id,
- temperature:checkStore.temperature,
- humidity:checkStore.humidity
- }).then(res => {
- if (res.code === 'A001014') {
- ElMessageBox.alert('装置配置异常', '检测失败', {
- confirmButtonText: '确定',
- type: 'error',
- })
- preTestStatus.value = 'error'
- }
- })
- preTestStatus.value = 'start'
- // setTimeout(() => {
- // preTestStatus.value = 'success'
- // }, 5000)
- break;
- case 2:
- timeTestStatus.value = 'start'
- break;
- case 3:
- // 调用系数校准组件的handleSubmit方法
- channelsTestStatus.value = 'start'
- break;
- case 4:
- if (TestStatus.value == "waiting") {
- startPreTest({
- userPageId: "cdf",
- devIds: deviceIds,
- planId: planId,
- operateType: checkStore.reCheckType ==1 ?'2':'8', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
- userId:userStore.userInfo.id,
- temperature:checkStore.temperature,
- humidity:checkStore.humidity
- }).then(res => {
- console.log(res)
- if (res.code === 'A001014') {
- ElMessageBox.alert('装置配置异常', '初始化失败', {
- confirmButtonText: '确定',
- type: 'error',
- })
- TestStatus.value = 'test_init_fail'
- }
- })
- TestStatus.value = 'start'
- } else if (TestStatus.value == 'paused') {
- // 发送继续指令
- sendResume()
- }
- // else if (TestStatus.value == 'recheck') {
- // // 发送重新检测指令
- // sendReCheck()
- // }
- // else if (TestStatus.value == 'success') {
- // handleClose()
- // }
- break;
- default:
- break;
- }
-};
+// const handleSubmit = () => {
+// let deviceIds = checkStore.devices.map((item) => item.deviceId)
+// let planId = checkStore.plan.id
+//
+// if (!dataSocket.socketServe.connected) {
+// ElMessage.error('webSocket连接中断！')
+// return
+// }
+// console.log("handleSubmit", stepsActive.value, TestStatus.value)
+// switch (stepsActive.value) {
+// case 1:
+// startPreTest({
+// userPageId: "cdf",
+// devIds: deviceIds,
+// planId: planId,
+// operateType: '1', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+// userId: userStore.userInfo.id,
+// temperature: checkStore.temperature,
+// humidity: checkStore.humidity
+// }).then(res => {
+// if (res.code === 'A001014') {
+// ElMessageBox.alert('装置配置异常', '检测失败', {
+// confirmButtonText: '确定',
+// type: 'error',
+// })
+// preTestStatus.value = 'error'
+// }
+// })
+// preTestStatus.value = 'start'
+// // setTimeout(() => {
+// // preTestStatus.value = 'success'
+// // }, 5000)
+// break;
+// case 2:
+// timeTestStatus.value = 'start'
+// break;
+// case 3:
+// // 调用系数校准组件的handleSubmit方法
+// channelsTestStatus.value = 'start'
+// break;
+// case 4:
+// if (TestStatus.value == "waiting") {
+// startPreTest({
+// userPageId: "cdf",
+// devIds: deviceIds,
+// planId: planId,
+// operateType: checkStore.reCheckType == 1 ? '2' : '8', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+// userId: userStore.userInfo.id,
+// temperature: checkStore.temperature,
+// humidity: checkStore.humidity
+// }).then(res => {
+// console.log(res)
+// if (res.code === 'A001014') {
+// ElMessageBox.alert('装置配置异常', '初始化失败', {
+// confirmButtonText: '确定',
+// type: 'error',
+// })
+// TestStatus.value = 'test_init_fail'
+// }
+// })
+// TestStatus.value = 'start'
+// } else if (TestStatus.value == 'paused') {
+// // 发送继续指令
+// sendResume()
+// }
+// // else if (TestStatus.value == 'recheck') {
+// // // 发送重新检测指令
+// // sendReCheck()
+// // }
+// // else if (TestStatus.value == 'success') {
+// // handleClose()
+// // }
+// break;
+// default:
+// break;
+// }
+// };
const emit = defineEmits<{
@@ -414,16 +400,17 @@ watch(ActiveStatue, function (newValue, oldValue) {
})
const handleQuit = () => {
- console.log('handleQuit',ActiveStatue.value)
+ console.log('handleQuit', ActiveStatue.value)
if (ActiveStatue.value !== 'success' && ActiveStatue.value !== 'waiting' && ActiveStatue.value !== 'paused' && ActiveStatue.value !== 'test_init_fail' && ActiveStatue.value !== 'connect_timeout' && ActiveStatue.value !== 'pause_timeout') {
- beforeClose(() => {})
+ beforeClose(() => {
+ })
} else {
handleClose()
}
}
-const handlePause=()=>{
+const handlePause = () => {
sendPause()
testRef.value?.handlePause()
}
@@ -447,9 +434,9 @@ const sendResume = () => {
devIds: checkStore.devices.map((item) => item.deviceId),
planId: checkStore.plan.id,
operateType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
- userId:userStore.userInfo.id,
- temperature:checkStore.temperature,
- humidity:checkStore.humidity
+ userId: userStore.userInfo.id,
+ temperature: checkStore.temperature,
+ humidity: checkStore.humidity
})
Object.assign(webMsgSend.value, {
requestId: 'Resume_Success'
@@ -463,9 +450,9 @@ const sendReCheck = () => {
devIds: checkStore.devices.map((item) => item.deviceId),
planId: checkStore.plan.id,
operateType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
- userId:userStore.userInfo.id,
- temperature:checkStore.temperature,
- humidity:checkStore.humidity
+ userId: userStore.userInfo.id,
+ temperature: checkStore.temperature,
+ humidity: checkStore.humidity
}).then(res => {
console.log(res)
if (res.code === 'A001014') {
@@ -575,7 +562,8 @@ defineExpose({open})
.el-step__head.is-success {
color: #91cc75;
}
- .el-step__title.is-success{
+
+ .el-step__title.is-success {
color: #91cc75;
}
}