From a80532b337571f0989b11cb9a5b7197f5b849ca7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期六, 10 八月 2024 15:37:20 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master

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

diff --git a/static/js/worker.js b/static/js/worker.js
index c3336df..e9efd59 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -12,6 +12,7 @@
 }
 let param = null
 let currentTable = ''
+let getDataTypeId = null
 self.onmessage = function(event) {
   const data = JSON.parse(event.data);
   if(currentTable!=data.currentTable){
@@ -30,6 +31,11 @@
     return
   }
   code = data.code;
+  if(data.getDataTypeId){
+    getDataTypeId = data.getDataTypeId
+  }else{
+    getDataTypeId = null
+  }
   if(tableList){
     let str = code.split('-')
     let r = str[1]
@@ -292,11 +298,17 @@
             // console.log(5555,tableList)
           }
           // console.log('1234567789', tableList,getParam())
+          // console.log('1234567789', item)
+          let getDataType0 = false
+          if(item.i==getDataTypeId){
+            getDataType0 = true
+          }
           result = {
             method:'saveInsContext',
             value:{
               tableList,
-              param:getParam()
+              param:getParam(),
+              getDataTypeId:getDataType0?getDataTypeId:''
             }
           }
           self.postMessage(JSON.stringify(result))
@@ -361,7 +373,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 +498,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 +507,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 +531,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 +550,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 +572,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 +593,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 +896,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