From 5217316a74583380f43b5b4fcb9b840a67cc29da Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 02 八月 2024 17:17:51 +0800
Subject: [PATCH] 完成数采升级对接
---
static/js/worker0.js | 67 +++++++++++++++++++++++----------
src/components/do/b1-inspect-order-plan/Inspection.vue | 8 +++-
2 files changed, 52 insertions(+), 23 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 0500304..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
@@ -1324,6 +1325,7 @@
done()
}else{
this.dataGetDia = false
+ this.getDataIndex = []
}
}).catch(() => {})
},
@@ -1361,7 +1363,9 @@
if(res.code!=200){
return
}
+ this.dataGetDia = false
this.handleDataAcquisition(res.data)
+ this.getDataIndex = []
})
},
// 澶氱嚎绋�
diff --git a/static/js/worker0.js b/static/js/worker0.js
index a85e73c..d29f483 100644
--- a/static/js/worker0.js
+++ b/static/js/worker0.js
@@ -39,33 +39,37 @@
list[index].forEach((n,i)=>{
if(n.v.ps&&n.v.ps.value&&typeof n.v.ps.value == 'string'&&n.v.ps.value.includes('妫�楠屽��')){
let arr = n.v.ps.value.split('鍊�')
- if(arr[1] ==dataAcquisitionInfo[str].frequency){
- setTimeout(()=>{
- let num0 = 0
- if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
- let str = n.v.ct.fa.split('.')[1]
- num0 = str.length
- n.v.v = dataAcquisitionInfo[str].value?dataAcquisitionInfo[str].value.toFixed(num0):dataAcquisitionInfo[str].value
- }else{
- n.v.v = dataAcquisitionInfo[str].value
+ if(Array.isArray(dataAcquisitionInfo[str].value)){
+ for (let i = 0; i < dataAcquisitionInfo[str].value.length; i++) {
+ if(i+1==arr[1]){
+ setTimeout(()=>{
+ let num0 = 0
+ if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
+ let str = n.v.ct.fa.split('.')[1]
+ num0 = str.length
+ n.v.v = dataAcquisitionInfo[str].value[i]?dataAcquisitionInfo[str].value[i].toFixed(num0):dataAcquisitionInfo[str].value[i]
+ }else{
+ n.v.v = dataAcquisitionInfo[str].value[i]
+ }
+ result = {
+ method:'changeInput',
+ value:{
+ list:list,
+ n:n
+ }
+ }
+ self.postMessage(JSON.stringify(result))
+ },2000)
}
- result = {
- method:'changeInput',
- value:{
- list:list,
- n:n
- }
- }
- self.postMessage(JSON.stringify(result))
- },2000)
- }else if(Number(dataAcquisitionInfo[str].frequency)>num){
- if(n.v.ps.value.includes(num)){
+ }
+ }else{
+ if(arr[1] ==dataAcquisitionInfo[str].frequency){
setTimeout(()=>{
let num0 = 0
if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
let str = n.v.ct.fa.split('.')[1]
num0 = str.length
- n.v.v = dataAcquisitionInfo[str].value?Number(dataAcquisitionInfo[str].value).toFixed(num0):dataAcquisitionInfo[str].value
+ n.v.v = dataAcquisitionInfo[str].value?dataAcquisitionInfo[str].value.toFixed(num0):dataAcquisitionInfo[str].value
}else{
n.v.v = dataAcquisitionInfo[str].value
}
@@ -78,6 +82,27 @@
}
self.postMessage(JSON.stringify(result))
},2000)
+ }else if(Number(dataAcquisitionInfo[str].frequency)>num){
+ if(n.v.ps.value.includes(num)){
+ setTimeout(()=>{
+ let num0 = 0
+ if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
+ let str = n.v.ct.fa.split('.')[1]
+ num0 = str.length
+ n.v.v = dataAcquisitionInfo[str].value?Number(dataAcquisitionInfo[str].value).toFixed(num0):dataAcquisitionInfo[str].value
+ }else{
+ n.v.v = dataAcquisitionInfo[str].value
+ }
+ result = {
+ method:'changeInput',
+ value:{
+ list:list,
+ n:n
+ }
+ }
+ self.postMessage(JSON.stringify(result))
+ },2000)
+ }
}
}
}
--
Gitblit v1.9.3