From 1df825000b911e5f7b1ad33fc6d0de95793f071a Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 28 三月 2024 16:10:05 +0800
Subject: [PATCH] -

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

diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index baaef08..2ddddc1 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -360,7 +360,7 @@
       },
       content: '',
       activeName: 'first',
-      url: "ws://192.168.10.21:8080/websocket/message/",
+      url: "ws://192.168.10.198:8080/websocket/message/",
       message: "",
       text_content: "",
       ws: null,
@@ -499,7 +499,15 @@
         this.formulaChildList = response.rows;
       });
     },
+    endClear(){
+      this.cakeLamp.InPlace= 0 //宸ヤ欢鍒颁綅
+      this.cakeLamp.scanFinish= 0
+      this.cakeLamp.startWork= 0
+      this.cakeLamp.release= 0 //鍏佽鏀捐
 
+      this.formulaChildList = []
+      this.headContent.sfcCode = null
+    },
     changeMenu(tab, event) {
       console.log(tab, event);
     },
@@ -562,6 +570,7 @@
         alert("鏈繛鎺ュ埌鏈嶅姟鍣�");
       }
     },
+
     initStation: async function () {
       await getIpv4().then(response => {
         this.StationConfQueryParams.ipAddress = response.msg
@@ -603,6 +612,7 @@
           }
           saveCampaignTimeParameters(param).then(response => {});
           self.cakeLamp.release = 1;
+          self.endClear()
 
         } else if (event.data.includes("[")) {
           let formulaChilds = "";
@@ -635,6 +645,8 @@
       };
     },
 
+
+
     //鎺ュ彈鏁版嵁鐨勫洖璋�
     callBack(value) {
       if (this.form1.isShowHistory) this.form1.desc = this.readLi().join("");
@@ -643,9 +655,11 @@
         console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
         // if(this.cakeLamp.InPlace=== 1){
           if(this.headContent.sfcCode !== ''){
+            this.$message('鎵弿鐗╂枡缂栫爜'+scanValue);
             console.log(scanValue)
             this.serialPortMethod(scanValue)
           }else {
+            this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
             this.headContent.sfcCode = scanValue;
             this.queryParams.productNum = scanValue;
             this.getList()

--
Gitblit v1.9.3