From 58c9d48e6a66b3db4da52b79e81dbf47c72e9cd3 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期二, 16 七月 2024 17:27:03 +0800
Subject: [PATCH] 修改参数采集
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 40 ++++++++++++++++------------------------
1 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 8db214d..6f7a94a 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -30,22 +30,15 @@
<span style="font-weight: bold">褰撳墠宸ヤ欢淇℃伅</span>
</div>
<el-descriptions :column="1" border :content-style="{'min-width': '140px'}">
-<!-- <el-descriptions :column="1" :label-style="{'font-size': '15px'}" border :content-style="{'min-width': '150px'}">-->
<el-descriptions-item label="宸ュ崟缂栧彿">
<span>{{workpieceInformation.workOrderNo}}</span>
</el-descriptions-item>
- <el-descriptions-item label="浜у搧鍨嬪彿">
- <span>{{workpieceInformation.productCode}}</span>
+ <el-descriptions-item label="鐗╂枡缂栫爜">
+ <span>{{workpieceInformation.materialCode}}</span>
</el-descriptions-item>
- <el-descriptions-item label="灏忚溅鐮�">
- <span>{{headContent.cardCode}}</span>
+ <el-descriptions-item label="璁″垝鏁伴噺">
+ <span>{{workpieceInformation.planQty}}</span>
</el-descriptions-item>
-<!-- <el-descriptions-item label="浜у搧鍨嬪彿">-->
-<!-- <span>{{workpieceInformation.productModel}}</span>-->
-<!-- </el-descriptions-item>-->
-<!-- <el-descriptions-item label="浜у搧鍚嶇О">-->
-<!-- <span>{{workpieceInformation.productName}}</span>-->
-<!-- </el-descriptions-item>-->
<el-descriptions-item label="寮�濮嬫椂闂�">
<span>{{workpieceInformation.inboundTime}}</span>
</el-descriptions-item>
@@ -309,7 +302,7 @@
fistSetpNumber, initializedData,
listFormulaChild,
noPageListFormulaChild,
- releaseCheck,
+ releaseCheck, unfinishedProcess,
updateResults,
updateTighteningFormula,
workpieceRelease
@@ -367,6 +360,8 @@
productModel: null,
productName: null,
inboundTime: null,
+ materialCode: null,
+ planQty: null,
},
// 鏌ヨ鍙傛暟
queryParams: {
@@ -390,8 +385,8 @@
},
content: '',
activeName: 'first',
- url: "ws://10.103.210.248:8080/websocket/message/",
- // url: "ws://192.168.10.100:8080/websocket/message/",
+ // url: "ws://10.103.210.248:8080/websocket/message/",
+ url: "ws://192.168.10.100:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
@@ -471,6 +466,7 @@
this.getList()
this.cakeLamp.scanFinish = 1
this.cakeLamp.startWork = 1
+ this.cakeLamp.InPlace = 1
});
}else {
this.$message.error("宸茬粡鏈夊伐鍗曚簡锛屼笉鑳芥帴鏀讹紒");
@@ -622,8 +618,8 @@
console.log(rowsData)
this.workpieceInformation.workOrderNo = rowsData.workOrderNo;
this.workpieceInformation.productCode = rowsData.productCode;
- this.workpieceInformation.productModel = rowsData.productModel;
- this.workpieceInformation.productName = rowsData.productName;
+ this.workpieceInformation.materialCode = rowsData.materialCode;
+ this.workpieceInformation.planQty = rowsData.planQty;
this.headContent.cardCode = rowsData.trolleyYard;
});
this.getListFormulaChild()
@@ -641,6 +637,7 @@
this.getList()
this.cakeLamp.scanFinish = 1
this.cakeLamp.startWork = 1
+ this.cakeLamp.InPlace = 1
}
});
},
@@ -741,18 +738,13 @@
if(self.headContent.sfcCode=== ''||self.headContent.sfcCode=== null){
self.$message('鎬绘垚鐮佷负绌猴紝璇锋壂鐮侊紒')
+ unfinishedProcess({processesCode: self.headContent.processesCode,recordDataDone: 26}).then(response => {});
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('鏈仛瀹屽伐搴忕姝㈡斁琛�');
+ unfinishedProcess({processesCode: self.headContent.processesCode,recordDataDone: 25}).then(response => {});
return;
}
@@ -820,7 +812,7 @@
self.getList()
self.cakeLamp.scanFinish = 1
self.cakeLamp.startWork = 1
- this.cakeLamp.InPlace = 1
+ self.cakeLamp.InPlace = 1
}
};
--
Gitblit v1.9.3