From 12dceacf931f4f29b1613eb06da8fd46d6375ebb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 08 八月 2024 21:32:47 +0800
Subject: [PATCH] 认领修改+松套管修改+不判定结论
---
static/js/worker.js | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/static/js/worker.js b/static/js/worker.js
index c3336df..f8d2e8d 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -361,7 +361,7 @@
a[b].v.v = isNaN(val) ? comResult : val
}
// console.log('a[b].v.ct', comResult)
- // console.log('a[b].v.v', a[b].v.v)
+ // console.log('a[b].v.v', a[b])
}catch(error){
a[b].v.v = comResult
console.log('error---', error)
@@ -486,7 +486,7 @@
b.i &&b.v.v&& param[b.i].insValue.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '璁＄畻鍊�') {
- b.i &&b.v.v&& param[b.i].comValue.push(b)
+ b.i &&b.v.v&&b.valueList&&b.valueList.length>0&& param[b.i].comValue.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '璁惧缂栫爜') {
b.i &&b.v&& param[b.i].equipValue.push(b)
@@ -495,7 +495,7 @@
b.i &&b.v&& param[b.i].equipName.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '鏈�缁堝��') {
- b.i &&b.v&& (param[b.i].resValue = b)
+ b.i &&b.v&&b.valueList&&b.valueList.length>0&& (param[b.i].resValue = b)
}
if (b.v.ps != undefined && b.v.ps.value === '缁撹') {
if(b.i &&(b.v.v||b.v.v===0||b.v.v==='0')){
@@ -519,7 +519,7 @@
function SUM(...val){
try {
let num = null;
- if(val!=null&&val!=undefined&&val!='undefined'&&val.length>0){
+ if(val!=null&&val!=undefined&&val!='undefined'&&val!='NaN'&&val.length>0){
val.forEach(item=>{
num+=item;
})
@@ -538,7 +538,7 @@
function MAX(...val){
try {
let max = null;
- if(val!=null&&val!=undefined&&val!='undefined'&&val.length>0){
+ if(val!=null&&val!=undefined&&val!='undefined'&&val!='NaN'&&val.length>0){
val = val.filter(item=>item!=null&&item!=='')
if(val.length>0){
max = Math.max(...val)
@@ -560,7 +560,7 @@
function MIN(...val){
try {
let min = null;
- if(val!=null&&val!=undefined&&val!='undefined'&&val.length>0){
+ if(val!=null&&val!=undefined&&val!='undefined'&&val!='NaN'&&val.length>0){
val = val.filter(item=>item!=null&&item!=='')
if(val.length>0){
min = Math.min(...val)
@@ -581,7 +581,7 @@
try {
let num = null;
let arr = [];
- if(val!=null&&val!=undefined&&val!='undefined'&&val.length>0){
+ if(val!=null&&val!=undefined&&val!='undefined'&&val!='NaN'&&val.length>0){
arr = val.filter(item=>item!==null&&item!==''&&item!=undefined)
arr.forEach(item=>{
num+=item;
@@ -884,7 +884,7 @@
} else if (isPoint) {
return str.replace('ABS', '').replace(/\(|\)/g, '')
}else {
- console.log('str', str,eval(str))
+ console.log('str', str)
return eval(str)
}
} catch (error) {
--
Gitblit v1.9.3