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 | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/static/js/worker.js b/static/js/worker.js
index ef9479a..3be9748 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -35,6 +35,9 @@
break
}
}
+ let isToExponential = ''
+ let list2 = []
+
excelMethodList.forEach(item => {
if (item.valueList.find(m => m.r == r && m.c == c)) {
var comValue = {}
@@ -50,6 +53,7 @@
break
}
}
+ list2.push(c.v.v)
if(getInspectionValueType(item.i)==1&&!isNaN(parseFloat(c.v.v))){
let n = String(c.v.v)
if(n.includes('/')){
@@ -85,6 +89,7 @@
}
})
}else{
+ // console.log(ask,res,item.v.f)
if(ask){
comp = ask.map((m, i) => {
if (m.includes('RTS')) {
@@ -142,6 +147,7 @@
return handleMoreParam(res,m,'-')
}else{
let k = m.split('-')
+ // console.log(k,eval(res),eval(res) >= eval(handleFraction(k[0])) && eval(res) <= eval(handleFraction(k[1])))
return eval(res) >= eval(handleFraction(k[0])) && eval(res) <= eval(handleFraction(k[1]))
}
}else if(m.includes('卤')){
@@ -212,10 +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 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 === '瑁呭鐢电紗' && ask[0].includes('RTS')) {
+ if (PROJECT === '瑁呭鐢电紗' && isToExponential) {
let num2 = new Big(comResult)
comResult = num2.toExponential()
}
@@ -241,6 +250,7 @@
comResult = str
}
} catch (error) {
+ console.log('error---', error)
}
try {
list.forEach(a => {
@@ -260,7 +270,7 @@
})
changeInput(comResult, `${id}-${item.r}-${item.c}-${pId}`) //鏀瑰彉鏈�缁堝��
} catch (error) {
-
+ console.log('error---', error)
}
}
}
--
Gitblit v1.9.3