From c5e9c5922da7de2bf6df6dce42e7162dbe5cdd2d Mon Sep 17 00:00:00 2001 From: 懒羊羊 <15939171744@163.com> Date: 星期五, 12 四月 2024 13:21:26 +0800 Subject: [PATCH] - --- jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue index 2ddddc1..c29cfdc 100644 --- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue +++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue @@ -106,7 +106,7 @@ <el-tab-pane name="first"> <span slot="label"> <a class="el-icon-date"></a>棣栭〉</span> <el-col :span="24"> - <el-table :cell-style="rowStyle" :data="formulaChildList"> + <el-table height="500" :cell-style="rowStyle" :data="formulaChildList"> <el-table-column label="鎺掑簭" width="60" align="center" type="index"> </el-table-column> <el-table-column label="鎿嶄綔鍐呭" :show-overflow-tooltip='true' align="center" prop="operationSteps"> @@ -294,6 +294,7 @@ import {listStationConf,getIpv4} from "@/api/main/sc/stationConf"; import { listFormulaChild, + noPageListFormulaChild, releaseCheck, updateResults, updateTighteningFormula, @@ -360,7 +361,7 @@ }, content: '', activeName: 'first', - url: "ws://192.168.10.198:8080/websocket/message/", + url: "ws://192.168.1.100:8080/websocket/message/", message: "", text_content: "", ws: null, @@ -370,7 +371,7 @@ input: "", keepReading: true, form1: { - baudRate: "9600", + baudRate: "115200", dataBits: "8", stopBits: "1", parity: "none", @@ -478,6 +479,10 @@ collectionTime: new Date() } updateResults(formulaChildParams).then(response => { + console.log(response) + if(response.msg === "3"){ + this.cakeLamp.release= 1 //鍏佽鏀捐 + } this.getListFormulaChild() }); }, @@ -495,7 +500,7 @@ this.formulaChildParams.productCode = this.workpieceInformation.productCode this.formulaChildParams.processesCode = this.headContent.processesCode console.log(this.formulaChildParams) - listFormulaChild(this.formulaChildParams).then(response => { + noPageListFormulaChild(this.formulaChildParams).then(response => { this.formulaChildList = response.rows; }); }, @@ -507,6 +512,10 @@ this.formulaChildList = [] this.headContent.sfcCode = null + this.workpieceInformation.productCode = null; + this.workpieceInformation.workOrderNo = null; + this.workpieceInformation.productModel = null; + this.workpieceInformation.productName = null; }, changeMenu(tab, event) { console.log(tab, event); @@ -596,7 +605,6 @@ this.$message('websocket杩炴帴鎴愬姛锛�'); }; this.ws.onmessage = function (event) { - const DELAY_TIME = 2000; if (event.data === "IN") { self.cakeLamp.InPlace = 1; } else if (event.data === "IN0") { -- Gitblit v1.9.3