From 4e83fa344f6cba81412fb354e7f32a88a8f34fde Mon Sep 17 00:00:00 2001 From: admin <15939171744@163.com> Date: 星期二, 09 七月 2024 09:39:11 +0800 Subject: [PATCH] -切换大模组代码更改 --- jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 19 ++++--------------- 1 files changed, 4 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 b64b35f..e91c97d 100644 --- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue +++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue @@ -124,7 +124,7 @@ <!-- </el-table-column>--> <el-table-column label="浜у搧缂栧彿" width="80" align="center" prop="productCode"> </el-table-column> - <el-table-column label="鐗╂枡缂栫爜" width="110" align="center" prop="materialCode"> + <el-table-column label="鐗╂枡缂栫爜" width="140" align="center" prop="materialCode"> </el-table-column> <el-table-column label="閲囬泦鍊�" align="center" prop="collectData"> </el-table-column> @@ -391,6 +391,7 @@ }, content: '', activeName: 'first', + // url: "ws://192.168.2.248:8080/websocket/message/", url: "ws://10.103.210.248:8080/websocket/message/", // url: "ws://192.168.2.76:8080/websocket/message/", message: "", @@ -714,27 +715,15 @@ const formulaChildIndex = self.formulaChildList.length-1 - const orderParam = { - productNum: self.headContent.sfcCode, - } - if(self.headContent.sfcCode=== ''||self.headContent.sfcCode=== null){ self.$message('鎬绘垚鐮佷负绌猴紝璇锋壂鐮侊紒') return; } - // if(self.headContent.cardCode === null || self.headContent.cardCode === ''){ - // self.$alert('<strong style="color: red;font-size: 30px">鏈壂鎻忓皬杞︾爜绂佹鏀捐</strong>', '鎻愮ず', { - // dangerouslyUseHTMLString: true - // }); - // return; - // } - if(self.formulaChildList[formulaChildIndex].results !== 'OK'){ self.$message('鏈仛瀹屽伐搴忕姝㈡斁琛�'); return; } - const param = { workOrderNo: self.workpieceInformation.workOrderNo, @@ -880,7 +869,7 @@ // this.headContent.yzSfcCode = scanValue // this.bindYzSfc(); // }else - if(scanValue.includes("0RSP1TE") && this.headContent.processesCode === 'OP240'){ + if(scanValue.includes("0RSP1TE") && this.headContent.processesCode === 'POP240'){ this.headContent.cardCode = scanValue this.bindcardCode(scanValue); this.serialPortMethod(scanValue) @@ -890,7 +879,7 @@ this.serialPortMethod(scanValue) } } else { - if(this.headContent.processesCode === 'OP240'){ + if(this.headContent.processesCode === 'POP240'){ this.headContent.sfcCode = scanValue; this.queryParams.productNum = scanValue; this.getList() -- Gitblit v1.9.3