From 332125c247b8cec21af77479f07ef35558eb6bba Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 02 八月 2024 17:24:09 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 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..cf3a9cd 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -784,7 +784,7 @@
<el-button type="primary" @click="submit()">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog title="鏁版嵁閲囬泦-璁＄畻鏁版嵁閫夋嫨" :visible.sync="dataGetDia" min-width="400px" :close-on-click-modal="false" :close-on-press-escape="false" :before-close="beforeDataGetDia">
+ <el-dialog title="鏁版嵁閲囬泦" :visible.sync="dataGetDia" min-width="400px" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
<div>
<table border="1" cellpadding="10" class="thermal-table">
<tr>
@@ -816,7 +816,6 @@
</table>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="beforeDataGetDia()">鍙� 娑�</el-button>
<el-button type="primary" @click="submitDataGet()" :loading="getDataIndexLoading">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -1274,12 +1273,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 +1293,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 +1324,7 @@
done()
}else{
this.dataGetDia = false
+ this.getDataIndex = []
}
}).catch(() => {})
},
@@ -1349,7 +1351,7 @@
}
this.getDataIndexLoading = true;
this.$axios.post(this.$api.deviceScope.formulaCalculation,{
- map:this.dataAcquisitionInfoNew
+ ...this.dataAcquisitionInfoNew
}, {
headers: {
'Content-Type': 'application/json'
@@ -1360,7 +1362,9 @@
if(res.code!=200){
return
}
- this.handleDataAcquisition(res.data.map)
+ this.dataGetDia = false
+ this.handleDataAcquisition(res.data)
+ this.getDataIndex = []
})
},
// 澶氱嚎绋�
--
Gitblit v1.9.3