|
@@ -221,13 +221,15 @@ const wsClient = useWebSocket(import.meta.env.VITE_WEBSOCKET_URL as string, {
|
|
|
console.log("长链接断开");
|
|
|
},
|
|
|
onMessage: (msg) => {
|
|
|
- if (wsClient.data.value) {
|
|
|
- let msgType = wsClient.data.value?.msgtype ?? "";
|
|
|
+ if (wsClient.data.value && JSON.parse(wsClient.data.value)) {
|
|
|
+ let megData = JSON.parse(wsClient.data.value);
|
|
|
+ console.log("长链接的消息 解析json后", megData);
|
|
|
+ let msgType = megData?.msgtype ?? "";
|
|
|
|
|
|
// 执行过程日志
|
|
|
if (msgType == 1) {
|
|
|
// let l = { data: { log: "label: 直流电源" }, msgtype: 1 };
|
|
|
- let logData = wsClient.data.value?.data?.log;
|
|
|
+ let logData = megData?.data?.log;
|
|
|
if (logData) {
|
|
|
logList.value.push(logData);
|
|
|
}
|
|
@@ -244,7 +246,7 @@ const wsClient = useWebSocket(import.meta.env.VITE_WEBSOCKET_URL as string, {
|
|
|
// "projectId": "",
|
|
|
// }
|
|
|
// }
|
|
|
- let logData = wsClient.data.value?.data;
|
|
|
+ let logData = megData?.data;
|
|
|
if (logData) {
|
|
|
// 根据 projectId 去已经选择的项目中找到名字
|
|
|
let project = topProSelectedList.value.find(
|
|
@@ -265,7 +267,7 @@ const wsClient = useWebSocket(import.meta.env.VITE_WEBSOCKET_URL as string, {
|
|
|
// }
|
|
|
// ]
|
|
|
// }
|
|
|
- let devData = wsClient.data.value?.data ?? [];
|
|
|
+ let devData = megData?.data ?? [];
|
|
|
devData.forEach((item) => {
|
|
|
// 根据 instrumentId 去已经选择的仪器中找到名字
|
|
|
let machine = testingMachines.value.find(
|
|
@@ -277,8 +279,6 @@ const wsClient = useWebSocket(import.meta.env.VITE_WEBSOCKET_URL as string, {
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- console.log("长链接的消息", wsClient.data.value);
|
|
|
},
|
|
|
});
|
|
|
|