Merge branch 'feature_1.0'

quanyawei

2023-10-08 60fa624bc4e502b9d526cb4293ff2bbd9c534aa9

 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)