From 60fa624bc4e502b9d526cb4293ff2bbd9c534aa9 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Sun, 08 Oct 2023 16:21:44 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/deviceDetail/index.vue | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/views/deviceDetail/index.vue b/src/views/deviceDetail/index.vue
index bdb9ab5..9afcd2c 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,12 +711,11 @@
// var param = this.macName
// ������URL
var socketUrl
- console.log('requestObj.baseUrl', requestObj.baseUrl)
if (this.equipment === 'car') {
- socketUrl = requestObj.baseUrl + '/cruiserWebsocket/' + this.macName
+ socketUrl = 'http://47.99.64.149:8081/api/cruiserWebsocket/' + this.macName
// socketUrl = 'http://192.168.0.11:8081/cruiserWebsocket/' + this.macName
} else {
- socketUrl = requestObj.baseUrl + '/singleDevice/' + this.macName
+ socketUrl = 'http://47.99.64.149:8081/api/singleDevice/' + this.macName
// socketUrl = 'http://192.168.0.11:8081/singleDevice/' + this.macName
}
// ������http���WS
--
Gitblit v1.8.0