From 7aca2b562095a836bd9e2e29b938c5b43aff6db1 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期一, 06 五月 2024 16:04:06 +0800
Subject: [PATCH] -

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

diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index b4cd486..1f17669 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -95,11 +95,11 @@
 
 <!--           </el-col>-->
 <!--         </el-row>-->
-         <el-row style="margin-top: 20px">
+         <el-row v-show="showInput" style="margin-top: 20px">
            <el-col></el-col>
              <span style="width: 130px;" class="head-font">棰勮鎬绘垚鍙� : {{headContent.yzSfcCode}}</span>
          </el-row>
-         <el-row style="margin-top: 20px">
+         <el-row v-show="showInput" style="margin-top: 20px">
 <!--             <el-button @click="Release" type="primary">缁戝畾</el-button>-->
            <el-button @click="bindYzSfc" type="primary">缁戝畾</el-button>
 
@@ -118,6 +118,8 @@
                <el-table-column label="鎿嶄綔鍐呭" :show-overflow-tooltip='true' align="center" prop="operationSteps">
                </el-table-column>
                <el-table-column label="浜у搧缂栧彿" align="center" prop="productCode">
+               </el-table-column>
+               <el-table-column label="鐗╂枡缂栫爜" align="center" prop="materialCode">
                </el-table-column>
                <el-table-column label="閲囬泦鍊�" align="center" prop="collectData">
                </el-table-column>
@@ -322,6 +324,7 @@
   name: "stationTerminal",
   data() {
     return {
+      showInput: true,
       serialPortContent: '',
       // 鏌ヨ鍙傛暟
       formulaChildParams: {
@@ -369,7 +372,7 @@
       },
       content: '',
       activeName: 'first',
-      url: "ws://192.168.1.101:8080/websocket/message/",
+      url: "ws://192.168.2.76:8080/websocket/message/",
       message: "",
       text_content: "",
       ws: null,
@@ -532,11 +535,11 @@
       this.cakeLamp.release= 0 //鍏佽鏀捐
 
       this.formulaChildList = []
-      this.headContent.sfcCode = null
       this.workpieceInformation.productCode = null;
       this.workpieceInformation.workOrderNo = null;
       this.workpieceInformation.productModel = null;
       this.workpieceInformation.productName = null;
+      this.headContent.sfcCode = '';
     },
     changeMenu(tab, event) {
       console.log(tab, event);

--
Gitblit v1.9.3