From 0a926b3ce629047a88dbc65cc38ec86c43520336 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 07 三月 2025 16:33:09 +0800
Subject: [PATCH] -换型bug修改
---
jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue | 66 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 19 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
index ae6a172..ad940b7 100644
--- a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
@@ -1,19 +1,32 @@
<template>
<div class="app-container">
<el-row :gutter="5">
- <el-col :span="7">
+ <el-col :span="5">
<el-card shadow="never">
<span class="head-font">宸ヤ綅缂栧彿 : {{headContent.processesCode}}</span>
</el-card>
</el-col>
- <el-col :span="7">
+ <el-col :span="5">
<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-col :span="6">
+ <el-card style="height: 57px" shadow="never">
+ <span class="head-font">浜у搧鍨嬪彿 : </span>
+ <el-select style="width: 70%;margin-top: -10px" v-model="selectProductCode" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-card>
+ </el-col>
+ <el-col :span="8">
<el-card shadow="never">
<span class="head-font">妯＄粍鐮� : {{headContent.module}}</span>
<!-- <el-input v-model="content" style="float: right;width: 150px;" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>-->
@@ -244,7 +257,7 @@
import {listWorkReport} from "@/api/main/om/workReport/workReport";
import {listStationConf,getIpv4} from "@/api/main/sc/stationConf";
import {
- clearWorkpieceRelease,
+ clearWorkpieceRelease, inPlaceInspection,
jrmUpdateResults, jrmWorkpieceRelease,
listFormulaChild,
noPageListFormulaChild,
@@ -277,6 +290,17 @@
name: "stationTerminal",
data() {
return {
+ selectProductCode: 'PE01B',
+ options: [{
+ value: 'PE01B',
+ label: 'PE01B'
+ }, {
+ value: 'PE01F',
+ label: 'PE01F'
+ }, {
+ value: 'PE01H',
+ label: 'PE01H'
+ }],
carCode: '',
showInput: false,
onLineBinDing: false,
@@ -332,8 +356,8 @@
content: '',
activeName: 'first',
// 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/",
+ // url: "ws://10.103.210.248:8080/websocket/message/",
+ url: "ws://192.168.2.76:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
@@ -425,8 +449,8 @@
let formulaChildParams = {
scanBarcode: value,
sfcBarcode: this.headContent.module,
- // workOrderNo: this.workpieceInformation.workOrderNo,
- productCode: 'PE01B',
+ // workOrderNo: '-',
+ productCode: this.selectProductCode,
locationCode: this.headContent.processesCode,
collectionTime: new Date()
}
@@ -474,7 +498,7 @@
getListFormulaChild() {
console.log('getListFormulaChild')
// this.formulaChildList = []
- this.formulaChildParams.productCode = 'PE01B'
+ this.formulaChildParams.productCode = this.selectProductCode
this.formulaChildParams.processesCode = this.headContent.processesCode
console.log(this.formulaChildParams)
noPageListFormulaChild(this.formulaChildParams).then(response => {
@@ -521,7 +545,7 @@
},
clearClick(){
const param = {
- productCode: "PE01B",
+ productCode: this.selectProductCode,
locationCode: this.headContent.processesCode,
}
// jrmSaveCampaignTimeParameters(param).then(response => {});
@@ -593,12 +617,11 @@
}
this.headContent.processesName = rows.processesName
this.headContent.processesCode = rows.processesCode
- if(this.headContent.processesCode === 'OP240'){
- this.onLineBinDing = true
- }
- if(this.headContent.processesCode === 'OP260'){
- this.showInput = true
- }
+
+ inPlaceInspection({processesCode: this.headContent.processesCode}).then(response => {
+ console.log(response)
+ this.cakeLamp.InPlace = response.data
+ });
console.log('璁剧疆宸ヤ綅缂栫爜' + this.headContent.processesCode)
});
@@ -631,10 +654,11 @@
}
const param = {
- productCode: "PE01B",
+ productCode: self.selectProductCode,
locationCode: self.headContent.processesCode,
productBarcode: self.headContent.module,
- inboundTime: self.workpieceInformation.inboundTime
+ inboundTime: self.workpieceInformation.inboundTime,
+ workOrderNo: '-'
}
jrmSaveCampaignTimeParameters(param).then(response => {});
self.cakeLamp.release = 1;
@@ -682,16 +706,20 @@
console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
if(this.headContent.module !== ''){
+ console.log('this.headContent.module !== \'\' true')
this.$message('鎵爜妯＄粍鐗╂枡鐮�'+scanValue);
this.serialPortMethod(scanValue)
} else {
- if(scanValue.includes("ORSM")){
+ console.log('this.headContent.module !== \'\' false')
+ if(scanValue.includes("0RSMB")){
this.headContent.module = scanValue;
this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
this.getList()
// this.cakeLamp.InPlace = 1
this.cakeLamp.scanFinish = 1
this.cakeLamp.startWork = 1
+ }else {
+ this.$message.error('鎵爜璇嗗埆閿欒鐨勪骇鍝佸簭鍒楀彿'+scanValue+'璇烽噸鏂版壂鐮�');
}
}
}
--
Gitblit v1.9.3