From e75c286f5b6d4ce78e16f002ccd3cfa7f5eacf14 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Sun, 08 Oct 2023 17:10:22 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
vue.config.js | 3 +++
src/views/deviceDetail/index.vue | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/deviceDetail/index.vue b/src/views/deviceDetail/index.vue
index 57d1843..ac43436 100644
--- a/src/views/deviceDetail/index.vue
+++ b/src/views/deviceDetail/index.vue
@@ -712,10 +712,10 @@
// ������URL
var socketUrl
if (this.equipment === 'car') {
- socketUrl = 'https://47.99.64.149:8081/api/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 = 'https://47.99.64.149:8081/api/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
diff --git a/vue.config.js b/vue.config.js
index 90e8e90..dcc1fcb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -28,6 +28,9 @@
productionSourceMap: false,
devServer: {
port: port,
+ client: {
+ webSocketURL: 'ws://0.0.0.0:8080/ws'
+ },
open: false,
overlay: {
warnings: false,
--
Gitblit v1.8.0