From 339331a775b111bb1c0079e146312792cf228c10 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Sun, 08 Oct 2023 15:47:36 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/deviceDetail/index.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/views/deviceDetail/index.vue b/src/views/deviceDetail/index.vue
index b6e837e..bdb9ab5 100644
--- a/src/views/deviceDetail/index.vue
+++ b/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,20 +705,23 @@
if (this.ws) {
this.ws.close()
}
+
var that = this
// ������������
// var param = this.accountId + '&' + this.orgId + '&' + this.macName
// var param = this.macName
// ������URL
var socketUrl
+ console.log('requestObj.baseUrl', requestObj.baseUrl)
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
+ console.log('socketUrl', socketUrl, this.macNamel)
socketUrl = socketUrl.replace('https', 'ws').replace('http', 'ws')
this.ws = new WebSocket(socketUrl)
@@ -1314,9 +1319,6 @@
position: 'top',
color: '#fff'
}
- },
- lineStyle: {
- color: '#e9071c' // ���������������������������
}
}
]
--
Gitblit v1.8.0