From e4beda2094872354bf5ab2c35a8838a6dc316c01 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期五, 12 七月 2024 13:14:13 +0800
Subject: [PATCH] 数采页面添加
---
static/js/worker.js | 76 +++++++++++++++++++++++++++++++-------
1 files changed, 62 insertions(+), 14 deletions(-)
diff --git a/static/js/worker.js b/static/js/worker.js
index c522b04..fcf7735 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -101,7 +101,11 @@
let str = handleFraction(m.split('=')[1])
if(typeof res == 'string'&&typeof str == 'string'){
if(res.includes('/')){
- return handleMoreParam(res,m.split('=')[1],'=')
+ if (m.includes('/')) {
+ return eval(res) == eval(str)
+ } else {
+ return handleMoreParam(res,m.split('=')[1],'=')
+ }
}else{
// console.log(res.trim().replace(/[.,銆傘�侊紱锛�'";?锛熲�滐紝]/g, ''),' == ',str.trim().replace(/[.,銆傘�侊紱锛�'";?锛熲�滐紝]/g, ''))
return res.trim().replace(/[.,銆傘�侊紱锛�'";?锛熲�滐紝]/g, '') == str.trim().replace(/[.,銆傘�侊紱锛�'";?锛熲�滐紝]/g, '')
@@ -110,45 +114,75 @@
return eval(res) == eval(str)
}
} else if (m.includes('鈮�')) {
- console.log('eval(res)---', eval(res))
- console.log('eval(str)---', eval(str))
if(typeof res =='string'&&res.includes('/')){
- return handleMoreParam(res,m.split('鈮�')[1],'鈮�')
+ if (m.includes('/')) {
+ console.log('eval(res)----', eval(res))
+ let str = handleFraction(m.split('鈮�')[1])
+ console.log('eval(str)----', eval(str))
+ return eval(res) >= eval(str)
+ } else {
+ return handleMoreParam(res,m.split('鈮�')[1],'鈮�')
+ }
}else{
let str = handleFraction(m.split('鈮�')[1])
return eval(res) >= eval(str)
}
}else if (m.includes('鈮�')) {
if(typeof res =='string'&&res.includes('/')){
- return handleMoreParam(res,m.split('鈮�')[1],'鈮�')
+ if (m.includes('/')) {
+ let str = handleFraction(m.split('鈮�')[1])
+ return eval(res) <= eval(str)
+ } else {
+ return handleMoreParam(res,m.split('鈮�')[1],'鈮�')
+ }
}else{
let str = handleFraction(m.split('鈮�')[1])
return eval(res) <= eval(str)
}
}else if (m.includes('<')) {
if(typeof res =='string'&&res.includes('/')){
- return handleMoreParam(res,m.split('<')[1],'<')
+ if (m.includes('/')) {
+ let str = handleFraction(m.split('<')[1])
+ return eval(res) < eval(str)
+ } else {
+ return handleMoreParam(res,m.split('<')[1],'<')
+ }
}else{
let str = handleFraction(m.split('<')[1])
return eval(res) < eval(str)
}
}else if (m.includes('>')) {
if(typeof res =='string'&&res.includes('/')){
- return handleMoreParam(res,m.split('>')[1],'>')
+ if (m.includes('/')) {
+ let str = handleFraction(m.split('>')[1])
+ return eval(res) > eval(str)
+ } else {
+ return handleMoreParam(res,m.split('>')[1],'>')
+ }
}else{
let str = handleFraction(m.split('>')[1])
return eval(res) > eval(str)
}
}else if (m.includes('~')) {
if(typeof res =='string'&&res.includes('/')){
- return handleMoreParam(res,m,'~')
+ if (m.includes('/')) {
+ let k = m.split('~')
+ return eval(res) >= eval(handleFraction((k[0]))) && eval(res) <= eval(handleFraction(k[1]))
+ } else {
+ return handleMoreParam(res,m,'~')
+ }
}else{
let k = m.split('~')
return eval(res) >= eval(handleFraction((k[0]))) && eval(res) <= eval(handleFraction(k[1]))
}
}else if(m.includes('-')){
if(typeof res =='string'&&res.includes('/')){
- return handleMoreParam(res,m,'-')
+ if (m.includes('/')) {
+ let k = m.split('-')
+ return eval(res) >= eval(handleFraction(k[0])) && eval(res) <= eval(handleFraction(k[1]))
+ } else {
+ return handleMoreParam(res,m,'-')
+ }
}else{
let k = m.split('-')
// console.log(k,eval(res),eval(res) >= eval(handleFraction(k[0])) && eval(res) <= eval(handleFraction(k[1])))
@@ -156,21 +190,36 @@
}
}else if(m.includes('卤')){
if(typeof res =='string'&&res.includes('/')){
- return handleMoreParam(res,m,'卤')
+ if (m.includes('/')) {
+ let k = m.split('卤')
+ return eval(res) >= eval((handleFraction(k[0]) - handleFraction(k[1]))) && eval(res) <= eval((handleFraction(k[0]) + handleFraction(k[1])))
+ } else {
+ return handleMoreParam(res,m,'卤')
+ }
}else{
let k = m.split('卤')
return eval(res) >= eval((handleFraction(k[0]) - handleFraction(k[1]))) && eval(res) <= eval((handleFraction(k[0]) + handleFraction(k[1])))
}
}else if(m.includes('锛�')){
if(typeof res =='string'&&res.includes('/')){
- return handleMoreParam(res,m.split('锛�')[1],'>')
+ if (m.includes('/')) {
+ let str = handleFraction(m.split('锛�')[1])
+ return eval(res) > eval(str)
+ } else {
+ return handleMoreParam(res,m.split('锛�')[1],'>')
+ }
}else{
let str = handleFraction(m.split('锛�')[1])
return eval(res) > eval(str)
}
}else if(m.includes('锛�')){
if(typeof res =='string'&&res.includes('/')){
- return handleMoreParam(res,m.split('锛�')[1],'<')
+ if (m.includes('/')) {
+ let str = handleFraction(m.split('锛�')[1])
+ return eval(res) < eval(str)
+ } else {
+ return handleMoreParam(res,m.split('锛�')[1],'<')
+ }
}else{
let str = handleFraction(m.split('锛�')[1])
return eval(res) < eval(str)
@@ -224,9 +273,7 @@
if(getInspectionValueType(item.i)==1){
let tell = currentSample.insProduct.find(m => m.id == item.i).tell?currentSample.insProduct.find(m => m.id == item.i).tell.split('&'):null;
isPoint = tell[0].includes('/') // 鍒ゆ柇瑕佹眰鍊兼槸鍚︿负鍒嗘暟
- console.log('comValue---', comValue)
comResult = compute(item.v.f.replace(/=/g, ' '),comValue, isPoint)
- console.log('comResult---', comResult)
let list3 = list2.map(item=>item+'')
isToExponential = list3.some(val => val.includes('e+'))
// 瑁呭椤圭洰妫�楠屽�艰浆鍖�
@@ -263,6 +310,7 @@
if (a[0].r == item.r && comResult !== '') {
for (var b in a) {
if (a[b].c == item.c) {
+ console.log('comResult---', comResult)
try{
let val = parseFloat(comResult.toFixed(3))
a[b].v.v = isNaN(val) ? '' : val
--
Gitblit v1.9.3