From a1235a07a8919120d0c971c600b67340a42d2eb5 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 01 十一月 2024 11:23:03 +0800
Subject: [PATCH] 修改互调、标签打印格式
---
src/components/do/b1-inspect-order-plan/circuit-parameters2.vue | 126 +++++++++++++++++++++++++++++++++++------
1 files changed, 107 insertions(+), 19 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
index e54a0f8..f9fcd1b 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
@@ -98,11 +98,6 @@
<el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state>1"></el-input>
</div>
</td>
- <td :rowspan="n.angleList.length+1">
- <el-button icon="el-icon-minus" circle size="mini" type="danger"
- @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1" style="margin: 5px;"></el-button>
- <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1" style="margin: 5px;"></el-button>
- </td>
</tr>
<tr>
<td>
@@ -115,8 +110,11 @@
</table>
</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?'鍚堟牸':'寰呭畾') }}
+ <el-col :span="1">
+ <el-input-number v-model="n.portNum" :min="1" :max="100" label="鏁伴噺" size="small" @change="m=>changePort(m,n.portList)" :disabled="state>1"></el-input-number>
+ </el-col>
+ <el-col :span="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>
@@ -135,10 +133,18 @@
<div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
<table border="1" cellpadding="10" class="thermal-table">
<tr>
- <td>棰戠偣</td>
+ <td>棰戞</td>
<td :colspan="n.portList.length+1">
<div style="display: flex;align-items: center;">
- <el-input size="small" placeholder="棰戠偣" v-model="n.often" :disabled="state>1" @blur="handlePort(n)"></el-input>
+ <!-- <el-input size="small" placeholder="棰戠偣" v-model="n.often" :disabled="state>1" @blur="handlePort(n)"></el-input> -->
+ <el-select v-model="n.often" placeholder="璇烽�夋嫨" size="small" style="width: 200px;" :disabled="state>1">
+ <el-option
+ v-for="item in bandList0"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
</div>
</td>
</tr>
@@ -148,11 +154,6 @@
<div style="display: flex;align-items: center;">
<el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state>1"></el-input>
</div>
- </td>
- <td :rowspan="n.angleList.length+1">
- <el-button icon="el-icon-minus" circle size="mini" type="danger"
- @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1" style="margin: 5px;"></el-button>
- <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1" style="margin: 5px;"></el-button>
</td>
</tr>
<tr v-for="(item,index) in n.angleList" :key="index + 'eee'">
@@ -166,8 +167,11 @@
</table>
</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?'鍚堟牸':'寰呭畾') }}
+ <el-col :span="1">
+ <el-input-number v-model="n.portNum" :min="1" :max="100" label="鏁伴噺" size="small" @change="m=>changePort(m,n.portList)" :disabled="state>1"></el-input-number>
+ </el-col>
+ <el-col :span="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>
@@ -185,6 +189,7 @@
return {
value: "",
bandList:[],
+ bandList0:[],
portList:[
{
value:'1',
@@ -272,12 +277,17 @@
},
currentNum(val) {
this.initData()
+ },
+ insProduct:{
+ deep:true,
+ handler:function(val){
+ this.initData()
+ }
}
},
mounted() {
this.getTypeDicts()
this.initData()
- console.log(2222,this.currentNum)
},
methods: {
// 瀛楀吀鑾峰彇鏁版嵁
@@ -287,14 +297,20 @@
}).then(res => {
this.bandList = res.data
})
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "浜掕皟-棰戞"
+ }).then(res => {
+ this.bandList0 = res.data
+ })
},
// 鍒濆鍖栨暟鎹�
initData(){
+ this.allBandList = []
// 澶勭悊椤圭洰
this.insProductNew = JSON.parse(JSON.stringify(this.insProduct)).filter(m=>m.inspectionItem.includes('鐢佃矾璇曢獙'))
this.insProductNew.forEach(async item => {
// 鑾峰彇璁惧鍒楄〃
- item.equipOptions = await this.getEquipOptions(item)
+ item.equipOptions = []
})
if(this.insProductNew[0].insProductResult2&&this.insProductNew[0].insProductResult2.length>0){
// 宸茬粡瀛樺湪鍊兼椂锛岃祴鍊�
@@ -348,7 +364,8 @@
equipName:n.equipName,
equipValue:n.equipValue,
frequency:n.frequency,
- sonLaboratory:item.sonLaboratory
+ sonLaboratory:item.sonLaboratory,
+ portNum:JSON.parse(n.value).length>0?JSON.parse(n.value)[0].length:4
}
this.$set(obj,'portList', n.port?portList:[])
this.$set(obj,'angleList', n.angle?angleList:[])
@@ -378,11 +395,31 @@
// 璧嬪�艰澶�
item.equipName = ''
item.equipValue = ''
+ 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))
// 璧嬪�肩粨璁�
item.result = ''
+ item.portNum = 4
// 璧嬪�兼渶宸��
item.value = []
if(item.inspectionItemSubclass.includes('浜掕皟')){
@@ -506,9 +543,27 @@
}
})
list.push(obj)
+ }else if(type=='绔彛'){
+ let obj = JSON.parse(JSON.stringify(list[0]));
+ obj.value = null;
+ list.push(obj)
}else{
let obj = JSON.parse(JSON.stringify(list[0]));
list.push(obj)
+ }
+ },
+ // 鏀瑰彉绔彛
+ changePort(num,list){
+ if(num>list.length){
+ for(let i = list.length;i<num;i++){
+ let obj = JSON.parse(JSON.stringify(list[0]));
+ obj.value = null;
+ list.push(obj)
+ }
+ }else if(num<list.length){
+ for(let i = list.length;i>num;i--){
+ list.pop()
+ }
}
},
// 鑾峰彇璁惧閫夐」 id:涓烘楠岄」id
@@ -654,4 +709,37 @@
.green{
color: green;
}
+>>>.el-input-number {
+ display: inline-flex;
+ flex-direction: column !important;
+ line-height: 26px;
+}
+
+>>>.el-input-number__increase, >>>.el-input-number__decrease {
+ width: 26px;
+ height: 26px;
+}
+>>>.el-input-number__increase{
+ top: 36px;
+ left: 10px;
+ border: 0px;
+ border-radius: 50%;
+ background: #3A7BFA;
+ color: #fff;
+}
+>>>.el-input-number__decrease{
+ top: -30px;
+ border: 0px;
+ border-radius: 50%;
+ left: 10px;
+ background: #F56C6C;
+ color: #fff;
+}
+>>>.el-input-number .el-input{
+ width: 50px;
+}
+>>>.el-input-number .el-input__inner{
+ width: 50px;
+ padding: 0;
+}
</style>
--
Gitblit v1.9.3