From c263fb316fc23d9db98ce711fda30d81c28d2d9c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 08 八月 2024 19:02:10 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
static/js/worker.js | 70 +++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 24 deletions(-)
diff --git a/static/js/worker.js b/static/js/worker.js
index 28c9c74..c3336df 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -5,16 +5,28 @@
let comparisonList = []
let currentSample = {}
let PROJECT = ''
+let bushing = ''
let result = {
method:'',
value:null
}
let param = null
+let currentTable = ''
self.onmessage = function(event) {
const data = JSON.parse(event.data);
+ if(currentTable!=data.currentTable){
+ tableList = data.tableList;
+ }
+ currentTable = data.currentTable;
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;
@@ -101,8 +113,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) {
@@ -162,6 +173,7 @@
}
}else{
let str = handleFraction(m.split('鈮�')[1])
+ console.log(555555,res,str)
return eval(res) <= eval(str)
}
}else if (m.includes('<')) {
@@ -277,7 +289,7 @@
}
})
}
- // console.log(tableList)
+ // console.log(5555,tableList)
}
// console.log('1234567789', tableList,getParam())
result = {
@@ -341,13 +353,15 @@
a[b].v.v = 0
}else if(a[b].v.ct&&a[b].v.ct.fa&&typeof a[b].v.ct.fa == 'string'&&a[b].v.ct.fa.includes('.')){
let num = 0
- let str = n.v.ct.fa.split('.')[1]
+ 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) ? '' : val
+ 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)
}catch(error){
a[b].v.v = comResult
console.log('error---', error)
@@ -454,14 +468,18 @@
* @returns 杩斿洖澶勭悊鍚庣殑鍙傛暟瀵硅薄
*/
function getParam(){
- for (var b in param){
- param[b].insValue = []
- param[b].comValue = []
- param[b].equipValue = []
- param[b].equipName = []
- param[b].resValue = null
- param[b].insResult = null
- }
+ tableList[0].arr.forEach(a=>{
+ a.forEach(b=>{
+ if(param[b.i]){
+ param[b.i].insValue = []
+ param[b.i].comValue = []
+ param[b.i].equipValue = []
+ param[b.i].equipName = []
+ param[b.i].resValue = null
+ param[b.i].insResult = null
+ }
+ })
+ })
tableList[0].arr.forEach(a => {
a.forEach(b=>{
if (b.v.ps != undefined &&typeof b.v.ps.value =='string'&& b.v.ps.value.includes('妫�楠屽��')) {
@@ -471,16 +489,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
+ }
+ }
}
})
})
@@ -497,7 +519,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;
})
@@ -516,7 +538,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)
@@ -538,7 +560,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)
@@ -559,8 +581,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;
})
@@ -862,7 +884,7 @@
} else if (isPoint) {
return str.replace('ABS', '').replace(/\(|\)/g, '')
}else {
- // console.log('str', str)
+ console.log('str', str,eval(str))
return eval(str)
}
} catch (error) {
--
Gitblit v1.9.3