monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 6853ade76d3e20cd85610d8dfd6ad9e9ba4dc5fa 2 parents 6161f995 fbfd9c23

Merge branch 'master-joke' into 'master' 

feat:天津需求调整，禅道https://hgkj.zentaopm.com/task-view-2116.html

feat:天津需求调整，禅道https://hgkj.zentaopm.com/task-view-2116.html

See merge request !1098
Inline Side-by-side
Showing 3 changed files with 27 additions and 12 deletions
@@ -6,13 +6,16 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) { @@ -6,13 +6,16 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
6 exports('netsafe_firewall_qimingxingchen', function (data) { 6 exports('netsafe_firewall_qimingxingchen', function (data) {
7 var resId = ''; 7 var resId = '';
8 var provider = ''; 8 var provider = '';
  9 + var model = ''; //型号 joke add 20230313
9 var showFlag = common.getUrlParam("show"); 10 var showFlag = common.getUrlParam("show");
10 if(showFlag && showFlag == '0'){ 11 if(showFlag && showFlag == '0'){
11 resId = common.getUrlParam("resId"); 12 resId = common.getUrlParam("resId");
12 provider = common.getUrlParam("provider"); 13 provider = common.getUrlParam("provider");
  14 + model = common.getUrlParam("model");
13 }else{ 15 }else{
14 resId = data.resId; 16 resId = data.resId;
15 provider = data.provider; 17 provider = data.provider;
  18 + model = data.model;
16 } 19 }
17 commonDetail.bindTips(); 20 commonDetail.bindTips();
18 21
@@ -27,15 +30,20 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) { @@ -27,15 +30,20 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
27 function reload() { 30 function reload() {
28 //基本信息 31 //基本信息
29 commonDetail.renderText('netsafe_firewall_qimingxingchen_jbxx',resId,jbxxKpiId,null,null,null,"true"); 32 commonDetail.renderText('netsafe_firewall_qimingxingchen_jbxx',resId,jbxxKpiId,null,null,null,"true");
30 - //当前会话连接数  
31 - commonDetail.renderLineCharat("netsafe_firewall_qimingxingchen_link_linechart",resId,"KPI837FA33C","当前连接数",'session');  
32 - $('.secLink').removeClass('layui-hide');  
33 - //转发速率  
34 - commonDetail.renderLineCharat("netsafe_firewall_qimingxingchen_sec_linechart",resId,"KPI2E8B3722","转发速率",'forwardRate');  
35 - //CPU使用率性能曲线  
36 - commonDetail.renderLineCharat("netsafe_firewall_qimingxingchen_cpu_linechart",resId,"KPI7054BC34","CPU使用率",'cpu');  
37 - //内存使用率性能曲线  
38 - commonDetail.renderLineCharat("netsafe_firewall_qimingxingchen_mem_linechart",resId,"KPI31CB8D97","内存使用率",'mem'); 33 + //非USG-FW-12600GP型号展示折线图
  34 + if (model != 'USG-FW-12600GP'){
  35 + $('.nowLink').removeClass('layui-hide');
  36 + $('.secLink').removeClass('layui-hide');
  37 + $('.memAndCpu').removeClass('layui-hide');
  38 + //当前会话连接数
  39 + commonDetail.renderLineCharat("netsafe_firewall_qimingxingchen_link_linechart",resId,"KPI837FA33C","当前连接数",'session');
  40 + //转发速率
  41 + commonDetail.renderLineCharat("netsafe_firewall_qimingxingchen_sec_linechart",resId,"KPI2E8B3722","转发速率",'forwardRate');
  42 + //CPU使用率性能曲线
  43 + commonDetail.renderLineCharat("netsafe_firewall_qimingxingchen_cpu_linechart",resId,"KPI7054BC34","CPU使用率",'cpu');
  44 + //内存使用率性能曲线
  45 + commonDetail.renderLineCharat("netsafe_firewall_qimingxingchen_mem_linechart",resId,"KPI31CB8D97","内存使用率",'mem');
  46 + }
39 //接口信息 47 //接口信息
40 commonDetail.renderTable("netsafe_firewall_qimingxingchen_interface_info",false,resId,interfaceinfoKpis,'接口信息','interface','KPI49ACAAFD','ASC',10); 48 commonDetail.renderTable("netsafe_firewall_qimingxingchen_interface_info",false,resId,interfaceinfoKpis,'接口信息','interface','KPI49ACAAFD','ASC',10);
41 //活动告警 49 //活动告警
@@ -6,21 +6,28 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) { @@ -6,21 +6,28 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
6 exports('netsafe_firewall_tianrongxin', function (data) { 6 exports('netsafe_firewall_tianrongxin', function (data) {
7 var resId = ''; 7 var resId = '';
8 var provider = ''; 8 var provider = '';
  9 + var model = ''; //型号 joke add 20230313
9 var showFlag = common.getUrlParam("show"); 10 var showFlag = common.getUrlParam("show");
10 if(showFlag && showFlag == '0'){ 11 if(showFlag && showFlag == '0'){
11 resId = common.getUrlParam("resId"); 12 resId = common.getUrlParam("resId");
12 provider = common.getUrlParam("provider"); 13 provider = common.getUrlParam("provider");
  14 + model = common.getUrlParam("model");
13 }else{ 15 }else{
14 resId = data.resId; 16 resId = data.resId;
15 provider = data.provider; 17 provider = data.provider;
  18 + model = data.model;
16 } 19 }
17 commonDetail.bindTips(); 20 commonDetail.bindTips();
18 21
  22 +
19 //基本信息 23 //基本信息
20 var jbxxKpiId = 'KPIBB1082BE,KPI4419E8A1,KPI5858832B,KPI2D507904,KPI282685A0,KPIF74D9D2B'; 24 var jbxxKpiId = 'KPIBB1082BE,KPI4419E8A1,KPI5858832B,KPI2D507904,KPI282685A0,KPIF74D9D2B';
21 //接口信息kpiids 25 //接口信息kpiids
22 var interfaceinfoKpis = 'KPI49ACAAFD,KPI1A03F672,KPIB6D0352E,KPIACCFFE79,KPI59BE184A,KPIF00B5E20,KPIBD006E36,KPIE4B51D5C,KPI7E81DFB5,KPIA3A74798'; 26 var interfaceinfoKpis = 'KPI49ACAAFD,KPI1A03F672,KPIB6D0352E,KPIACCFFE79,KPI59BE184A,KPIF00B5E20,KPIBD006E36,KPIE4B51D5C,KPI7E81DFB5,KPIA3A74798';
23 - 27 + //当型号为NGFW4000-UF NG-81342/NG-81662时，接口指标屏蔽：接口带宽、接口接收速率、接口发送速率，增加：接口速率（KPIB28E7495）
  28 + if (model == 'NGFW4000-UF NG-81342' || model == 'NG-81662'){
  29 + interfaceinfoKpis = 'KPI49ACAAFD,KPI1A03F672,KPIB6D0352E,KPIB28E7495,KPIBD006E36,KPIE4B51D5C,KPI7E81DFB5,KPIA3A74798';
  30 + }
24 reload() 31 reload()
25 32
26 //渲染页面 33 //渲染页面
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <h5 class="lay-row-title">基本信息<i data-id="netsafe_firewall_qimingxingchen_jbxx" class="iconfont detail_base_info">&#xe61e;</i></h5> 9 <h5 class="lay-row-title">基本信息<i data-id="netsafe_firewall_qimingxingchen_jbxx" class="iconfont detail_base_info">&#xe61e;</i></h5>
10 <ul class="info-table" id="netsafe_firewall_qimingxingchen_jbxx"></ul> 10 <ul class="info-table" id="netsafe_firewall_qimingxingchen_jbxx"></ul>
11 </div> 11 </div>
12 - <div class="lay-row-item"> 12 + <div class="lay-row-item layui-hide nowLink">
13 <h5 class="lay-row-title">当前会话连接数</h5> 13 <h5 class="lay-row-title">当前会话连接数</h5>
14 <div id="netsafe_firewall_qimingxingchen_link_linechart" class="detail_line_chart"></div> 14 <div id="netsafe_firewall_qimingxingchen_link_linechart" class="detail_line_chart"></div>
15 </div> 15 </div>
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <div id="netsafe_firewall_qimingxingchen_sec_linechart" class="detail_line_chart"></div> 18 <div id="netsafe_firewall_qimingxingchen_sec_linechart" class="detail_line_chart"></div>
19 </div> 19 </div>
20 </div> 20 </div>
21 - <div class="lay-row"> 21 + <div class="lay-row layui-hide memAndCpu">
22 <div class="lay-row-item"> 22 <div class="lay-row-item">
23 <h5 class="lay-row-title">CPU使用率</h5> 23 <h5 class="lay-row-title">CPU使用率</h5>
24 <div id="netsafe_firewall_qimingxingchen_cpu_linechart" class="detail_line_chart"></div> 24 <div id="netsafe_firewall_qimingxingchen_cpu_linechart" class="detail_line_chart"></div>