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)
}
//删除
$(".delete-alarmtemplate-policy-btn").on("click",function (){
var tr = $("#alarmtemplate-policy-table-body").find('tr').length
if (tr <= 1){
layer.msg("告警模板至少绑定一条告警策略", { offset: '15px' , icon: 7 , time: 1000 });
return false;
}
$(this).parent().parent().remove();
});
}
... ...
... ... @@ -14,12 +14,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
exports('alarmtemplateIndex', function (data) {
var policyId = (data && data.policyId) ? data.policyId : "";
var resIdList = (data && data.resIds) ? data.resIds : '';
var resType = (data && common.isNotEmpty(data.resType)) ? data.resType : '';
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
//获得权限列表
var checkList = common.checkPermission(accessToken);
var alarmTempId = '';
// 业务类型Id
var busId = '';
//回车搜索
$('#alarmtemplatekw').keydown(function (e) {
if (e.keyCode === 13) {
... ... @@ -357,7 +359,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
//查看告警模板的资源数量
$(".view-alarmtemplate-res-total").on("click", function () {
var alarmTempId = $(this).data("id");
alarmTempId = $(this).data("id");
layer.open({
title: ['绑定资源', 'font-size:18px;'],
type: 1,
... ... @@ -366,13 +368,69 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
btn: ['确定','取消'],
content: laytpl($('#tempResource').html()).render(JSON.stringify({})),
success: function (index, layero) {
renderResByTemp(alarmTempId)
renderResByTemp(resType)
//新增资源权限
$('#addAuthResBtn').on('click', function () {
openResByTemp(alarmTempId,index)
})
// 查询条件框回车查询事件
$('#res-keyword').keydown(function (e) {
if (e.keyCode === 13) {
renderResByTemp(resType);
}
});
//查询按钮事件
$('#tempResBut').unbind().on('click',function () {
renderResByTemp(resType);
});
// 如果参数有busId
if(data && common.isNotEmpty(data.busId)){
busId = data.busId;
$("#templist_resListBizTypes").attr("disabled",true);
form.render()
}
//绑定业务下拉选择数据
common.bizTypeSelect("templist_resListBizTypes",function () {
$("#templist_resListBizTypes").val(busId);
form.render("select");
});
//绑定资源类型下拉选择
common.resTypeXmSelect({
el: '#templist_restype',
initValue: resType.split(','),
on(data) {
resType = data.arr.map(item => item.resTypeCode).join(',');
resType || (resType = 'all')
renderResByTemp(resType);
}
});
//绑定厂商下拉选择
common.providerSelect("templist_provider",function () {
form.render("select");
});
form.render();
bindSelectEvent();
//绑定下拉搜索事件
function bindSelectEvent() {
//选择业务搜索
form.on('select(templist_resListBizTypes)', function(data){
busId = data.value;
renderResByTemp(resType);
});
// 资源状态
form.on('select(templist_resStatus)', function(data){
renderResByTemp(resType);
});
// 厂商
form.on('select(templist_provider)', function(data){
renderResByTemp(resType);
});
}
//删除资源权限
$('#delAuthResBtn').on('click', function () {
deleteResTemp(alarmTempId)
... ... @@ -399,16 +457,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
});
//渲染用户所有资源权限列表表格
function renderResByTemp(alarmTempId) {
function renderResByTemp(resType) {
temResTable = table.render({
elem: '#res_temp_table',
url: domainName + '/api-web/home/res-list/all',
url: common.domainName + '/api-web/home/res-list/' + (resType ? resType : 'all'),
where: {
access_token: accessToken,
resName: '',
busId: '',
resHealth: '',
provider:'',
resName: $('#res-keyword').val(),
busId: $("#templist_resListBizTypes").val(),
resHealth: $("#templist_resStatus").val(),
provider:$("#templist_provider").val(),
collectorId: '',
trapCollectorId: '',
alarmTempId: alarmTempId,
... ...
... ... @@ -63,6 +63,56 @@
<div class="page-panel">
<div class="main">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status">
<form class="layui-form layui-card-header layuiadmin-card-header-auto">
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input type="text" id="res-keyword" placeholder="输入名称，回车搜索" autocomplete="off"
lay-tips="关键字检索包含： </br>资源名称</br>ip地址"
class="layui-input">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<div id="templist_restype"></div>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select name="reslist_resStatus" id="templist_resStatus" lay-filter="templist_resStatus" lay-verify="required">
<option value="">=资源状态=</option>
<option value="1">中</option>
<option value="2">良</option>
<option value="3">优</option>
</select>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select name="label" id="templist_resListBizTypes" lay-filter="templist_resListBizTypes" lay-search>
<option value="">=选择业务=</option>
</select>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select name="provider" id="templist_provider" lay-filter="templist_provider" lay-search>
<option value="">=选择厂商=</option>
</select>
</div>
</div>
<div class="layui-inline">
<button id="tempResBut" type="button" class="layui-btn layui-btn-normal" ><i
class="layui-icon layui-icon-search"></i>查询
</button>
</div>
</div>
</form>
</div>
</div>
<div class="layui-card-body">
<div class="warn-btns">
<button id="addAuthResBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal"><i
... ...