From 11cc367e5134b27e25167a7492d8033f3fd9ce52 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期二, 19 三月 2024 13:17:41 +0800
Subject: [PATCH] 操作看板
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 142 +++++++++++++++++++++++++---------------------
1 files changed, 77 insertions(+), 65 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 0f16945..7e19145 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -107,15 +107,15 @@
<span slot="label"> <a class="el-icon-date"></a>棣栭〉</span>
<el-col :span="24">
<el-table :cell-style="rowStyle" :data="formulaChildList">
- <el-table-column label="鎺掑簭" width="60" align="center" prop="stepSort">
+ <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">
</el-table-column>
- <el-table-column label="浜у搧缂栧彿" width="150" align="center" prop="productCode">
+ <el-table-column label="浜у搧缂栧彿" align="center" prop="productCode">
</el-table-column>
- <el-table-column label="閲囬泦鍊�" width="150" align="center" prop="productCode">
+ <el-table-column label="閲囬泦鍊�" align="center" prop="collectData">
</el-table-column>
- <el-table-column label="缁撴灉" width="150" align="center" prop="results">
+ <el-table-column label="缁撴灉" align="center" prop="results">
</el-table-column>
</el-table>
</el-col>
@@ -292,7 +292,13 @@
<script>
import {listWorkReport} from "@/api/main/om/workReport/workReport";
import {listStationConf,getIpv4} from "@/api/main/sc/stationConf";
-import {listFormulaChild, releaseCheck, updateResults, workpieceRelease} from "@/api/main/bs/formulaChild/formulaChild";
+import {
+ listFormulaChild,
+ releaseCheck,
+ updateResults,
+ updateTighteningFormula,
+ workpieceRelease
+} from "@/api/main/bs/formulaChild/formulaChild";
import MySerialPort from "@/utils/MySerialPort";
import USBDevice from "@/utils/usb.json";
import {listProductionOrde} from "@/api/main/om/productionOrde/productionOrde";
@@ -353,7 +359,7 @@
},
content: '',
activeName: 'first',
- url: "ws://192.168.11.76:8080/websocket/message/",
+ url: "ws://192.168.10.21:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
@@ -451,30 +457,28 @@
// });
},
serialPortMethod(value){
- console.log(value.includes('C'));
- let formulaChilds = '';
- console.log(this.formulaChildList)
- this.formulaChildList.forEach((formulaChild) => {
- formulaChilds = formulaChild;
- let operationType = formulaChild.operationType;
- let results = formulaChild.results;
- let materialCode = formulaChild.materialCode;
- if(operationType === '2' && value.includes(materialCode) && (results === '' || results === null || results === 'NG')){
- return; // 浣跨敤return浠ｆ浛break
- }
- });
- console.log(formulaChilds)
- // let formulaChildParams = {
- // scanBarcode: value,
- // sfcBarcode: this.headContent.sfcCode,
- // workOrderNo: this.workpieceInformation.workOrderNo,
- // productCode: this.workpieceInformation.productCode,
- // locationCode: this.headContent.processesCode,
- // collectionTime: new Date()
- // }
- // updateResults(formulaChildParams).then(response => {
- // this.getListFormulaChild()
+ // let formulaChilds = "";
+ // this.formulaChildList.forEach((formulaChild) => {
+ // let operationType = formulaChild.operationType;
+ // let results = formulaChild.results;
+ // let materialCode = formulaChild.materialCode;
+ // if(operationType === '2' && value.includes(materialCode) && (results === "" || results === null || results === 'NG')){
+ // formulaChilds = formulaChild;
+ // return; // 浣跨敤return浠ｆ浛break
+ // }
// });
+ // console.log(formulaChilds)
+ let formulaChildParams = {
+ scanBarcode: value,
+ sfcBarcode: this.headContent.sfcCode,
+ workOrderNo: this.workpieceInformation.workOrderNo,
+ productCode: this.workpieceInformation.productCode,
+ locationCode: this.headContent.processesCode,
+ collectionTime: new Date()
+ }
+ updateResults(formulaChildParams).then(response => {
+ this.getListFormulaChild()
+ });
},
rowStyle({ row }) {
if (row.results === 'OK') {
@@ -486,11 +490,11 @@
},
/** 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛� */
getListFormulaChild() {
+ // this.formulaChildList = []
this.formulaChildParams.productCode = this.workpieceInformation.productCode
this.formulaChildParams.processesCode = this.headContent.processesCode
listFormulaChild(this.formulaChildParams).then(response => {
this.formulaChildList = response.rows;
- console.log(this.formulaChildList)
});
},
@@ -627,38 +631,39 @@
self.cakeLamp.InPlace = 0;
} else if (event.data === "OUT") {
self.cakeLamp.release = 1;
- setTimeout(() => {
- self.cakeLamp.InPlace = 0;
- self.cakeLamp.release = 0;
- self.cakeLamp.startWork = 0;
- self.cakeLamp.scanFinish = 0;
- self.Release();
- }, DELAY_TIME);
+ // setTimeout(() => {
+ // self.cakeLamp.InPlace = 0;
+ // self.cakeLamp.release = 0;
+ // self.cakeLamp.startWork = 0;
+ // self.cakeLamp.scanFinish = 0;
+ // self.Release();
+ // }, DELAY_TIME);
} else if (event.data === "TIGHTEN") {
this.formulaChildList = [];
self.getListFormulaChild();
} else if (event.data.includes("[")) {
let formulaChilds = "";
- // for(let i=0;i<self.formulaChildList.length;i++){
- // formulaChilds = self.formulaChildList[i];
+ self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
+ self.formulaChildList
+ .filter((formulaChild) => formulaChild.operationType === '1');
+ for (let i = 0; i < self.formulaChildList.length; i++) {
+ let formulaChild = self.formulaChildList[i];
+ let results = formulaChild.results;
+ if (results === '' || results === null || results === 'NG') {
+ formulaChilds = formulaChild;
+ break;
+ }
+ }
+ // self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
+ // self.formulaChildList.forEach((formulaChild) => {
// let operationType = formulaChild.operationType;
// let results = formulaChild.results;
- // if(operationType === '1' &&
- // (results === '' || results === null ||results === 'NG')){
- // break;
+ // if(operationType === '1' && (results === '' || results === null || results === 'NG')){
+ // formulaChilds = formulaChild;
+ // return; // 浣跨敤return浠ｆ浛break
// }
- // }
- self.formulaChildList.forEach((formulaChild) => {
- formulaChilds = formulaChild;
- let operationType = formulaChild.operationType;
- let results = formulaChild.results;
- if(operationType === '1' && (results === '' || results === null || results === 'NG')){
- return; // 浣跨敤return浠ｆ浛break
- }
- // 鎵ц鍏朵粬鎿嶄綔
- });
- console.log(formulaChilds)
- console.log(formulaChilds.paramCode)
+ // // 鎵ц鍏朵粬鎿嶄綔
+ // });
const param = {
tightenTheArray: event.data,
paramCode: formulaChilds.paramCode,
@@ -668,6 +673,9 @@
productBarcode: self.headContent.sfcCode,
}
addTighteningParameters(param).then(response => {});
+ updateTighteningFormula(param).then(response => {
+ self.getListFormulaChild()
+ });
}
};
},
@@ -677,18 +685,21 @@
if (this.form1.isShowHistory) this.form1.desc = this.readLi().join("");
else {
const scanValue = this.myserialport.hex2atostr(value).replace(/[\r\n]/g, '');
- this.$message('鎵爜瀹屾垚'+this.content);
-
- if(this.headContent.sfcCode !== ''){
- console.log(scanValue)
- this.serialPortMethod(scanValue)
+ console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
+ if(this.cakeLamp.InPlace=== 1){
+ if(this.headContent.sfcCode !== ''){
+ console.log(scanValue)
+ this.serialPortMethod(scanValue)
+ }else {
+ this.headContent.sfcCode = scanValue;
+ this.queryParams.productNum = scanValue;
+ this.getList()
+ // this.getListFormulaChild()
+ this.cakeLamp.scanFinish = 1
+ this.cakeLamp.startWork = 1
+ }
}else {
- this.headContent.sfcCode = scanValue;
- this.queryParams.productNum = scanValue;
- this.getList()
- // this.getListFormulaChild()
- this.cakeLamp.scanFinish = 1
- this.cakeLamp.startWork = 1
+ this.$message('宸ヤ欢鏈埌浣嶇姝㈡壂鐮侊紒');
}
}
},
@@ -748,6 +759,7 @@
this.myserialport.state.parity = this.form1.parity;
this.myserialport.state.flowControl = this.form1.flowControl;
await this.myserialport.openPort(this.form1.port, true, this.callBack);
+ console.log(this.form1.port)
} catch (error) {
this.$message.error("涓插彛杩炴帴澶辫触锛佽妫�鏌ヤ覆鍙ｆ槸鍚﹀凡琚崰鐢�");
}
--
Gitblit v1.9.3