From a4362dfe3e0e9c6fad426685da0065455799d018 Mon Sep 17 00:00:00 2001 From: hdy <1105738590@qq.com> Date: 星期三, 10 七月 2024 20:06:15 +0800 Subject: [PATCH] cvt交互逻辑更新 --- jcdm-ui/src/views/main/kb/cvt/index.vue | 196 +++++++++++++++++++++++------------------------- 1 files changed, 94 insertions(+), 102 deletions(-) diff --git a/jcdm-ui/src/views/main/kb/cvt/index.vue b/jcdm-ui/src/views/main/kb/cvt/index.vue index af3c07e..866977f 100644 --- a/jcdm-ui/src/views/main/kb/cvt/index.vue +++ b/jcdm-ui/src/views/main/kb/cvt/index.vue @@ -24,14 +24,15 @@ <el-row :gutter="0" > <el-col :span="14"> <el-card class="box-card" style="margin-top: 5px" > - <el-form ref="form" :model="form" label-width="25%" > - <el-form-item prop="engineNo" style="margin-top: 16px"> - <span slot="label" style="font-size:22px;color:black;"><strong>鍙戝姩鏈哄彿</strong></span> - <el-input style="font-size:20px" v-model="form.engineNo" placeholder="璇疯緭鍏ュ彂鍔ㄦ満鍙�" clearable @input="EngineNohandleChange"> - <el-button slot="append" plain type="info" @click="EngineNohandleChange" icon="el-icon-search"></el-button> - </el-input> + <el-form :model="form" size="large" :inline="true" label-width="68px" @submit.native.prevent> + <el-form-item label-width="200" label="鍙戝姩鏈虹爜" :prop="form.engineNo" style="align-content: center"> + <input v-model="form.engineNo" + ref="inputdata" + style="height: 39px; width: 300px" + placeholder="璇疯緭鍏ュ彂鍔ㄦ満鐮�" + /> </el-form-item> - </el-form> + </el-form> <el-form ref="form" :model="form" label-width="25%" > <el-form-item prop="productType"style="margin-top: 30px" > <span slot="label" style="font-size:22px;color:black"><strong>鏈哄瀷</strong></span> @@ -54,7 +55,7 @@ <el-row :gutter="10" class="mb8" type="flex" justify="center" style="text-align: center"> <el-col :span="1.5"> - <el-button plain :disabled="buttondisabled" type="primary" style="width:400px;height:160px" v-hasPermi="['bs:formula:add']" @click="forceOnline"> + <el-button plain :disabled="buttondisabled" type="primary" style="width:400px;height:160px" v-hasPermi="['bs:formula:add']"> <span class="el-icon-thumb" style="font-size:40px;color:black"></span> <span style="font-size:45px;color:black"><strong>寮哄埗涓婄嚎</strong></span> </el-button> @@ -78,9 +79,8 @@ <script> import { listOrderScheduling, getOrderScheduling, delOrderScheduling, addOrderScheduling, updateOrderScheduling } from "@/api/main/bs/orderScheduling/orderScheduling"; -import { listPassingStationCollection, getPassingStationCollection, delPassingStationCollection, addPassingStationCollection, updatePassingStationCollection } from "@/api/main/da/passingStationCollection/passingStationCollection"; +import {listPassingStationCollection, getPassingStationCollection, delPassingStationCollection, addPassingStationCollection, updatePassingStationCollection,initializedData } from "@/api/main/da/passingStationCollection/passingStationCollection"; import {listLineInfo} from "@/api/main/bs/lineInfo/lineInfo"; -import { setSNCode } from "@/api/main/da/opcuaconfig/opcuaconfig"; import {getIp, listStationConf} from "@/api/main/sc/stationConf"; export default { @@ -94,16 +94,11 @@ engineCheckList:[], showFlag:false, buttondisabled:true, - locationCode: "鏈厤缃�", + locationCode: "鏈厤缃甀P", locationName: "鏈厤缃伐浣�", - codeValue: "", - code: "", - lastTime: "", - nextTime: "", - lastCode: "", - nextCode: "", - dtmainId: "", + scannerFlag: false, + barcode: "", // 鏌ヨ鍙傛暟 queryParams: { @@ -132,40 +127,90 @@ }, computed: {}, watch: {}, - created() { - window.document.onkeypress = (e) => { - if (window.event) { - this.nextCode = e.keyCode; - } else if (e.which) { - this.nextCode = e.which; - } - if (e.which === 13) { - // 閿洏鍥炶溅浜嬩欢 - if (this.code.length < 3) return; // 鎵爜鏋殑閫熷害寰堝揩锛屾墜鍔ㄨ緭鍏ョ殑鏃堕棿涓嶄細璁ヽode鐨勯暱搴﹀ぇ浜�2锛屾墍浠ヨ繖閲屼笉浼氬鎵爜鏋湁鏁� - this.parseQRCode(this.code); // 鑾峰彇鍒版壂鐮佹灙杈撳叆鐨勫唴瀹癸紝鍋氬埆鐨勬搷浣� - this.lastCode = ""; - this.lastTime = ""; - return; - } - this.nextTime = new Date().getTime(); - if (!this.lastTime && !this.lastCode) { - this.code = ""; // 娓呯┖涓婃鐨勬潯褰㈢爜 - this.code += e.key; - } - if (this.lastCode && this.lastTime && this.nextTime - this.lastTime > 500) { - // 褰撴壂鐮佸墠鏈塳eypress浜嬩欢鏃�,闃叉棣栧瓧缂哄け - this.code = e.key; - } else if (this.lastCode && this.lastTime) { - this.code += e.key; - } - this.lastCode = this.nextCode; - this.lastTime = this.nextTime; - }; + + beforeDestroy() { + this.$refs.inputdata.removeEventListener('keydown',this.handleScannerInput) }, mounted() { + this.setFocus() + this.$refs.inputdata.addEventListener('keydown',this.handleScannerInput) this.getStationConf(); }, methods: { + + refresh() { + location.reload(); + }, + setFocus(){ + this.$nextTick(()=>{ + this.$refs.inputdata.focus() + }) + }, + handleScannerInput(event){ + if (this.scannerFlag){ + this.form.engineNo = '' + this.$refs.inputdata.value = '' + this.scannerFlag = false + } + const input = event.target + const inputValue = input.value + this.form.engineNo = inputValue + if (event.key === 'Enter'){ + this.scannerFlag = true + console.log("鏉$爜锛�",this.form.engineNo) + if(this.form.engineNo !== null && this.form.engineNo !== undefined) { + console.log("鏉$爜2锛�",this.locationCode) + initializedData({sfcCode:this.form.engineNo,locationCode:this.locationCode}).then(res =>{ + if(res.code===500){ + this.$createElement; + }else { + addPassingStationCollection({sfcCode:this.form.engineNo,locationCode:this.locationCode}).then(res =>{ + console.log("rrrrr",res)}) + this.$message({ + message: '鎵爜鎴愬姛', + type: 'success' + }); + } + }) + }else{ + this.reset(); + this.buttondisabled = true + const h = this.$createElement; + this.$message({ + message: h('p',null, [ + h('span', null, '璀﹀憡 '), + h('i', { style: 'color: black' }, '杈撳叆鐨勫彂鍔ㄦ満鍙锋湁璇�'), + h()]), + type: 'error', + center: true, + offset:300 + }); + } + + } + // this.AddEngineNo(); + }, + + handleScannerInput111(event){ + const param = { + sfcCode: this.from.engineNo, + } + addPassingStationCollection(param).then(response => { + }); + }, + + + // AddEngineNo(){ + // const param = { + // locationCode: this.from.locationCode, + // sfcCode: this.from.engineNo, + // // locationCode:"OP110", + // // sfcCode:"666", + // + // } + // addPassingStationCollection(param).then(response =>{}); + // }, + getStationConf() { getIp().then(response => { let queryParams = { @@ -192,62 +237,14 @@ this.resetForm("form"); }, EngineNohandleChange(){ + console.log('鏉$爜锛�',this.form.engineNo) if(this.form.engineNo !== null && this.form.engineNo !== undefined){ - //let OrderSchedulingParam = {engineNo: null} setSNCode(this.form.engineNo,this.locationCode) - //OrderSchedulingParam.engineNo = this.form.engineNo; - /* listOrderScheduling(OrderSchedulingParam).then(response => { - if(response.total === 1 ){ - this.form.productType = response.rows[0].model - this.form.orderNo = response.rows[0].orderNo - this.form.qualityStatus = response.rows[0].qualityStatus - this.form.currentWorkstation = response.rows[0].currentWorkstation - this.form.add= response.rows[0].currentWorkstation+ response.rows[0].qualityStatus - if(this.form.qualityStatus ==='涓嶅悎鏍�'){ - this.buttondisabled = false; - } - else{ - this.buttondisabled = true; - } - } - else{ - this.reset(); - this.buttondisabled = true - const h = this.$createElement; - this.$message({ - message: h('p',null, [ - h('span', null, '璀﹀憡 '), - h('i', { style: 'color: black' }, '杈撳叆鐨勫彂鍔ㄦ満鍙锋湁璇�'), - h()]), - type: 'error', - center: true, - offset:300 - }); - } - });*/ - /*let PassingStationCollectionParam = {sfcCode: null} - PassingStationCollectionParam.sfcCode = this.form.engineNo; - listPassingStationCollection(PassingStationCollectionParam).then(ponse =>{ - this.engineCheckList = ponse.rows.locationCode ; - if(ponse.rows.length >= 1 && this.form.engineNo !== undefined){ - this.form.engineCheckList = '' - for (let i = 0; i < ponse.rows.length; i++) { - this.form.engineCheckList += ' 宸ヤ綅:'+ ponse.rows[i].locationCode+'['+ponse.rows[i].outRsSign+']' - } - } - else{ - this.form.engineCheckList = '鏆傛棤鏁版嵁' - } - });*/ } }, - parseQRCode(code) { - this.form.engineNo = code; - }, }, } - </script> <style scoped> @@ -272,10 +269,5 @@ justify-content: center; margin-top: 5px } -/*.my-custom-modal .el-dialog__wrapper {*/ -/* width: 400px; !* 璁剧疆瀹藉害 *!*/ -/* height: 200px; !* 璁剧疆楂樺害 *!*/ -/* top: 50px; !* 璁剧疆璺濈椤甸潰椤堕儴鐨勪綅缃� *!*/ -/* left: 50px; !* 璁剧疆璺濈椤甸潰宸︿晶鐨勪綅缃� *!*/ -/*}*/ + </style> -- Gitblit v1.9.3