From 553f9357c13d068fd2a341f6ed29150ff7a64eda Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 02 八月 2024 16:49:07 +0800
Subject: [PATCH] Merge branch 'master' into test
---
static/js/worker0.js | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/static/js/worker0.js b/static/js/worker0.js
index c0f4e72..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,19 +39,16 @@
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){
- n.v.v = dataAcquisitionInfo[str]
- result = {
- method:'changeInput',
- value:{
- list:list,
- n:n
+ 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
}
- }
- self.postMessage(JSON.stringify(result))
- }else if(Number(dataAcquisitionInfo.frequency)>num){
- if(n.v.ps.value.includes(num)){
- n.v.v = dataAcquisitionInfo[str]
result = {
method:'changeInput',
value:{
@@ -61,11 +57,27 @@
}
}
self.postMessage(JSON.stringify(result))
- // setTimeout(()=>{
- // this.$delete(n.v,'v')
- // this.$set(n.v,'v',this.dataAcquisitionInfo[str])
- // this.changeInput('',`${this.currentSample.insProduct[0].templateId}-${n.r}-${n.c}-${n.i}`,n)
- // },1000)
+ },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