From dd6aa18a74f7c47d816ae57be4667274a48ebee3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 09 八月 2024 09:29:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 static/js/worker.js |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/static/js/worker.js b/static/js/worker.js
index 37fd593..f8d2e8d 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -5,6 +5,7 @@
 let comparisonList = []
 let currentSample = {}
 let PROJECT = ''
+let bushing = ''
 let result = {
   method:'',
   value:null
@@ -20,6 +21,12 @@
   if(data.type&&data.type=='saveData'){
     tableList = data.tableList;
     param = data.param;
+    return
+  }
+  if(data.bushing&&(data.bushing!=bushing)&&data.type=='saveData'){
+    tableList = data.tableList;
+    param = data.param;
+    bushing = data.bushing;
     return
   }
   code = data.code;
@@ -354,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)
@@ -479,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)
@@ -488,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')){
@@ -512,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;
       })
@@ -531,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)
@@ -553,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)
@@ -574,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;
@@ -877,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