This commit is contained in:
caozehui
2025-02-26 13:57:07 +08:00
parent fc97087767
commit 1aeceffe0b
3 changed files with 41 additions and 35 deletions

View File

@@ -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<string[]>([]) // 初始化为空数组
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)