From e2670e7912ea7316d1f9fb518d980b8a4ef94055 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期四, 18 四月 2024 10:23:28 +0800
Subject: [PATCH] 点位订阅
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 67 ++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 19 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index b3cd5fa..b4cd486 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -96,7 +96,13 @@
<!-- </el-col>-->
<!-- </el-row>-->
<el-row style="margin-top: 20px">
- <el-button @click="Release" type="primary">鏀捐</el-button>
+ <el-col></el-col>
+ <span style="width: 130px;" class="head-font">棰勮鎬绘垚鍙� : {{headContent.yzSfcCode}}</span>
+ </el-row>
+ <el-row style="margin-top: 20px">
+<!-- <el-button @click="Release" type="primary">缁戝畾</el-button>-->
+ <el-button @click="bindYzSfc" type="primary">缁戝畾</el-button>
+
</el-row>
</el-card>
@@ -308,7 +314,8 @@
addBasicParameters,
addParamCollection,
addTighteningParameters,
- saveCampaignTimeParameters
+ saveCampaignTimeParameters,
+ replaceAssemblyCode,
} from "@/api/main/da/paramCollection/paramCollection";
export default {
@@ -331,6 +338,7 @@
processesCode: 'OP1010',
processesName: '璐存爣鏈�-璐寸爜',
sfcCode: '',
+ yzSfcCode: '',
},
workpieceInformation: {
workOrderNo: null,
@@ -361,7 +369,7 @@
},
content: '',
activeName: 'first',
- url: "ws://192.168.10.40:8080/websocket/message/",
+ url: "ws://192.168.1.101:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
@@ -371,7 +379,7 @@
input: "",
keepReading: true,
form1: {
- baudRate: "9600",
+ baudRate: "115200",
dataBits: "8",
stopBits: "1",
parity: "none",
@@ -429,6 +437,19 @@
serialLink() {
this.open1 = true
},
+ bindYzSfc(){
+ if(this.headContent.sfcCode!==""&&this.headContent.yzSfcCode!==""){
+ let param = {
+ sfcCode: this.headContent.sfcCode,
+ locationCode: this.headContent.processesCode,
+ yzSfcCode: this.headContent.yzSfcCode
+ }
+ this.$message('鍙互缁戝畾锛�');
+ replaceAssemblyCode(param).then(response => {
+
+ });
+ }
+ },
Release(){
// this.$message('portsList锛�'+this.portsList.length);
if(this.btnType === "danger"){
@@ -479,6 +500,10 @@
collectionTime: new Date()
}
updateResults(formulaChildParams).then(response => {
+ console.log(response)
+ if(response.msg === "3"){
+ this.cakeLamp.release= 1 //鍏佽鏀捐
+ }
this.getListFormulaChild()
});
},
@@ -508,6 +533,10 @@
this.formulaChildList = []
this.headContent.sfcCode = null
+ this.workpieceInformation.productCode = null;
+ this.workpieceInformation.workOrderNo = null;
+ this.workpieceInformation.productModel = null;
+ this.workpieceInformation.productName = null;
},
changeMenu(tab, event) {
console.log(tab, event);
@@ -597,7 +626,6 @@
this.$message('websocket杩炴帴鎴愬姛锛�');
};
this.ws.onmessage = function (event) {
- const DELAY_TIME = 2000;
if (event.data === "IN") {
self.cakeLamp.InPlace = 1;
} else if (event.data === "IN0") {
@@ -614,7 +642,7 @@
saveCampaignTimeParameters(param).then(response => {});
self.cakeLamp.release = 1;
self.endClear()
-
+ workpieceRelease(param).then(response => {});
} else if (event.data.includes("[")) {
let formulaChilds = "";
self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
@@ -654,23 +682,24 @@
else {
const scanValue = this.myserialport.hex2atostr(value).replace(/[\r\n]/g, '');
console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
- // if(this.cakeLamp.InPlace=== 1){
- if(this.headContent.sfcCode !== ''){
+
+ if(this.headContent.sfcCode !== ''){
+ if(scanValue.includes("SS")){
+ this.headContent.yzSfcCode = scanValue
+ }else {
this.$message('鎵弿鐗╂枡缂栫爜'+scanValue);
console.log(scanValue)
this.serialPortMethod(scanValue)
- }else {
- this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
- this.headContent.sfcCode = scanValue;
- this.queryParams.productNum = scanValue;
- this.getList()
- // this.getListFormulaChild()
- this.cakeLamp.scanFinish = 1
- this.cakeLamp.startWork = 1
}
- // }else {
- // this.$message('宸ヤ欢鏈埌浣嶇姝㈡壂鐮侊紒');
- // }
+ } else {
+ this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
+ this.headContent.sfcCode = scanValue;
+ this.queryParams.productNum = scanValue;
+ this.getList()
+ this.cakeLamp.scanFinish = 1
+ this.cakeLamp.startWork = 1
+ }
+
}
},
clearHistory() {
--
Gitblit v1.9.3