From 26b6cf313d624215f0b9c30099483a39e9e8a843 Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期四, 11 七月 2024 15:55:36 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master --- static/js/worker.js | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/static/js/worker.js b/static/js/worker.js index 3546e3f..f262b6e 100644 --- a/static/js/worker.js +++ b/static/js/worker.js @@ -39,7 +39,7 @@ let list2 = [] excelMethodList.forEach(item => { - if (item.valueList.find(m => m.r == r && m.c == c)) { + if (item.valueList&&item.valueList.length>0&&item.valueList.find(m => m.r == r && m.c == c)) { var comValue = {} item.valueList.forEach(a => { list.forEach(b => { @@ -221,11 +221,7 @@ // let ask = currentSample.insProduct.find(m => m.id == item.i).ask?currentSample.insProduct.find(m => m.id == item.i).ask.split('&'):null; // let tell = currentSample.insProduct.find(m => m.id == item.i).tell?currentSample.insProduct.find(m => m.id == item.i).tell.split('&'):null; comResult = compute(item.v.f.replace(/=/g, ' '),comValue) - let list3 = [] - list2.forEach(val => { - val = val.toString() - list3.push(val) - }) + let list3 = list2.map(item=>item+'') isToExponential = list3.some(val => val.includes('e+')) // 瑁呭椤圭洰妫�楠屽�艰浆鍖� if (PROJECT === '瑁呭鐢电紗' && isToExponential) { -- Gitblit v1.9.3