From 04e417033993b1b2af1fa2e9b3058c461e5ae6e4 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Sun, 08 Oct 2023 16:56:07 +0800
Subject: [PATCH] Merge branch 'feature_1.0'

---
 src/views/deviceDetail/index.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/deviceDetail/index.vue b/src/views/deviceDetail/index.vue
index 9afcd2c..57d1843 100644
--- a/src/views/deviceDetail/index.vue
+++ b/src/views/deviceDetail/index.vue
@@ -712,16 +712,16 @@
       // ������URL
       var socketUrl
       if (this.equipment === 'car') {
-        socketUrl = 'http://47.99.64.149:8081/api/cruiserWebsocket/' + this.macName
+        socketUrl = 'https://47.99.64.149:8081/api/cruiserWebsocket/' + this.macName
         // socketUrl = 'http://192.168.0.11:8081/cruiserWebsocket/' + this.macName
       } else {
-        socketUrl = 'http://47.99.64.149:8081/api/singleDevice/' + this.macName
+        socketUrl = 'https://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')
 
+      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