From 25d10ee678644a6283454ca486d74a938eeccfd1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 05 十二月 2024 16:50:45 +0800
Subject: [PATCH] Merge branch 'cnas' into master
---
src/components/do/b1-inspect-order-plan/circuit-parameters2.vue | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 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 4a506c4..6cb01b7 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters2.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;">
@@ -213,7 +213,7 @@
{
inspectionItemSubclass:'鐢靛帇椹绘尝姣�',
unit:'/',
- tell:'鈮�1.45',
+ ask:'鈮�1.45',
result:0,
portList:[],
angleList:[],
@@ -222,7 +222,7 @@
{
inspectionItemSubclass:'鍚屾瀬鍖栭殧绂诲害',
unit:'dB',
- tell:'鈮�1.45',
+ ask:'鈮�1.45',
result:0,
portList:[],
angleList:[],
@@ -232,7 +232,7 @@
inspectionItemSubclass:'浜掕皟',
often:'',//浜掕皟鐗规湁瀛楁
unit:'dB',
- tell:'鈮�1.45',
+ ask:'鈮�1.45',
result:0,
portList:[],
angleList:[],
@@ -350,18 +350,18 @@
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
}
let obj = {
inspectionItemSubclass: item.inspectionItemSubclass,
unit:item.unit,
- tell:tell,
+ ask:ask,
result:n.result,
id:item.id,
often:n.often,
@@ -649,8 +649,8 @@
this.$set( this.loading, y, true)
// 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
@@ -673,16 +673,28 @@
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),
- band:item.band
- }
+ this.$set(this.allBandList, index, {projectList:this.HaveJson(this.allBandList[0].projectList)})
+ // this.allBandList[index] = {
+ // projectList:this.HaveJson(this.allBandList[0].projectList),
+ // band:item.band
+ // }
}
let arr = []
item.projectList.forEach((m,i)=>{
@@ -691,13 +703,16 @@
angleList:m.angleList,
portList:m.portList,
portNum:m.portNum,
- value:m.value,
+ // value:m.value,
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.allBandList[index].projectList = arr
+ this.$delete(this.allBandList[index],'projectList')
+ this.$set(this.allBandList[index],'projectList',arr)
})
this.angleList = obj.angleList
this.intermodulationNum = obj.intermodulationNum
--
Gitblit v1.9.3