From 88cc6e9805c5300d918c0363585c133bcee0cfe1 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Sun, 08 Oct 2023 12:01:14 +0800
Subject: [PATCH] Merge branch 'feature_1.0'

---
 src/views/deviceDetail/index.vue |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/views/deviceDetail/index.vue b/src/views/deviceDetail/index.vue
index b6e837e..581e30f 100644
--- a/src/views/deviceDetail/index.vue
+++ b/src/views/deviceDetail/index.vue
@@ -710,10 +710,10 @@
       // ������URL
       var socketUrl
       if (this.equipment === 'car') {
-        socketUrl = 'http://47.99.64.149:8081/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 = 'http://47.99.64.149:8081/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
@@ -1314,9 +1314,6 @@
                   position: 'top',
                   color: '#fff'
                 }
-              },
-              lineStyle: {
-                color: '#e9071c' // ���������������������������
               }
             }
           ]

--
Gitblit v1.8.0