From 339331a775b111bb1c0079e146312792cf228c10 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Sun, 08 Oct 2023 15:47:36 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/deviceDetail/index.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/deviceDetail/index.vue b/src/views/deviceDetail/index.vue
index d289e7f..bdb9ab5 100644
--- a/src/views/deviceDetail/index.vue
+++ b/src/views/deviceDetail/index.vue
@@ -705,22 +705,23 @@
if (this.ws) {
this.ws.close()
}
- console.log('socketUrl', socketUrl, this.macNamel)
+
var that = this
// ������������
// var param = this.accountId + '&' + this.orgId + '&' + this.macName
// var param = this.macName
// ������URL
var socketUrl
+ console.log('requestObj.baseUrl', requestObj.baseUrl)
if (this.equipment === 'car') {
- socketUrl = `${requestObj.baseUrl}cruiserWebsocket/` + this.macName
+ socketUrl = requestObj.baseUrl + '/cruiserWebsocket/' + this.macName
// socketUrl = 'http://192.168.0.11:8081/cruiserWebsocket/' + this.macName
} else {
- socketUrl = `${requestObj.baseUrl}singleDevice/` + this.macName
+ socketUrl = requestObj.baseUrl + '/singleDevice/' + this.macName
// socketUrl = 'http://192.168.0.11:8081/singleDevice/' + this.macName
}
// ������http���WS
-
+ console.log('socketUrl', socketUrl, this.macNamel)
socketUrl = socketUrl.replace('https', 'ws').replace('http', 'ws')
this.ws = new WebSocket(socketUrl)
--
Gitblit v1.8.0