From b40d8371913805a2926ba1c5f9bdcafd36dfff05 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 21 八月 2025 16:42:16 +0800
Subject: [PATCH] 电路试验修改
---
src/components/do/b1-inspect-order-plan/circuit-parameters1.vue | 67 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 21 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 12cdaf7..8e9f083 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
@@ -84,7 +84,7 @@
<template v-for="(n, j) in h.projectList">
<!-- 鐢靛帇椹绘尝姣� -->
<el-row :gutter="5" style="margin: 12px 0 0;display: flex;align-items: center;"
- v-if="n.inspectionItemSubclass.includes('椹绘尝姣�') || n.inspectionItemSubclass.includes('闅旂搴�')">
+ v-if="(n.inspectionItemSubclass.includes('椹绘尝姣�') || n.inspectionItemSubclass.includes('闅旂搴�'))&&isLooks(n)">
<el-col :span="2">
<div style="text-align: center;">{{ n.inspectionItemSubclass }}</div>
</el-col>
@@ -92,7 +92,10 @@
<div style="text-align: center;">{{ n.unit }}</div>
</el-col>
<el-col :span="2">
- <div style="text-align: center;" v-html="n.ask"></div>
+ <div style="text-align: center;">
+ <el-input size="small" v-model="n.ask" :disabled="state > 1"
+ ></el-input>
+ </div>
</el-col>
<el-col :span="16">
<div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -132,7 +135,7 @@
</el-row>
<!-- 浜掕皟 -->
<el-row :gutter="5" style="margin: 12px 0 0;display: flex;align-items: center;"
- v-if="n.inspectionItemSubclass.includes('浜掕皟')">
+ v-if="n.inspectionItemSubclass.includes('浜掕皟')&&isLooks(n)">
<el-col :span="2">
<div style="text-align: center;">{{ n.inspectionItemSubclass }}</div>
</el-col>
@@ -140,7 +143,10 @@
<div style="text-align: center;">{{ n.unit }}</div>
</el-col>
<el-col :span="2">
- <div style="text-align: center;" v-html="n.ask"></div>
+ <div style="text-align: center;">
+ <el-input size="small" v-model="n.ask" :disabled="state > 1"
+ ></el-input>
+ </div>
</el-col>
<el-col :span="16">
<div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -202,7 +208,7 @@
</el-row>
<!-- 骞呭害鍋忓樊/鏈�澶х浉浣嶅亸宸� -->
<el-row :gutter="5" style="margin: 12px 0 0;display: flex;align-items: center;"
- v-if="n.inspectionItemSubclass.includes('鍋忓樊')">
+ v-if="n.inspectionItemSubclass.includes('鍋忓樊')&&isLooks(n)">
<el-col :span="2">
<div style="text-align: center;">{{ n.inspectionItemSubclass }}</div>
</el-col>
@@ -210,7 +216,10 @@
<div style="text-align: center;">{{ n.unit }}</div>
</el-col>
<el-col :span="2">
- <div style="text-align: center;" v-html="n.ask"></div>
+ <div style="text-align: center;">
+ <el-input size="small" v-model="n.ask" :disabled="state > 1"
+ ></el-input>
+ </div>
</el-col>
<el-col :span="16">
<div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -253,7 +262,7 @@
</el-row>
<!-- 鏈�澶ц�﹀悎搴�/鏈�灏忚�﹀悎搴� -->
<el-row :gutter="5" style="margin: 12px 0 0;display: flex;align-items: center;"
- v-if="n.inspectionItemSubclass.includes('鑰﹀悎搴�')">
+ v-if="n.inspectionItemSubclass.includes('鑰﹀悎搴�')&&isLooks(n)">
<el-col :span="2">
<div style="text-align: center;">{{ n.inspectionItemSubclass }}</div>
</el-col>
@@ -261,7 +270,10 @@
<div style="text-align: center;">{{ n.unit }}</div>
</el-col>
<el-col :span="2">
- <div style="text-align: center;" v-html="n.ask"></div>
+ <div style="text-align: center;">
+ <el-input size="small" v-model="n.ask" :disabled="state > 1"
+ ></el-input>
+ </div>
</el-col>
<el-col :span="17">
<div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -294,7 +306,7 @@
</div>
</el-col>
</el-row>
- <el-divider v-if="j != h.projectList.length - 1"></el-divider>
+ <el-divider v-if="j != h.projectList.length - 1&&isLooks(n)"></el-divider>
</template>
</div>
</div>
@@ -559,19 +571,19 @@
this.angleList = angleList
this.upTemplateState = false;
}
- let ask = ''
- if (item.ask.includes(',')) {
- item.ask.split(',').forEach((m, i) => {
- ask = ask + m + (i == item.ask.split(',').length - 1 ? '' : '<br/>')
- })
- } else {
- ask = item.ask
- }
- console.log(ask)
+ // let ask = ''
+ // if (item.ask.includes(',')) {
+ // item.ask.split(',').forEach((m, i) => {
+ // ask = ask + m + (i == item.ask.split(',').length - 1 ? '' : '<br/>')
+ // })
+ // } else {
+ // ask = item.ask
+ // }
+ // console.log(ask)
let obj = {
inspectionItemSubclass: item.inspectionItemSubclass,
unit: item.unit,
- ask: ask,
+ ask: n.ask,
result: n.result,
id: item.id,
often: n.often,
@@ -858,7 +870,8 @@
port: item.portList.map(m => m.value).join(','),
angle: item.angleList.map(m => m.value).join(','),
value: JSON.stringify(item.value),
- often: item.often
+ often: item.often,
+ ask: item.ask
}
return obj
})
@@ -911,7 +924,8 @@
port: item.portList.map(m => m.value).join(','),
angle: item.angleList.map(m => m.value).join(','),
value: JSON.stringify(item.value),
- often: item.often
+ often: item.often,
+ ask: item.ask
}
return obj
})
@@ -971,6 +985,17 @@
})
this.angleList = obj.angleList
this.intermodulationNum = obj.intermodulationNum
+ },
+ // 鏌ョ湅鏃跺鏋滄病鏈夋暟鎹紝灏变笉鏄剧ず杩欎釜妫�楠岄」
+ isLooks(n){
+ if(this.state<2){
+ return true
+ }
+ let state = n.value.some(m=>m.some(n=>n))
+ if(this.state > 1&&state){
+ return true
+ }
+ return false
}
}
}
--
Gitblit v1.9.3