From 332125c247b8cec21af77479f07ef35558eb6bba Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 02 八月 2024 17:24:09 +0800
Subject: [PATCH] 合并冲突
---
static/js/worker0.js | 74 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/static/js/worker0.js b/static/js/worker0.js
index ffff123..d29f483 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,35 +39,39 @@
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){
- setTimeout(()=>{
- let num = 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]
- }else{
- n.v.v = dataAcquisitionInfo[str]
+ 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.frequency)>num){
- if(n.v.ps.value.includes(num)){
+ }
+ }else{
+ 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]?Number(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',
@@ -79,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