From 5316c506119ad056a5640650e5e79babe4194d38 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期四, 25 四月 2024 20:33:31 +0800
Subject: [PATCH] -
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 93 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 71 insertions(+), 22 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 8fbc4da..bed610d 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -95,8 +95,14 @@
<!-- </el-col>-->
<!-- </el-row>-->
- <el-row style="margin-top: 20px">
- <el-button @click="Release" type="primary">鏀捐</el-button>
+ <el-row v-show="showInput" style="margin-top: 20px">
+ <el-col></el-col>
+ <span style="width: 130px;" class="head-font">棰勮鎬绘垚鍙� : {{headContent.yzSfcCode}}</span>
+ </el-row>
+ <el-row v-show="showInput" style="margin-top: 20px">
+<!-- <el-button @click="Release" type="primary">缁戝畾</el-button>-->
+ <el-button @click="bindYzSfc" type="primary">缁戝畾</el-button>
+
</el-row>
</el-card>
@@ -106,12 +112,14 @@
<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">
</el-table-column>
<el-table-column label="浜у搧缂栧彿" align="center" prop="productCode">
+ </el-table-column>
+ <el-table-column label="鐗╂枡缂栫爜" align="center" prop="materialCode">
</el-table-column>
<el-table-column label="閲囬泦鍊�" align="center" prop="collectData">
</el-table-column>
@@ -294,6 +302,7 @@
import {listStationConf,getIpv4} from "@/api/main/sc/stationConf";
import {
listFormulaChild,
+ noPageListFormulaChild,
releaseCheck,
updateResults,
updateTighteningFormula,
@@ -307,13 +316,15 @@
addBasicParameters,
addParamCollection,
addTighteningParameters,
- saveCampaignTimeParameters
+ saveCampaignTimeParameters,
+ replaceAssemblyCode,
} from "@/api/main/da/paramCollection/paramCollection";
export default {
name: "stationTerminal",
data() {
return {
+ showInput: true,
serialPortContent: '',
// 鏌ヨ鍙傛暟
formulaChildParams: {
@@ -330,6 +341,7 @@
processesCode: 'OP1010',
processesName: '璐存爣鏈�-璐寸爜',
sfcCode: '',
+ yzSfcCode: '',
},
workpieceInformation: {
workOrderNo: null,
@@ -360,7 +372,7 @@
},
content: '',
activeName: 'first',
- url: "ws://192.168.10.21:8080/websocket/message/",
+ url: "ws://192.168.1.103:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
@@ -370,7 +382,7 @@
input: "",
keepReading: true,
form1: {
- baudRate: "9600",
+ baudRate: "115200",
dataBits: "8",
stopBits: "1",
parity: "none",
@@ -428,6 +440,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"){
@@ -478,6 +503,10 @@
collectionTime: new Date()
}
updateResults(formulaChildParams).then(response => {
+ console.log(response)
+ if(response.msg === "3"){
+ this.cakeLamp.release= 1 //鍏佽鏀捐
+ }
this.getListFormulaChild()
});
},
@@ -494,11 +523,24 @@
// this.formulaChildList = []
this.formulaChildParams.productCode = this.workpieceInformation.productCode
this.formulaChildParams.processesCode = this.headContent.processesCode
- listFormulaChild(this.formulaChildParams).then(response => {
+ console.log(this.formulaChildParams)
+ 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.workpieceInformation.productCode = null;
+ this.workpieceInformation.workOrderNo = null;
+ this.workpieceInformation.productModel = null;
+ this.workpieceInformation.productName = null;
+ this.headContent.sfcCode = '';
+ },
changeMenu(tab, event) {
console.log(tab, event);
},
@@ -561,6 +603,7 @@
alert("鏈繛鎺ュ埌鏈嶅姟鍣�");
}
},
+
initStation: async function () {
await getIpv4().then(response => {
this.StationConfQueryParams.ipAddress = response.msg
@@ -577,7 +620,7 @@
console.log('璁剧疆宸ヤ綅缂栫爜' + this.headContent.processesCode)
});
- // this.conCom()
+ this.conCom()
console.log('websocket杩炴帴宸ヤ綅涓�' + this.headContent.processesCode)
const wsuri = this.url + this.headContent.processesCode;
this.ws = new WebSocket(wsuri);
@@ -586,7 +629,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") {
@@ -601,7 +643,9 @@
productBarcode: self.headContent.sfcCode,
}
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);
@@ -633,27 +677,32 @@
};
},
+
+
//鎺ュ彈鏁版嵁鐨勫洖璋�
callBack(value) {
if (this.form1.isShowHistory) this.form1.desc = this.readLi().join("");
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.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