Merge branch 'feature_1.0'

quanyawei

2023-10-08 889cddc1cf0cbd5518c8b03d58f473db74e771a0

 src/views/deviceDetail/index.vue

@@ -338,6 +338,7 @@
// 例如：import《组件名称》from'《组件路径》';

import json from '@/assets/json/sensor.json'
import requestObj from '@/utils/request'
import * as echarts from 'echarts'
// import { parse } from 'path-to-regexp'
// import LineChart from '@/components/Echarts/LineChart'
@@ -447,6 +448,7 @@
  watch: {
    PM2_5Data(val) {
      // console.log('新数据' + val)
      this.myChart = null
      this.drawChart()
    },
    leftaSide(n, o) {
@@ -703,6 +705,7 @@
      if (this.ws) {
        this.ws.close()
      }
      console.log('socketUrl', socketUrl, this.macNamel)
      var that = this
      // 拼写参数
      // var param = this.accountId + '&' + this.orgId + '&' + this.macName
@@ -710,13 +713,14 @@
      // 拼写URL
      var socketUrl
      if (this.equipment === 'car') {
        socketUrl = 'http://47.99.64.149:8081/cruiserWebsocket/' + this.macName
        socketUrl = `${requestObj.baseUrl}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 = `${requestObj.baseUrl}singleDevice/` + this.macName
        // socketUrl = 'http://192.168.0.11:8081/singleDevice/' + this.macName
      }
      // 替换http为WS

      socketUrl = socketUrl.replace('https', 'ws').replace('http', 'ws')

      this.ws = new WebSocket(socketUrl)
@@ -1314,9 +1318,6 @@
                  position: 'top',
                  color: '#fff'
                }
              },
              lineStyle: {
                color: '#e9071c' // 设置线的颜色为红色
              }
            }
          ]