From a80532b337571f0989b11cb9a5b7197f5b849ca7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期六, 10 八月 2024 15:37:20 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
static/js/worker0.js | 89 +++++++++++++++++++++++++++++++++-----------
1 files changed, 66 insertions(+), 23 deletions(-)
diff --git a/static/js/worker0.js b/static/js/worker0.js
index a85e73c..680a2a9 100644
--- a/static/js/worker0.js
+++ b/static/js/worker0.js
@@ -4,11 +4,15 @@
method:'',
value:null
}
-
+let arrSpecial = []
+let numSpecial = 0;
self.onmessage = function(event) {
const data = JSON.parse(event.data);
dataAcquisitionInfo = data.dataAcquisitionInfo;
list = data.list;
+ // console.log(111,dataAcquisitionInfo)
+ arrSpecial = []
+ numSpecial = 0
handleData()
}
@@ -39,32 +43,40 @@
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]){
+ arrSpecial.push(n.i)
+ numSpecial++
+ setTimeout(()=>{
+ let num0 = 0
+ if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
+ let str0 = n.v.ct.fa.split('.')[1]
+ num0 = str0.length
+ n.v.v = dataAcquisitionInfo[str].value[i]?Number(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){
+ arrSpecial.push(n.i)
+ numSpecial++
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
+ let str0 = n.v.ct.fa.split('.')[1]
+ num0 = str0.length
n.v.v = dataAcquisitionInfo[str].value?Number(dataAcquisitionInfo[str].value).toFixed(num0):dataAcquisitionInfo[str].value
}else{
n.v.v = dataAcquisitionInfo[str].value
@@ -78,6 +90,29 @@
}
self.postMessage(JSON.stringify(result))
},2000)
+ }else if(Number(dataAcquisitionInfo[str].frequency)>num){
+ if(n.v.ps.value.includes(num)){
+ arrSpecial.push(n.i)
+ numSpecial++
+ setTimeout(()=>{
+ let num0 = 0
+ if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
+ let str0 = n.v.ct.fa.split('.')[1]
+ num0 = str0.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)
+ }
}
}
}
@@ -86,4 +121,12 @@
}
})
})
+ if(arrSpecial[numSpecial-1]){
+ setTimeout(()=>{
+ result = {
+ getDataTypeId:arrSpecial[numSpecial-1],
+ }
+ self.postMessage(JSON.stringify(result))
+ },0)
+ }
}
--
Gitblit v1.9.3