From b9e6b361bdb8cd26b9768602734b3a078dcdee26 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 31 七月 2024 12:18:14 +0800
Subject: [PATCH] 修改检验任务bug
---
static/js/worker.js | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/static/js/worker.js b/static/js/worker.js
index e6e931f..08e8046 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -10,8 +10,13 @@
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;
@@ -339,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){
@@ -857,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