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 | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/static/js/worker.js b/static/js/worker.js
index e3fe14a..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 => {
@@ -101,7 +101,8 @@
if(res.includes('/')){
return handleMoreParam(res,m.split('=')[1],'=')
}else{
- return res.trim() == str.trim()
+ // console.log(res.trim().replace(/[.,銆傘�侊紱锛�'";?锛熲�滐紝]/g, ''),' == ',str.trim().replace(/[.,銆傘�侊紱锛�'";?锛熲�滐紝]/g, ''))
+ return res.trim().replace(/[.,銆傘�侊紱锛�'";?锛熲�滐紝]/g, '') == str.trim().replace(/[.,銆傘�侊紱锛�'";?锛熲�滐紝]/g, '')
}
}else{
return eval(res) == eval(str)
@@ -186,7 +187,6 @@
}
})
} else {
- console.log(333333)
item.v.v = 0
list.forEach(a => {
if (a[0].r == item.r) {
@@ -199,6 +199,7 @@
}
})
}
+ console.log(tableList)
}
result = {
method:'saveInsContext',
@@ -220,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