From 5a656e598c979f3bffd4a589eca2f8a2c93c984e Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期五, 18 十月 2024 08:50:13 +0800 Subject: [PATCH] 修改报告生成 --- src/components/do/b1-inspect-order-plan/circuit-parameters1.vue | 41 +++++++++++++++++++++++++++++++++++------ 1 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue index 6315c9e..1ac292c 100644 --- a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue +++ b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue @@ -116,7 +116,7 @@ </div> </el-col> <el-col :span="2"> - <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'涓嶅悎鏍�':(n.result===1?'鍚堟牸':'寰呭畾') }} + <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'涓嶅悎鏍�':(n.result===1?'鍚堟牸':(n.result===3?'涓嶅垽瀹�':(n.result===3?'涓嶅垽瀹�':'寰呭畾'))) }} </div> </el-col> </el-row> @@ -167,7 +167,7 @@ </div> </el-col> <el-col :span="2"> - <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'涓嶅悎鏍�':(n.result===1?'鍚堟牸':'寰呭畾') }} + <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'涓嶅悎鏍�':(n.result===1?'鍚堟牸':(n.result===3?'涓嶅垽瀹�':(n.result===3?'涓嶅垽瀹�':'寰呭畾'))) }} </div> </el-col> </el-row> @@ -189,7 +189,7 @@ <td>棰戞</td> <td v-for="(item,index) in n.portList" :key="index+'aaa'"> <div style="display: flex;align-items: center;"> - <el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state>1"></el-input> + <el-input size="small" placeholder="棰戞" v-model="item.value" :disabled="state>1"></el-input> </div> </td> <td :rowspan="n.angleList.length+1"> @@ -210,7 +210,7 @@ </div> </el-col> <el-col :span="2"> - <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'涓嶅悎鏍�':(n.result===1?'鍚堟牸':'寰呭畾') }} + <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'涓嶅悎鏍�':(n.result===1?'鍚堟牸':(n.result===3?'涓嶅垽瀹�':'寰呭畾')) }} </div> </el-col> </el-row> @@ -248,7 +248,7 @@ </div> </el-col> <el-col :span="2"> - <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'涓嶅悎鏍�':(n.result===1?'鍚堟牸':'寰呭畾') }} + <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'涓嶅悎鏍�':(n.result===1?'鍚堟牸':(n.result===3?'涓嶅垽瀹�':'寰呭畾')) }} </div> </el-col> </el-row> @@ -391,6 +391,13 @@ }, currentNum(val) { this.initData() + }, + insProduct:{ + deep:true, + handler:function(val){ + // console.log('鏇存柊椤甸潰鍟�') + this.initData() + } } }, mounted() { @@ -408,6 +415,7 @@ }, // 鍒濆鍖栨暟鎹� initData(){ + this.allBandList = [] // 澶勭悊椤圭洰 this.insProductNew = JSON.parse(JSON.stringify(this.insProduct)).filter(m=>m.inspectionItem.includes('鐢佃矾璇曢獙')) this.insProductNew.forEach(async item => { @@ -415,7 +423,7 @@ this.intermodulationNum++ } // 鑾峰彇璁惧鍒楄〃 - item.equipOptions = await this.getEquipOptions(item) + item.equipOptions = [] }) if(this.insProductNew[0].insProductResult2&&this.insProductNew[0].insProductResult2.length>0){ // 宸茬粡瀛樺湪鍊兼椂锛岃祴鍊� @@ -488,12 +496,32 @@ }) } }else{ + console.log(2222) // 娌℃湁鍊兼椂锛屽垵濮嬪寲椤甸潰 this.insProductNew.forEach(async item => { // 璧嬪�艰澶� item.equipName = '' item.equipValue = '' // 璧嬪�肩鍙e拰瑙掑害 + this.portList = [ + { + value:'1', + }, + { + value:'2', + }, + { + value:'3', + }, + { + value:'4', + }, + ] + this.angleList = [ + { + value:'' + } + ] item.portList = JSON.parse(JSON.stringify(this.portList)) item.angleList = JSON.parse(JSON.stringify(this.angleList)) // 璧嬪�肩粨璁� @@ -520,6 +548,7 @@ projectList: JSON.parse(JSON.stringify(this.insProductNew)) } ) + console.log(this.allBandList) } }, // 鍒犻櫎鏁扮粍 -- Gitblit v1.9.3