Merge branch 'feature_1.0'

quanyawei

2023-10-08 04e417033993b1b2af1fa2e9b3058c461e5ae6e4

Merge branch 'feature_1.0'

 src/views/deviceDetail/index.vue

@@ -712,10 +712,10 @@
      // 拼写URL
      var socketUrl
      if (this.equipment === 'car') {
        socketUrl = 'http://47.99.64.149:8081/api/cruiserWebsocket/' + this.macName
        socketUrl = 'https://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/api/singleDevice/' + this.macName
        socketUrl = 'https://47.99.64.149:8081/api/singleDevice/' + this.macName
        // socketUrl = 'http://192.168.0.11:8081/singleDevice/' + this.macName
      }
      // 替换http为WS