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 @@ -713,8 +713,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
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) { //字符串类的
717 policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`; 717 policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`;
  718 + } else if(conditon == 8) { //字符串类的
  719 + policyStr += `("${conval}").${conOjb[conditon]}[${kpiId},kpiValue]`;
  720 + } else if(conditon == 11) { //字符串类的
  721 + policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${kpiId},kpiValue]`;
718 }else { 722 }else {
719 policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`; 723 policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
720 724
@@ -728,16 +732,21 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -728,16 +732,21 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
728 'operatorValue':conval, 732 'operatorValue':conval,
729 "relationSymbol": '', 733 "relationSymbol": '',
730 "isTermOver": 0, 734 "isTermOver": 0,
731 - "sort": j, 735 + "sort": i-1,
732 "policyFlag":policyFlag 736 "policyFlag":policyFlag
733 } 737 }
734 seriouspolicyItems.push(itemObj); 738 seriouspolicyItems.push(itemObj);
735 if (conditon <= 5) { 739 if (conditon <= 5) {
736 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`; 740 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
737 - } else if(conditon == 7 || conditon ==11) { //字符串类的 741 + } else if(conditon == 7) { //字符串类的
738 policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`; 742 policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`;
739 - }  
740 - else { 743 + }else if(conditon == 8){
  744 + policyStr += `("${conval}").${conOjb[conditon]}[${param}]`;
  745 +
  746 + }else if(conditon == 11){
  747 + policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`;
  748 +
  749 + } else {
741 policyStr += `[${param}].${conOjb[conditon]}("${conval}")`; 750 policyStr += `[${param}].${conOjb[conditon]}("${conval}")`;
742 } 751 }
743 752
@@ -781,8 +790,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -781,8 +790,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
781 importantpolicyItems.push(itemObj); 790 importantpolicyItems.push(itemObj);
782 if (conditon <= 5) { //数字类的 791 if (conditon <= 5) { //数字类的
783 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`; 792 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
784 - } else if(conditon == 7 || conditon ==11) { //字符串类的 793 + } else if(conditon == 7) { //字符串类的
785 policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`; 794 policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`;
  795 + } else if(conditon == 8) { //字符串类的
  796 + policyStr += `("${conval}").${conOjb[conditon]}[${kpiId},kpiValue]`;
  797 + } else if(conditon == 11) { //字符串类的
  798 + policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${kpiId},kpiValue]`;
786 }else { //字符串类的 799 }else { //字符串类的
787 policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`; 800 policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
788 } 801 }
@@ -795,16 +808,21 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -795,16 +808,21 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
795 'operatorValue': conval, 808 'operatorValue': conval,
796 "relationSymbol": '', 809 "relationSymbol": '',
797 "isTermOver": 0, 810 "isTermOver": 0,
798 - "sort": j, 811 + "sort": i-1,
799 "policyFlag":policyFlag 812 "policyFlag":policyFlag
800 } 813 }
801 importantpolicyItems.push(itemObj); 814 importantpolicyItems.push(itemObj);
802 if (conditon <= 5) { 815 if (conditon <= 5) {
803 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`; 816 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
804 - }else if(conditon == 7 || conditon ==11) { //字符串类的 817 + }else if(conditon == 7) { //字符串类的
805 policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`; 818 policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`;
806 - }  
807 - else { 819 + }else if(conditon == 8){
  820 + policyStr += `("${conval}").${conOjb[conditon]}[${param}]`;
  821 +
  822 + }else if(conditon == 11){
  823 + policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`;
  824 +
  825 + } else {
808 policyStr += `[${param}].${conOjb[conditon]}("${conval}")`; 826 policyStr += `[${param}].${conOjb[conditon]}("${conval}")`;
809 } 827 }
810 828
@@ -849,9 +867,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -849,9 +867,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
849 commonlypolicyItems.push(itemObj); 867 commonlypolicyItems.push(itemObj);
850 if (conditon <= 5) { //数字类的 868 if (conditon <= 5) { //数字类的
851 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`; 869 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
852 - } else if(conditon == 7 || conditon ==11) { //字符串类的 870 + }else if(conditon == 7) { //字符串类的
853 policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`; 871 policyStr += `![${kpiId},kpiValue].${conOjb[conditon].split(",")[1]}("${conval}")`;
854 - } else { //字符串类的 872 + } else if(conditon == 8) { //字符串类的
  873 + policyStr += `("${conval}").${conOjb[conditon]}[${kpiId},kpiValue]`;
  874 + } else if(conditon == 11) { //字符串类的
  875 + policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${kpiId},kpiValue]`;
  876 + }else { //字符串类的
855 policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`; 877 policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
856 } 878 }
857 } else { 879 } else {
@@ -863,15 +885,21 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -863,15 +885,21 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
863 'operatorValue': conval, 885 'operatorValue': conval,
864 "relationSymbol": '', 886 "relationSymbol": '',
865 "isTermOver": 0, 887 "isTermOver": 0,
866 - "sort": j, 888 + "sort": i-1,
867 "policyFlag":policyFlag 889 "policyFlag":policyFlag
868 } 890 }
869 commonlypolicyItems.push(itemObj); 891 commonlypolicyItems.push(itemObj);
870 if (conditon <= 5) { 892 if (conditon <= 5) {
871 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`; 893 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
872 - } else if(conditon == 7 || conditon ==11) { //字符串类的 894 + }else if(conditon == 7) { //字符串类的
873 policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`; 895 policyStr += `![${param}].${conOjb[conditon].split(",")[1]}("${conval}")`;
874 - }else { 896 + }else if(conditon == 8){
  897 + policyStr += `("${conval}").${conOjb[conditon]}[${param}]`;
  898 +
  899 + }else if(conditon == 11){
  900 + policyStr += `!("${conval}").${conOjb[conditon].split(",")[1]}[${param}]`;
  901 +
  902 + } else {
875 policyStr += `[${param}].${conOjb[conditon]}("${conval}")`; 903 policyStr += `[${param}].${conOjb[conditon]}("${conval}")`;
876 } 904 }
877 905