From 4e83fa344f6cba81412fb354e7f32a88a8f34fde Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 09 七月 2024 09:39:11 +0800
Subject: [PATCH] -切换大模组代码更改
---
jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue | 109 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 66 insertions(+), 43 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
index d9276f0..87359ce 100644
--- a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
@@ -6,22 +6,22 @@
<span class="head-font">宸ヤ綅缂栧彿 : {{headContent.processesCode}}</span>
</el-card>
</el-col>
- <el-col :span="17">
+ <el-col :span="7">
<el-card shadow="never">
<span class="head-font">宸ヤ綅鍚嶇О : {{headContent.processesName}}</span>
+<!-- <el-button type="primary" style="float: right" icon="el-icon-search" size="mini" @click="serialLink">涓插彛杩炴帴</el-button>-->
+<!-- <el-button @click="clearClick" style="float: right" type="danger" size="mini">娓呴櫎</el-button>-->
+ </el-card>
+ </el-col>
+ <el-col :span="10">
+ <el-card shadow="never">
+ <span class="head-font">妯＄粍鐮� : {{headContent.module}}</span>
+<!-- <el-input v-model="content" style="float: right;width: 150px;" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>-->
+<!-- <el-button @click="scanCompleted" style="float: right" type="primary">鎵爜瀹屾垚</el-button>-->
<el-button type="primary" style="float: right" icon="el-icon-search" size="mini" @click="serialLink">涓插彛杩炴帴</el-button>
<el-button @click="clearClick" style="float: right" type="danger" size="mini">娓呴櫎</el-button>
</el-card>
</el-col>
-<!-- <el-col :span="10">-->
-<!-- <el-card shadow="never">-->
-<!-- <span class="head-font">浜у搧搴忓垪鍙� : {{headContent.sfcCode}}</span>-->
-<!--<!– <el-input v-model="content" style="float: right;width: 150px;" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>–>-->
-<!--<!– <el-button @click="scanCompleted" style="float: right" type="primary">鎵爜瀹屾垚</el-button>–>-->
-<!-- <el-button type="primary" style="float: right" icon="el-icon-search" size="mini" @click="serialLink">涓插彛杩炴帴</el-button>-->
-<!-- <el-button @click="clearClick" style="float: right" type="danger" size="mini">娓呴櫎</el-button>-->
-<!-- </el-card>-->
-<!-- </el-col>-->
</el-row>
<el-row :gutter="5" style="margin-top: 5px">
@@ -31,6 +31,12 @@
<i class="el-icon-tickets"></i>
<span style="font-weight: bold">褰撳墠宸ヤ綅淇℃伅</span>
</div>
+ <el-descriptions :column="1" border :content-style="{'min-width': '140px'}">
+ <el-descriptions-item label="寮�濮嬫椂闂�">
+ <span>{{workpieceInformation.inboundTime}}</span>
+ </el-descriptions-item>
+ </el-descriptions>
+ <el-divider></el-divider>
<el-row>
<el-col :span="12">
<el-button class="circle-button" :class="cakeLamp.plcState ? 'circle-green-animate':'circle-red'" circle></el-button>
@@ -67,13 +73,6 @@
<span> 鍏佽鏀捐</span>
</el-col>
- </el-row>
- <el-divider></el-divider>
- <el-row style="margin-top: 20px">
- <span style="width: 130px;" class="head-font">妯＄粍鐮丄 : {{headContent.moduleA}}</span>
- </el-row>
- <el-row style="margin-top: 20px">
- <span style="width: 130px;" class="head-font">妯＄粍鐮丅 : {{headContent.moduleB}}</span>
</el-row>
</el-card>
@@ -245,6 +244,7 @@
import {listWorkReport} from "@/api/main/om/workReport/workReport";
import {listStationConf,getIpv4} from "@/api/main/sc/stationConf";
import {
+ clearWorkpieceRelease,
jrmUpdateResults, jrmWorkpieceRelease,
listFormulaChild,
noPageListFormulaChild,
@@ -299,15 +299,15 @@
sfcCode: '',
yzSfcCode: '',
cardCode: '',
- moduleA: '',
- moduleB: '',
+ module: '',
+ // moduleB: '',
},
workpieceInformation: {
workOrderNo: null,
productCode: null,
productModel: null,
productName: null,
- beat: null,
+ inboundTime: null,
},
// 鏌ヨ鍙傛暟
queryParams: {
@@ -331,7 +331,8 @@
},
content: '',
activeName: 'first',
- url: "ws://192.168.2.76: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,
@@ -422,9 +423,9 @@
serialPortMethod(value){
let formulaChildParams = {
scanBarcode: value,
- sfcBarcode: this.headContent.moduleA+','+this.headContent.moduleB,
+ sfcBarcode: this.headContent.module,
// workOrderNo: this.workpieceInformation.workOrderNo,
- productCode: '1P102S',
+ productCode: 'PE01B',
locationCode: this.headContent.processesCode,
collectionTime: new Date()
}
@@ -444,6 +445,19 @@
}
return '';
},
+ getCurrentTime() {
+ const now = new Date();
+ const year = now.getFullYear();
+ const month = this.padTimeUnit(now.getMonth() + 1); // 鏈堜唤鏄粠0寮�濮嬬殑
+ const day = this.padTimeUnit(now.getDate());
+ const hours = this.padTimeUnit(now.getHours());
+ const minutes = this.padTimeUnit(now.getMinutes());
+ const seconds = this.padTimeUnit(now.getSeconds());
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+ },
+ padTimeUnit(value) {
+ return value.toString().padStart(2, '0');
+ },
getElement() {
let temp33 = document.getElementsByClassName('el-table__row')
console.log('temp33',temp33)
@@ -459,7 +473,7 @@
getListFormulaChild() {
console.log('getListFormulaChild')
// this.formulaChildList = []
- this.formulaChildParams.productCode = '1P102S'
+ this.formulaChildParams.productCode = 'PE01B'
this.formulaChildParams.processesCode = this.headContent.processesCode
console.log(this.formulaChildParams)
noPageListFormulaChild(this.formulaChildParams).then(response => {
@@ -498,25 +512,24 @@
this.workpieceInformation.productModel = null;
this.workpieceInformation.productName = null;
this.headContent.sfcCode = '';
- this.headContent.moduleB = '';
- this.headContent.moduleA = '';
+ this.workpieceInformation.inboundTime = null;
+ this.headContent.module = '';
},
changeMenu(tab, event) {
console.log(tab, event);
},
clearClick(){
const param = {
- workOrderNo: this.workpieceInformation.workOrderNo,
- productCode: "1P102S",
+ productCode: "PE01B",
locationCode: this.headContent.processesCode,
- productBarcode: this.headContent.moduleA+','+this.headContent.moduleB,
}
- jrmSaveCampaignTimeParameters(param).then(response => {});
- this.cakeLamp.release = 1;
+ // jrmSaveCampaignTimeParameters(param).then(response => {});
+ // this.cakeLamp.release = 1;
this.endClear()
+ clearWorkpieceRelease(param).then(response => {});
// workpieceRelease(param).then(response => {});
- jrmWorkpieceRelease(param).then(response => {});
- // this.$message('杩欐槸涓�鏉℃竻闄ゆ秷鎭彁绀�');
+ // jrmWorkpieceRelease(param).then(response => {});
+ this.$message('杩欐槸涓�鏉℃竻闄ゆ秷鎭彁绀�');
// this.headContent.sfcCode = null
},
scanCompleted(){
@@ -531,8 +544,9 @@
},
/** 鏌ヨ宸ュ崟鍒楄〃 */
async getList() {
+ this.workpieceInformation.inboundTime = this.getCurrentTime()
this.getListFormulaChild()
- this.addOverStationCollection()
+ // this.addOverStationCollection()
},
/** 鍏ョ珯澧炲姞杩囩珯閲囬泦璁板綍 **/
@@ -545,7 +559,7 @@
locationCode: this.headContent.processesCode,
// model: this.workpieceInformation.productModel,
// productBarcode: this.headContent.sfcCode,
- sfcCode: this.headContent.moduleA+','+this.headContent.moduleB,
+ sfcCode: this.headContent.module,
inboundTime: new Date()
}
jrmAddPassingStationCollection(this.passingStationForm).then(response => {});
@@ -603,11 +617,23 @@
} else if (event.data === "OUT") {
self.cakeLamp.release = 1;
} else if (event.data === "END") {
+ const formulaChildIndex = self.formulaChildList.length-1
+
+ if(self.headContent.module=== ''||self.headContent.module=== null){
+ self.$message.error('妯＄粍鐮佷负绌猴紝璇锋壂鐮侊紒')
+ return;
+ }
+
+ if(self.formulaChildList[formulaChildIndex].results !== 'OK'){
+ self.$message('鏈仛瀹屽伐搴忕姝㈡斁琛�');
+ return;
+ }
+
const param = {
- workOrderNo: self.workpieceInformation.workOrderNo,
- productCode: "1P102S",
+ productCode: "PE01B",
locationCode: self.headContent.processesCode,
- productBarcode: self.headContent.moduleA+','+self.headContent.moduleB,
+ productBarcode: self.headContent.module,
+ inboundTime: self.workpieceInformation.inboundTime
}
jrmSaveCampaignTimeParameters(param).then(response => {});
self.cakeLamp.release = 1;
@@ -654,14 +680,11 @@
const scanValue = this.myserialport.hex2atostr(value).replace(/[\r\n]/g, '');
console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
- if(this.headContent.moduleA !== '' && this.headContent.moduleB !== '' ){
+ if(this.headContent.module !== ''){
this.serialPortMethod(scanValue)
} else {
- if(scanValue.includes("9900168135")){
- this.headContent.moduleA = scanValue;
- }
if(scanValue.includes("9900168136")){
- this.headContent.moduleB = scanValue;
+ this.headContent.module = scanValue;
this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
this.getList()
// this.cakeLamp.InPlace = 1
--
Gitblit v1.9.3