From a52d0875e95d60d228367f24fc937274df0b4244 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 18 五月 2024 08:56:15 +0800
Subject: [PATCH] -

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

diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index be3361d..35f4aa7 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -89,18 +89,17 @@
            <el-col></el-col>
              <span style="width: 130px;" class="head-font">棰勮鎬绘垚鍙� : {{headContent.yzSfcCode}}</span>
          </el-row>
-         <el-row v-show="showInput" style="margin-top: 20px">
-           <el-button @click="bindYzSfc" type="primary">缁戝畾</el-button>
-
-         </el-row>
+<!--         <el-row v-show="showInput" style="margin-top: 20px">-->
+<!--           <el-button @click="bindYzSfc" type="primary">缁戝畾</el-button>-->
+<!--         </el-row>-->
 
          <el-row v-show="onLineBinDing" style="margin-top: 20px">
            <el-col></el-col>
            <span style="width: 130px;" class="head-font">灏忚溅鐮� : {{headContent.cardCode}}</span>
          </el-row>
-         <el-row v-show="onLineBinDing" style="margin-top: 20px">
-           <el-button @click="bindcardCode" type="primary">缁戝畾</el-button>
-         </el-row>
+<!--         <el-row v-show="onLineBinDing" style="margin-top: 20px">-->
+<!--           <el-button @click="bindcardCode" type="primary">缁戝畾</el-button>-->
+<!--         </el-row>-->
        </el-card>
 
      </el-col>
@@ -298,6 +297,7 @@
 import {listWorkReport} from "@/api/main/om/workReport/workReport";
 import {listStationConf,getIpv4} from "@/api/main/sc/stationConf";
 import {
+  fistSetpNumber,
   listFormulaChild,
   noPageListFormulaChild,
   releaseCheck,
@@ -444,7 +444,7 @@
   },
   methods: {
     bindcardCode(){
-      this.$message('鍙互缁戝畾锛�');
+      this.$message('缁戝畾鎴愬姛锛�');
       let param = {
         productNum: this.headContent.sfcCode,
         trolleyYard: this.headContent.cardCode,
@@ -463,9 +463,8 @@
           locationCode: this.headContent.processesCode,
           yzSfcCode: this.headContent.yzSfcCode
         }
-        this.$message('鍙互缁戝畾锛�');
         replaceAssemblyCode(param).then(response => {
-
+          this.$message('缁戝畾鎴愬姛锛�');
         });
       }
     },
@@ -575,9 +574,9 @@
         this.workpieceInformation.productCode = rowsData.productCode;
         this.workpieceInformation.productModel = rowsData.productModel;
         this.workpieceInformation.productName = rowsData.productName;
-        this.timer = setInterval(() => {
-          this.workpieceInformation.beat++;
-        }, 1000);
+        // this.timer = setInterval(() => {
+        //   this.workpieceInformation.beat++;
+        // }, 1000);
       });
       this.getListFormulaChild()
       this.addOverStationCollection()
@@ -633,6 +632,7 @@
         }
 
         console.log('璁剧疆宸ヤ綅缂栫爜' + this.headContent.processesCode)
+
       });
       this.conCom()
       console.log('websocket杩炴帴宸ヤ綅涓�' + this.headContent.processesCode)
@@ -641,10 +641,16 @@
       const self = this;
       this.ws.onopen = function (event) {
         this.$message('websocket杩炴帴鎴愬姛锛�');
+
       };
       this.ws.onmessage = function (event) {
         if (event.data === "IN") {
           self.cakeLamp.InPlace = 1;
+          console.log(self.headContent.processesCode);
+          const param = {
+            processesCode: self.headContent.processesCode,
+          }
+          fistSetpNumber(param).then(response => {});
         } else if (event.data === "IN0") {
           self.cakeLamp.InPlace = 0;
         } else if (event.data === "OUT") {
@@ -703,10 +709,12 @@
         if(this.headContent.sfcCode !== ''){
           if(scanValue.includes("P9900173252")){
             this.headContent.yzSfcCode = scanValue
-          }else if(scanValue.includes("HDY")){
+            this.bindYzSfc();
+          }else if(scanValue.includes("0RSP1TE")){
             this.headContent.cardCode = scanValue
+            this.bindcardCode();
           }else {
-            this.$message('鎵弿鐗╂枡缂栫爜'+scanValue);
+            this.$message('宸ヤ綅缁堢鎵弿鐗╂枡缂栫爜'+scanValue);
             console.log(scanValue)
             this.serialPortMethod(scanValue)
           }

--
Gitblit v1.9.3