From fc970877670024f006103982ecb0d990760241b3 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 26 Feb 2025 13:22:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=951?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/stores/modules/check.ts | 4 +- .../src/views/home/components/factorTest.vue | 38 +++++++++---------- frontend/src/views/home/components/table.vue | 2 +- frontend/src/views/home/components/test.vue | 38 +++++++++---------- .../src/views/home/components/testPopup.vue | 38 +++++++++---------- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/frontend/src/stores/modules/check.ts b/frontend/src/stores/modules/check.ts index 7549cfc..ed7316e 100644 --- a/frontend/src/stores/modules/check.ts +++ b/frontend/src/stores/modules/check.ts @@ -10,7 +10,7 @@ export const useCheckStore = defineStore("check", { state: () => ({ devices: Array(), plan: Object(), - selectTestItems: Object({preTest: true, timeTest: true, channelsTest: true, test: true}), + selectTestItems: Object({preTest: true, timeTest: true, channelsTest: false, test: true}), checkType:1 }), @@ -28,7 +28,7 @@ export const useCheckStore = defineStore("check", { }, initSelectTestItems() { this.selectTestItems.preTest = true - this.selectTestItems.channelsTest = true + this.selectTestItems.channelsTest = false this.selectTestItems.test = true }, setSelectTestItems(selectTestItems: CheckData.SelectTestItem) { diff --git a/frontend/src/views/home/components/factorTest.vue b/frontend/src/views/home/components/factorTest.vue index 9c0a4b7..cac9fae 100644 --- a/frontend/src/views/home/components/factorTest.vue +++ b/frontend/src/views/home/components/factorTest.vue @@ -486,25 +486,25 @@ watch(webMsgSend, function (newValue, oldValue) { break; } break; - case 'connect': - switch (newValue.operateCode) { - case "Source": - ElMessageBox.alert('源服务端连接失败', '源服务端连接失败', { - confirmButtonText: '确定', - type: 'error', - }) - TableInit(); - break; - case "Dev": - ElMessageBox.alert('设备服务端连接失败', '设备服务端连接失败', { - confirmButtonText: '确定', - type: 'error', - }) - TableInit(); - break; - } - - break; + // case 'connect': + // switch (newValue.operateCode) { + // case "Source": + // ElMessageBox.alert('源服务端连接失败', '源服务端连接失败', { + // confirmButtonText: '确定', + // type: 'error', + // }) + // TableInit(); + // break; + // case "Dev": + // ElMessageBox.alert('设备服务端连接失败', '设备服务端连接失败', { + // confirmButtonText: '确定', + // type: 'error', + // }) + // TableInit(); + // break; + // } + // + // break; } } }) diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index 7b2b91b..f7b8f9b 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -1132,7 +1132,7 @@ onBeforeMount(async () => { const handleQuitClicked = () => { //console.log('handleQuitClicked') - dataSocket.socketServe.closeWs() + //dataSocket.socketServe.closeWs() emit('batchGenerateClicked') // 触发事件 } diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue index 7cfae79..0dfc2cc 100644 --- a/frontend/src/views/home/components/test.vue +++ b/frontend/src/views/home/components/test.vue @@ -477,25 +477,25 @@ watch(webMsgSend, function (newValue, oldValue) { break; } break; - case 'connect': - switch (newValue.operateCode) { - case "Source": - ElMessageBox.alert('源通讯失败，请检查源连接情况！', '初始化失败', { - confirmButtonText: '确定', - type: 'error', - }) - testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源通讯失败！`}) - break; - case "Dev": - ElMessageBox.alert('设备通讯失败，请检查设备连接情况！', '初始化失败', { - confirmButtonText: '确定', - type: 'error', - }) - testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：设备通讯失败！`}) - break; - } - emit('update:testStatus', 'test_init_fail') - break; + // case 'connect': + // switch (newValue.operateCode) { + // case "Source": + // ElMessageBox.alert('源通讯失败，请检查源连接情况！', '初始化失败', { + // confirmButtonText: '确定', + // type: 'error', + // }) + // testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源通讯失败！`}) + // break; + // case "Dev": + // ElMessageBox.alert('设备通讯失败，请检查设备连接情况！', '初始化失败', { + // confirmButtonText: '确定', + // type: 'error', + // }) + // testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：设备通讯失败！`}) + // break; + // } + // emit('update:testStatus', 'test_init_fail') + // break; case 'yjc_ytxjy': switch (newValue.operateCode) { case 'INIT_GATHER': diff --git a/frontend/src/views/home/components/testPopup.vue b/frontend/src/views/home/components/testPopup.vue index 0612733..4dfe8b0 100644 --- a/frontend/src/views/home/components/testPopup.vue +++ b/frontend/src/views/home/components/testPopup.vue @@ -177,10 +177,10 @@ const handleSubmit = () => { let deviceIds = checkStore.devices.map((item) => item.deviceId) let planId = checkStore.plan.id - // if (!dataSocket.socketServe.connected) { - // ElMessage.error('webSocket连接中断！') - // return - // } + if (!dataSocket.socketServe.connected) { + ElMessage.error('webSocket连接中断！') + return + } switch (stepsActive.value) { case 1: startPreTest({ @@ -208,21 +208,21 @@ const handleSubmit = () => { break; case 4: if (TestStatus.value == "waiting") { - startPreTest({ - userPageId: "cdf", - devIds: deviceIds, - planId: planId, - operateType: '2' // '1'为预检测、‘2‘为正式检测 - }).then(res => { - console.log(res) - if (res.code === 'A001014') { - ElMessageBox.alert('装置配置异常', '初始化失败', { - confirmButtonText: '确定', - type: 'error', - }) - TestStatus.value = 'test_init_fail' - } - }) + startPreTest({ + userPageId: "cdf", + devIds: deviceIds, + planId: planId, + operateType: '2' // '1'为预检测、‘2‘为正式检测 + }).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') { // 发送继续指令 From 1aeceffe0b78bcb85651891f1b8fe959db2967d7 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 26 Feb 2025 13:57:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=8B=E8=AF=951?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/check/interface/index.ts | 1 + .../home/components/selectTestItemPopup.vue | 23 ++++++++ frontend/src/views/home/components/table.vue | 52 ++++++------------- 3 files changed, 41 insertions(+), 35 deletions(-) diff --git a/frontend/src/api/check/interface/index.ts b/frontend/src/api/check/interface/index.ts index e666a3f..099ec80 100644 --- a/frontend/src/api/check/interface/index.ts +++ b/frontend/src/api/check/interface/index.ts @@ -95,6 +95,7 @@ export namespace CheckData { devType: string; //设备类型 devVolt:number; //设备电压 devCurr:number; //设备电流 + factorFlag:number; //是否支持系数校准 } // 用来描述检测脚本类型 diff --git a/frontend/src/views/home/components/selectTestItemPopup.vue b/frontend/src/views/home/components/selectTestItemPopup.vue index 03560d5..5f533b4 100644 --- a/frontend/src/views/home/components/selectTestItemPopup.vue +++ b/frontend/src/views/home/components/selectTestItemPopup.vue @@ -30,6 +30,7 @@ import {dialogSmall} from "@/utils/elementBind"; import {ref} from "vue"; import {useCheckStore} from "@/stores/modules/check"; import type {CheckData} from "@/api/check/interface"; +import {ElMessageBox} from "element-plus"; const emit = defineEmits(['openTestDialog']) const checkStore = useCheckStore(); @@ -61,6 +62,28 @@ const handleStart = () => { if (count === 0) { ElMessage.warning('请选择测试内容！') } else { + if(formContent.channelsTest){ + const factorFlagArray = ref([]) // 初始化为空数组 + for (let i = 0; i < checkStore.devices.length; i++) { + const factorFlag = checkStore.devices[i].factorFlag + if (factorFlag !== undefined && factorFlag !== null && factorFlag === 0) { + factorFlagArray.value.push(checkStore.devices[i].deviceName.toString()) + } + } + if (factorFlagArray.value.length > 0) { + const factorFlags = factorFlagArray.value.join(', ') + ElMessageBox.confirm( + factorFlags + '设备不支持系数校准，请重新选择', + '提示', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }, + ) + return + } + } checkStore.setCheckType(0) checkStore.setSelectTestItems({...formContent}) handleClose() diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index f7b8f9b..a0900b9 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -651,6 +651,7 @@ const handleSelectionChange = (selection: any[]) => { deviceType: item.devType, devVolt: item.devVolt, devCurr: item.devCurr, + factorFlag: item.factorFlag, } }) @@ -962,26 +963,7 @@ const handleTest = async (val: string) => { selectTestItemPopupRef.value?.open() } } else if (val === '系数校准') { - const factorFlagArray = ref([]) // 初始化为空数组 - for (let i = 0; i < channelsSelection.value.length; i++) { - const factorFlag = channelsSelection.value[i].factorFlag - if (factorFlag !== undefined && factorFlag !== null && factorFlag === 0) { - factorFlagArray.value.push(channelsSelection.value[i].name.toString()) - } - } - if (factorFlagArray.value.length > 0) { - const factorFlags = factorFlagArray.value.join(', ') - ElMessageBox.confirm( - factorFlags + '设备不支持系数校准，请重新选择', - '提示', - { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning', - }, - ) - return - } + // // 检查 socketClient.Instance 是否存在 // if (!socketClient.Instance) { @@ -989,22 +971,22 @@ const handleTest = async (val: string) => { // return; // } - socketClient.Instance.connect(); - dataSocket.socketServe = socketClient.Instance; - dataSocket.socketServe.registerCallBack('aaa', (res: { code: number; }) => { - // 处理来自服务器的消息 - //console.log('Received message:', res) - // 根据需要在这里添加更多的处理逻辑 - if (res.code === 20000) { - ElMessage.error(message.message) - loading.close() - } else { - webMsgSend.value = res - } - }) + // socketClient.Instance.connect(); + // dataSocket.socketServe = socketClient.Instance; + // dataSocket.socketServe.registerCallBack('aaa', (res: { code: number; }) => { + // // 处理来自服务器的消息 + // //console.log('Received message:', res) + // // 根据需要在这里添加更多的处理逻辑 + // if (res.code === 20000) { + // ElMessage.error(message.message) + // loading.close() + // } else { + // webMsgSend.value = res + // } + // }) - channelsTest.value?.open(channelsSelection.value, props.plan) - return + // channelsTest.value?.open(channelsSelection.value, props.plan) + // return } else { // 一键检测 checkStore.setCheckType(1)