From 505237e928b3518483f3a49080a4e0b266bd7e7d Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 11 四月 2024 14:01:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index baaef08..3d695cd 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.21:8080/websocket/message/",
+ url: "ws://192.168.1.102: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",
@@ -495,11 +496,19 @@
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;
});
},
+ endClear(){
+ this.cakeLamp.InPlace= 0 //宸ヤ欢鍒颁綅
+ this.cakeLamp.scanFinish= 0
+ this.cakeLamp.startWork= 0
+ this.cakeLamp.release= 0 //鍏佽鏀捐
+ this.formulaChildList = []
+ this.headContent.sfcCode = null
+ },
changeMenu(tab, event) {
console.log(tab, event);
},
@@ -562,6 +571,7 @@
alert("鏈繛鎺ュ埌鏈嶅姟鍣�");
}
},
+
initStation: async function () {
await getIpv4().then(response => {
this.StationConfQueryParams.ipAddress = response.msg
@@ -603,6 +613,7 @@
}
saveCampaignTimeParameters(param).then(response => {});
self.cakeLamp.release = 1;
+ self.endClear()
} else if (event.data.includes("[")) {
let formulaChilds = "";
@@ -635,6 +646,8 @@
};
},
+
+
//鎺ュ彈鏁版嵁鐨勫洖璋�
callBack(value) {
if (this.form1.isShowHistory) this.form1.desc = this.readLi().join("");
@@ -643,9 +656,11 @@
console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
// if(this.cakeLamp.InPlace=== 1){
if(this.headContent.sfcCode !== ''){
+ this.$message('鎵弿鐗╂枡缂栫爜'+scanValue);
console.log(scanValue)
this.serialPortMethod(scanValue)
}else {
+ this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
this.headContent.sfcCode = scanValue;
this.queryParams.productNum = scanValue;
this.getList()
--
Gitblit v1.9.3