From 100005431ace86564be26478818302d4572f8959 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 08 十一月 2024 13:02:44 +0800
Subject: [PATCH] 修改电路试验bug
---
src/components/do/b1-inspect-order-plan/circuit-parameters1.vue | 19 +++++++++++--------
src/components/do/b1-inspect-order-plan/circuit-parameters2.vue | 16 ++++++++++------
src/main.js | 4 ++--
3 files changed, 23 insertions(+), 16 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..8c83ab2 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
@@ -803,25 +803,28 @@
// 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
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..ecd3ef7 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
@@ -679,10 +679,11 @@
// 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 +692,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
diff --git a/src/main.js b/src/main.js
index afa39b8..b6fd273 100644
--- a/src/main.js
+++ b/src/main.js
@@ -21,11 +21,11 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://172.20.10.5:8001';
+// const javaApi = 'http://172.20.10.5:8001';
// //閫氫俊娴嬭瘯搴�
// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
-// const javaApi = 'http://10.1.13.77:8001';
+const javaApi = 'http://10.1.13.77:8001';
// 閫氫俊姝ｅ紡搴�
// Vue.prototype.LOCATIONVUE = "https://ztwxlims.ztt.cn:7443";
--
Gitblit v1.9.3