From 6fb9ccefdb939d728340fc7b626e97b26f2eab57 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 04 十二月 2024 13:44:18 +0800
Subject: [PATCH] 修改电路试验保存
---
src/components/do/b1-inspect-order-plan/circuit-parameters1.vue | 66 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 26 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 eccd8f6..6c61c11 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
@@ -86,7 +86,7 @@
<div style="text-align: center;">{{ n.unit }}</div>
</el-col>
<el-col :span="2">
- <div style="text-align: center;" v-html="n.tell"></div>
+ <div style="text-align: center;" v-html="n.ask"></div>
</el-col>
<el-col :span="16">
<div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -127,7 +127,7 @@
<div style="text-align: center;">{{ n.unit }}</div>
</el-col>
<el-col :span="2">
- <div style="text-align: center;" v-html="n.tell"></div>
+ <div style="text-align: center;" v-html="n.ask"></div>
</el-col>
<el-col :span="16">
<div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -189,7 +189,7 @@
<div style="text-align: center;">{{ n.unit }}</div>
</el-col>
<el-col :span="2">
- <div style="text-align: center;" v-html="n.tell"></div>
+ <div style="text-align: center;" v-html="n.ask"></div>
</el-col>
<el-col :span="16">
<div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -235,7 +235,7 @@
<div style="text-align: center;">{{ n.unit }}</div>
</el-col>
<el-col :span="2">
- <div style="text-align: center;" v-html="n.tell"></div>
+ <div style="text-align: center;" v-html="n.ask"></div>
</el-col>
<el-col :span="17">
<div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -302,7 +302,7 @@
{
name:'鐢靛帇椹绘尝姣�',
unit:'/',
- tell:'鈮�1.45',
+ ask:'鈮�1.45',
result:'',
conclusion:'鍚堟牸',
portList:[],
@@ -312,7 +312,7 @@
{
name:'鍚屾瀬鍖栭殧绂诲害',
unit:'dB',
- tell:'鈮�1.45',
+ ask:'鈮�1.45',
result:'',
conclusion:'鍚堟牸',
portList:[],
@@ -323,7 +323,7 @@
name:'浜掕皟',
band:'2100MHz',
unit:'dB',
- tell:'鈮�1.45',
+ ask:'鈮�1.45',
result:'',
conclusion:'鍚堟牸',
portList:[],
@@ -333,7 +333,7 @@
{
name:'鍋忓樊',
unit:'dB',
- tell:'鈮�1.45',
+ ask:'鈮�1.45',
result:'',
conclusion:'鍚堟牸',
portList:[],
@@ -344,7 +344,7 @@
name:'鏈�澶ц�﹀悎搴�',
unit:'dB',
band:'2100MHz',
- tell:'鈮�1.45',
+ ask:'鈮�1.45',
result:'',
conclusion:'鍚堟牸',
portList:[],
@@ -479,19 +479,19 @@
this.angleList = angleList
this.upTemplateState = false;
}
- let tell = ''
- if(item.tell.includes(',')){
- item.tell.split(',').forEach((m,i)=>{
- tell = tell + m+ (i==item.tell.split(',').length-1?'':'<br/>')
+ let ask = ''
+ if(item.ask.includes(',')){
+ item.ask.split(',').forEach((m,i)=>{
+ ask = ask + m+ (i==item.ask.split(',').length-1?'':'<br/>')
})
}else{
- tell = item.tell
+ ask = item.ask
}
- console.log(tell)
+ console.log(ask)
let obj = {
inspectionItemSubclass: item.inspectionItemSubclass,
unit:item.unit,
- tell:tell,
+ ask:ask,
result:n.result,
id:item.id,
often:n.often,
@@ -773,8 +773,8 @@
this.$delete(this.loading, y)
this.$set( this.loading, y, true)
this.$axios.post(this.$api.insOrderPlan.saveInsContext2, {
- orderId:this.orderId,
- sampleId:this.sampleId,
+ // orderId:this.orderId,
+ sampleId:this.orderId,
sonLaboratory:h.projectList[0].sonLaboratory,
frequency:h.band,
insProductResult2s:arr
@@ -797,31 +797,45 @@
console.log(err)
})
},
+ saveAll(){
+ if(this.allBandList.find(m=>!m.band)){
+ this.$message.error('璇峰厛濉啓棰戞')
+ return false
+ }else{
+ this.allBandList.forEach((h,j)=>{
+ this.save(h,j)
+ })
+ return true
+ }
+ },
// 鏇存柊妯℃澘
upTemplate(obj){
this.upTemplateState = true;
// return
obj.allBandList.forEach((item,index)=>{
if(!this.allBandList[index]){
- this.allBandList[index] = {
- projectList:this.HaveJson(this.allBandList[0].projectList)
- }
+ this.$set(this.allBandList, index, {projectList:this.HaveJson(this.allBandList[0].projectList)})
+ // this.allBandList[index] = {
+ // projectList:this.HaveJson(this.allBandList[0].projectList)
+ // }
}
this.allBandList[index].band = item.band
let arr = []
item.projectList.forEach((m,i)=>{
if(this.allBandList[index].projectList.find(n=>n.inspectionItemSubclass==m.inspectionItemSubclass)){
let obj0 = {
- angleList:m.angleList,
- portList:m.portList,
- portNum:m.portNum,
- value:m.value,
+ angleList:m.angleList,
+ portList:m.portList,
+ portNum:m.portNum,
valueType:m.valueType
}
+ this.$set(obj0,'value',m.value)
arr.push({...this.allBandList[index].projectList.find(n=>n.inspectionItemSubclass==m.inspectionItemSubclass),...obj0})
}
})
- this.allBandList[index].projectList = arr
+ this.$delete(this.allBandList[index],'projectList')
+ this.$set(this.allBandList[index],'projectList',arr)
+ // this.allBandList[index].projectList = arr
})
this.angleList = obj.angleList
this.intermodulationNum = obj.intermodulationNum
--
Gitblit v1.9.3