From 4a53ae7900954ef581b45a9c742f01ded1a66db5 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期五, 07 六月 2024 09:38:02 +0800
Subject: [PATCH] 打印
---
jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
index 5c077d1..c637493 100644
--- a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
@@ -187,26 +187,22 @@
</div>
</template>
<script>
-import {listWorkReport} from "@/api/main/om/workReport/workReport";
-import {listStationConf,getIpv4} from "@/api/main/sc/stationConf";
+import {getIpv4, listStationConf} from "@/api/main/sc/stationConf";
import {
- listFormulaChild,
+ fistSetpNumber,
noPageListFormulaChild,
- releaseCheck,
- updateResults,
- updateTighteningFormula,
- workpieceRelease, yzUpdateResults, yzUpdateTighteningFormula
+ workpieceRelease,
+ yzUpdateResults,
+ yzUpdateTighteningFormula
} from "@/api/main/bs/formulaChild/formulaChild";
import MySerialPort from "@/utils/MySerialPort";
import USBDevice from "@/utils/usb.json";
-import {listProductionOrde} from "@/api/main/om/productionOrde/productionOrde";
import {addPassingStationCollection} from "@/api/main/da/passingStationCollection/passingStationCollection";
import {
- addBasicParameters,
- addParamCollection,
addTighteningParameters,
+ replaceAssemblyCode,
saveCampaignTimeParameters,
- replaceAssemblyCode, yzAddBasicParameters,
+ yzAddBasicParameters,
} from "@/api/main/da/paramCollection/paramCollection";
export default {
@@ -382,6 +378,25 @@
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' })
+ }
+ })
+ }
+
+ }
});
},
endClear(){
@@ -406,6 +421,10 @@
},
/** 鏌ヨ宸ュ崟鍒楄〃 */
async getList() {
+ const param = {
+ processesCode: this.headContent.processesCode,
+ }
+ fistSetpNumber(param).then(response => {});
this.getListFormulaChild()
this.addOverStationCollection()
},
@@ -514,12 +533,15 @@
locationCode: self.headContent.processesCode,
productBarcode: self.headContent.sfcCode,
}
+ if(formulaChilds.paramCode === null||formulaChilds.paramCode ===''){
+ self.$message('鏈壘鍒板弬鏁扮爜锛岃妫�鏌ュ弬鏁扮爜鏄惁姝ｇ‘');
+ return;
+ }
addTighteningParameters(param).then(response => {});
yzUpdateTighteningFormula(param).then(response => {
- console.log(response.msg)
- if(response.msg === "1"){
+ console.log(response)
+ if(response.msg === "1" || response.msg === "3"){
self.getListFormulaChild()
-
}else {
const param = {
workOrderNo: self.workpieceInformation.workOrderNo,
@@ -533,6 +555,8 @@
self.headContent.sfcCode = '';
}
});
+ // self.getListFormulaChild()
+
}
};
},
@@ -547,7 +571,7 @@
console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
if(this.headContent.sfcCode !== ''){
- this.$message('鎵弿鐗╂枡缂栫爜'+scanValue);
+ this.$message('棰勮宸ヤ綅鎵弿鐗╂枡缂栫爜'+scanValue);
console.log(scanValue)
this.serialPortMethod(scanValue)
} else {
--
Gitblit v1.9.3