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 |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/views/deviceDetail/index.vue b/src/views/deviceDetail/index.vue
index 581e30f..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
@@ -717,6 +719,7 @@
         // 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