From 42b603a8c4ada5a4f890f4e60322a719ff8428ab Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Wed, 15 Nov 2023 17:29:30 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/deviceDetail/index.vue | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/views/deviceDetail/index.vue b/src/views/deviceDetail/index.vue
index bdb9ab5..0fe0de8 100644
--- a/src/views/deviceDetail/index.vue
+++ b/src/views/deviceDetail/index.vue
@@ -338,7 +338,6 @@
// ���������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'
@@ -712,18 +711,17 @@
// var param = this.macName
// ������URL
var socketUrl
- console.log('requestObj.baseUrl', requestObj.baseUrl)
if (this.equipment === 'car') {
- socketUrl = requestObj.baseUrl + '/cruiserWebsocket/' + this.macName
+ socketUrl = 'https://qx.7drlb.com/api/cruiserWebsocket/' + this.macName
// socketUrl = 'http://192.168.0.11:8081/cruiserWebsocket/' + this.macName
} else {
- socketUrl = requestObj.baseUrl + '/singleDevice/' + this.macName
+ socketUrl = 'https://qx.7drlb.com/api/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')
+ 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