monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by XuHaoJie
Commit 3435c21097e67e5dd3a94c2f7631fdd089f6cf5c 1 parent 3c18f4bf

杭州-活动告警-活动告警历史告警优化指标查询的条件

Inline Side-by-side
Showing 2 changed files with 17 additions and 6 deletions
@@ -691,7 +691,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -691,7 +691,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
691 beginTime: $("#activewarningStartdate").val(), 691 beginTime: $("#activewarningStartdate").val(),
692 endTime: $("#activewarningEnddate").val(), 692 endTime: $("#activewarningEnddate").val(),
693 sortKey: sortKey, 693 sortKey: sortKey,
694 - alarmKpi: $("#alarmKpiSearchBox").val(), 694 + alarmKpi: $("#alarmKpiSearchBox").val()!='KPI97B835A4'?$("#alarmKpiSearchBox").val():'',
  695 + isBus:$("#alarmKpiSearchBox").val()=='KPI97B835A4'?'Y':'',
695 durationVal: $('#inline-condition-duration input[name="durationVal"]').val(), 696 durationVal: $('#inline-condition-duration input[name="durationVal"]').val(),
696 durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(), 697 durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(),
697 netFlag: netFlag, 698 netFlag: netFlag,
@@ -724,7 +725,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -724,7 +725,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
724 beginTime: $("#activewarningStartdate").val(), 725 beginTime: $("#activewarningStartdate").val(),
725 endTime: $("#activewarningEnddate").val(), 726 endTime: $("#activewarningEnddate").val(),
726 sortKey: sortKey, 727 sortKey: sortKey,
727 - alarmKpi: $("#alarmKpiSearchBox").val(), 728 + //alarmKpi: $("#alarmKpiSearchBox").val(),
  729 + alarmKpi: $("#alarmKpiSearchBox").val()!='KPI97B835A4'?$("#alarmKpiSearchBox").val():'',
  730 + isBus:$("#alarmKpiSearchBox").val()=='KPI97B835A4'?'Y':'',
728 durationVal: $('#inline-condition-duration input[name="durationVal"]').val(), 731 durationVal: $('#inline-condition-duration input[name="durationVal"]').val(),
729 durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(), 732 durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(),
730 netFlag: netFlag, 733 netFlag: netFlag,
@@ -981,7 +984,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -981,7 +984,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
981 beginTime: $("#activewarningStartdate").val(), 984 beginTime: $("#activewarningStartdate").val(),
982 endTime: $("#activewarningEnddate").val(), 985 endTime: $("#activewarningEnddate").val(),
983 sortKey: sortKey, 986 sortKey: sortKey,
984 - alarmKpi: $("#alarmKpiSearchBox").val(), 987 + //alarmKpi: $("#alarmKpiSearchBox").val(),
  988 + alarmKpi: $("#alarmKpiSearchBox").val()!='KPI97B835A4'?$("#alarmKpiSearchBox").val():'',
  989 + isBus:$("#alarmKpiSearchBox").val()=='KPI97B835A4'?'Y':'',
985 durationVal: $('#inline-condition-duration input[name="durationVal"]').val(), 990 durationVal: $('#inline-condition-duration input[name="durationVal"]').val(),
986 durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(), 991 durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(),
987 alarmTimeDay:todayStr, 992 alarmTimeDay:todayStr,
@@ -278,7 +278,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -278,7 +278,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
278 durationVal: $('#his_inline-condition-duration input[name="durationVal"]').val(), 278 durationVal: $('#his_inline-condition-duration input[name="durationVal"]').val(),
279 durationUnit: $('#his_inline-condition-duration select[name="durationUnit"]').val(), 279 durationUnit: $('#his_inline-condition-duration select[name="durationUnit"]').val(),
280 sortKey: sortKey, 280 sortKey: sortKey,
281 - alarmKpi: $("#alarmKpiHisSearchBox").val(), 281 + //alarmKpi: $("#alarmKpiHisSearchBox").val(),
  282 + alarmKpi: $("#alarmKpiHisSearchBox").val()!='KPI97B835A4'?$("#alarmKpiHisSearchBox").val():'',
  283 + isBus:$("#alarmKpiHisSearchBox").val()=='KPI97B835A4'?'Y':'',
282 } 284 }
283 , height: 'full-245' 285 , height: 'full-245'
284 , cellMinWidth: 80 286 , cellMinWidth: 80
@@ -309,7 +311,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -309,7 +311,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
309 durationVal: $('#his_inline-condition-duration input[name="durationVal"]').val(), 311 durationVal: $('#his_inline-condition-duration input[name="durationVal"]').val(),
310 durationUnit: $('#his_inline-condition-duration select[name="durationUnit"]').val(), 312 durationUnit: $('#his_inline-condition-duration select[name="durationUnit"]').val(),
311 sortKey: sortKey, 313 sortKey: sortKey,
312 - alarmKpi: $("#alarmKpiHisSearchBox").val(), 314 + //alarmKpi: $("#alarmKpiHisSearchBox").val(),
  315 + alarmKpi: $("#alarmKpiHisSearchBox").val()!='KPI97B835A4'?$("#alarmKpiHisSearchBox").val():'',
  316 + isBus:$("#alarmKpiHisSearchBox").val()=='KPI97B835A4'?'Y':'',
313 }, 317 },
314 success: function (res) { 318 success: function (res) {
315 var map = res.map; 319 var map = res.map;
@@ -523,7 +527,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -523,7 +527,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
523 durationVal: $('#his_inline-condition-duration input[name="durationVal"]').val(), 527 durationVal: $('#his_inline-condition-duration input[name="durationVal"]').val(),
524 durationUnit: $('#his_inline-condition-duration select[name="durationUnit"]').val(), 528 durationUnit: $('#his_inline-condition-duration select[name="durationUnit"]').val(),
525 sortKey: sortKey, 529 sortKey: sortKey,
526 - alarmKpi: $("#alarmKpiHisSearchBox").val(), 530 + //alarmKpi: $("#alarmKpiHisSearchBox").val(),
  531 + alarmKpi: $("#alarmKpiHisSearchBox").val()!='KPI97B835A4'?$("#alarmKpiHisSearchBox").val():'',
  532 + isBus:$("#alarmKpiHisSearchBox").val()=='KPI97B835A4'?'Y':'',
527 } 533 }
528 }); 534 });
529 } 535 }