monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 袁晋鹏
Commit 6a9f448f57394bd6355503914d76361f107d1d05 1 parent edc2e878

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

Inline Side-by-side
Showing 1 changed file with 18 additions and 18 deletions
... ... @@ -711,12 +711,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
"policyFlag":policyFlag
}
seriouspolicyItems.push(itemObj);
if (conditon < 5) { //数字类的
if (conditon <= 5) { //数字类的
policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
} else if(conditon == 7 || conditon ==11) { //字符串类的
policyStr += `![${kpiId},kpiValue]${conOjb[conditon].split(",")[1]}("${conval}")`;
policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`;
}else {
policyStr += `[${kpiId},kpiValue]${conOjb[conditon]}("${conval}")`;
policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
}
} else {
... ... @@ -732,13 +732,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
"policyFlag":policyFlag
}
seriouspolicyItems.push(itemObj);
if (conditon < 5) {
if (conditon <= 5) {
policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
} else if(conditon == 7 || conditon ==11) { //字符串类的
policyStr += `![${param}]${conOjb[conditon].split(",")[1]}("${conval}")`;
policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`;
}
else {
policyStr += `[${param}]${conOjb[conditon]}("${conval}")`;
policyStr += `[${param}].${conOjb[conditon]}("${conval}")`;
}
}
... ... @@ -779,12 +779,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
"policyFlag":policyFlag
}
importantpolicyItems.push(itemObj);
if (conditon < 5) { //数字类的
if (conditon <= 5) { //数字类的
policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
} else if(conditon == 7 || conditon ==11) { //字符串类的
policyStr += `![${kpiId},kpiValue]${conOjb[conditon].split(",")[1]}("${conval}")`;
policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`;
}else { //字符串类的
policyStr += `[${kpiId},kpiValue]${conOjb[conditon]}("${conval}")`;
policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
}
} else {
var itemObj = {
... ... @@ -799,13 +799,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
"policyFlag":policyFlag
}
importantpolicyItems.push(itemObj);
if (conditon < 5) {
if (conditon <= 5) {
policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
}else if(conditon == 7 || conditon ==11) { //字符串类的
policyStr += `![${param}]${conOjb[conditon].split(",")[1]}("${conval}")`;
policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`;
}
else {
policyStr += `[${param}]${conOjb[conditon]}("${conval}")`;
policyStr += `[${param}].${conOjb[conditon]}("${conval}")`;
}
}
... ... @@ -847,12 +847,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
"policyFlag":policyFlag
}
commonlypolicyItems.push(itemObj);
if (conditon < 5) { //数字类的
if (conditon <= 5) { //数字类的
policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
} else if(conditon == 7 || conditon ==11) { //字符串类的
policyStr += `![${kpiId},kpiValue]${conOjb[conditon].split(",")[1]}("${conval}")`;
policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`;
} else { //字符串类的
policyStr += `[${kpiId},kpiValue]${conOjb[conditon]}("${conval}")`;
policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
}
} else {
var itemObj = {
... ... @@ -867,12 +867,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
"policyFlag":policyFlag
}
commonlypolicyItems.push(itemObj);
if (conditon < 5) {
if (conditon <= 5) {
policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
} else if(conditon == 7 || conditon ==11) { //字符串类的
policyStr += `![${param}]${conOjb[conditon].split(",")[1]}("${conval}")`;
policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`;
}else {
policyStr += `[${param}]${conOjb[conditon]}("${conval}")`;
policyStr += `[${param}].${conOjb[conditon]}("${conval}")`;
}
}
... ...