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 @@ -711,12 +711,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
711 "policyFlag":policyFlag 711 "policyFlag":policyFlag
712 } 712 }
713 seriouspolicyItems.push(itemObj); 713 seriouspolicyItems.push(itemObj);
714 - if (conditon < 5) { //数字类的 714 + if (conditon <= 5) { //数字类的
715 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`; 715 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
716 } else if(conditon == 7 || conditon ==11) { //字符串类的 716 } else if(conditon == 7 || conditon ==11) { //字符串类的
717 - policyStr += `![${kpiId},kpiValue]${conOjb[conditon].split(",")[1]}("${conval}")`; 717 + policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`;
718 }else { 718 }else {
719 - policyStr += `[${kpiId},kpiValue]${conOjb[conditon]}("${conval}")`; 719 + policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
720 720
721 } 721 }
722 } else { 722 } else {
@@ -732,13 +732,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -732,13 +732,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
732 "policyFlag":policyFlag 732 "policyFlag":policyFlag
733 } 733 }
734 seriouspolicyItems.push(itemObj); 734 seriouspolicyItems.push(itemObj);
735 - if (conditon < 5) { 735 + if (conditon <= 5) {
736 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`; 736 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
737 } else if(conditon == 7 || conditon ==11) { //字符串类的 737 } else if(conditon == 7 || conditon ==11) { //字符串类的
738 - policyStr += `![${param}]${conOjb[conditon].split(",")[1]}("${conval}")`; 738 + policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`;
739 } 739 }
740 else { 740 else {
741 - policyStr += `[${param}]${conOjb[conditon]}("${conval}")`; 741 + policyStr += `[${param}].${conOjb[conditon]}("${conval}")`;
742 } 742 }
743 743
744 } 744 }
@@ -779,12 +779,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -779,12 +779,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
779 "policyFlag":policyFlag 779 "policyFlag":policyFlag
780 } 780 }
781 importantpolicyItems.push(itemObj); 781 importantpolicyItems.push(itemObj);
782 - if (conditon < 5) { //数字类的 782 + if (conditon <= 5) { //数字类的
783 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`; 783 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
784 } else if(conditon == 7 || conditon ==11) { //字符串类的 784 } else if(conditon == 7 || conditon ==11) { //字符串类的
785 - policyStr += `![${kpiId},kpiValue]${conOjb[conditon].split(",")[1]}("${conval}")`; 785 + policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`;
786 }else { //字符串类的 786 }else { //字符串类的
787 - policyStr += `[${kpiId},kpiValue]${conOjb[conditon]}("${conval}")`; 787 + policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
788 } 788 }
789 } else { 789 } else {
790 var itemObj = { 790 var itemObj = {
@@ -799,13 +799,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -799,13 +799,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
799 "policyFlag":policyFlag 799 "policyFlag":policyFlag
800 } 800 }
801 importantpolicyItems.push(itemObj); 801 importantpolicyItems.push(itemObj);
802 - if (conditon < 5) { 802 + if (conditon <= 5) {
803 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`; 803 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
804 }else if(conditon == 7 || conditon ==11) { //字符串类的 804 }else if(conditon == 7 || conditon ==11) { //字符串类的
805 - policyStr += `![${param}]${conOjb[conditon].split(",")[1]}("${conval}")`; 805 + policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`;
806 } 806 }
807 else { 807 else {
808 - policyStr += `[${param}]${conOjb[conditon]}("${conval}")`; 808 + policyStr += `[${param}].${conOjb[conditon]}("${conval}")`;
809 } 809 }
810 810
811 } 811 }
@@ -847,12 +847,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -847,12 +847,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
847 "policyFlag":policyFlag 847 "policyFlag":policyFlag
848 } 848 }
849 commonlypolicyItems.push(itemObj); 849 commonlypolicyItems.push(itemObj);
850 - if (conditon < 5) { //数字类的 850 + if (conditon <= 5) { //数字类的
851 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`; 851 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
852 } else if(conditon == 7 || conditon ==11) { //字符串类的 852 } else if(conditon == 7 || conditon ==11) { //字符串类的
853 - policyStr += `![${kpiId},kpiValue]${conOjb[conditon].split(",")[1]}("${conval}")`; 853 + policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`;
854 } else { //字符串类的 854 } else { //字符串类的
855 - policyStr += `[${kpiId},kpiValue]${conOjb[conditon]}("${conval}")`; 855 + policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
856 } 856 }
857 } else { 857 } else {
858 var itemObj = { 858 var itemObj = {
@@ -867,12 +867,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -867,12 +867,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
867 "policyFlag":policyFlag 867 "policyFlag":policyFlag
868 } 868 }
869 commonlypolicyItems.push(itemObj); 869 commonlypolicyItems.push(itemObj);
870 - if (conditon < 5) { 870 + if (conditon <= 5) {
871 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`; 871 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
872 } else if(conditon == 7 || conditon ==11) { //字符串类的 872 } else if(conditon == 7 || conditon ==11) { //字符串类的
873 - policyStr += `![${param}]${conOjb[conditon].split(",")[1]}("${conval}")`; 873 + policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`;
874 }else { 874 }else {
875 - policyStr += `[${param}]${conOjb[conditon]}("${conval}")`; 875 + policyStr += `[${param}].${conOjb[conditon]}("${conval}")`;
876 } 876 }
877 877
878 } 878 }