From f595ea40ebacb61dd84947fd2ba029657ac5a0a9 Mon Sep 17 00:00:00 2001 From: quanyawei <401863037@qq.com> Date: Sun, 08 Oct 2023 16:14:54 +0800 Subject: [PATCH] fix:接口修改 --- src/views/deviceDetail/index.vue | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/views/deviceDetail/index.vue b/src/views/deviceDetail/index.vue index d4ec9ff..1ffb0e9 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' @@ -705,7 +704,7 @@ if (this.ws) { this.ws.close() } - console.log('socketUrl', socketUrl, this.macNamel) + var that = this // ������������ // var param = this.accountId + '&' + this.orgId + '&' + this.macName @@ -713,14 +712,14 @@ // ������URL var socketUrl 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 - + console.log('socketUrl', socketUrl, this.macNamel) socketUrl = socketUrl.replace('https', 'ws').replace('http', 'ws') this.ws = new WebSocket(socketUrl) -- Gitblit v1.8.0