monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 袁晋鹏
Commit f8a724545169e179c4e5a59e48730af3599fff0b 1 parent 6a9f448f

优化运算符不等于和不包含

Inline Side-by-side
Showing 1 changed file with 43 additions and 15 deletions
... ... @@ -713,8 +713,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
seriouspolicyItems.push(itemObj);
if (conditon <= 5) { //数字类的
policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
} else if(conditon == 7 || conditon ==11) { //字符串类的
} else if(conditon == 7) { //字符串类的
policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`;
} else if(conditon == 8) { //字符串类的
policyStr += `("${conval}").${conOjb[conditon]}[${kpiId},kpiValue]`;
} else if(conditon == 11) { //字符串类的
policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${kpiId},kpiValue]`;
}else {
policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
... ... @@ -728,16 +732,21 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
'operatorValue':conval,
"relationSymbol": '',
"isTermOver": 0,
"sort": j,
"sort": i-1,
"policyFlag":policyFlag
}
seriouspolicyItems.push(itemObj);
if (conditon <= 5) {
policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
} else if(conditon == 7 || conditon ==11) { //字符串类的
} else if(conditon == 7) { //字符串类的
policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`;
}
else {
}else if(conditon == 8){
policyStr += `("${conval}").${conOjb[conditon]}[${param}]`;
}else if(conditon == 11){
policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`;
} else {
policyStr += `[${param}].${conOjb[conditon]}("${conval}")`;
}
... ... @@ -781,8 +790,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
importantpolicyItems.push(itemObj);
if (conditon <= 5) { //数字类的
policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
} else if(conditon == 7 || conditon ==11) { //字符串类的
} else if(conditon == 7) { //字符串类的
policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`;
} else if(conditon == 8) { //字符串类的
policyStr += `("${conval}").${conOjb[conditon]}[${kpiId},kpiValue]`;
} else if(conditon == 11) { //字符串类的
policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${kpiId},kpiValue]`;
}else { //字符串类的
policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
}
... ... @@ -795,16 +808,21 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
'operatorValue': conval,
"relationSymbol": '',
"isTermOver": 0,
"sort": j,
"sort": i-1,
"policyFlag":policyFlag
}
importantpolicyItems.push(itemObj);
if (conditon <= 5) {
policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
}else if(conditon == 7 || conditon ==11) { //字符串类的
}else if(conditon == 7) { //字符串类的
policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`;
}
else {
}else if(conditon == 8){
policyStr += `("${conval}").${conOjb[conditon]}[${param}]`;
}else if(conditon == 11){
policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`;
} else {
policyStr += `[${param}].${conOjb[conditon]}("${conval}")`;
}
... ... @@ -849,9 +867,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
commonlypolicyItems.push(itemObj);
if (conditon <= 5) { //数字类的
policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
} else if(conditon == 7 || conditon ==11) { //字符串类的
}else if(conditon == 7) { //字符串类的
policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`;
} else { //字符串类的
} else if(conditon == 8) { //字符串类的
policyStr += `("${conval}").${conOjb[conditon]}[${kpiId},kpiValue]`;
} else if(conditon == 11) { //字符串类的
policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${kpiId},kpiValue]`;
}else { //字符串类的
policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
}
} else {
... ... @@ -863,15 +885,21 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
'operatorValue': conval,
"relationSymbol": '',
"isTermOver": 0,
"sort": j,
"sort": i-1,
"policyFlag":policyFlag
}
commonlypolicyItems.push(itemObj);
if (conditon <= 5) {
policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
} else if(conditon == 7 || conditon ==11) { //字符串类的
}else if(conditon == 7) { //字符串类的
policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`;
}else {
}else if(conditon == 8){
policyStr += `("${conval}").${conOjb[conditon]}[${param}]`;
}else if(conditon == 11){
policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`;
} else {
policyStr += `[${param}].${conOjb[conditon]}("${conval}")`;
}
... ...