From 8e45d3f67681a7c81b6551b22287d731a81f0ef2 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 31 七月 2024 12:18:23 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
static/js/worker.js | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/static/js/worker.js b/static/js/worker.js
index 24bb42f..08e8046 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -10,8 +10,18 @@
value:null
}
let param = null
+let currentTable = ''
self.onmessage = function(event) {
const data = JSON.parse(event.data);
+ if(currentTable!=data.currentTable){
+ tableList = data.tableList;
+ }
+ currentTable = data.currentTable;
+ if(data.type&&data.type=='saveData'){
+ tableList = data.tableList;
+ param = data.param;
+ return
+ }
code = data.code;
if(tableList){
let str = code.split('-')
@@ -334,8 +344,13 @@
try{
if(comResult==0){
a[b].v.v = 0
+ }else if(a[b].v.ct&&a[b].v.ct.fa&&typeof a[b].v.ct.fa == 'string'&&a[b].v.ct.fa.includes('.')){
+ let num = 0
+ let str = a[b].v.ct.fa.split('.')[1]
+ num = str.length
+ a[b].v.v = comResult?Number(comResult).toFixed(num):0
}else{
- let val = parseFloat(comResult.toFixed(3))
+ let val = parseFloat(Number(comResult).toFixed(3))
a[b].v.v = isNaN(val) ? '' : val
}
}catch(error){
@@ -852,7 +867,7 @@
} else if (isPoint) {
return str.replace('ABS', '').replace(/\(|\)/g, '')
}else {
- console.log('str', str,eval(str))
+ // console.log('str', str)
return eval(str)
}
} catch (error) {
--
Gitblit v1.9.3