zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:针对剪切值18mm的判定条件更改

This commit is contained in:
shijing 2025-10-13 15:03:46 +08:00
parent 1f63a0741d
commit e9cf1db534
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/views/wpm_bx/mlogbw_check_table.vue
View File

@ -636,6 +636,11 @@ export default {
if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){
let str = item.rule_expression.replace(/`/g, '');
str = str.replace(/\${(.*?)}/g, 'row.\$1')
if(str.indexOf('row.剪切值18mm')>-1){
if(row.剪切值18mm==null||row.剪切值18mm==''||row.剪切值18mm==undefined){
str = str.split('||')[0];
}
}
let judge = eval(str);
row[item.defect_name] = judge;
}
@ -745,7 +750,13 @@ export default {
that.qct_defects.forEach(item => {
if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){
let str = item.rule_expression.replace(/`/g, '');
str = str.replace(/\${(.*?)}/g, 'row.\$1')
str = str.replace(/\${(.*?)}/g, 'row.\$1');
if(str.indexOf('row.剪切值18mm')>-1){
if(row.剪切值18mm==null||row.剪切值18mm==''||row.剪切值18mm==undefined){
str = str.split('||')[0];
}
}
//`${剪切18mm}>31||${剪切值18mm}.indexOf("满")!=-1`
let judge = eval(str);
that.mlogbwlist[index][item.defect_name] = judge;
}else{