monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit e265d09102241a1417f50e65082e5c0dbc3cd8d9 2 parents 16a97eb2 c1f900eb

Merge branch 'master-v32-xwx' into 'master' 

告警模板取消只能保留一个策略逻辑/无法添加



See merge request !730
Inline Side-by-side
Showing 3 changed files with 118 additions and 15 deletions
@@ -101,11 +101,6 @@ layui.define(['form','table', 'admin', 'common','sessions'], function (exports) @@ -101,11 +101,6 @@ layui.define(['form','table', 'admin', 'common','sessions'], function (exports)
101 } 101 }
102 //删除 102 //删除
103 $(".delete-alarmtemplate-policy-btn").on("click",function (){ 103 $(".delete-alarmtemplate-policy-btn").on("click",function (){
104 - var tr = $("#alarmtemplate-policy-table-body").find('tr').length  
105 - if (tr <= 1){  
106 - layer.msg("告警模板至少绑定一条告警策略", { offset: '15px' , icon: 7 , time: 1000 });  
107 - return false;  
108 - }  
109 $(this).parent().parent().remove(); 104 $(this).parent().parent().remove();
110 }); 105 });
111 } 106 }
@@ -14,12 +14,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -14,12 +14,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
14 exports('alarmtemplateIndex', function (data) { 14 exports('alarmtemplateIndex', function (data) {
15 var policyId = (data && data.policyId) ? data.policyId : ""; 15 var policyId = (data && data.policyId) ? data.policyId : "";
16 var resIdList = (data && data.resIds) ? data.resIds : ''; 16 var resIdList = (data && data.resIds) ? data.resIds : '';
  17 + var resType = (data && common.isNotEmpty(data.resType)) ? data.resType : '';
17 var sessions = layui.sessions; 18 var sessions = layui.sessions;
18 var accessToken = sessions.getToken()['access_token']; 19 var accessToken = sessions.getToken()['access_token'];
19 //获得权限列表 20 //获得权限列表
20 var checkList = common.checkPermission(accessToken); 21 var checkList = common.checkPermission(accessToken);
21 -  
22 - 22 + var alarmTempId = '';
  23 + // 业务类型Id
  24 + var busId = '';
23 //回车搜索 25 //回车搜索
24 $('#alarmtemplatekw').keydown(function (e) { 26 $('#alarmtemplatekw').keydown(function (e) {
25 if (e.keyCode === 13) { 27 if (e.keyCode === 13) {
@@ -357,7 +359,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -357,7 +359,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
357 359
358 //查看告警模板的资源数量 360 //查看告警模板的资源数量
359 $(".view-alarmtemplate-res-total").on("click", function () { 361 $(".view-alarmtemplate-res-total").on("click", function () {
360 - var alarmTempId = $(this).data("id"); 362 + alarmTempId = $(this).data("id");
361 layer.open({ 363 layer.open({
362 title: ['绑定资源', 'font-size:18px;'], 364 title: ['绑定资源', 'font-size:18px;'],
363 type: 1, 365 type: 1,
@@ -366,13 +368,69 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -366,13 +368,69 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
366 btn: ['确定','取消'], 368 btn: ['确定','取消'],
367 content: laytpl($('#tempResource').html()).render(JSON.stringify({})), 369 content: laytpl($('#tempResource').html()).render(JSON.stringify({})),
368 success: function (index, layero) { 370 success: function (index, layero) {
369 - renderResByTemp(alarmTempId) 371 + renderResByTemp(resType)
370 372
371 //新增资源权限 373 //新增资源权限
372 $('#addAuthResBtn').on('click', function () { 374 $('#addAuthResBtn').on('click', function () {
373 openResByTemp(alarmTempId,index) 375 openResByTemp(alarmTempId,index)
374 }) 376 })
375 377
  378 + // 查询条件框回车查询事件
  379 + $('#res-keyword').keydown(function (e) {
  380 + if (e.keyCode === 13) {
  381 + renderResByTemp(resType);
  382 + }
  383 + });
  384 + //查询按钮事件
  385 + $('#tempResBut').unbind().on('click',function () {
  386 + renderResByTemp(resType);
  387 + });
  388 +
  389 + // 如果参数有busId
  390 + if(data && common.isNotEmpty(data.busId)){
  391 + busId = data.busId;
  392 + $("#templist_resListBizTypes").attr("disabled",true);
  393 + form.render()
  394 + }
  395 + //绑定业务下拉选择数据
  396 + common.bizTypeSelect("templist_resListBizTypes",function () {
  397 + $("#templist_resListBizTypes").val(busId);
  398 + form.render("select");
  399 + });
  400 + //绑定资源类型下拉选择
  401 + common.resTypeXmSelect({
  402 + el: '#templist_restype',
  403 + initValue: resType.split(','),
  404 + on(data) {
  405 + resType = data.arr.map(item => item.resTypeCode).join(',');
  406 + resType || (resType = 'all')
  407 + renderResByTemp(resType);
  408 + }
  409 + });
  410 + //绑定厂商下拉选择
  411 + common.providerSelect("templist_provider",function () {
  412 + form.render("select");
  413 + });
  414 +
  415 + form.render();
  416 + bindSelectEvent();
  417 + //绑定下拉搜索事件
  418 + function bindSelectEvent() {
  419 + //选择业务搜索
  420 + form.on('select(templist_resListBizTypes)', function(data){
  421 + busId = data.value;
  422 + renderResByTemp(resType);
  423 + });
  424 + // 资源状态
  425 + form.on('select(templist_resStatus)', function(data){
  426 + renderResByTemp(resType);
  427 + });
  428 + // 厂商
  429 + form.on('select(templist_provider)', function(data){
  430 + renderResByTemp(resType);
  431 + });
  432 + }
  433 +
376 //删除资源权限 434 //删除资源权限
377 $('#delAuthResBtn').on('click', function () { 435 $('#delAuthResBtn').on('click', function () {
378 deleteResTemp(alarmTempId) 436 deleteResTemp(alarmTempId)
@@ -399,16 +457,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -399,16 +457,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
399 }); 457 });
400 458
401 //渲染用户所有资源权限列表表格 459 //渲染用户所有资源权限列表表格
402 - function renderResByTemp(alarmTempId) { 460 + function renderResByTemp(resType) {
403 temResTable = table.render({ 461 temResTable = table.render({
404 elem: '#res_temp_table', 462 elem: '#res_temp_table',
405 - url: domainName + '/api-web/home/res-list/all', 463 + url: common.domainName + '/api-web/home/res-list/' + (resType ? resType : 'all'),
406 where: { 464 where: {
407 access_token: accessToken, 465 access_token: accessToken,
408 - resName: '',  
409 - busId: '',  
410 - resHealth: '',  
411 - provider:'', 466 + resName: $('#res-keyword').val(),
  467 + busId: $("#templist_resListBizTypes").val(),
  468 + resHealth: $("#templist_resStatus").val(),
  469 + provider:$("#templist_provider").val(),
412 collectorId: '', 470 collectorId: '',
413 trapCollectorId: '', 471 trapCollectorId: '',
414 alarmTempId: alarmTempId, 472 alarmTempId: alarmTempId,
@@ -63,6 +63,56 @@ @@ -63,6 +63,56 @@
63 <div class="page-panel"> 63 <div class="page-panel">
64 <div class="main"> 64 <div class="main">
65 <div class="layui-card"> 65 <div class="layui-card">
  66 + <div class="layui-card-header">
  67 + <div class="layui-status">
  68 + <form class="layui-form layui-card-header layuiadmin-card-header-auto">
  69 + <div class="layui-form-item">
  70 + <div class="layui-inline">
  71 + <div class="layui-input-inline layui-input-inline--long">
  72 + <input type="text" id="res-keyword" placeholder="输入名称，回车搜索" autocomplete="off"
  73 + lay-tips="关键字检索包含： </br>资源名称</br>ip地址"
  74 + class="layui-input">
  75 + </div>
  76 + </div>
  77 + <div class="layui-inline">
  78 + <div class="layui-input-inline layui-input-inline--long">
  79 + <div id="templist_restype"></div>
  80 + </div>
  81 + </div>
  82 +
  83 + <div class="layui-inline">
  84 + <div class="layui-input-inline">
  85 + <select name="reslist_resStatus" id="templist_resStatus" lay-filter="templist_resStatus" lay-verify="required">
  86 + <option value="">=资源状态=</option>
  87 + <option value="1">中</option>
  88 + <option value="2">良</option>
  89 + <option value="3">优</option>
  90 + </select>
  91 + </div>
  92 + </div>
  93 + <div class="layui-inline">
  94 + <div class="layui-input-inline">
  95 + <select name="label" id="templist_resListBizTypes" lay-filter="templist_resListBizTypes" lay-search>
  96 + <option value="">=选择业务=</option>
  97 + </select>
  98 + </div>
  99 + </div>
  100 + <div class="layui-inline">
  101 + <div class="layui-input-inline">
  102 + <select name="provider" id="templist_provider" lay-filter="templist_provider" lay-search>
  103 + <option value="">=选择厂商=</option>
  104 + </select>
  105 + </div>
  106 + </div>
  107 + <div class="layui-inline">
  108 + <button id="tempResBut" type="button" class="layui-btn layui-btn-normal" ><i
  109 + class="layui-icon layui-icon-search"></i>查询
  110 + </button>
  111 + </div>
  112 + </div>
  113 + </form>
  114 + </div>
  115 + </div>
66 <div class="layui-card-body"> 116 <div class="layui-card-body">
67 <div class="warn-btns"> 117 <div class="warn-btns">
68 <button id="addAuthResBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal"><i 118 <button id="addAuthResBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal"><i