From 9f636f3476b661cf8d18edb69d0d75eea74e64ea Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期日, 04 八月 2024 14:16:42 +0800
Subject: [PATCH] -bug修改
---
jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
index 4e0e4df..3b9d766 100644
--- a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
@@ -263,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,
@@ -414,7 +415,7 @@
},
clearClick(){
const param = {
- productCode: '1P102S',
+ productCode: 'PE01B',
locationCode: this.headContent.processesCode,
}
clearWorkpieceRelease(param).then(response => {});
@@ -493,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("[")) {
@@ -542,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 => {});
@@ -571,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