From daa9a0f42e96f8643f69d6c1412496c4a011de66 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 10 八月 2024 17:27:46 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
static/js/worker.js | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/static/js/worker.js b/static/js/worker.js
index 696fd94..580ae6e 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -300,7 +300,6 @@
// console.log('1234567789', tableList,getParam())
// console.log('1234567789', item)
let getDataType0 = false
- console.log('1234567789', item.i,getDataTypeId)
if(item.i==getDataTypeId){
getDataType0 = true
}
@@ -326,7 +325,7 @@
isPoint = PROJECT=='瑁呭鐢电紗'&&tell&&tell.length>0&&typeof tell[0] =='string'&&tell[0].includes('/') // 鍒ゆ柇瑕佹眰鍊兼槸鍚︿负鍒嗘暟
comResult = compute(item.v.f.replace(/=/g, ' '),comValue, isPoint)
let list3 = list2.map(item=>item+'')
- isToExponential = list3.some(val => val.includes('e+'))
+ isToExponential = list3.some(val => val.includes('e+')||val.includes('e-'))
// 瑁呭椤圭洰妫�楠屽�艰浆鍖�
if (PROJECT === '瑁呭鐢电紗' && isToExponential) {
let num2 = new Big(comResult)
@@ -369,6 +368,8 @@
let str = a[b].v.ct.fa.split('.')[1]
num = str.length
a[b].v.v = comResult?Number(comResult).toFixed(num):comResult
+ }else if(comResult.includes('e+')|| comResult.includes('e-')){
+ a[b].v.v = comResult
}else{
let val = parseFloat(Number(comResult).toFixed(3))
a[b].v.v = isNaN(val) ? comResult : val
--
Gitblit v1.9.3