From 0479e3bcf39f458669ecd95bf43c20b7a1b1929e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 02 八月 2024 14:17:39 +0800
Subject: [PATCH] 数采升级-前端修改

---
 static/js/worker0.js |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/static/js/worker0.js b/static/js/worker0.js
index ffff123..a85e73c 100644
--- a/static/js/worker0.js
+++ b/static/js/worker0.js
@@ -13,7 +13,6 @@
 }
 
 function handleData(){
-  // console.log(33333,dataAcquisitionInfo)
   list.forEach((item,index)=>{
     let num = 0;
     let str = ''
@@ -40,15 +39,15 @@
           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.frequency){
+              if(arr[1] ==dataAcquisitionInfo[str].frequency){
                 setTimeout(()=>{
-                  let num = 0
+                  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]
-                    num = str.length
-                    n.v.v = dataAcquisitionInfo[str]?dataAcquisitionInfo[str].toFixed(num):dataAcquisitionInfo[str]
+                    num0 = str.length
+                    n.v.v = dataAcquisitionInfo[str].value?dataAcquisitionInfo[str].value.toFixed(num0):dataAcquisitionInfo[str].value
                   }else{
-                    n.v.v = dataAcquisitionInfo[str]
+                    n.v.v = dataAcquisitionInfo[str].value
                   }
                   result = {
                     method:'changeInput',
@@ -59,16 +58,16 @@
                   }
                   self.postMessage(JSON.stringify(result))
                 },2000)
-              }else if(Number(dataAcquisitionInfo.frequency)>num){
+              }else if(Number(dataAcquisitionInfo[str].frequency)>num){
                 if(n.v.ps.value.includes(num)){
                   setTimeout(()=>{
-                    let num = 0
+                    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]
-                      num = str.length
-                      n.v.v = dataAcquisitionInfo[str]?Number(dataAcquisitionInfo[str]).toFixed(num):dataAcquisitionInfo[str]
+                      num0 = str.length
+                      n.v.v = dataAcquisitionInfo[str].value?Number(dataAcquisitionInfo[str].value).toFixed(num0):dataAcquisitionInfo[str].value
                     }else{
-                      n.v.v = dataAcquisitionInfo[str]
+                      n.v.v = dataAcquisitionInfo[str].value
                     }
                     result = {
                       method:'changeInput',

--
Gitblit v1.9.3