From b572bdc7da9c6c47df9be5939f5d3280f2127546 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 02 八月 2024 17:18:35 +0800
Subject: [PATCH] Merge branch 'test' of http://114.132.189.42:9002/r/center-lims-before into test
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 080013c..8db3532 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1274,12 +1274,13 @@
child:[]
}
for(let j in data[i]){
- if(j!='frequency'&&!data[i][j].isCalculation){
+ console.log(j,data[i][j])
+ if(j!='frequency'&&data[i][j]&&!data[i][j].isCalculation){
this.dataAcquisitionInfo[i+','+j] = {
value:data[i][j].result,
frequency:data[i].frequency
}
- }else if(j!='frequency'&&data[i][j].isCalculation){
+ }else if(j!='frequency'&&data[i][j]&&data[i][j].isCalculation){
let obj0 = {
name:j,
arr:data[i][j].result
@@ -1293,15 +1294,16 @@
}
if(this.getData.length>0){
this.dataGetDia = true
- }
- try {
- // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
- this.worker0.postMessage(JSON.stringify({
- dataAcquisitionInfo: this.dataAcquisitionInfo,
- list:this.tableList[0].arr
- }));
- } catch (error) {
- console.log(1111,error);
+ }else{
+ try {
+ // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
+ this.worker0.postMessage(JSON.stringify({
+ dataAcquisitionInfo: this.dataAcquisitionInfo,
+ list:this.tableList[0].arr
+ }));
+ } catch (error) {
+ console.log(1111,error);
+ }
}
// 鐩戝惉 Worker 杩斿洖鐨勭粨鏋�
this.worker0.onmessage = (event) => {
@@ -1323,6 +1325,7 @@
done()
}else{
this.dataGetDia = false
+ this.getDataIndex = []
}
}).catch(() => {})
},
@@ -1349,7 +1352,7 @@
}
this.getDataIndexLoading = true;
this.$axios.post(this.$api.deviceScope.formulaCalculation,{
- map:this.dataAcquisitionInfoNew
+ ...this.dataAcquisitionInfoNew
}, {
headers: {
'Content-Type': 'application/json'
@@ -1360,7 +1363,9 @@
if(res.code!=200){
return
}
- this.handleDataAcquisition(res.data.map)
+ this.dataGetDia = false
+ this.handleDataAcquisition(res.data)
+ this.getDataIndex = []
})
},
// 澶氱嚎绋�
--
Gitblit v1.9.3