From 7aca2b562095a836bd9e2e29b938c5b43aff6db1 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期一, 06 五月 2024 16:04:06 +0800
Subject: [PATCH] -
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 63 ++++++++++++++++++++++---------
1 files changed, 44 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 c29cfdc..1f17669 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>
@@ -112,6 +118,8 @@
<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>
@@ -308,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: {
@@ -331,6 +341,7 @@
processesCode: 'OP1010',
processesName: '璐存爣鏈�-璐寸爜',
sfcCode: '',
+ yzSfcCode: '',
},
workpieceInformation: {
workOrderNo: null,
@@ -361,7 +372,7 @@
},
content: '',
activeName: 'first',
- url: "ws://192.168.1.100:8080/websocket/message/",
+ url: "ws://192.168.2.76:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
@@ -428,6 +439,19 @@
methods: {
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);
@@ -511,11 +535,11 @@
this.cakeLamp.release= 0 //鍏佽鏀捐
this.formulaChildList = []
- this.headContent.sfcCode = null
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);
@@ -621,7 +645,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);
@@ -661,23 +685,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