Authored by 王涛

Merge branch 'master-joke' into 'master'

feat:天津分支增加长城bmc页面及山石防火墙页面

feat:天津分支增加长城bmc页面及山石防火墙页面

See merge request !1087
... ... @@ -781,6 +781,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
BMCMap.set('HP_knifeBox', 'HOST_BMC_HP_KNIFEBOX');
BMCMap.set('HUAWEI_KNIFEBOX', 'HOST_BMC_HUAWEI_KNIFEBOX');
BMCMap.set('HUAWEI_BLADE', 'HOST_BMC_HUAWEI_BLADE');
BMCMap.set('GreatWall', 'HOST_BMC_GREATWALL');
//存放共享存储厂商和详情页关系的map
var shareMap = new Map();
... ... @@ -796,6 +797,8 @@ layui.define(['xmSelect', 'md5'], function (exports) {
resType = BMCMap.get('HUAWEI_KNIFEBOX');
} else if (bean.resCode && bean.resCode.indexOf('华为Blade__') && bean.parentId) {
resType = BMCMap.get('HUAWEI_BLADE');
} else if (bean.provider == 'GreatWall') {
resType = BMCMap.get('GreatWall');
} else {
if(BMCMap.get(bean.provider)){
resType = BMCMap.get(bean.provider)
... ...
// joke add 20230222 长城 bmc详情页
layui.define(['commonDetail','common', 'admin'], function (exports) {
var $ = layui.$;
var commonDetail = layui.commonDetail;
var common = layui.common;
var admin = layui.admin;
//对外暴露的接口
exports('host_bmc_greatwall', function (data) {
var resId = '';
var resType = '';
var os = '';
var showFlag = common.getUrlParam("show");
if(showFlag && showFlag == '0'){
resId = common.getUrlParam("resId");
resType = common.getUrlParam("resType");
os = common.getUrlParam("os");
}else{
resId = data.resId;
resType = data.resType;
os = data.os;
}
//基本信息
var jbxxKpi = "KPI64B810F6,KPI70AEFC6A,KPI12348B4B,KPI5858832B,KPI9F694F60,KPI820C0246,KPI4419E8A1,KPI79126156";
//风扇信息
var fankpi = "KPI3597AB6F,KPI28C9A37D,KPI54A686BD,KPIFB844B8B,KPI1A9360B6";
//内存信息
var memkpi = "KPI3597AB6F,KPICA2A9A1F,KPI1584BE1C,KPI8ED105CD,KPIFB844B8B,KPI4419E8A1";
//CPU信息
var cpukpi = "KPI3597AB6F,KPI6232CA8F,KPI237487B8,KPIB3DBF4F3,KPIBDB60856,KPICCC3188A,KPIFB844B8B,KPI15358CE3";
//磁盘信息
var diskkpi = "KPI3597AB6F,KPI29D42042,KPI4E700C08,KPI32A0A858,KPI4419E8A1,KPI9D22EAB6";
//逻辑磁盘信息
var logicDiskkpi = "KPI2ED5EAD6,KPICCC3188A,KPIFB844B8B,KPIC98EA1B0,KPI29D42042";
commonDetail.bindTips();
renderPageInfo();
//渲染页面
function renderPageInfo() {
//基本信息
commonDetail.renderText("host_bmc_greatwall_baseinfo",resId,jbxxKpi,null,null,null,"true");
//BMCCPU使用率走势(12小时)
commonDetail.renderLineCharat("host_bmc_greatwall_cpu_linechart", resId, "KPI24B752B5", "BMCCPU使用率", "cpu");
//BMC内存使用率走势(12小时)
commonDetail.renderLineCharat("host_bmc_greatwall_mem_linechart", resId, "KPI3F4822F1", "BMC内存使用率", "mem");
//风扇信息
commonDetail.renderTable("host_bmc_greatwall_faninfo",false,resId,fankpi,'风扇信息','fan-','KPI3597AB6F','ASC');
//内存信息
commonDetail.renderTable("host_bmc_greatwall_meminfo",false,resId,memkpi,'内存信息','mem-','KPI3597AB6F','ASC');
//CPU信息
commonDetail.renderTable("host_bmc_greatwall_cpuinfo",false,resId,cpukpi,'CPU信息','cpu-','KPI3597AB6F','ASC');
//磁盘信息
commonDetail.renderTable("host_bmc_greatwall_diskinfo",false,resId,diskkpi,'磁盘信息','bmcdisk-','KPI3597AB6F','ASC');
//逻辑磁盘信息
commonDetail.renderTable("host_bmc_greatwall_logic_diskinfo",false,resId,logicDiskkpi,'逻辑磁盘信息','raid-');
//活动告警
commonDetail.renderActiveAlarms("host_bmc_greatwall_active_alarm",resId);
}
//定时任务
var timer = setInterval(function () {
renderPageInfo()
},commonDetail.timerTime);
commonDetail.detailTimer.push(timer);
});
});
\ No newline at end of file
... ...
//netsafe_firewall_shanshi.js
layui.define(['laypage', 'commonDetail','common'], function (exports) {
var commonDetail = layui.commonDetail;
var common = layui.common;
//对外暴露的接口
exports('netsafe_firewall_shanshi', function (data) {
var resId = '';
var provider = '';
var showFlag = common.getUrlParam("show");
if(showFlag && showFlag == '0'){
resId = common.getUrlParam("resId");
provider = common.getUrlParam("provider");
}else{
resId = data.resId;
provider = data.provider;
}
commonDetail.bindTips();
//基本信息
var jbxxKpiId = 'KPIF74D9D2B,KPIE13DD9A3,KPIBB1082BE,KPI5858832B,KPI4419E8A1,KPI2D507904,KPI282685A0';
//接口信息kpiids
var interfaceinfoKpis = 'KPI49ACAAFD,KPI59BE184A,KPIF00B5E20,KPIA3A74798';
reload()
//渲染页面
function reload() {
//基本信息
commonDetail.renderText('netsafe_firewall_shanshi_jbxx',resId,jbxxKpiId,null,null,null,"true");
//当前会话连接数
commonDetail.renderLineCharat("netsafe_firewall_shanshi_link_linechart",resId,"KPID7FAD4DC","当前会话连接数",'currSessionNum');
//新建连接数
commonDetail.renderLineCharat("netsafe_firewall_shanshi_sec_linechart",resId,"KPI3CA9E956","新建连接数",'newSessionNum');
//CPU使用率性能曲线
commonDetail.renderLineCharat("netsafe_firewall_shanshi_cpu_linechart",resId,"KPI7054BC34","CPU使用率",'cpu');
//内存使用率性能曲线
commonDetail.renderLineCharat("netsafe_firewall_shanshi_mem_linechart",resId,"KPI31CB8D97","内存使用率",'mem');
//接口信息
commonDetail.renderTable("netsafe_firewall_shanshi_interface_info",false,resId,interfaceinfoKpis,'接口信息','interface','KPI49ACAAFD','ASC');
//活动告警
commonDetail.renderActiveAlarms("netsafe_firewall_shanshi_active_alram",resId);
}
//定时任务
var timer = setInterval(function () {
reload()
},commonDetail.timerTime);
commonDetail.detailTimer.push(timer);
});
});
\ No newline at end of file
... ...
<!--长城bmc详细页面 joke add 20230222-->
<article class="page-container template">
<div class="page-panel">
<div class="main">
<div class="layui-card template_detail_content">
<div class="layui-card-body">
<div class="lay-row">
<div class="lay-row-item lay-row-item--small">
<h5 class="lay-row-title">基本信息<i data-id="host_bmc_greatwall_baseinfo" class="iconfont detail_base_info">&#xe61e;</i></h5>
<ul class="info-table" id="host_bmc_greatwall_baseinfo"></ul>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">BMCCPU使用率走势</h5>
<div id="host_bmc_greatwall_cpu_linechart" class="detail_line_chart"></div>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">BMC内存使用率走势</h5>
<div id="host_bmc_greatwall_mem_linechart" class="detail_line_chart"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">风扇信息<span id="host_bmc_greatwall_faninfoDownload" class="layui-table-link" style="margin-left: 10px;">下载</span><span id="host_bmc_greatwall_faninfoMore" class="layui-table-link">更多</span></h5>
<div id="host_bmc_greatwall_faninfo"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">内存信息<span id="host_bmc_greatwall_meminfoDownload" class="layui-table-link" style="margin-left: 10px;">下载</span><span id="host_bmc_greatwall_meminfoMore" class="layui-table-link">更多</span></h5>
<div id="host_bmc_greatwall_meminfo"></div>
</div>
</div>
<div class="layui-row">
<div class="lay-row-item">
<h5 class="lay-row-title">CPU信息<span id="host_bmc_greatwall_cpuinfoDownload" class="layui-table-link" style="margin-left: 10px;">下载</span><span id="host_bmc_greatwall_cpuinfoMore" class="layui-table-link">更多</span></h5>
<div id="host_bmc_greatwall_cpuinfo"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">磁盘信息<span id="host_bmc_greatwall_diskinfoDownload" class="layui-table-link" style="margin-left: 10px;">下载</span><span id="host_bmc_greatwall_diskinfoMore" class="layui-table-link">更多</span></h5>
<div id="host_bmc_greatwall_diskinfo"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">逻辑磁盘<span id="host_bmc_greatwall_logic_diskinfoDownload" class="layui-table-link" style="margin-left: 10px;">下载</span><span id="host_bmc_greatwall_logic_diskinfoMore" class="layui-table-link">更多</span></h5>
<div id="host_bmc_greatwall_logic_diskinfo"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">实时告警动态</h5>
<div id="host_bmc_greatwall_active_alarm"></div>
</div>
</div>
</div>
</div>
</div>
</div>
</article>
<textarea id="host_bmc_greatwall_param_id" style="display: none;">{{d}}</textarea>
<script>
layui.use('host_bmc_greatwall', function (fn) {
var $ = layui.$;
var parm = $("#host_bmc_greatwall_param_id").val();
if(parm.indexOf('{{d') != -1){
fn();
}else{
fn(JSON.parse(parm));
}
});
</script>
\ No newline at end of file
... ...
<!--netsafe_firewall_shanshi详细页面 山石-->
<article class="page-container template">
<div class="page-panel">
<div class="main">
<div class="layui-card">
<div class="layui-card-body">
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">基本信息<i data-id="netsafe_firewall_shanshi_jbxx" class="iconfont detail_base_info">&#xe61e;</i></h5>
<ul class="info-table" id="netsafe_firewall_shanshi_jbxx"></ul>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">当前会话连接数</h5>
<div id="netsafe_firewall_shanshi_link_linechart" class="detail_line_chart"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">新建连接数</h5>
<div id="netsafe_firewall_shanshi_sec_linechart" class="detail_line_chart"></div>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">CPU使用率</h5>
<div id="netsafe_firewall_shanshi_cpu_linechart" class="detail_line_chart"></div>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">内存使用率</h5>
<div id="netsafe_firewall_shanshi_mem_linechart" class="detail_line_chart"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">接口信息<span id="netsafe_firewall_shanshi_interface_infoDownload" class="layui-table-link" style="margin-left: 10px;">下载</span><span id="netsafe_firewall_shanshi_interface_infoMore" class="layui-table-link">更多</span></h5>
<div id="netsafe_firewall_shanshi_interface_info"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">实时告警动态</h5>
<div id="netsafe_firewall_shanshi_active_alram"></div>
</div>
</div>
</div>
</div>
</div>
</div>
</article>
<textarea id="netsafe_firewall_shanshi_param_id" style="display: none;">{{d}}</textarea>
<script>
layui.use('netsafe_firewall_shanshi', function (fn) {
var $ = layui.$;
var parm = $("#netsafe_firewall_shanshi_param_id").val();
if(parm.indexOf('{{d') != -1){
fn();
}else{
fn(JSON.parse(parm));
}
});
</script>
\ No newline at end of file
... ...