This commit is contained in:
caozehui
2025-02-26 13:22:01 +08:00
parent 61be97b04b
commit fc97087767
5 changed files with 60 additions and 60 deletions

View File

@@ -10,7 +10,7 @@ export const useCheckStore = defineStore("check", {
state: () => ({ state: () => ({
devices: Array<CheckData.Device>(), devices: Array<CheckData.Device>(),
plan: Object<Plan.ResPlan>(), plan: Object<Plan.ResPlan>(),
selectTestItems: Object<CheckData.SelectTestItem>({preTest: true, timeTest: true, channelsTest: true, test: true}), selectTestItems: Object<CheckData.SelectTestItem>({preTest: true, timeTest: true, channelsTest: false, test: true}),
checkType:1 checkType:1
}), }),
@@ -28,7 +28,7 @@ export const useCheckStore = defineStore("check", {
}, },
initSelectTestItems() { initSelectTestItems() {
this.selectTestItems.preTest = true this.selectTestItems.preTest = true
this.selectTestItems.channelsTest = true this.selectTestItems.channelsTest = false
this.selectTestItems.test = true this.selectTestItems.test = true
}, },
setSelectTestItems(selectTestItems: CheckData.SelectTestItem) { setSelectTestItems(selectTestItems: CheckData.SelectTestItem) {

View File

@@ -486,25 +486,25 @@ watch(webMsgSend, function (newValue, oldValue) {
break; break;
} }
break; break;
case 'connect': // case 'connect':
switch (newValue.operateCode) { // switch (newValue.operateCode) {
case "Source": // case "Source":
ElMessageBox.alert('源服务端连接失败', '源服务端连接失败', { // ElMessageBox.alert('源服务端连接失败', '源服务端连接失败', {
confirmButtonText: '确定', // confirmButtonText: '确定',
type: 'error', // type: 'error',
}) // })
TableInit(); // TableInit();
break; // break;
case "Dev": // case "Dev":
ElMessageBox.alert('设备服务端连接失败', '设备服务端连接失败', { // ElMessageBox.alert('设备服务端连接失败', '设备服务端连接失败', {
confirmButtonText: '确定', // confirmButtonText: '确定',
type: 'error', // type: 'error',
}) // })
TableInit(); // TableInit();
break; // break;
} // }
//
break; // break;
} }
} }
}) })

View File

@@ -1132,7 +1132,7 @@ onBeforeMount(async () => {
const handleQuitClicked = () => { const handleQuitClicked = () => {
//console.log('handleQuitClicked') //console.log('handleQuitClicked')
dataSocket.socketServe.closeWs() //dataSocket.socketServe.closeWs()
emit('batchGenerateClicked') // 触发事件 emit('batchGenerateClicked') // 触发事件
} }

View File

@@ -477,25 +477,25 @@ watch(webMsgSend, function (newValue, oldValue) {
break; break;
} }
break; break;
case 'connect': // case 'connect':
switch (newValue.operateCode) { // switch (newValue.operateCode) {
case "Source": // case "Source":
ElMessageBox.alert('源通讯失败,请检查源连接情况!', '初始化失败', { // ElMessageBox.alert('源通讯失败,请检查源连接情况!', '初始化失败', {
confirmButtonText: '确定', // confirmButtonText: '确定',
type: 'error', // type: 'error',
}) // })
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}:源通讯失败!`}) // testLogList.push({type: 'error', log: `${new Date().toLocaleString()}:源通讯失败!`})
break; // break;
case "Dev": // case "Dev":
ElMessageBox.alert('设备通讯失败,请检查设备连接情况!', '初始化失败', { // ElMessageBox.alert('设备通讯失败,请检查设备连接情况!', '初始化失败', {
confirmButtonText: '确定', // confirmButtonText: '确定',
type: 'error', // type: 'error',
}) // })
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}:设备通讯失败!`}) // testLogList.push({type: 'error', log: `${new Date().toLocaleString()}:设备通讯失败!`})
break; // break;
} // }
emit('update:testStatus', 'test_init_fail') // emit('update:testStatus', 'test_init_fail')
break; // break;
case 'yjc_ytxjy': case 'yjc_ytxjy':
switch (newValue.operateCode) { switch (newValue.operateCode) {
case 'INIT_GATHER': case 'INIT_GATHER':

View File

@@ -177,10 +177,10 @@ const handleSubmit = () => {
let deviceIds = checkStore.devices.map((item) => item.deviceId) let deviceIds = checkStore.devices.map((item) => item.deviceId)
let planId = checkStore.plan.id let planId = checkStore.plan.id
// if (!dataSocket.socketServe.connected) { if (!dataSocket.socketServe.connected) {
// ElMessage.error('webSocket连接中断') ElMessage.error('webSocket连接中断')
// return return
// } }
switch (stepsActive.value) { switch (stepsActive.value) {
case 1: case 1:
startPreTest({ startPreTest({
@@ -208,21 +208,21 @@ const handleSubmit = () => {
break; break;
case 4: case 4:
if (TestStatus.value == "waiting") { if (TestStatus.value == "waiting") {
startPreTest({ startPreTest({
userPageId: "cdf", userPageId: "cdf",
devIds: deviceIds, devIds: deviceIds,
planId: planId, planId: planId,
operateType: '2' // '1'为预检测、2为正式检测 operateType: '2' // '1'为预检测、2为正式检测
}).then(res => { }).then(res => {
console.log(res) console.log(res)
if (res.code === 'A001014') { if (res.code === 'A001014') {
ElMessageBox.alert('装置配置异常', '初始化失败', { ElMessageBox.alert('装置配置异常', '初始化失败', {
confirmButtonText: '确定', confirmButtonText: '确定',
type: 'error', type: 'error',
}) })
TestStatus.value = 'test_init_fail' TestStatus.value = 'test_init_fail'
} }
}) })
TestStatus.value = 'start' TestStatus.value = 'start'
} else if (TestStatus.value == 'paused') { } else if (TestStatus.value == 'paused') {
// 发送继续指令 // 发送继续指令