From e75c286f5b6d4ce78e16f002ccd3cfa7f5eacf14 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Sun, 08 Oct 2023 17:10:22 +0800
Subject: [PATCH] Merge branch 'feature_1.0'

---
 src/views/deviceDetail/index.vue |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

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