From bdb4046a1ed5358a94cc9ce846f2a1ec88e5d5ec Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 18 六月 2024 10:51:57 +0800
Subject: [PATCH] -
---
jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue | 73 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 21 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
index 02f712a..d9276f0 100644
--- a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
@@ -245,7 +245,7 @@
import {listWorkReport} from "@/api/main/om/workReport/workReport";
import {listStationConf,getIpv4} from "@/api/main/sc/stationConf";
import {
- jrmUpdateResults,
+ jrmUpdateResults, jrmWorkpieceRelease,
listFormulaChild,
noPageListFormulaChild,
releaseCheck,
@@ -409,19 +409,6 @@
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"){
@@ -457,6 +444,17 @@
}
return '';
},
+ getElement() {
+ let temp33 = document.getElementsByClassName('el-table__row')
+ console.log('temp33',temp33)
+ console.log('len',temp33.item(12))
+ if (temp33.length > 0){
+ console.log('1111111111111111')
+ let arr = temp33[12]
+ console.log('srr',arr)
+ arr.scrollIntoView({ block: 'center' })
+ }
+ },
/** 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛� */
getListFormulaChild() {
console.log('getListFormulaChild')
@@ -466,8 +464,27 @@
console.log(this.formulaChildParams)
noPageListFormulaChild(this.formulaChildParams).then(response => {
this.formulaChildList = response.rows;
+ if (this.formulaChildList.length >0){
+ let pos = 0
+ const tempArr = this.formulaChildList.filter(x=> 'OK' === x.results)
+ if (tempArr.length>0){
+ pos = tempArr.length
+ this.$nextTick(() => {
+ let temp33 = document.getElementsByClassName('el-table__row')
+ console.log('temp33',temp33)
+ console.log('len',temp33.item(pos))
+ if (temp33.length > 0){
+ console.log('1111111111111111')
+ let arr = temp33[pos-1]
+ console.log('srr',arr)
+ arr.scrollIntoView({ block: 'center' })
+ }
+ })
+ }
+
+ }
+
});
- console.log('success_getListFormulaChild')
},
endClear(){
this.cakeLamp.InPlace= 0 //宸ヤ欢鍒颁綅
@@ -481,13 +498,26 @@
this.workpieceInformation.productModel = null;
this.workpieceInformation.productName = null;
this.headContent.sfcCode = '';
+ this.headContent.moduleB = '';
+ this.headContent.moduleA = '';
},
changeMenu(tab, event) {
console.log(tab, event);
},
clearClick(){
- this.$message('杩欐槸涓�鏉℃竻闄ゆ秷鎭彁绀�');
- this.headContent.sfcCode = null
+ const param = {
+ workOrderNo: this.workpieceInformation.workOrderNo,
+ productCode: "1P102S",
+ locationCode: this.headContent.processesCode,
+ productBarcode: this.headContent.moduleA+','+this.headContent.moduleB,
+ }
+ jrmSaveCampaignTimeParameters(param).then(response => {});
+ this.cakeLamp.release = 1;
+ this.endClear()
+ // workpieceRelease(param).then(response => {});
+ jrmWorkpieceRelease(param).then(response => {});
+ // this.$message('杩欐槸涓�鏉℃竻闄ゆ秷鎭彁绀�');
+ // this.headContent.sfcCode = null
},
scanCompleted(){
this.$message('鎵爜瀹屾垚'+this.content);
@@ -575,14 +605,15 @@
} else if (event.data === "END") {
const param = {
workOrderNo: self.workpieceInformation.workOrderNo,
- productCode: self.workpieceInformation.productCode,
+ productCode: "1P102S",
locationCode: self.headContent.processesCode,
- productBarcode: self.headContent.sfcCode,
+ productBarcode: self.headContent.moduleA+','+self.headContent.moduleB,
}
jrmSaveCampaignTimeParameters(param).then(response => {});
self.cakeLamp.release = 1;
self.endClear()
- workpieceRelease(param).then(response => {});
+ // workpieceRelease(param).then(response => {});
+ jrmWorkpieceRelease(param).then(response => {});
} else if (event.data.includes("[")) {
let formulaChilds = "";
self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
@@ -633,7 +664,7 @@
this.headContent.moduleB = scanValue;
this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
this.getList()
- this.cakeLamp.InPlace = 1
+ // this.cakeLamp.InPlace = 1
this.cakeLamp.scanFinish = 1
this.cakeLamp.startWork = 1
}
--
Gitblit v1.9.3