monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 5d36bc3beee744f8cc4e1a83d9cdb417a00c39d3 2 parents 6943346f c71423bc

Merge branch 'master-mj-joke' into 'master-mj' 

feat:迁移页面优化(告警策略、告警模板、告警订阅及ip视图)

feat:迁移页面优化(告警策略、告警模板、告警订阅及ip视图)

See merge request !1091
Inline Side-by-side
Showing 8 changed files with 422 additions and 88 deletions
... ... @@ -11,10 +11,9 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
exports('alarmpolicyAdd', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
console.log(data)
admin.req({
url: common.domainName + '/api-web/manage/ddic/findSucDdics/alarm_strategy_type'
, method: 'POST'
, method: 'get'
, async: false
}).done(function (res) {
let radioData = res.data;
... ... @@ -24,7 +23,6 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
htmlRadio += `<option value="` + item.ddicSort + `">` + item.ddicName + '</option>'
})
}
;
$('#alarmpolicy_policyType_add').html(htmlRadio);
});
//编辑
... ... @@ -75,7 +73,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
function getNoticeMergeFlag() {
admin.req({
url: common.domainName + '/api-web/manage/ddic/findSucDdics/noticeMergeFlag'
, method: 'POST'
, method: 'get'
, async: false
, success: function (res) {
$.each(res.data, function (i, v) {
... ...
... ... @@ -20,7 +20,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
resListSelectIds = [];
admin.req({
url: common.domainName + '/api-web/manage/ddic/findSucDdics/alarm_strategy_type'
, method: 'POST'
, method: 'get'
, async: false
}).done(function (res) {
let radioData = res.data;
... ... @@ -69,17 +69,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
form.render(null, 'alarmpolicy-form');
//新增
$("#alarmpolicy_create").unbind("click").on("click",function () {
if ($.inArray('back:alarmpolicy:save', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if(!common.hasPermission('back:alarmpolicy:save')){
return;
}
openPolicyForm();
});
//同步
$("#alarmpolicy_sync").on("click",function (){
if ($.inArray('back:alarmpolicy:synchronization', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
$("#alarmpolicy_sync").unbind("click").on("click",function (){
if(!common.hasPermission('back:alarmpolicy:synchronization')){
return;
}
syncAlarmPolicy();
... ... @@ -199,8 +197,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
//点击名称编辑
$(".view-alarmPolicy-name").off("click").on("click",function () {
if ($.inArray('back:alarmpolicy:update', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if (!common.hasPermission('back:alarmpolicy:update')){
return;
}
openPolicyForm($(this).data("id"));
... ... @@ -350,8 +347,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
//删除数据
function deleteAlarmPolicy(id) {
if ($.inArray('back:alarmpolicy:delete', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if(!common.hasPermission('back:alarmpolicy:delete')){
return;
}
if (typeof (id) != "string") {
... ... @@ -395,10 +391,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
});
}
$.ajax({
url: `${common.domainName}/api-web/manage/restype/list?access_token=${accessToken}`,
method: 'GET',
success: function (res) {
admin.req({
url: `${common.domainName}/api-web/manage/restype/list?access_token=${accessToken}`
,type:"GET"
}).done(function (res) {
// 资源类型下拉框
var resTypeList = res.data.map(item => {
return {
... ... @@ -448,8 +444,64 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
}
}
});
}
}).error(function (error) {
console.log(error);
});
// $.ajax({
// url: `${common.domainName}/api-web/manage/restype/list?access_token=${accessToken}`,
// method: 'GET',
// success: function (res) {
// // 资源类型下拉框
// var resTypeList = res.data.map(item => {
// return {
// name: item.resTypeName,
// value: item.resTypeCode,
// parentId: item.parentId
// }
// });
// var resTypeTree = treeTable.pidToChildren(resTypeList, "value", "parentId");
// xmSelect.render({
// el: '#alarmpolicy_kpi_resName',
// name: "resName",
// tips: '=资源类型=',
// filterable: true,
// radio: true,
// clickClose: true,
// toolbar: {
// show: true,
// list: ['CLEAR']
// },
// tree: {
// show: true,
// showFolderIcon: true,
// showLine: true,
// strict: false,
// indent: 20
// },
// model: {
// label: {
// type: 'text'
// }
// },
// prop: {
// name: 'name',
// value: 'name'
// },
// height: 'auto',
// data: resTypeTree,
// on: function (data) {
// if(data.isAdd){
// if (data.arr.length != 0) {
// resName = data.arr[0].name;
// } else {
// resName = '';
// }
// reloadAlarmPolicyTable();
// }
// }
// });
// }
// });
//新增、编辑策略表单
function openPolicyForm(id){
... ...
... ... @@ -47,8 +47,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
form.render(null, 'alarmsubscribe-form');
//新增
$("#alarmsubscribe_create").off("click").on("click", function () {
if ($.inArray('back:alarmsubscribe:save', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if(!common.hasPermission('back:alarmsubscribe:save')){
return;
}
openAlarmsubscribeForm();
... ... @@ -58,9 +57,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
deletealarmsubscribe();
});
//同步
$("#alarmsubscribe_sync").on("click", function () {
if ($.inArray('back:alarmsubscribe:synchronization', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
$("#alarmsubscribe_sync").unbind("click").on("click", function () {
if(!common.hasPermission('back:alarmsubscribe:synchronization')){
return;
}
var ids = [];
... ... @@ -333,8 +331,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
done: function () {
//点击名称编辑
$(".view-alarmsubscribe-name").on("click", function () {
if ($.inArray('back:alarmsubscribe:update', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if(!common.hasPermission('back:alarmsubscribe:update')){
return;
}
openAlarmsubscribeForm($(this).data("id"));
... ... @@ -454,7 +451,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
});
//查看资源订阅列表
$(".view-alarmsubscribe-resource").on("click", function () {
$(".view-alarmsubscribe-resource").unbind("click").on("click", function () {
if ($(this).text() == '0') {
layer.msg('暂无订阅资源，请先订阅！', {icon: 7, time: 3000});
return false;
... ... @@ -800,7 +797,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
});
//查看资源类型订阅列表
$(".view-alarmsubscribe-resType").on("click", function () {
$(".view-alarmsubscribe-resType").unbind("click").on("click", function () {
if ($(this).text() == '0') {
layer.msg('暂无订阅资源类型，请先订阅！', {icon: 7, time: 3000});
return false;
... ... @@ -833,8 +830,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//资源订阅
$(".alarmsubscribe-resource-btn").on("click", function () {
if ($.inArray('back:alarmsubscribe:resource', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if(!common.hasPermission('back:alarmsubscribe:resource')){
return;
}
var subId = $(this).data("id");
... ... @@ -880,8 +876,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//指标订阅
$(".alarmsubscribe-kpi-btn").on("click", function () {
if ($.inArray('back:alarmsubscribe:target', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if(!common.hasPermission('back:alarmsubscribe:target')){
return;
}
var subId = $(this).data("id");
... ... @@ -1088,8 +1083,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//删除拓扑数据
function deletealarmsubscribe(id) {
if ($.inArray('back:alarmsubscribe:delete', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if(!common.hasPermission('back:alarmsubscribe:delete')){
return;
}
if (typeof (id) != "string") {
... ...
... ... @@ -35,8 +35,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
form.render(null, 'alarmtemplate-form');
//新增
$("#alarmtemplate_create").on("click", function () {
if ($.inArray('back:alarmtemp:save', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if(!common.hasPermission('back:alarmtemp:save')){
return;
}
openAlarmTemplateForm();
... ... @@ -47,16 +46,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
});
//同步
$("#alarmtemplate_sync").on("click", function () {
if ($.inArray('back:alarmtemp:synchronization', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if(!common.hasPermission('back:alarmtemp:synchronization')){
return;
}
syncAlarmTemplate();
});
//配置策略
$("#alarmtemplate_configpolicy").on("click", function () {
if ($.inArray('back:alarmtemp:tactics', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if(!common.hasPermission('back:alarmtemp:tactics')){
return;
}
var tempData = table.checkStatus('alarmtemplateTable').data;
... ... @@ -174,9 +171,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
}
//配置资源
$("#alarmtemplate_configres").on("click", function () {
if ($.inArray('back:alarmtemp:resource', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
$("#alarmtemplate_configres").unbind("click").on("click", function () {
if(!common.hasPermission('back:alarmtemp:resource')){
return;
}
var tempIds = [];
... ... @@ -309,8 +305,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
done: function () {
//点击名称编辑
$(".view-alarmtemplate-name").on("click", function () {
if ($.inArray('back:alarmtemp:update', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if(!common.hasPermission('back:alarmtemp:update')){
return;
}
openAlarmTemplateForm($(this).data("id"));
... ... @@ -570,13 +565,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
layer.confirm('您确定要删除绑定的该资源吗？', {
btn: ['确定', '取消'] //按钮
}, function () {
$.ajax({
url: common.domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds?access_token=' + accessToken
, data: {
admin.req({
url: common.domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds?access_token=' + accessToken,
async: false,
data: {
resIds: id,
tempIds: alarmTempId.toString()
}
}).done(function (res) {
},
}).done(function (response) {
layer.msg('删除成功', {
offset: '15px'
, icon: 1
... ... @@ -585,9 +581,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
layer.closeAll();
reloadalarmtemplateTable()
});
}).error(function (error) {
console.log(error);
});
// $.ajax({
// url: common.domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds?access_token=' + accessToken
// , data: {
// resIds: id,
// tempIds: alarmTempId.toString()
// }
// }).done(function (res) {
// layer.msg('删除成功', {
// offset: '15px'
// , icon: 1
// , time: 2000
// }, function () {
// layer.closeAll();
// reloadalarmtemplateTable()
// });
// }).error(function (error) {
// console.log(error);
// });
});
}
... ... @@ -652,8 +664,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
//删除拓扑数据
function deletealarmtemplate(id) {
if ($.inArray('back:alarmtemp:delete', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if(!common.hasPermission('back:alarmtemp:delete')){
return;
}
if (typeof (id) != "string") {
... ...
... ... @@ -2758,15 +2758,11 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
}
});
if ($('.layui-show').find(".detail-left-panel").length == 0) {
var leftUrl = common.domainName + '/api-web/detail/findRelationGroupByResId'
$.ajax({
var leftUrl = common.domainName + '/api-web/detail/findRelationGroupByResId';
admin.req({
url: leftUrl,
type: 'get',
headers: {
"Authorization": "Bearer " + obj.sessions.getToken().access_token + ""
},
data: {resId: resId},
success: function (res) {
success(res) {
if (!res || !res.success) {
layer.msg('获取关联信息失败!', {icon: 0});
res.map = {};
... ... @@ -2857,8 +2853,111 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
obj.openDetail(resId, resType, title, false, null, null, 'newTabPage');
});
}, 0)
},
error() {
}
})
});
// $.ajax({
// url: leftUrl,
// type: 'get',
// headers: {
// "Authorization": "Bearer " + obj.sessions.getToken().access_token + ""
// },
// data: {resId: resId},
// success: function (res) {
// if (!res || !res.success) {
// layer.msg('获取关联信息失败!', {icon: 0});
// res.map = {};
// }
// setTimeout(function () {
// // var height = $("#" + tableId).parent().parent().parent().parent().parent().height() - 10;
// var height = $('.layui-layer-page').find('.layui-layer-content').height();
// if (!height || height === 0) {
// height = window.innerHeight
// }
// if ($('.layui-layer-page').find('.layui-tab-title').length > 0) {
// height = height - 70;
// } else {
// height = height - 15;
// }
// $("#" + tableId).parent().parent().parent().parent().before(laytpl($("#detailPageLeftPanel").html()).render(res))
// $(".detail-left-panel").css({height: height + "px"})
// $(".detail-left-panel").find(".detail-left-panel-btn").unbind("click").on("click", function () {
// var $that = $(this);
// if ($(".detail-left-panel").width() == 0) {
// $that.find("i.layui-icon").removeClass("layui-icon-next").addClass("layui-icon-prev")
// $(".detail-left-panel").animate({width: 270, marginLeft: 0}, 300);
// $(".detail-left-panel").find(".detail-left-panel-node").show();
// } else {
// $that.find("i.layui-icon").removeClass("layui-icon-prev").addClass("layui-icon-next")
// $(".detail-left-panel").animate({width: 0, marginLeft: 10}, 300);
// $(".detail-left-panel").find(".detail-left-panel-node").hide();
// }
// });
// $('div.info-box').unbind('click').bind('click', function () {
// var name = $(this).text();
// var resId = $(this).data("resid");
// var resType = '';
// var ip = $(this).data("ip");
// var resTypeName = $(this).data("restypename");
// var admin = $(this).data("admin");
// var adminName = '';
// var manageIp = '';
// var collProtocol = '';
// $.ajax({
// url: common.domainName + "/api-web/home/resource/findById?resId=" + resId,
// async: false,
// type: 'get',
// headers: {
// "Authorization": "Bearer " + obj.sessions.getToken().access_token + ""
// },
// error: function () {
// layer.closeAll('loading');
// },
// success: function (res) {
// var data = res.object;
// resType = data.resType;
// adminName = data.adminName;
// manageIp = data.manageIp;
// collProtocol = data.collProtocol;
// }
// })
// var title = name;
// if (title && title !== '') {
// title += '|';
// }
// if (resTypeName && resType !== 'HOST_X86SERVER') {
// title += resTypeName + '|';
// }
// if (ip) {
// if (resType === 'HOST_X86SERVER') {
// if (collProtocol && (collProtocol.split(",").length > 1 || collProtocol === 'SSH')) {
// title += '应用IP-' + ip + '|';
// }
// } else {
// title += ip + '|';
// }
// }
// if (resType === 'HOST_X86SERVER' && collProtocol && collProtocol.indexOf('SNMP') !== -1) {
// if (manageIp) {
// title += '管理IP-' + manageIp + '|';
// }
// }
// if (adminName) {
// title += adminName + '|';
// }
// if (title.length > 0) {
// title = title.substr(0, title.length - 1);
// }
// layer.closeAll('page');
// //资源关联关系时弹窗在新的标签页
// // obj.openDetail(resId, resType, name, false,null,null,'newTabPage');
// obj.openDetail(resId, resType, title, false, null, null, 'newTabPage');
// });
// }, 0)
// }
// })
}
},
... ... @@ -2996,7 +3095,6 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
});
cols.push({field: 'resRemark', title: '备注', align: 'center', sort: false});
console.log(JSON.stringify(cols))
var vhostTable = table.render(Object.assign({
elem: '#' + tableId
, url: common.domainName + '/api-web/home/res-list/' + resType + '?parentId=' + resId
... ... @@ -3376,14 +3474,14 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
"provider": res.provider,
"model": res.model
};
$.ajax({
admin.req({
url: common.domainName + "/api-web/favorites/checkResIsExist",
async: false,
data: {
resId: resId,
access_token: layui.sessions.getToken()['access_token']
},
success: function (response) {
}).done(function (response) {
layer.closeAll('loading');
//拼接提示信息
var li = '';
... ... @@ -3492,7 +3590,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
title += `<a class="layui-icon filterList" data-id=${resId} lay-tips="指标过滤清单" style="margin-left: 10px"><i class="iconfont">&#XE516;</i></a>`;
title += `<a class="layui-icon res-view-relation-topo" data-id=${resId} lay-tips="查看资源关系拓扑" style="margin-left: 10px"></a>`;
//lsq 2022-04-25 增加ping详情提交按钮
title += `<a class="layui-icon res-view-ping" data-id=${resId} data-resname=${resName} data-ip=${ip} data-restypename=${resTypeName} data-adminname=${adminName} lay-tips="历史数据" style="margin-left: 10px;position:relative;top:-3px;"> <img width="20" src="/src/style/img/ping.png" ></a>`;
title += `<a class="layui-icon res-view-ping" data-id=${resId} data-resname=${resName} data-ip=${ip} data-restypename=${resTypeName} data-adminname=${adminName} lay-tips="历史数据" style="margin-left: 10px;position:relative;top:-3px;"> <img width="20" src="/monitor-web/src/style/img/ping.png" ></a>`;
if (resCategory === 'share' && hardwareFlag.endsWith("Y")) {
/*
title += `<a class="layui-icon res-view-assets-details" data-ip=${ip} data-name=${name} data-restype=${resType} data-id=${resId} lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>`;
... ... @@ -3507,13 +3605,11 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
return;
}
//lsq 停机计划跑马灯 2022-08-19
title +=`<span id="title-shutdown" data-id=${resId} style="flex:1;padding:0 5px;margin-left:10px;background:url('/src/style/img/shutdown.png'); background-repeat: round;"></span>`
title += `<div style="width:60px;display:flex;justify-content: flex-end"><a class="layui-icon res-view-addSnapshot" data-id=${resId} lay-tips="创建快照" style=" margin:0 10px"> <img width="20" src="/src/style/img/snapshotadd.png" ></a>`;
title += `<a class="layui-icon res-view-history" data-id=${resId} data-resname=${res.resName} data-ip=${ip} data-restypename=${res.resTypeName} data-adminname=${res.adminName} lay-tips="快照历史记录" style=""> <img width="20" src="/src/style/img/snapshothistory.png" ></a></div>`;
title +=`<span id="title-shutdown" data-id=${resId} style="flex:1;padding:0 5px;margin-left:10px;background:url('/monitor-web/src/style/img/shutdown.png'); background-repeat: round;"></span>`
title += `<div style="width:60px;display:flex;justify-content: flex-end"><a class="layui-icon res-view-addSnapshot" data-id=${resId} lay-tips="创建快照" style=" margin:0 10px"> <img width="20" src="/monitor-web/src/style/img/snapshotadd.png" ></a>`;
title += `<a class="layui-icon res-view-history" data-id=${resId} data-resname=${res.resName} data-ip=${ip} data-restypename=${res.resTypeName} data-adminname=${res.adminName} lay-tips="快照历史记录" style=""> <img width="20" src="/monitor-web/src/style/img/snapshothistory.png" ></a></div>`;
obj.openNewWin(url, title, params, editFlag, fn, cancelfn, type, sign_);
},
error: function () {
}).error(function () {
layer.closeAll('loading');
title += '<i data-id=${resId} class="iconfont detail_base_info" style="margin-left: 10px" lay-tips="暂无信息">&#xe61e;</i>'
title += `<a class="layui-icon layui-icon-pause" id=${resId} data-opts="stop" style="display: none" lay-tips="暂停采集"></a>`
... ... @@ -3522,30 +3618,197 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
title += `<a class="layui-icon filterList" data-id=${resId} lay-tips="指标过滤清单" style="margin-left: 10px"><i class="iconfont">&#XE516;</i></a>`;
title += `<a class="layui-icon res-view-relation-topo" data-id=${resId} lay-tips="查看资源关系拓扑" style="margin-left: 10px"></a>`;
//lsq 2022-04-25 增加ping详情提交按钮
title += `<a class="layui-icon res-view-ping" data-id=${resId} data-resname=${res.resName} data-ip=${ip} data-restypename=${res.resTypeName} data-adminname=${res.adminName} lay-tips="历史数据" style="margin-left: 10px;position:relative;top:-3px;"> <img width="20" src="/src/style/img/ping.png" ></a>`;
title += `<div style="width:60px;display:flex;justify-content: flex-end"><a class="layui-icon res-view-addSnapshot" data-id=${resId} lay-tips="创建快照" style=" margin: 0 10px"> <img width="20" src="/src/style/img/snapshotadd.png" ></a>`;
title += `<a class="layui-icon res-view-history" data-id=${resId} data-resname=${res.resName} data-ip=${ip} data-restypename=${res.resTypeName} data-adminname=${res.adminName} lay-tips="快照历史记录" style=""> <img width="20" src="/src/style/img/snapshothistory.png" ></a></div>`;
title += `<a class="layui-icon res-view-ping" data-id=${resId} data-resname=${res.resName} data-ip=${ip} data-restypename=${res.resTypeName} data-adminname=${res.adminName} lay-tips="历史数据" style="margin-left: 10px;position:relative;top:-3px;"> <img width="20" src="/monitor-web/src/style/img/ping.png" ></a>`;
title += `<div style="width:60px;display:flex;justify-content: flex-end"><a class="layui-icon res-view-addSnapshot" data-id=${resId} lay-tips="创建快照" style=" margin: 0 10px"> <img width="20" src="/monitor-web/src/style/img/snapshotadd.png" ></a>`;
title += `<a class="layui-icon res-view-history" data-id=${resId} data-resname=${res.resName} data-ip=${ip} data-restypename=${res.resTypeName} data-adminname=${res.adminName} lay-tips="快照历史记录" style=""> <img width="20" src="/monitor-web/src/style/img/snapshothistory.png" ></a></div>`;
if (resCategory === 'share' && hardwareFlag.endsWith("Y")) {
/*
title += `<a class="layui-icon res-view-assets-details" data-ip=${ip} data-name=${name} data-restype=${resType} data-id=${resId} lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>`;
*/
}
obj.openNewWin(url, title, params, editFlag, fn, cancelfn, type);
}
});
// $.ajax({
// url: common.domainName + "/api-web/favorites/checkResIsExist",
// async: false,
// data: {
// resId: resId,
// access_token: layui.sessions.getToken()['access_token']
// },
// success: function (response) {
// layer.closeAll('loading');
// //拼接提示信息
// var li = '';
// var html = '';
// admin.req({
// url: common.domainName + '/api-web/manage/resource/getTab?access_token=' + layui.sessions.getToken().access_token + '&resId=' + resId
// , async: false
// , done: function (res) {
// if (res.success) {
// if (res.map) {
// if (res.map.ip) {
// li += ' <li><span style="text-align:left;width:40%">IP地址</span>' +
// '<span title="' + res.map.ip + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
// + res.map.ip + '</span></li>'
// }
// if (res.map.resTypeName) {
// li += ' <li><span style="text-align:left;width:40%">资源类型</span>' +
// '<span title="' + res.map.resTypeName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
// + res.map.resTypeName + '</span></li>'
// }
// if (res.map.businessName) {
// li += ' <li><span style="text-align:left;width:30%">所属业务</span>' +
// '<span title="' + res.map.businessName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
// + res.map.businessName + '</span></li>'
// }
// if (res.map.taskName) {
// li += ' <li><span style="text-align:left;width:40%">所属任务</span>' +
// '<span title="' + res.map.taskName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
// + res.map.taskName + '</span></li>'
// }
// if (res.map.collectorName) {
// li += ' <li><span style="text-align:left;width:40%">所属采集器</span>' +
// '<span title="' + res.map.collectorName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
// + res.map.collectorName + '</span></li>'
// }
// if (res.map.domainName) {
// li += ' <li><span style="text-align:left;width:40%">所属域</span>' +
// '<span title="' + res.map.domainName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
// + res.map.domainName + '</span></li>'
// }
// if (res.map.extendCol3) {
// li += ' <li><span style="text-align:left;width:40%">所属平台</span>' +
// '<span title="' + res.map.extendCol3 + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
// + res.map.extendCol3 + '</span></li>'
// }
// if (res.map.colonyName) {
// li += ' <li><span style="text-align:left;width:40%">所属资源池</span>' +
// '<span title="' + res.map.colonyName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
// + res.map.colonyName + '</span></li>'
// }
// if (res.map.resNameHost) {
// li += ' <li><span style="text-align:left;width:40%">所属宿主机</span>' +
// '<span title="' + res.map.resNameHost + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
// + res.map.resNameHost + '</span></li>'
// }
// if (res.map.os) {
// li += ' <li><span style="text-align:left;width:40%">操作系统</span>' +
// '<span title="' + res.map.os + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
// + res.map.os + '</span></li>'
// }
// if (res.map.provider) {
// li += ' <li><span style="text-align:left;width:40%">厂商</span>' +
// '<span title="' + res.map.provider + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
// + res.map.provider + '</span></li>'
// }
// if (res.map.model) {
// li += ' <li><span style="text-align:left;width:40%">型号</span>' +
// '<span title="' + res.map.extendCol3 + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
// + res.map.model + '</span></li>'
// }
// if (res.map.resPositon) {
// li += ' <li><span style="text-align:left;width:40%">所属机房</span>' +
// '<span title="' + res.map.resPositon + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
// + res.map.resPositon + '</span></li>'
// }
// if (resId) {
// li += ' <li><span style="text-align:left;width:40%">资源ID</span>' +
// '<span title="' + resId + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
// + resId + '</span></li>'
// }
// }
// }
// }
// });
// var uuid = generateUUID();
// //start lsq 资源名称、资源类型名称、责任人字段值传递 2022-04-25
// var resName = res.resName;
// var resTypeName = res.resTypeName;
// var adminName = res.adminName;
// //end lsq 2022-04-25
//
// if (li != '') {
// html = `<ul class="info-table hide" id="${uuid}">` + li + `</ul>`
// }
// if (html != '') {
// title += `<i class='iconfont detail_base_info' style='margin-left: 10px' data-id='${uuid}' data-direction="3" >&#xe61e;${html}</i>`
// }
// title += `<a class="layui-icon layui-icon-pause" id=${resId} data-opts="stop" style="display: none" lay-tips="暂停采集"></a>`
// title += `<a class="layui-icon layui-icon-play" id=${resId} data-opts="start" style="display: none" lay-tips="恢复采集"></a>`
// if (response && response.success && response.count > 0) {
// var favIds = response.map.favIds;
// title += `<a class="layui-icon layui-icon-rate-solid" data-id=${resId} data-favids="${favIds}" lay-tips="移出/修改收藏夹"></a>`;
// } else {
// title += `<a class="layui-icon layui-icon-rate" data-id=${resId} lay-tips="加入收藏夹"></a>`;
// }
// title += `<a class="layui-icon filterList" data-id=${resId} lay-tips="指标过滤清单" style="margin-left: 10px"><i class="iconfont">&#XE516;</i></a>`;
// title += `<a class="layui-icon res-view-relation-topo" data-id=${resId} lay-tips="查看资源关系拓扑" style="margin-left: 10px"></a>`;
// //lsq 2022-04-25 增加ping详情提交按钮
// title += `<a class="layui-icon res-view-ping" data-id=${resId} data-resname=${resName} data-ip=${ip} data-restypename=${resTypeName} data-adminname=${adminName} lay-tips="历史数据" style="margin-left: 10px;position:relative;top:-3px;"> <img width="20" src="/src/style/img/ping.png" ></a>`;
// if (resCategory === 'share' && hardwareFlag.endsWith("Y")) {
// /*
// title += `<a class="layui-icon res-view-assets-details" data-ip=${ip} data-name=${name} data-restype=${resType} data-id=${resId} lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>`;
// */
// }
// if (res.state == 'new' && hardwareFlag.endsWith("N")) {
// layer.alert('资源未监控!', {icon: 0});
// return;
// }
// if (res.resType == 'STORAGE_SHARE' && res.provider != 'HUAWEI' && res.provider != 'Inspur'&& res.provider != 'macrosan') {
// layer.alert('该资源只对接TRAP告警信息!', {icon: 0});
// return;
// }
// //lsq 停机计划跑马灯 2022-08-19
// title +=`<span id="title-shutdown" data-id=${resId} style="flex:1;padding:0 5px;margin-left:10px;background:url('/src/style/img/shutdown.png'); background-repeat: round;"></span>`
// title += `<div style="width:60px;display:flex;justify-content: flex-end"><a class="layui-icon res-view-addSnapshot" data-id=${resId} lay-tips="创建快照" style=" margin:0 10px"> <img width="20" src="/src/style/img/snapshotadd.png" ></a>`;
// title += `<a class="layui-icon res-view-history" data-id=${resId} data-resname=${res.resName} data-ip=${ip} data-restypename=${res.resTypeName} data-adminname=${res.adminName} lay-tips="快照历史记录" style=""> <img width="20" src="/src/style/img/snapshothistory.png" ></a></div>`;
//
// obj.openNewWin(url, title, params, editFlag, fn, cancelfn, type, sign_);
// },
// error: function () {
// layer.closeAll('loading');
// title += '<i data-id=${resId} class="iconfont detail_base_info" style="margin-left: 10px" lay-tips="暂无信息">&#xe61e;</i>'
// title += `<a class="layui-icon layui-icon-pause" id=${resId} data-opts="stop" style="display: none" lay-tips="暂停采集"></a>`
// title += `<a class="layui-icon layui-icon-play" id=${resId} data-opts="start" style="display: none" lay-tips="恢复采集"></a>`
// title += `<a class="layui-icon layui-icon-rate" data-id=${resId} lay-tips="加入收藏夹"></a>`;
// title += `<a class="layui-icon filterList" data-id=${resId} lay-tips="指标过滤清单" style="margin-left: 10px"><i class="iconfont">&#XE516;</i></a>`;
// title += `<a class="layui-icon res-view-relation-topo" data-id=${resId} lay-tips="查看资源关系拓扑" style="margin-left: 10px"></a>`;
// //lsq 2022-04-25 增加ping详情提交按钮
// title += `<a class="layui-icon res-view-ping" data-id=${resId} data-resname=${res.resName} data-ip=${ip} data-restypename=${res.resTypeName} data-adminname=${res.adminName} lay-tips="历史数据" style="margin-left: 10px;position:relative;top:-3px;"> <img width="20" src="/src/style/img/ping.png" ></a>`;
// title += `<div style="width:60px;display:flex;justify-content: flex-end"><a class="layui-icon res-view-addSnapshot" data-id=${resId} lay-tips="创建快照" style=" margin: 0 10px"> <img width="20" src="/src/style/img/snapshotadd.png" ></a>`;
// title += `<a class="layui-icon res-view-history" data-id=${resId} data-resname=${res.resName} data-ip=${ip} data-restypename=${res.resTypeName} data-adminname=${res.adminName} lay-tips="快照历史记录" style=""> <img width="20" src="/src/style/img/snapshothistory.png" ></a></div>`;
// if (resCategory === 'share' && hardwareFlag.endsWith("Y")) {
// /*
// title += `<a class="layui-icon res-view-assets-details" data-ip=${ip} data-name=${name} data-restype=${resType} data-id=${resId} lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>`;
// */
// }
// obj.openNewWin(url, title, params, editFlag, fn, cancelfn, type);
// }
// });
});
},
alarmData: new Object(),
loadResAlarm: function (resId) {
$.ajax({
type: 'get',
admin.req({
url: common.domainName + '/api-web/home/alarm/alarmListPage?page=1&limit=100&access_token=' + layui.sessions.getToken().access_token + "&resId=" + resId,
contentType: "application/json; charset=utf-8",
async: false,
success: function (res) {
data: {},
success(res) {
obj.alarmData = res.data;
},
error() {
//layer.closeAll('loading');
}
});
// $.ajax({
// type: 'get',
// url: common.domainName + '/api-web/home/alarm/alarmListPage?page=1&limit=100&access_token=' + layui.sessions.getToken().access_token + "&resId=" + resId,
// contentType: "application/json; charset=utf-8",
// async: false,
// success: function (res) {
// obj.alarmData = res.data;
// }
// });
},
alarmEleMatchStyle: function (flag, kpiId) {
var tempAlarms = obj.alarmData;
... ...
... ... @@ -147,10 +147,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe
//删除指标过滤
function delFilter(param) {
$.ajax({
url: common.domainName + '/api-web/filterkpi/kpi/remove?access_token=' + accessToken,
data: param,
success: function () {
admin.req({
url: common.domainName + '/api-web/filterkpi/kpi/remove'
,data: param,
}).done(function (res) {
layer.msg('删除成功', {
offset: '15px'
, icon: 1
... ... @@ -158,8 +158,23 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe
}, function () {
reloadTable();
});
}
})
}).error(function (error) {
console.log(error);
});
// $.ajax({
// url: common.domainName + '/api-web/filterkpi/kpi/remove?access_token=' + accessToken,
// data: param,
// success: function () {
// layer.msg('删除成功', {
// offset: '15px'
// , icon: 1
// , time: 1000
// }, function () {
// reloadTable();
// });
// }
// })
}
//删除指标压制
... ...
... ... @@ -89,7 +89,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laytpl',
layer.open({
title: '',
area: ['1690px', '450px'],
area: ['90%', '500px'],
type: 1,
content: laytpl($('#tpl-ip-segment-big-content').html()).render(domainList[domainIndex].ipSegmentList[segmentIndex]),
success: function () {
... ...
... ... @@ -118,7 +118,8 @@ layui.define(['laytpl', 'layer'], function (exports) {
// }
if(options.method == 'post' || options.method == 'POST' || options.type == 'post' || options.type == 'POST'){
if(options.method == 'post' || options.method == 'POST' || options.type == 'post' || options.type == 'POST'
|| options.type == 'delete' || options.method == 'delete' || options.type == 'DELETE' || options.method == 'DELETE'){
layui.use(['common'], function () {
var common = layui.common;
let tokenVal = common.getMjToken();
... ...