Merge branch 'master-joke' into 'master'
feat:天津分支增加长城bmc页面及山石防火墙页面 feat:天津分支增加长城bmc页面及山石防火墙页面 See merge request !1087
Showing
5 changed files
with
253 additions
and
0 deletions
@@ -781,6 +781,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { | @@ -781,6 +781,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { | ||
781 | BMCMap.set('HP_knifeBox', 'HOST_BMC_HP_KNIFEBOX'); | 781 | BMCMap.set('HP_knifeBox', 'HOST_BMC_HP_KNIFEBOX'); |
782 | BMCMap.set('HUAWEI_KNIFEBOX', 'HOST_BMC_HUAWEI_KNIFEBOX'); | 782 | BMCMap.set('HUAWEI_KNIFEBOX', 'HOST_BMC_HUAWEI_KNIFEBOX'); |
783 | BMCMap.set('HUAWEI_BLADE', 'HOST_BMC_HUAWEI_BLADE'); | 783 | BMCMap.set('HUAWEI_BLADE', 'HOST_BMC_HUAWEI_BLADE'); |
784 | + BMCMap.set('GreatWall', 'HOST_BMC_GREATWALL'); | ||
784 | 785 | ||
785 | //存放共享存储厂商和详情页关系的map | 786 | //存放共享存储厂商和详情页关系的map |
786 | var shareMap = new Map(); | 787 | var shareMap = new Map(); |
@@ -796,6 +797,8 @@ layui.define(['xmSelect', 'md5'], function (exports) { | @@ -796,6 +797,8 @@ layui.define(['xmSelect', 'md5'], function (exports) { | ||
796 | resType = BMCMap.get('HUAWEI_KNIFEBOX'); | 797 | resType = BMCMap.get('HUAWEI_KNIFEBOX'); |
797 | } else if (bean.resCode && bean.resCode.indexOf('华为Blade__') && bean.parentId) { | 798 | } else if (bean.resCode && bean.resCode.indexOf('华为Blade__') && bean.parentId) { |
798 | resType = BMCMap.get('HUAWEI_BLADE'); | 799 | resType = BMCMap.get('HUAWEI_BLADE'); |
800 | + } else if (bean.provider == 'GreatWall') { | ||
801 | + resType = BMCMap.get('GreatWall'); | ||
799 | } else { | 802 | } else { |
800 | if(BMCMap.get(bean.provider)){ | 803 | if(BMCMap.get(bean.provider)){ |
801 | resType = BMCMap.get(bean.provider) | 804 | resType = BMCMap.get(bean.provider) |
1 | +// joke add 20230222 长城 bmc详情页 | ||
2 | +layui.define(['commonDetail','common', 'admin'], function (exports) { | ||
3 | + var $ = layui.$; | ||
4 | + var commonDetail = layui.commonDetail; | ||
5 | + var common = layui.common; | ||
6 | + var admin = layui.admin; | ||
7 | + //对外暴露的接口 | ||
8 | + exports('host_bmc_greatwall', function (data) { | ||
9 | + var resId = ''; | ||
10 | + var resType = ''; | ||
11 | + var os = ''; | ||
12 | + var showFlag = common.getUrlParam("show"); | ||
13 | + if(showFlag && showFlag == '0'){ | ||
14 | + resId = common.getUrlParam("resId"); | ||
15 | + resType = common.getUrlParam("resType"); | ||
16 | + os = common.getUrlParam("os"); | ||
17 | + }else{ | ||
18 | + resId = data.resId; | ||
19 | + resType = data.resType; | ||
20 | + os = data.os; | ||
21 | + } | ||
22 | + | ||
23 | + //基本信息 | ||
24 | + var jbxxKpi = "KPI64B810F6,KPI70AEFC6A,KPI12348B4B,KPI5858832B,KPI9F694F60,KPI820C0246,KPI4419E8A1,KPI79126156"; | ||
25 | + //风扇信息 | ||
26 | + var fankpi = "KPI3597AB6F,KPI28C9A37D,KPI54A686BD,KPIFB844B8B,KPI1A9360B6"; | ||
27 | + //内存信息 | ||
28 | + var memkpi = "KPI3597AB6F,KPICA2A9A1F,KPI1584BE1C,KPI8ED105CD,KPIFB844B8B,KPI4419E8A1"; | ||
29 | + //CPU信息 | ||
30 | + var cpukpi = "KPI3597AB6F,KPI6232CA8F,KPI237487B8,KPIB3DBF4F3,KPIBDB60856,KPICCC3188A,KPIFB844B8B,KPI15358CE3"; | ||
31 | + //磁盘信息 | ||
32 | + var diskkpi = "KPI3597AB6F,KPI29D42042,KPI4E700C08,KPI32A0A858,KPI4419E8A1,KPI9D22EAB6"; | ||
33 | + //逻辑磁盘信息 | ||
34 | + var logicDiskkpi = "KPI2ED5EAD6,KPICCC3188A,KPIFB844B8B,KPIC98EA1B0,KPI29D42042"; | ||
35 | + | ||
36 | + commonDetail.bindTips(); | ||
37 | + | ||
38 | + renderPageInfo(); | ||
39 | + | ||
40 | + //渲染页面 | ||
41 | + function renderPageInfo() { | ||
42 | + //基本信息 | ||
43 | + commonDetail.renderText("host_bmc_greatwall_baseinfo",resId,jbxxKpi,null,null,null,"true"); | ||
44 | + //BMCCPU使用率走势(12小时) | ||
45 | + commonDetail.renderLineCharat("host_bmc_greatwall_cpu_linechart", resId, "KPI24B752B5", "BMCCPU使用率", "cpu"); | ||
46 | + //BMC内存使用率走势(12小时) | ||
47 | + commonDetail.renderLineCharat("host_bmc_greatwall_mem_linechart", resId, "KPI3F4822F1", "BMC内存使用率", "mem"); | ||
48 | + //风扇信息 | ||
49 | + commonDetail.renderTable("host_bmc_greatwall_faninfo",false,resId,fankpi,'风扇信息','fan-','KPI3597AB6F','ASC'); | ||
50 | + //内存信息 | ||
51 | + commonDetail.renderTable("host_bmc_greatwall_meminfo",false,resId,memkpi,'内存信息','mem-','KPI3597AB6F','ASC'); | ||
52 | + //CPU信息 | ||
53 | + commonDetail.renderTable("host_bmc_greatwall_cpuinfo",false,resId,cpukpi,'CPU信息','cpu-','KPI3597AB6F','ASC'); | ||
54 | + //磁盘信息 | ||
55 | + commonDetail.renderTable("host_bmc_greatwall_diskinfo",false,resId,diskkpi,'磁盘信息','bmcdisk-','KPI3597AB6F','ASC'); | ||
56 | + //逻辑磁盘信息 | ||
57 | + commonDetail.renderTable("host_bmc_greatwall_logic_diskinfo",false,resId,logicDiskkpi,'逻辑磁盘信息','raid-'); | ||
58 | + //活动告警 | ||
59 | + commonDetail.renderActiveAlarms("host_bmc_greatwall_active_alarm",resId); | ||
60 | + } | ||
61 | + | ||
62 | + //定时任务 | ||
63 | + var timer = setInterval(function () { | ||
64 | + renderPageInfo() | ||
65 | + },commonDetail.timerTime); | ||
66 | + commonDetail.detailTimer.push(timer); | ||
67 | + }); | ||
68 | +}); |
1 | +//netsafe_firewall_shanshi.js | ||
2 | +layui.define(['laypage', 'commonDetail','common'], function (exports) { | ||
3 | + var commonDetail = layui.commonDetail; | ||
4 | + var common = layui.common; | ||
5 | + //对外暴露的接口 | ||
6 | + exports('netsafe_firewall_shanshi', function (data) { | ||
7 | + var resId = ''; | ||
8 | + var provider = ''; | ||
9 | + var showFlag = common.getUrlParam("show"); | ||
10 | + if(showFlag && showFlag == '0'){ | ||
11 | + resId = common.getUrlParam("resId"); | ||
12 | + provider = common.getUrlParam("provider"); | ||
13 | + }else{ | ||
14 | + resId = data.resId; | ||
15 | + provider = data.provider; | ||
16 | + } | ||
17 | + commonDetail.bindTips(); | ||
18 | + | ||
19 | + //基本信息 | ||
20 | + var jbxxKpiId = 'KPIF74D9D2B,KPIE13DD9A3,KPIBB1082BE,KPI5858832B,KPI4419E8A1,KPI2D507904,KPI282685A0'; | ||
21 | + //接口信息kpiids | ||
22 | + var interfaceinfoKpis = 'KPI49ACAAFD,KPI59BE184A,KPIF00B5E20,KPIA3A74798'; | ||
23 | + | ||
24 | + reload() | ||
25 | + | ||
26 | + //渲染页面 | ||
27 | + function reload() { | ||
28 | + //基本信息 | ||
29 | + commonDetail.renderText('netsafe_firewall_shanshi_jbxx',resId,jbxxKpiId,null,null,null,"true"); | ||
30 | + //当前会话连接数 | ||
31 | + commonDetail.renderLineCharat("netsafe_firewall_shanshi_link_linechart",resId,"KPID7FAD4DC","当前会话连接数",'currSessionNum'); | ||
32 | + //新建连接数 | ||
33 | + commonDetail.renderLineCharat("netsafe_firewall_shanshi_sec_linechart",resId,"KPI3CA9E956","新建连接数",'newSessionNum'); | ||
34 | + //CPU使用率性能曲线 | ||
35 | + commonDetail.renderLineCharat("netsafe_firewall_shanshi_cpu_linechart",resId,"KPI7054BC34","CPU使用率",'cpu'); | ||
36 | + //内存使用率性能曲线 | ||
37 | + commonDetail.renderLineCharat("netsafe_firewall_shanshi_mem_linechart",resId,"KPI31CB8D97","内存使用率",'mem'); | ||
38 | + //接口信息 | ||
39 | + commonDetail.renderTable("netsafe_firewall_shanshi_interface_info",false,resId,interfaceinfoKpis,'接口信息','interface','KPI49ACAAFD','ASC'); | ||
40 | + //活动告警 | ||
41 | + commonDetail.renderActiveAlarms("netsafe_firewall_shanshi_active_alram",resId); | ||
42 | + } | ||
43 | + | ||
44 | + //定时任务 | ||
45 | + var timer = setInterval(function () { | ||
46 | + reload() | ||
47 | + },commonDetail.timerTime); | ||
48 | + commonDetail.detailTimer.push(timer); | ||
49 | + }); | ||
50 | +}); |
hg-monitor-web-base/src/main/resources/static/src/views/template/detail/host_bmc_greatwall.html
0 → 100644
1 | +<!--长城bmc详细页面 joke add 20230222--> | ||
2 | +<article class="page-container template"> | ||
3 | + <div class="page-panel"> | ||
4 | + <div class="main"> | ||
5 | + <div class="layui-card template_detail_content"> | ||
6 | + <div class="layui-card-body"> | ||
7 | + <div class="lay-row"> | ||
8 | + <div class="lay-row-item lay-row-item--small"> | ||
9 | + <h5 class="lay-row-title">基本信息<i data-id="host_bmc_greatwall_baseinfo" class="iconfont detail_base_info"></i></h5> | ||
10 | + <ul class="info-table" id="host_bmc_greatwall_baseinfo"></ul> | ||
11 | + </div> | ||
12 | + <div class="lay-row-item"> | ||
13 | + <h5 class="lay-row-title">BMCCPU使用率走势</h5> | ||
14 | + <div id="host_bmc_greatwall_cpu_linechart" class="detail_line_chart"></div> | ||
15 | + </div> | ||
16 | + <div class="lay-row-item"> | ||
17 | + <h5 class="lay-row-title">BMC内存使用率走势</h5> | ||
18 | + <div id="host_bmc_greatwall_mem_linechart" class="detail_line_chart"></div> | ||
19 | + </div> | ||
20 | + </div> | ||
21 | + <div class="lay-row"> | ||
22 | + <div class="lay-row-item"> | ||
23 | + <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> | ||
24 | + <div id="host_bmc_greatwall_faninfo"></div> | ||
25 | + </div> | ||
26 | + </div> | ||
27 | + <div class="lay-row"> | ||
28 | + <div class="lay-row-item"> | ||
29 | + <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> | ||
30 | + <div id="host_bmc_greatwall_meminfo"></div> | ||
31 | + </div> | ||
32 | + </div> | ||
33 | + <div class="layui-row"> | ||
34 | + <div class="lay-row-item"> | ||
35 | + <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> | ||
36 | + <div id="host_bmc_greatwall_cpuinfo"></div> | ||
37 | + </div> | ||
38 | + </div> | ||
39 | + <div class="lay-row"> | ||
40 | + <div class="lay-row-item"> | ||
41 | + <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> | ||
42 | + <div id="host_bmc_greatwall_diskinfo"></div> | ||
43 | + </div> | ||
44 | + </div> | ||
45 | + <div class="lay-row"> | ||
46 | + <div class="lay-row-item"> | ||
47 | + <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> | ||
48 | + <div id="host_bmc_greatwall_logic_diskinfo"></div> | ||
49 | + </div> | ||
50 | + </div> | ||
51 | + <div class="lay-row"> | ||
52 | + <div class="lay-row-item"> | ||
53 | + <h5 class="lay-row-title">实时告警动态</h5> | ||
54 | + <div id="host_bmc_greatwall_active_alarm"></div> | ||
55 | + </div> | ||
56 | + </div> | ||
57 | + </div> | ||
58 | + </div> | ||
59 | + </div> | ||
60 | + </div> | ||
61 | +</article> | ||
62 | +<textarea id="host_bmc_greatwall_param_id" style="display: none;">{{d}}</textarea> | ||
63 | +<script> | ||
64 | + layui.use('host_bmc_greatwall', function (fn) { | ||
65 | + var $ = layui.$; | ||
66 | + var parm = $("#host_bmc_greatwall_param_id").val(); | ||
67 | + if(parm.indexOf('{{d') != -1){ | ||
68 | + fn(); | ||
69 | + }else{ | ||
70 | + fn(JSON.parse(parm)); | ||
71 | + } | ||
72 | + }); | ||
73 | +</script> |
1 | +<!--netsafe_firewall_shanshi详细页面 山石--> | ||
2 | +<article class="page-container template"> | ||
3 | + <div class="page-panel"> | ||
4 | + <div class="main"> | ||
5 | + <div class="layui-card"> | ||
6 | + <div class="layui-card-body"> | ||
7 | + <div class="lay-row"> | ||
8 | + <div class="lay-row-item"> | ||
9 | + <h5 class="lay-row-title">基本信息<i data-id="netsafe_firewall_shanshi_jbxx" class="iconfont detail_base_info"></i></h5> | ||
10 | + <ul class="info-table" id="netsafe_firewall_shanshi_jbxx"></ul> | ||
11 | + </div> | ||
12 | + <div class="lay-row-item"> | ||
13 | + <h5 class="lay-row-title">当前会话连接数</h5> | ||
14 | + <div id="netsafe_firewall_shanshi_link_linechart" class="detail_line_chart"></div> | ||
15 | + </div> | ||
16 | + </div> | ||
17 | + <div class="lay-row"> | ||
18 | + <div class="lay-row-item"> | ||
19 | + <h5 class="lay-row-title">新建连接数</h5> | ||
20 | + <div id="netsafe_firewall_shanshi_sec_linechart" class="detail_line_chart"></div> | ||
21 | + </div> | ||
22 | + <div class="lay-row-item"> | ||
23 | + <h5 class="lay-row-title">CPU使用率</h5> | ||
24 | + <div id="netsafe_firewall_shanshi_cpu_linechart" class="detail_line_chart"></div> | ||
25 | + </div> | ||
26 | + <div class="lay-row-item"> | ||
27 | + <h5 class="lay-row-title">内存使用率</h5> | ||
28 | + <div id="netsafe_firewall_shanshi_mem_linechart" class="detail_line_chart"></div> | ||
29 | + </div> | ||
30 | + </div> | ||
31 | + <div class="lay-row"> | ||
32 | + <div class="lay-row-item"> | ||
33 | + <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> | ||
34 | + <div id="netsafe_firewall_shanshi_interface_info"></div> | ||
35 | + </div> | ||
36 | + </div> | ||
37 | + <div class="lay-row"> | ||
38 | + <div class="lay-row-item"> | ||
39 | + <h5 class="lay-row-title">实时告警动态</h5> | ||
40 | + <div id="netsafe_firewall_shanshi_active_alram"></div> | ||
41 | + </div> | ||
42 | + </div> | ||
43 | + </div> | ||
44 | + </div> | ||
45 | + </div> | ||
46 | + </div> | ||
47 | +</article> | ||
48 | +<textarea id="netsafe_firewall_shanshi_param_id" style="display: none;">{{d}}</textarea> | ||
49 | +<script> | ||
50 | + layui.use('netsafe_firewall_shanshi', function (fn) { | ||
51 | + var $ = layui.$; | ||
52 | + var parm = $("#netsafe_firewall_shanshi_param_id").val(); | ||
53 | + if(parm.indexOf('{{d') != -1){ | ||
54 | + fn(); | ||
55 | + }else{ | ||
56 | + fn(JSON.parse(parm)); | ||
57 | + } | ||
58 | + }); | ||
59 | +</script> |
-
Please register or login to post a comment