From 5f3cf604c6598d34a389dcbdded8ab9c973f4085 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期四, 11 七月 2024 15:09:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
static/js/worker.js | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/static/js/worker.js b/static/js/worker.js
index 76eb25b..3be9748 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -54,7 +54,6 @@
}
}
list2.push(c.v.v)
- isToExponential = list2.some(val => val.includes('e+'))
if(getInspectionValueType(item.i)==1&&!isNaN(parseFloat(c.v.v))){
let n = String(c.v.v)
if(n.includes('/')){
@@ -102,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)
@@ -187,7 +187,6 @@
}
})
} else {
- console.log(333333)
item.v.v = 0
list.forEach(a => {
if (a[0].r == item.r) {
@@ -200,6 +199,7 @@
}
})
}
+ console.log(tableList)
}
result = {
method:'saveInsContext',
@@ -218,11 +218,13 @@
let comResult = ''
try {
if(getInspectionValueType(item.i)==1){
- 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;
+ // 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.map(item=>item+'')
+ isToExponential = list3.some(val => val.includes('e+'))
// 瑁呭椤圭洰妫�楠屽�艰浆鍖�
- if (PROJECT === '瑁呭鐢电紗' && isToExponential === true) {
+ if (PROJECT === '瑁呭鐢电紗' && isToExponential) {
let num2 = new Big(comResult)
comResult = num2.toExponential()
}
@@ -248,6 +250,7 @@
comResult = str
}
} catch (error) {
+ console.log('error---', error)
}
try {
list.forEach(a => {
@@ -267,7 +270,7 @@
})
changeInput(comResult, `${id}-${item.r}-${item.c}-${pId}`) //鏀瑰彉鏈�缁堝��
} catch (error) {
-
+ console.log('error---', error)
}
}
}
--
Gitblit v1.9.3