From 6f509dd2ad48541331a115aa8f59e55dd351ed13 Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期五, 15 七月 2022 21:00:52 +0800
Subject: [PATCH] gengxin
---
src/samples/sockteStomp.ts | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/samples/sockteStomp.ts b/src/samples/sockteStomp.ts
index 0a04b93..706b288 100644
--- a/src/samples/sockteStomp.ts
+++ b/src/samples/sockteStomp.ts
@@ -176,27 +176,24 @@
stompClient.send(`/app/workstation/config/set/${clientCode}/${pcName}`,{},JSON.stringify({"clientCode":clientCode,"machineName":pcName}))
}
-<<<<<<< HEAD
// 更新sockte链接状态
sockteStore().setsockteIsLink(true)
console.log(sockteStore().isLink)
if(devices!==undefined&&devices.length>0){
-=======
-
- // 更新sockte链接状态
- sockteStore().setsockteIsLink(true)
- console.log(sockteStore().isLink)
- console.log(devices)
- if(devices!==undefined&&devices!=null &&devices.length>0){
->>>>>>> 5fc7472d0ec6bff69b874f33eeccc30541f7f6df
- devices.forEach(de=>{
- if(stompClient!==null){
- stompClient.subscribe(`/queue/${clientCode}/${de.deviceName}/result`,callback)
- // stompClient.subscribe(`/queue/${clientCode}/${de.deviceName}/keepalive`,callbackState)
- stompClient.send(`/app/device/request/${clientCode}/${de.deviceName}`, {}, JSON.stringify({"deviceNumber":de.deviceName}));
+ // 更新sockte链接状态
+ sockteStore().setsockteIsLink(true)
+ console.log(sockteStore().isLink)
+ console.log(devices)
+ if(devices!==undefined&&devices!=null &&devices.length>0){
+ devices.forEach(de=>{
+ if(stompClient!==null){
+ stompClient.subscribe(`/queue/${clientCode}/${de.deviceName}/result`,callback)
+ // stompClient.subscribe(`/queue/${clientCode}/${de.deviceName}/keepalive`,callbackState)
+ stompClient.send(`/app/device/request/${clientCode}/${de.deviceName}`, {}, JSON.stringify({"deviceNumber":de.deviceName}));
- }
- })
+ }
+ })
+ }
}
}
--
Gitblit v1.8.0