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

Compare commits

base: zcdsj:d99f14d543325834ff1ff8104d680f4da399c750
Branches Tags
zcdsj:master
zcdsj:gzerp
zcdsj:base
zcdsj:scui
zcdsj:2.6.2025040209
zcdsj:2.6.2025031916
..
compare: zcdsj:8382275e67c3068f6ead836c58254fe52db4c8ae
Branches Tags
zcdsj:master
zcdsj:gzerp
zcdsj:base
zcdsj:scui
zcdsj:2.6.2025040209
zcdsj:2.6.2025031916

No commits in common. "d99f14d543325834ff1ff8104d680f4da399c750" and "8382275e67c3068f6ead836c58254fe52db4c8ae" have entirely different histories.
d99f14d543 ... 8382275e67

1 changed files with 1 additions and 12 deletions
Show Stats Expand all files Collapse all files

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

@ -636,11 +636,6 @@ export default {
if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){ if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){
let str = item.rule_expression.replace(/`/g, ''); 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];
}
}
let judge = eval(str); let judge = eval(str);
row[item.defect_name] = judge; row[item.defect_name] = judge;
} }
@ -750,13 +745,7 @@ export default {
that.qct_defects.forEach(item => { that.qct_defects.forEach(item => {
if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){ if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){
let str = item.rule_expression.replace(/`/g, ''); 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); let judge = eval(str);
that.mlogbwlist[index][item.defect_name] = judge; that.mlogbwlist[index][item.defect_name] = judge;
}else{ }else{