From a846f28bef985e7671f0b469fb73541cbfb08a93 Mon Sep 17 00:00:00 2001 From: admin <15939171744@163.com> Date: 星期六, 01 六月 2024 11:15:39 +0800 Subject: [PATCH] - --- jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue | 45 ++++++++++++++++++++++++++++++--------------- 1 files changed, 30 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..2dd794b 100644 --- a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue +++ b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue @@ -187,26 +187,21 @@ </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, 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 +377,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(){ @@ -516,10 +530,9 @@ } 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 +546,8 @@ self.headContent.sfcCode = ''; } }); + // self.getListFormulaChild() + } }; }, @@ -547,7 +562,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