From 6f509dd2ad48541331a115aa8f59e55dd351ed13 Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期五, 15 七月 2022 21:00:52 +0800
Subject: [PATCH] gengxin
---
/dev/null | 0
src/views/home/index.vue | 2 +-
src/samples/sockteStomp.ts | 29 +++++++++++++----------------
3 files changed, 14 insertions(+), 17 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}));
- }
- })
+ }
+ })
+ }
}
}
diff --git a/src/views/home/dd.vue b/src/views/home/dd.vue
deleted file mode 100644
index e69de29..0000000
--- a/src/views/home/dd.vue
+++ /dev/null
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 5240710..e15298d 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -232,7 +232,7 @@
</el-col>
<el-col :span="2">
- <el-input id="inputCode" style="width:5px;" @change="inputChabge" v-model="inputCode" ref="inputRef" placeholder="" />
+ <el-input id="inputCode" @change="inputChabge" v-model="inputCode" ref="inputRef" placeholder="" />
</el-col>
<el-col :span="8" class="titleText">
患者签到
--
Gitblit v1.8.0