This commit is contained in:
sjl
2025-01-02 13:12:13 +08:00
parent 012f7e3346
commit e95552e6b9
3 changed files with 255 additions and 125 deletions

View File

@@ -231,7 +231,7 @@
></matchPopup>
<!--系数校准-->
<ChannelsTest ref="channelsTest"></ChannelsTest>
<ChannelsTest ref="channelsTest" :webMsgSend="webMsgSend"></ChannelsTest>
</div>
</template>
@@ -262,7 +262,7 @@ import socketClient from '@/utils/webSocketClient';
const dictStore = useDictStore()
const checkStore = useCheckStore()
const webMsgSend = ref();//webSocket推送的数据
let devNum = 0;//当前选取的被检设备数量
let devChannelsNum = 0;//当前选择的被检设备通道总数
let devTestedNum = 0;//当前选择的已完成检测的被检设备数量
@@ -750,19 +750,19 @@ const addDevice = (val:string) => {
};
const handleTest = async (val:string) => {
if(devNum == 0)
{
ElMessageBox.confirm(
'请先选择被检设备',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
)
return
}
if(devNum == 0)
{
ElMessageBox.confirm(
'请先选择被检设备',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
)
return
}
const checkDevVolt = channelsSelection.value.map(item => item.devVolt);
const isDevVoltConsistent = new Set(checkDevVolt).size === 1;
@@ -855,12 +855,29 @@ const handleTest = async (val:string) => {
}
if(val==='系数校准')
{
if(val === '系数校准') {
// //开始创建webSocket客户端
// const data = reactive({
// socketServe: socketClient.Instance,
// });
// const url = 'ws://localhost:7777/hello?name=cdf';
// socketClient.Instance.connect(url);
// data.socketServe = socketClient.Instance;
// data.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)
return
}
channelsTest.value?.open(channelsSelection.value);
return;
}
if(devTestedNum == 0)
{