From 22686249d05921f62a033819f0294c6586d46bf3 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 09 八月 2024 16:57:25 +0800
Subject: [PATCH] 修改数采bug
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index dd3fb7d..713522c 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1057,6 +1057,7 @@
getDataIndex:[],
getDataIndexLoading:false,
changeType:null,
+ getDataTypeId:''
}
},
computed: {
@@ -1397,6 +1398,7 @@
// 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
this.getDataIndexLoading = false
this.dataGetDia = false
+ this.getDataTypeId = ''
this.worker0.postMessage(JSON.stringify({
dataAcquisitionInfo: this.dataAcquisitionInfo,
list:this.tableList[0].arr
@@ -1412,6 +1414,8 @@
let {list,n} = result.value
this.$set(this.tableList[0],'arr',list)
this.changeInput('',`${this.currentSample.insProduct[0].templateId}-${n.r}-${n.c}-${n.i}`,n)
+ }else if(result.getDataTypeId){
+ this.getDataTypeId = result.getDataTypeId
}
};
},
@@ -2680,7 +2684,7 @@
let str = code.split('-')
let pId = str[3]
for(let i =0;i<this.currentSample.insProduct.length;i++){
- if(this.currentSample.insProduct[i].id==pId&&(this.currentSample.insProduct[i].ask=='-'||this.currentSample.insProduct[i].ask=='/')){
+ if(this.currentSample.insProduct[i].id==pId&&(this.currentSample.insProduct[i].ask=='-'||this.currentSample.insProduct[i].ask=='/'||this.currentSample.insProduct[i].ask=='鈥�')){
this.tableList[0].arr.forEach(item=>{
item.forEach(m=>{
if(m.i==pId&&m.v.ps&&m.v.ps.value=='缁撹'){
@@ -2722,15 +2726,20 @@
currentSample:this.currentSample,
PROJECT:this.PROJECT,
param:this.param,
- currentTable:this.currentTable
+ currentTable:this.currentTable,
+ getDataTypeId:this.getDataTypeId
}));
} catch (error) {
console.log(444,error);
}
+ let getDataType = false
// 鐩戝惉 Worker 杩斿洖鐨勭粨鏋�
this.worker.onmessage = (event) => {
this.result = JSON.parse(event.data);
+ if(this.result.value.getDataTypeId){
+ getDataType = true
+ }
switch (this.result.method){
case 'saveInsContext':
this.$nextTick(()=>{
@@ -2746,7 +2755,13 @@
}
}
}
- this.saveInsContext()
+ if(this.isGet&&!this.dataAcquisitionEidtAble&&!getDataType){
+ return
+ }
+ setTimeout(()=>{
+ this.saveInsContext()
+ },2000)
+ // this.saveInsContext()
})
break;
case 'tableList':
@@ -3140,8 +3155,8 @@
return
},
saveInsContext() {
- console.log(1111,this.param)
try {
+ console.log(1111,this.param)
if(this.param){
this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
param: JSON.stringify(this.param)
--
Gitblit v1.9.3