From 002c0ac4c04ea51dd3fd96def3c1f62c8bade624 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期四, 01 八月 2024 11:26:59 +0800
Subject: [PATCH] -bug修改
---
jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
index 8aeedb5..3b9d766 100644
--- a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
@@ -30,17 +30,19 @@
<span slot="label"> <a class="el-icon-date"></a>棣栭〉</span>
<el-col :span="24">
<el-table height="500" :cell-style="rowStyle" :data="formulaChildList">
- <el-table-column label="鎺掑簭" width="60" align="center" type="index">
+<!-- <el-table-column label="鎺掑簭" width="60" align="center" type="index">-->
+<!-- </el-table-column>-->
+ <el-table-column label="鎷х揣姝ュ彿" width="80" align="center" prop="stepSort">
</el-table-column>
<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 label="浜у搧缂栧彿" width="80" align="center" prop="productCode">
</el-table-column>
- <el-table-column label="鐗╂枡缂栫爜" 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>
- <el-table-column label="缁撴灉" align="center" prop="results">
+ <el-table-column label="缁撴灉" width="60" align="center" prop="results">
</el-table-column>
</el-table>
</el-col>
@@ -261,8 +263,9 @@
},
content: '',
activeName: 'first',
- url: "ws://10.103.210.248:8080/websocket/message/",
- // url: "ws://192.168.2.76:8080/websocket/message/",
+ // 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: "",
text_content: "",
ws: null,
@@ -360,7 +363,7 @@
scanBarcode: value,
sfcBarcode: this.headContent.sfcCode,
workOrderNo: this.workpieceInformation.workOrderNo,
- productCode: "1P102S",
+ productCode: "PE01B",
locationCode: this.headContent.processesCode,
collectionTime: new Date()
}
@@ -378,7 +381,7 @@
},
/** 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛� */
getListFormulaChild() {
- this.formulaChildParams.productCode = "1P102S"
+ this.formulaChildParams.productCode = "PE01B"
this.formulaChildParams.processesCode = this.headContent.processesCode
console.log(this.formulaChildParams)
noPageListFormulaChild(this.formulaChildParams).then(response => {
@@ -412,7 +415,7 @@
},
clearClick(){
const param = {
- productCode: '1P102S',
+ productCode: 'PE01B',
locationCode: this.headContent.processesCode,
}
clearWorkpieceRelease(param).then(response => {});
@@ -491,7 +494,7 @@
this.ws = new WebSocket(wsuri);
const self = this;
this.ws.onopen = function (event) {
- this.$message('websocket杩炴帴鎴愬姛锛�');
+ self.$message('websocket杩炴帴鎴愬姛锛�');
};
this.ws.onmessage = function (event) {
if(event.data.includes("[")) {
@@ -540,7 +543,10 @@
const param = {
locationCode: self.headContent.processesCode,
productBarcode: self.headContent.sfcCode,
- inboundTime: self.headContent.inboundTime
+ inboundTime: self.headContent.inboundTime,
+ productCode: "PE01B",
+ workOrderNo: "-",
+
}
preInstallOut(param).then(response => {});
workpieceRelease(param).then(response => {});
@@ -569,9 +575,14 @@
console.log(scanValue)
this.serialPortMethod(scanValue)
} else {
- this.headContent.sfcCode = scanValue;
- this.headContent.inboundTime = this.getCurrentTime();
- this.getList()
+ if(scanValue.includes("P9900183275") || scanValue.includes("P9900173252")){
+ this.headContent.sfcCode = scanValue;
+ this.headContent.inboundTime = this.getCurrentTime();
+ this.getList()
+ }else {
+ this.$message.error('鎬绘垚鐮佹壂鎻忛敊璇紒');
+ }
+
}
}
--
Gitblit v1.9.3