From defa824eab2350fd6abfd10abd8f4df94749e336 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 31 七月 2024 11:21:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
static/js/worker0.js | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/static/js/worker0.js b/static/js/worker0.js
index aa80ca3..e2481ba 100644
--- a/static/js/worker0.js
+++ b/static/js/worker0.js
@@ -42,7 +42,14 @@
let arr = n.v.ps.value.split('鍊�')
if(arr[1] ==dataAcquisitionInfo.frequency){
setTimeout(()=>{
- n.v.v = dataAcquisitionInfo[str]
+ 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):0
+ }else{
+ n.v.v = dataAcquisitionInfo[str]
+ }
result = {
method:'changeInput',
value:{
@@ -55,7 +62,14 @@
}else if(Number(dataAcquisitionInfo.frequency)>num){
if(n.v.ps.value.includes(num)){
setTimeout(()=>{
- n.v.v = dataAcquisitionInfo[str]
+ 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]?Number(dataAcquisitionInfo[str]).toFixed(num):0
+ }else{
+ n.v.v = dataAcquisitionInfo[str]
+ }
result = {
method:'changeInput',
value:{
@@ -65,20 +79,6 @@
}
self.postMessage(JSON.stringify(result))
},2000)
- // n.v.v = dataAcquisitionInfo[str]
- // result = {
- // method:'changeInput',
- // value:{
- // list:list,
- // n:n
- // }
- // }
- // 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)
}
}
}
--
Gitblit v1.9.3