From 60fa624bc4e502b9d526cb4293ff2bbd9c534aa9 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Sun, 08 Oct 2023 16:21:44 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/deviceDetail/index.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/deviceDetail/index.vue b/src/views/deviceDetail/index.vue
index b6e837e..9afcd2c 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,13 +712,14 @@
// ������URL
var socketUrl
if (this.equipment === 'car') {
- socketUrl = 'http://47.99.64.149:8081/cruiserWebsocket/' + this.macName
+ socketUrl = 'http://47.99.64.149:8081/api/cruiserWebsocket/' + this.macName
// socketUrl = 'http://192.168.0.11:8081/cruiserWebsocket/' + this.macName
} else {
- socketUrl = 'http://47.99.64.149:8081/singleDevice/' + this.macName
+ socketUrl = 'http://47.99.64.149:8081/api/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)
@@ -1314,9 +1317,6 @@
position: 'top',
color: '#fff'
}
- },
- lineStyle: {
- color: '#e9071c' // ���������������������������
}
}
]
--
Gitblit v1.8.0