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 +++++++++++++++++++++++---------- 1 files changed, 46 insertions(+), 21 deletions(-) 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