monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 袁晋鹏
Commit edc2e8783e523614fdfbaad50fde3ac7e9c1f67a 1 parent f5930902

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

Inline Side-by-side
Showing 1 changed file with 24 additions and 9 deletions
@@ -673,7 +673,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -673,7 +673,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
673 return false; 673 return false;
674 } 674 }
675 var policyFlag = $(this).data("flag"); 675 var policyFlag = $(this).data("flag");
676 - var conOjb = {"0":">","1":"<","2":"=","3":">=","4":"<=","5":"!=","6":"equals","7":"!equals","8":"contains","9":"startsWith","10":"endsWith","11":"!contains"}; 676 + var conOjb = {"0":">","1":"<","2":"=","3":">=","4":"<=","5":"!=","6":"equals","7":"!,equals","8":"contains","9":"startsWith","10":"endsWith","11":"!,contains"};
677 var doms = $(`[id^=${policyFlag}-policy-box]`); 677 var doms = $(`[id^=${policyFlag}-policy-box]`);
678 var policyStr = ''; 678 var policyStr = '';
679 var relationobj = {"1": 0,"3":1,"5":2,"7":3,"9":4,"11":5,"13":6,"15":7,"17":8,"19":9,"21":10} 679 var relationobj = {"1": 0,"3":1,"5":2,"7":3,"9":4,"11":5,"13":6,"15":7,"17":8,"19":9,"21":10}
@@ -713,8 +713,11 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -713,8 +713,11 @@ 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 { //字符串类的 716 + } else if(conditon == 7 || conditon ==11) { //字符串类的
  717 + policyStr += `![${kpiId},kpiValue]${conOjb[conditon].split(",")[1]}("${conval}")`;
  718 + }else {
717 policyStr += `[${kpiId},kpiValue]${conOjb[conditon]}("${conval}")`; 719 policyStr += `[${kpiId},kpiValue]${conOjb[conditon]}("${conval}")`;
  720 +
718 } 721 }
719 } else { 722 } else {
720 var itemObj = { 723 var itemObj = {
@@ -725,13 +728,16 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -725,13 +728,16 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
725 'operatorValue':conval, 728 'operatorValue':conval,
726 "relationSymbol": '', 729 "relationSymbol": '',
727 "isTermOver": 0, 730 "isTermOver": 0,
728 - "sort": i-1, 731 + "sort": j,
729 "policyFlag":policyFlag 732 "policyFlag":policyFlag
730 } 733 }
731 seriouspolicyItems.push(itemObj); 734 seriouspolicyItems.push(itemObj);
732 if (conditon < 5) { 735 if (conditon < 5) {
733 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`; 736 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
734 - } else { 737 + } else if(conditon == 7 || conditon ==11) { //字符串类的
  738 + policyStr += `![${param}]${conOjb[conditon].split(",")[1]}("${conval}")`;
  739 + }
  740 + else {
735 policyStr += `[${param}]${conOjb[conditon]}("${conval}")`; 741 policyStr += `[${param}]${conOjb[conditon]}("${conval}")`;
736 } 742 }
737 743
@@ -775,7 +781,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -775,7 +781,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
775 importantpolicyItems.push(itemObj); 781 importantpolicyItems.push(itemObj);
776 if (conditon < 5) { //数字类的 782 if (conditon < 5) { //数字类的
777 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`; 783 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
778 - } else { //字符串类的 784 + } else if(conditon == 7 || conditon ==11) { //字符串类的
  785 + policyStr += `![${kpiId},kpiValue]${conOjb[conditon].split(",")[1]}("${conval}")`;
  786 + }else { //字符串类的
779 policyStr += `[${kpiId},kpiValue]${conOjb[conditon]}("${conval}")`; 787 policyStr += `[${kpiId},kpiValue]${conOjb[conditon]}("${conval}")`;
780 } 788 }
781 } else { 789 } else {
@@ -787,13 +795,16 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -787,13 +795,16 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
787 'operatorValue': conval, 795 'operatorValue': conval,
788 "relationSymbol": '', 796 "relationSymbol": '',
789 "isTermOver": 0, 797 "isTermOver": 0,
790 - "sort": i-1, 798 + "sort": j,
791 "policyFlag":policyFlag 799 "policyFlag":policyFlag
792 } 800 }
793 importantpolicyItems.push(itemObj); 801 importantpolicyItems.push(itemObj);
794 if (conditon < 5) { 802 if (conditon < 5) {
795 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`; 803 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
796 - } else { 804 + }else if(conditon == 7 || conditon ==11) { //字符串类的
  805 + policyStr += `![${param}]${conOjb[conditon].split(",")[1]}("${conval}")`;
  806 + }
  807 + else {
797 policyStr += `[${param}]${conOjb[conditon]}("${conval}")`; 808 policyStr += `[${param}]${conOjb[conditon]}("${conval}")`;
798 } 809 }
799 810
@@ -838,6 +849,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -838,6 +849,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
838 commonlypolicyItems.push(itemObj); 849 commonlypolicyItems.push(itemObj);
839 if (conditon < 5) { //数字类的 850 if (conditon < 5) { //数字类的
840 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`; 851 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
  852 + } else if(conditon == 7 || conditon ==11) { //字符串类的
  853 + policyStr += `![${kpiId},kpiValue]${conOjb[conditon].split(",")[1]}("${conval}")`;
841 } else { //字符串类的 854 } else { //字符串类的
842 policyStr += `[${kpiId},kpiValue]${conOjb[conditon]}("${conval}")`; 855 policyStr += `[${kpiId},kpiValue]${conOjb[conditon]}("${conval}")`;
843 } 856 }
@@ -850,13 +863,15 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -850,13 +863,15 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
850 'operatorValue': conval, 863 'operatorValue': conval,
851 "relationSymbol": '', 864 "relationSymbol": '',
852 "isTermOver": 0, 865 "isTermOver": 0,
853 - "sort": i-1, 866 + "sort": j,
854 "policyFlag":policyFlag 867 "policyFlag":policyFlag
855 } 868 }
856 commonlypolicyItems.push(itemObj); 869 commonlypolicyItems.push(itemObj);
857 if (conditon < 5) { 870 if (conditon < 5) {
858 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`; 871 policyStr += `[${param}]${conOjb[conditon]}"${conval}"`;
859 - } else { 872 + } else if(conditon == 7 || conditon ==11) { //字符串类的
  873 + policyStr += `![${param}]${conOjb[conditon].split(",")[1]}("${conval}")`;
  874 + }else {
860 policyStr += `[${param}]${conOjb[conditon]}("${conval}")`; 875 policyStr += `[${param}]${conOjb[conditon]}("${conval}")`;
861 } 876 }
862 877