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

张凯
Commit fbfd9c2361e573214d39118f224e0b6199b59178 1 parent 6161f995
Showing 3 changed files with 19 additions and 4 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/netsafe_firewall_qimingxingchen.js
hg-monitor-web-base/src/main/resources/static/src/controller/netsafe_firewall_tianrongxin.js
hg-monitor-web-base/src/main/resources/static/src/views/template/detail/netsafe_firewall_qimingxingchen.html
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/netsafe_firewall_qimingxingchen.js
View file @fbfd9c2
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/netsafe_firewall_qimingxingchen.js
View file @fbfd9c2
@@ -6,13 +6,16 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
     exports('netsafe_firewall_qimingxingchen', function (data) {
         var resId = '';
         var provider = '';
+        var model = '';  //型号 joke add 20230313
         var showFlag = common.getUrlParam("show");
         if(showFlag  && showFlag == '0'){
             resId = common.getUrlParam("resId");
             provider = common.getUrlParam("provider");
+            model = common.getUrlParam("model");
         }else{
             resId = data.resId;
             provider = data.provider;
+            model = data.model;
         }
         commonDetail.bindTips();
@@ -27,15 +30,20 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
         function reload() {
             //基本信息
             commonDetail.renderText('netsafe_firewall_qimingxingchen_jbxx',resId,jbxxKpiId,null,null,null,"true");
+            //非USG-FW-12600GP型号展示折线图
+            if (model != 'USG-FW-12600GP'){
+                $('.nowLink').removeClass('layui-hide');
+                $('.secLink').removeClass('layui-hide');
+                $('.memAndCpu').removeClass('layui-hide');
                 //当前会话连接数
                 commonDetail.renderLineCharat("netsafe_firewall_qimingxingchen_link_linechart",resId,"KPI837FA33C","当前连接数",'session');
-            $('.secLink').removeClass('layui-hide');
                 //转发速率
                 commonDetail.renderLineCharat("netsafe_firewall_qimingxingchen_sec_linechart",resId,"KPI2E8B3722","转发速率",'forwardRate');
                 //CPU使用率性能曲线
                 commonDetail.renderLineCharat("netsafe_firewall_qimingxingchen_cpu_linechart",resId,"KPI7054BC34","CPU使用率",'cpu');
                 //内存使用率性能曲线
                 commonDetail.renderLineCharat("netsafe_firewall_qimingxingchen_mem_linechart",resId,"KPI31CB8D97","内存使用率",'mem');
+            }
             //接口信息
             commonDetail.renderTable("netsafe_firewall_qimingxingchen_interface_info",false,resId,interfaceinfoKpis,'接口信息','interface','KPI49ACAAFD','ASC',10);
             //活动告警
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/netsafe_firewall_tianrongxin.js
View file @fbfd9c2
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/netsafe_firewall_tianrongxin.js
View file @fbfd9c2
@@ -6,21 +6,28 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
     exports('netsafe_firewall_tianrongxin', function (data) {
         var resId = '';
         var provider = '';
+        var model = '';  //型号 joke add 20230313
         var showFlag = common.getUrlParam("show");
         if(showFlag  && showFlag == '0'){
             resId = common.getUrlParam("resId");
             provider = common.getUrlParam("provider");
+            model = common.getUrlParam("model");
         }else{
             resId = data.resId;
             provider = data.provider;
+            model = data.model;
         }
         commonDetail.bindTips();
+
         //基本信息
         var jbxxKpiId = 'KPIBB1082BE,KPI4419E8A1,KPI5858832B,KPI2D507904,KPI282685A0,KPIF74D9D2B';
         //接口信息kpiids
         var interfaceinfoKpis = 'KPI49ACAAFD,KPI1A03F672,KPIB6D0352E,KPIACCFFE79,KPI59BE184A,KPIF00B5E20,KPIBD006E36,KPIE4B51D5C,KPI7E81DFB5,KPIA3A74798';
-
+        //当型号为NGFW4000-UF NG-81342/NG-81662时，接口指标屏蔽：接口带宽、接口接收速率、接口发送速率，增加：接口速率（KPIB28E7495）
+        if (model == 'NGFW4000-UF NG-81342' || model == 'NG-81662'){
+            interfaceinfoKpis = 'KPI49ACAAFD,KPI1A03F672,KPIB6D0352E,KPIB28E7495,KPIBD006E36,KPIE4B51D5C,KPI7E81DFB5,KPIA3A74798';
+        }
         reload()
         //渲染页面
--- a/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/netsafe_firewall_qimingxingchen.html
View file @fbfd9c2
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/netsafe_firewall_qimingxingchen.html
View file @fbfd9c2
@@ -9,7 +9,7 @@
                             <h5 class="lay-row-title">基本信息<i data-id="netsafe_firewall_qimingxingchen_jbxx" class="iconfont detail_base_info">&#xe61e;</i></h5>
                             <ul class="info-table" id="netsafe_firewall_qimingxingchen_jbxx"></ul>
                         </div>
-                        <div class="lay-row-item">
+                        <div class="lay-row-item layui-hide nowLink">
                             <h5 class="lay-row-title">当前会话连接数</h5>
                             <div id="netsafe_firewall_qimingxingchen_link_linechart" class="detail_line_chart"></div>
                         </div>
@@ -18,7 +18,7 @@
                             <div id="netsafe_firewall_qimingxingchen_sec_linechart" class="detail_line_chart"></div>
                         </div>
                     </div>
-                    <div class="lay-row">
+                    <div class="lay-row layui-hide memAndCpu">
                         <div class="lay-row-item">
                             <h5 class="lay-row-title">CPU使用率</h5>
                             <div id="netsafe_firewall_qimingxingchen_cpu_linechart" class="detail_line_chart"></div>