From a19ea2098bd9ddbf9c81a58ad3faade25d8c6e7e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 01 八月 2024 14:02:03 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
static/js/worker0.js | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/static/js/worker0.js b/static/js/worker0.js
index b725961..e2481ba 100644
--- a/static/js/worker0.js
+++ b/static/js/worker0.js
@@ -46,8 +46,10 @@
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]
}
- n.v.v = dataAcquisitionInfo[str]?dataAcquisitionInfo[str].toFixed(num):0
result = {
method:'changeInput',
value:{
@@ -64,8 +66,10 @@
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]
}
- n.v.v = dataAcquisitionInfo[str]?Number(dataAcquisitionInfo[str]).toFixed(num):0
result = {
method:'changeInput',
value:{
@@ -75,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