From 7e83dbeda4774213691f59f32b6ca97708b9f246 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期一, 08 七月 2024 16:38:29 +0800
Subject: [PATCH] Merge branch 'master' of http://183.134.244.158:8442/r/Jcdm042-Mes-Module-One

---
 jcdm-ui/src/views/main/kb/stationTerminal/index.vue |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 8db214d..516fe58 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -390,8 +390,8 @@
       },
       content: '',
       activeName: 'first',
-      url: "ws://10.103.210.248:8080/websocket/message/",
-      // url: "ws://192.168.10.100:8080/websocket/message/",
+      // url: "ws://10.103.210.248:8080/websocket/message/",
+      url: "ws://192.168.10.100:8080/websocket/message/",
       message: "",
       text_content: "",
       ws: null,
@@ -641,6 +641,7 @@
           this.getList()
           this.cakeLamp.scanFinish = 1
           this.cakeLamp.startWork = 1
+          this.cakeLamp.InPlace = 1
         }
       });
     },

--
Gitblit v1.9.3