From 11cc367e5134b27e25167a7492d8033f3fd9ce52 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期二, 19 三月 2024 13:17:41 +0800
Subject: [PATCH] 操作看板

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

diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index c9fb425..7e19145 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -490,7 +490,7 @@
     },
     /** 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛� */
     getListFormulaChild() {
-      this.formulaChildList = []
+      // this.formulaChildList = []
       this.formulaChildParams.productCode = this.workpieceInformation.productCode
       this.formulaChildParams.processesCode = this.headContent.processesCode
       listFormulaChild(this.formulaChildParams).then(response => {
@@ -674,8 +674,8 @@
           }
           addTighteningParameters(param).then(response => {});
           updateTighteningFormula(param).then(response => {
+            self.getListFormulaChild()
           });
-          self.getListFormulaChild()
         }
       };
     },
@@ -685,7 +685,8 @@
       if (this.form1.isShowHistory) this.form1.desc = this.readLi().join("");
       else {
         const scanValue = this.myserialport.hex2atostr(value).replace(/[\r\n]/g, '');
-        // if(this.cakeLamp.InPlace=== 1){
+        console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
+        if(this.cakeLamp.InPlace=== 1){
           if(this.headContent.sfcCode !== ''){
             console.log(scanValue)
             this.serialPortMethod(scanValue)
@@ -697,9 +698,9 @@
             this.cakeLamp.scanFinish = 1
             this.cakeLamp.startWork = 1
           }
-        // }else {
-        //   this.$message('宸ヤ欢鏈埌浣嶇姝㈡壂鐮侊紒');
-        // }
+        }else {
+          this.$message('宸ヤ欢鏈埌浣嶇姝㈡壂鐮侊紒');
+        }
       }
     },
     clearHistory() {
@@ -758,6 +759,7 @@
           this.myserialport.state.parity = this.form1.parity;
           this.myserialport.state.flowControl = this.form1.flowControl;
           await this.myserialport.openPort(this.form1.port, true, this.callBack);
+          console.log(this.form1.port)
         } catch (error) {
           this.$message.error("涓插彛杩炴帴澶辫触锛佽妫�鏌ヤ覆鍙f槸鍚﹀凡琚崰鐢�");
         }

--
Gitblit v1.9.3