From 16bc320eee29357111dff65c4fdca63a138f6450 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 06 八月 2024 17:03:40 +0800
Subject: [PATCH] 松套管

---
 static/js/worker.js |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/static/js/worker.js b/static/js/worker.js
index ba752fe..37fd593 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -106,8 +106,7 @@
           let ask = currentSample.insProduct.find(m => m.id == item.i).ask?currentSample.insProduct.find(m => m.id == item.i).ask.split('&'):null;
           let res = Object.values(comValue)[0]
           let comp = []
-
-          if(res==''||res==null||res==undefined||res=='Infinity'){
+          if(res===''||res===null||res===undefined||res==='Infinity'){
             item.v.v = null
             list.forEach(a => {
               if (a[0].r == item.r) {
@@ -167,6 +166,7 @@
                     }
                   }else{
                     let str = handleFraction(m.split('鈮�')[1])
+                    console.log(555555,res,str)
                     return eval(res) <= eval(str)
                   }
                 }else if (m.includes('<')) {
@@ -282,7 +282,7 @@
                 }
               })
             }
-            // console.log(tableList)
+            // console.log(5555,tableList)
           }
           // console.log('1234567789', tableList,getParam())
           result = {
@@ -348,7 +348,7 @@
                       let num = 0
                       let str = a[b].v.ct.fa.split('.')[1]
                       num = str.length
-                      a[b].v.v = comResult?Number(comResult).toFixed(num):0
+                      a[b].v.v = comResult?Number(comResult).toFixed(num):comResult
                     }else{
                       let val = parseFloat(Number(comResult).toFixed(3))
                       a[b].v.v = isNaN(val) ? comResult : val
@@ -482,16 +482,20 @@
         b.i &&b.v.v&& param[b.i].comValue.push(b)
       }
       if (b.v.ps != undefined && b.v.ps.value === '璁惧缂栫爜') {
-        b.i &&b.v.v&& param[b.i].equipValue.push(b)
+        b.i &&b.v&& param[b.i].equipValue.push(b)
       }
       if (b.v.ps != undefined && b.v.ps.value === '璁惧鍚嶇О') {
-        b.i &&b.v.v&& param[b.i].equipName.push(b)
+        b.i &&b.v&& param[b.i].equipName.push(b)
       }
       if (b.v.ps != undefined && b.v.ps.value === '鏈�缁堝��') {
-        b.i &&b.v.v&& (param[b.i].resValue = b)
+        b.i &&b.v&& (param[b.i].resValue = b)
       }
       if (b.v.ps != undefined && b.v.ps.value === '缁撹') {
-        b.i &&(b.v.v||b.v.v===0||b.v.v==='0')&& (param[b.i].insResult = b)
+        if(b.i &&(b.v.v||b.v.v===0||b.v.v==='0')){
+          if(b.v.v != '鍚堟牸'&&b.v.v != '涓嶅悎鏍�'){
+            param[b.i].insResult = b
+          }
+        }
       }
     })
   })
@@ -508,7 +512,7 @@
 function SUM(...val){
   try {
     let num = null;
-    if(val&&val.length>0){
+    if(val!=null&&val!=undefined&&val!='undefined'&&val.length>0){
       val.forEach(item=>{
         num+=item;
       })
@@ -527,7 +531,7 @@
 function MAX(...val){
   try {
     let max = null;
-    if(val&&val.length>0){
+    if(val!=null&&val!=undefined&&val!='undefined'&&val.length>0){
       val = val.filter(item=>item!=null&&item!=='')
       if(val.length>0){
         max = Math.max(...val)
@@ -549,7 +553,7 @@
 function MIN(...val){
   try {
     let min = null;
-    if(val&&val.length>0){
+    if(val!=null&&val!=undefined&&val!='undefined'&&val.length>0){
       val = val.filter(item=>item!=null&&item!=='')
       if(val.length>0){
         min = Math.min(...val)
@@ -570,8 +574,8 @@
   try {
     let num = null;
     let arr = [];
-    if(val&&val.length>0){
-      arr = val.filter(item=>item!=null&&item!=''&&item!=undefined)
+    if(val!=null&&val!=undefined&&val!='undefined'&&val.length>0){
+      arr = val.filter(item=>item!==null&&item!==''&&item!=undefined)
       arr.forEach(item=>{
         num+=item;
       })

--
Gitblit v1.9.3