feat:天津分支增加绿盟ads及绿盟ips页面，并调整负载均衡详情页

@@ -1199,18 +1199,39 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
             ],
             "NETSAFE_IPS": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
+                {field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
                 {
-                    field: 'resName', title: '资源名称', minWidth: 250, sort: true,
+                    field: 'resName', title: '资源名称', minWidth: x_350, sort: true,
                     templet: '#resindex_resName'
                 },
-                {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
-                {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
-                {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
-                {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
-                {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
-                {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
-                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
-                {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
+                {field: 'model', title: '型号', minWidth: x_130, align: 'center', sort: true, },
+                {field: 'health', title: '健康状态', minWidth: x_110, align: 'center', sort: true, templet: '#healthTpl'},
+                {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_120, templet: '#cpuRateTpl', sort: true},
+                {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_120, templet: '#memoryRateTpl', sort: true},
+                {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
+                {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_110, templet: '#linkStateTpl', sort: true},
+                {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
+                {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
+                {field: 'state', title: '资源状态', minWidth: x_110, align: 'center', sort: true, templet: '#resStateTpl'}
+            ],
+            "NETSAFE_ADS": [
+                //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
+                {field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
+                {
+                    field: 'resName', title: '资源名称', minWidth: x_350, sort: true,
+                    templet: '#resindex_resName'
+                },
+                {field: 'model', title: '型号', minWidth: x_130, align: 'center', sort: true, },
+                {field: 'health', title: '健康状态', minWidth: x_110, align: 'center', sort: true, templet: '#healthTpl'},
+                {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_120, templet: '#cpuRateTpl', sort: true},
+                {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_120, templet: '#memoryRateTpl', sort: true},
+                {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
+                {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_110, templet: '#linkStateTpl', sort: true},
+                {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
+                {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
+                {field: 'state', title: '资源状态', minWidth: x_110, align: 'center', sort: true, templet: '#resStateTpl'}
             ],
             "NETSAFE_IDS": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},

@@ -3398,6 +3398,12 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                 }else if (res.resType === 'NETSAFE_FIREWALL') {
                     var str='NETSAFE_FIREWALL_'+res.provider;
                     url = common.detailPath(str,res.resId)
+                }else if (res.resType === 'NETSAFE_IPS') {
+                    var str='NETSAFE_IPS_'+res.provider;
+                    url = common.detailPath(str,res.resId)
+                }else if (res.resType === 'NETSAFE_ADS') {
+                    var str='NETSAFE_ADS_'+res.provider;
+                    url = common.detailPath(str,res.resId)
                 }else {
                     url = common.detailPath(res.resType,res.resId,protocol);
                 }
@@ -3519,7 +3525,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                         }
                         title += `<a class="layui-icon filterList" data-id=${resId} lay-tips="指标过滤清单" style="margin-left: 10px"><i class="iconfont">&#XE516;</i></a>`;
                         title += `<a class="layui-icon res-view-relation-topo" data-id=${resId} lay-tips="查看资源关系拓扑" style="margin-left: 10px"><i class="iconfont">&#XE515;</i></a>`;
-                        if (resCategory === 'share' && hardwareFlag.endsWith("Y")) {
+                        if (resCategory === 'share' && hardwareFlag && hardwareFlag.endsWith("Y")) {
                             title += `<a class="layui-icon res-view-assets-details" data-ip=${ip} data-name=${name} data-restype=${resType} data-id=${resId} lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>`;
                         }
                         if (res.state == 'new' && hardwareFlag.endsWith("N")){

@@ -20,18 +20,18 @@ layui.define(['laypage', 'commonDetail', 'common', 'element', 'admin'], function
         }
         commonDetail.bindTips();
         //基本信息
-        var jbxxKpiId = 'KPIBB1082BE,KPI72E7FB4B,KPIE13DD9A3,KPI9F694F60,KPIDAC7AC64,KPICA591C11,KPIF74D9D2B';
+        var jbxxKpiId = 'KPIBB1082BE,KPI72E7FB4B,KPIE13DD9A3,KPI9F694F60,KPIDAC7AC64,KPICA591C11,KPIF74D9D2B,KPI9F694F60,KPIDAC7AC64';
         // 关键信息
         //2020-02-07 xwx屏蔽：内存大小 与李腾飞确认采集不到，屏蔽
-        var zyxxKpiId = 'KPIA838A981,KPI4A216352';
+        var zyxxKpiId = 'KPIA838A981,KPI4A216352,KPI1584BE1C';
         // 风扇信息
         var haKpiIds = 'KPI28C9A37D,KPIF5D53796,KPI1A9360B6';
         // 硬盘信息
         //2020-02-07 xwx屏蔽：硬盘温度 与李腾飞确认采集不到，屏蔽
-        var diskKpiIds = 'KPI9D22EAB6,KPI29D42042,KPI1988842F,KPI50331084,KPI2C8A6D17';
+        var diskKpiIds = 'KPI9D22EAB6,KPI29D42042,KPI1988842F,KPI50331084,KPI2C8A6D17,KPI7E96CACC';
         // 虚拟服务信息
         //2020-02-07 xwx屏蔽：启动状态，IP地址,端口号 与李腾飞确认采集不到，屏蔽
-        var vsKpiIds = 'KPIFABFD741';
+        var vsKpiIds = 'KPIFABFD741,KPI39C76443,KPI9B417789,KPIFB844B8B';
 
         reload()
 

+//netsafe_ads_nsfocus.js
+layui.define(['laypage', 'commonDetail','common'], function (exports) {
+    var commonDetail = layui.commonDetail;
+    var common = layui.common;
+    //对外暴露的接口
+    exports('netsafe_ads_nsfocus', 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 = 'KPI02F41E23,KPI9F694F60,KPI35BFAE04,KPI961872D9';
+        //重要信息
+        var zyKpiId = 'KPI8C8CDA73';
+        //接口信息kpiids
+        var interfaceinfoKpis = 'KPI49ACAAFD,KPI1A03F672,KPIB28E7495,KPIBD006E36,KPIE4B51D5C,KPI7E81DFB5,KPI7D3D3496,KPICFEE28E9';
+
+        reload()
+
+        //渲染页面
+        function reload() {
+            //基本信息
+            commonDetail.renderText('netsafe_ads_nsfocus_jbxx',resId,jbxxKpiId,null,null,null,"false");
+            //重要信息
+            commonDetail.renderText('netsafe_ads_nsfocus_zyxx',resId,zyKpiId,null,null,null,"false");
+            //CPU使用率性能曲线
+            commonDetail.renderLineCharat("netsafe_ads_nsfocus_cpu_linechart",resId,"KPI7054BC34","CPU使用率",'cpu');
+            //内存使用率性能曲线
+            commonDetail.renderLineCharat("netsafe_ads_nsfocus_mem_linechart",resId,"KPI31CB8D97","内存使用率",'mem');
+            //接口信息
+            commonDetail.renderTable("netsafe_ads_nsfocus_interface_info",false,resId,interfaceinfoKpis,'接口信息','interface','KPI49ACAAFD','ASC',10);
+            //活动告警
+            commonDetail.renderActiveAlarms("netsafe_ads_nsfocus_active_alram",resId);
+        }
+
+        //定时任务
+        var timer = setInterval(function () {
+            reload()
+        },commonDetail.timerTime);
+        commonDetail.detailTimer.push(timer);
+    });
+});
\ No newline at end of file

+//netsafe_ips_nsfocus.js
+layui.define(['laypage', 'commonDetail','common'], function (exports) {
+    var commonDetail = layui.commonDetail;
+    var common = layui.common;
+    //对外暴露的接口
+    exports('netsafe_ips_nsfocus', 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 = 'KPI02F41E23,KPI54DC5912,KPI2D507904,KPI9F694F60,KPI35BFAE04,KPI961872D9';
+        //重要信息
+        var zyKpiId = 'KPI8C8CDA73';
+        //接口信息kpiids
+        var interfaceinfoKpis = 'KPI49ACAAFD,KPI1A03F672,KPIB28E7495,KPIBD006E36,KPIE4B51D5C,KPI7E81DFB5,KPI7D3D3496,KPICFEE28E9';
+
+        reload()
+
+        //渲染页面
+        function reload() {
+            //基本信息
+            commonDetail.renderText('netsafe_ips_nsfocus_jbxx',resId,jbxxKpiId,null,null,null,"false");
+            //重要信息
+            commonDetail.renderText('netsafe_ips_nsfocus_zyxx',resId,zyKpiId,null,null,null,"false");
+            //TCP每秒会话数
+            commonDetail.renderLineCharat("netsafe_ips_nsfocus_link_linechart",resId,"KPI72FBD484","TCP每秒会话数",'session');
+            //CPU使用率性能曲线
+            commonDetail.renderLineCharat("netsafe_ips_nsfocus_cpu_linechart",resId,"KPI7054BC34","CPU使用率",'cpu');
+            //内存使用率性能曲线
+            commonDetail.renderLineCharat("netsafe_ips_nsfocus_mem_linechart",resId,"KPI31CB8D97","内存使用率",'mem');
+            //接口信息
+            commonDetail.renderTable("netsafe_ips_nsfocus_interface_info",false,resId,interfaceinfoKpis,'接口信息','interface','KPI49ACAAFD','ASC',10);
+            //活动告警
+            commonDetail.renderActiveAlarms("netsafe_ips_nsfocus_active_alram",resId);
+        }
+
+        //定时任务
+        var timer = setInterval(function () {
+            reload()
+        },commonDetail.timerTime);
+        commonDetail.detailTimer.push(timer);
+    });
+});
\ No newline at end of file

+<!--netsafe_ads_nsfocus详细页面 绿盟科技ads-->
+<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">基本信息</h5>
+                            <ul class="info-table" id="netsafe_ads_nsfocus_jbxx"></ul>
+                        </div>
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">重要信息</h5>
+                            <ul class="info-table" id="netsafe_ads_nsfocus_zyxx"></ul>
+                        </div>
+                        <div class="lay-row-item layui-hide secLink">
+                            <h5 class="lay-row-title">每秒新建连接数</h5>
+                            <div id="netsafe_ads_nsfocus_sec_linechart" class="detail_line_chart"></div>
+                        </div>
+                    </div>
+                    <div class="lay-row">
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">CPU使用率</h5>
+                            <div id="netsafe_ads_nsfocus_cpu_linechart" class="detail_line_chart"></div>
+                        </div>
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">内存使用率</h5>
+                            <div id="netsafe_ads_nsfocus_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_ads_nsfocus_interface_infoDownload" class="layui-table-link"  style="margin-left: 10px;">下载</span><span id="netsafe_ads_nsfocus_interface_infoMore" class="layui-table-link">更多</span></h5>
+                            <div id="netsafe_ads_nsfocus_interface_info"></div>
+                        </div>
+                    </div>
+                    <div class="lay-row">
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">实时告警动态</h5>
+                            <div id="netsafe_ads_nsfocus_active_alram"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</article>
+<textarea id="netsafe_ads_nsfocus_param_id" style="display: none;">{{d}}</textarea>
+<script>
+    layui.use('netsafe_ads_nsfocus', function (fn) {
+        var $ = layui.$;
+        var parm = $("#netsafe_ads_nsfocus_param_id").val();
+        if(parm.indexOf('{{d') != -1){
+            fn();
+        }else{
+            fn(JSON.parse(parm));
+        }
+    });
+</script>
\ No newline at end of file

+<!--netsafe_ips_nsfocus详细页面 绿盟科技ips-->
+<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">基本信息</h5>
+                            <ul class="info-table" id="netsafe_ips_nsfocus_jbxx"></ul>
+                        </div>
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">重要信息</h5>
+                            <ul class="info-table" id="netsafe_ips_nsfocus_zyxx"></ul>
+                        </div>
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">TCP每秒会话数</h5>
+                            <div id="netsafe_ips_nsfocus_link_linechart" class="detail_line_chart"></div>
+                        </div>
+                        <div class="lay-row-item layui-hide secLink">
+                            <h5 class="lay-row-title">每秒新建连接数</h5>
+                            <div id="netsafe_ips_nsfocus_sec_linechart" class="detail_line_chart"></div>
+                        </div>
+                    </div>
+                    <div class="lay-row">
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">CPU使用率</h5>
+                            <div id="netsafe_ips_nsfocus_cpu_linechart" class="detail_line_chart"></div>
+                        </div>
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">内存使用率</h5>
+                            <div id="netsafe_ips_nsfocus_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_ips_nsfocus_interface_infoDownload" class="layui-table-link"  style="margin-left: 10px;">下载</span><span id="netsafe_ips_nsfocus_interface_infoMore" class="layui-table-link">更多</span></h5>
+                            <div id="netsafe_ips_nsfocus_interface_info"></div>
+                        </div>
+                    </div>
+                    <div class="lay-row">
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">实时告警动态</h5>
+                            <div id="netsafe_ips_nsfocus_active_alram"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</article>
+<textarea id="netsafe_ips_nsfocus_param_id" style="display: none;">{{d}}</textarea>
+<script>
+    layui.use('netsafe_ips_nsfocus', function (fn) {
+        var $ = layui.$;
+        var parm = $("#netsafe_ips_nsfocus_param_id").val();
+        if(parm.indexOf('{{d') != -1){
+            fn();
+        }else{
+            fn(JSON.parse(parm));
+        }
+    });
+</script>
\ No newline at end of file