monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by ww
Commit 408d74f273bb732d3943bdd0454fa650bc17f95f 1 parent 6ea5ae50

fix: 【任务2693】 【资源管理】屏蔽控制台功能，查看详情跳转新的页面

Inline Side-by-side
Showing 1 changed file with 46 additions and 41 deletions
... ... @@ -889,9 +889,9 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
if ((d.resType !== 'MIDDLEWARE_WEBLOGIC') || (d.resType === 'MIDDLEWARE_WEBLOGIC' && d.parentId && d.parentId !== '')) {
htm += '<a resmanage-data-opendetail="' + d.resId + '" data-ip="' + d.ip + '" data-restype="' + d.resType + '" data-restypename="' + d.resTypeName + '" data-admin="' + d.admin + '" data-name="' + d.resName + '" data-adminname="' + d.adminName + '" data-manageip="' + d.manageIp + '" data-collprotocol="' + d.collProtocol + '" data-provider="' + d.provider + '" class="layui-btn layui-btn-xs layui-btn-normal" lay-tips="查看详情">查看详情</a>';
}
if (d.resType && d.resType.indexOf("HOST") > -1) {
htm += '<a class="layui-btn layui-btn-xs layui-btn-normal" lay-tips="CONSOLE" resmanage-data-console="' + d.resId + '">控制台</a>'
}
// if (d.resType && d.resType.indexOf("HOST") > -1) {
// htm += '<a class="layui-btn layui-btn-xs layui-btn-normal" lay-tips="CONSOLE" resmanage-data-console="' + d.resId + '">控制台</a>'
// }
if (loginName === 'admin') {
htm += '<a resmanage-data-delete-plus="' + d.resId + '" class="layui-btn layui-btn-xs layui-btn-normal" lay-tips="强制删除">强制删除</a>'
}
... ... @@ -1186,44 +1186,49 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
// $(this).parents('tr').eq(0).addClass("tbody-tr-background-color");
var resId = $(this).attr("resmanage-data-openDetail");
var resType = $(this).data("restype");
var name = $(this).data("name");
var ip = $(this).data("ip");
var resTypeName = $(this).data("restypename");
var admin = $(this).data("admin");
var adminName = $(this).data("adminname");
var manageIp = $(this).data("manageip");
var collProtocol = $(this).data("collprotocol");
var provider = $(this).data("provider");
if (name && name != '') {
name += ' | ';
}
if (resTypeName && resType !== 'HOST_X86SERVER') {
name += resTypeName + '|';
}
if (ip) {
if (resType === 'HOST_X86SERVER') {
if (collProtocol && (collProtocol.split(",").length > 1 || collProtocol === 'SSH')) {
name += '应用IP-' + ip + '|';
}
} else {
name += ip + '|';
}
}
if (resType === 'HOST_X86SERVER' && collProtocol && collProtocol.indexOf('SNMP') !== -1) {
if (manageIp) {
name += '管理IP-' + manageIp + '|';
}
}
if (adminName) {
name += adminName + ' | ';
}
if (name.length > 0) {
name = name.substr(0, name.length - 1);
}
if (resType == 'STORAGE_SHARE' && provider != 'HUAWEI' && provider != 'Inspur' && provider != 'macrosan') {
return false;
}
commonDetail.openDetail(resId, resType, name)
// var name = $(this).data("name");
// var ip = $(this).data("ip");
// var resTypeName = $(this).data("restypename");
// var admin = $(this).data("admin");
// var adminName = $(this).data("adminname");
// var manageIp = $(this).data("manageip");
// var collProtocol = $(this).data("collprotocol");
// var provider = $(this).data("provider");
// if (name && name != '') {
// name += ' | ';
// }
// if (resTypeName && resType !== 'HOST_X86SERVER') {
// name += resTypeName + '|';
// }
// if (ip) {
// if (resType === 'HOST_X86SERVER') {
// if (collProtocol && (collProtocol.split(",").length > 1 || collProtocol === 'SSH')) {
// name += '应用IP-' + ip + '|';
// }
// } else {
// name += ip + '|';
// }
// }
// if (resType === 'HOST_X86SERVER' && collProtocol && collProtocol.indexOf('SNMP') !== -1) {
// if (manageIp) {
// name += '管理IP-' + manageIp + '|';
// }
// }
// if (adminName) {
// name += adminName + ' | ';
// }
// if (name.length > 0) {
// name = name.substr(0, name.length - 1);
// }
// if (resType == 'STORAGE_SHARE' && provider != 'HUAWEI' && provider != 'Inspur' && provider != 'macrosan') {
// return false;
// }
// commonDetail.openDetail(resId, resType, name)
window.top.postMessage({
type: 'resDetail',
message: {'params':{'resId':resId,'resType':resType}}
}, '*')
});
resTopo();
//lsq T3和IOP点击修改删除 2022-08-04
... ...