From 8241ddde076c3418f359e48009585a2d9aae7ed7 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 29 三月 2024 14:19:25 +0800
Subject: [PATCH] chenge plan
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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..2ddddc1 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -360,7 +360,7 @@
},
content: '',
activeName: 'first',
- url: "ws://192.168.10.21:8080/websocket/message/",
+ url: "ws://192.168.10.198:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
@@ -499,7 +499,15 @@
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 +570,7 @@
alert("鏈繛鎺ュ埌鏈嶅姟鍣�");
}
},
+
initStation: async function () {
await getIpv4().then(response => {
this.StationConfQueryParams.ipAddress = response.msg
@@ -603,6 +612,7 @@
}
saveCampaignTimeParameters(param).then(response => {});
self.cakeLamp.release = 1;
+ self.endClear()
} else if (event.data.includes("[")) {
let formulaChilds = "";
@@ -635,6 +645,8 @@
};
},
+
+
//鎺ュ彈鏁版嵁鐨勫洖璋�
callBack(value) {
if (this.form1.isShowHistory) this.form1.desc = this.readLi().join("");
@@ -643,9 +655,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