From 618dec29866fdae7d602fc1c14c881d7295a6f1e Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Thu, 16 Nov 2023 14:25:40 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/deviceDetail/index.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/views/deviceDetail/index.vue b/src/views/deviceDetail/index.vue
index 581e30f..0fe0de8 100644
--- a/src/views/deviceDetail/index.vue
+++ b/src/views/deviceDetail/index.vue
@@ -447,6 +447,7 @@
watch: {
PM2_5Data(val) {
// console.log('���������' + val)
+ this.myChart = null
this.drawChart()
},
leftaSide(n, o) {
@@ -703,6 +704,7 @@
if (this.ws) {
this.ws.close()
}
+
var that = this
// ������������
// var param = this.accountId + '&' + this.orgId + '&' + this.macName
@@ -710,15 +712,16 @@
// ������URL
var socketUrl
if (this.equipment === 'car') {
- socketUrl = 'http://47.99.64.149:8081/api/cruiserWebsocket/' + this.macName
+ socketUrl = 'https://qx.7drlb.com/api/cruiserWebsocket/' + this.macName
// socketUrl = 'http://192.168.0.11:8081/cruiserWebsocket/' + this.macName
} else {
- socketUrl = 'http://47.99.64.149:8081/api/singleDevice/' + this.macName
+ socketUrl = 'https://qx.7drlb.com/api/singleDevice/' + this.macName
// socketUrl = 'http://192.168.0.11:8081/singleDevice/' + this.macName
}
// ������http���WS
- socketUrl = socketUrl.replace('https', 'ws').replace('http', 'ws')
+ socketUrl = socketUrl.replace('https', 'wss').replace('http', 'ws')
+ console.log('socketUrl', socketUrl)
this.ws = new WebSocket(socketUrl)
this.ws.onopen = function() {
--
Gitblit v1.8.0