Merge branch 'master-joke' into 'master'

Master joke



See merge request !1141

@@ -2658,6 +2658,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                 {field: 'linkState', title: '连接状态', align: 'center', width: x_120, templet: '#linkStateTpl', sort: true},
                 {field: 'adminName', title: '负责人', width: x_130, align: 'center', sort: true},
                 {field: 'adminPhone', title: '负责人电话', width: x_130, align: 'center', sort: true},
+                {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
                 {field: 'state', title: '资源状态', width: x_110, align: 'center', sort: true, templet: '#resStateTpl'}
             ],
             "TENCENT_CLOUD_PLAT_PHYSICSHOST": [
@@ -2673,6 +2674,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                 {field: 'linkState', title: '连接状态', align: 'center', width: x_120, templet: '#linkStateTpl', sort: true},
                 {field: 'adminName', title: '负责人', width: x_130, align: 'center', sort: true},
                 {field: 'adminPhone', title: '负责人电话', width: x_130, align: 'center', sort: true},
+                {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
                 {field: 'state', title: '资源状态', width: x_110, align: 'center', sort: true, templet: '#resStateTpl'}
             ],
             "TENCENT_CLOUD_PLAT_VIRTUALHOST": [
@@ -2688,6 +2690,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                 {field: 'linkState', title: '连接状态', align: 'center', width: x_120, templet: '#linkStateTpl', sort: true},
                 {field: 'adminName', title: '负责人', width: x_130, align: 'center', sort: true},
                 {field: 'adminPhone', title: '负责人电话', width: x_130, align: 'center', sort: true},
+                {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
                 {field: 'state', title: '资源状态', width: x_110, align: 'center', sort: true, templet: '#resStateTpl'}
             ],
             "TENCENT_CLOUD_PLAT_RES_TDSQLMYSQL": [
@@ -2703,6 +2706,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                 {field: 'linkState', title: '连接状态', align: 'center', width: x_120, templet: '#linkStateTpl', sort: true},
                 {field: 'adminName', title: '负责人', width: x_130, align: 'center', sort: true},
                 {field: 'adminPhone', title: '负责人电话', width: x_130, align: 'center', sort: true},
+                {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
                 {field: 'state', title: '资源状态', width: x_110, align: 'center', sort: true, templet: '#resStateTpl'}
             ],
             "TENCENT_CLOUD_PLAT_RES_REDIS": [
@@ -2717,9 +2721,9 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                 {field: 'linkState', title: '连接状态', align: 'center', width: x_120, templet: '#linkStateTpl', sort: true},
                 {field: 'adminName', title: '负责人', width: x_130, align: 'center', sort: true},
                 {field: 'adminPhone', title: '负责人电话', width: x_130, align: 'center', sort: true},
+                {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
                 {field: 'state', title: '资源状态', width: x_110, align: 'center', sort: true, templet: '#resStateTpl'}
             ],
-
             "TENCENT_CLOUD_PLAT_RES_CKAFKA": [
                 {field: 'ip', title: 'IP地址', width: x_130, align: 'center', sort: true},
                 {
@@ -2732,9 +2736,9 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                 {field: 'linkState', title: '连接状态', align: 'center', width: x_120, templet: '#linkStateTpl', sort: true},
                 {field: 'adminName', title: '负责人', width: x_130, align: 'center', sort: true},
                 {field: 'adminPhone', title: '负责人电话', width: x_130, align: 'center', sort: true},
+                {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
                 {field: 'state', title: '资源状态', width: x_110, align: 'center', sort: true, templet: '#resStateTpl'}
             ],
-
             "TENCENT_CLOUD_PLAT_RES_DISK": [
                 {field: 'ip', title: 'IP地址', width: x_130, align: 'center', sort: true},
                 {
@@ -2747,6 +2751,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                 {field: 'linkState', title: '连接状态', align: 'center', width: x_120, templet: '#linkStateTpl', sort: true},
                 {field: 'adminName', title: '负责人', width: x_130, align: 'center', sort: true},
                 {field: 'adminPhone', title: '负责人电话', width: x_130, align: 'center', sort: true},
+                {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
                 {field: 'state', title: '资源状态', width: x_110, align: 'center', sort: true, templet: '#resStateTpl'}
             ],
         },

+//tencent_cloud_plat_res_ckafka(腾讯云kafka)详情页js
+layui.define(['commonDetail','common'], function (exports) {
+    var commonDetail = layui.commonDetail;
+    var common = layui.common;
+    //对外暴露的接口
+    exports('tencent_cloud_plat_res_ckafka', function (data) {
+        var resId = '';
+        var showFlag = common.getUrlParam("show");
+        if(showFlag  && showFlag == '0'){
+            resId = common.getUrlParam("resId");
+        }else{
+            resId = data.resId;
+        }
+        commonDetail.bindTips();
+
+        //基本信息指标
+        var baseKpi = "KPIE13DD9A3,KPIF74D9D2B,KPIA1CFDB4B,KPI2DC9105C,KPI39C76443,KPIECA37CB0,KPI1782D6AF,KPI352DE256";
+        //关键信息指标
+        var keyKpi = "KPI86DF5046,KPID2DBDD50,KPIBAA7E176,KPI19832098,KPI91C252FE,KPI8546BDCF";
+
+        reload();
+
+        //渲染页面
+        function reload() {
+            //资源状态
+            commonDetail.renderResHealth("tencent_cloud_plat_res_ckafka_health_state", resId);
+            //基本信息
+            commonDetail.renderText("tencent_cloud_plat_res_ckafka_baseinfo",resId,baseKpi);
+            //关键信息
+            commonDetail.renderText("tencent_cloud_plat_res_ckafka_keyinfo",resId,keyKpi);
+            //活动告警
+            commonDetail.renderActiveAlarms("tencent_cloud_plat_res_ckafka_active_alarm",resId);
+        }
+
+        //定时任务
+        var timer = setInterval(function () {
+            reload()
+        },commonDetail.timerTime);
+        commonDetail.detailTimer.push(timer);
+
+    });
+});
\ No newline at end of file

+//tencent_cloud_plat_res_disk(腾讯云硬盘)详情页js
+layui.define(['commonDetail','common'], function (exports) {
+    var commonDetail = layui.commonDetail;
+    var common = layui.common;
+    //对外暴露的接口
+    exports('tencent_cloud_plat_res_disk', function (data) {
+        var resId = '';
+        var showFlag = common.getUrlParam("show");
+        if(showFlag  && showFlag == '0'){
+            resId = common.getUrlParam("resId");
+        }else{
+            resId = data.resId;
+        }
+        commonDetail.bindTips();
+
+        //基本信息指标
+        var baseKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI889D5B6D,KPI9A8015CE,KPI352DE256,KPIECA37CB0";
+        //关键信息指标
+        var keyKpi = "KPI61935D31,KPI077D23A3,KPI85E5923E,KPI29D42042,KPI4C0DC0C6,KPIFE77ABF5,KPI52E5F2AA";
+        //硬盘信息指标
+        var diskKpi = "KPICF4940F7,KPI6C16A077,KPIE7E304C4,KPI28E8B622";
+        //IO信息指标
+        var ioKpi = "KPI5DC210DE,KPI25D46638,KPI9F00C7A6";
+
+        reload();
+
+        //渲染页面
+        function reload() {
+            //资源状态
+            commonDetail.renderResHealth("tencent_cloud_plat_res_disk_health_state", resId);
+            //基本信息
+            commonDetail.renderText("tencent_cloud_plat_res_disk_baseinfo",resId,baseKpi);
+            //关键信息
+            commonDetail.renderText("tencent_cloud_plat_res_disk_keyinfo",resId,keyKpi);
+            //实例信息
+            commonDetail.renderText("tencent_cloud_plat_res_disk_diskinfo",resId,diskKpi);
+            //性能信息
+            commonDetail.renderText("tencent_cloud_plat_res_disk_ioinfo",resId,ioKpi);
+            //硬盘读流量
+            commonDetail.renderLineCharat("tencent_cloud_plat_res_disk_readflow_linechart",resId,"KPICF4940F7","硬盘读流量","disk_read_traffic");
+            //硬盘写流量
+            commonDetail.renderLineCharat("tencent_cloud_plat_res_disk_writeflow_linechart",resId,"KPI6C16A077","硬盘写流量","disk_write_traffic");
+            //硬盘读IOPS
+            commonDetail.renderLineCharat("tencent_cloud_plat_res_disk_readipos_linechart",resId,"KPIE7E304C4","硬盘读IOPS","disk_read_iops");
+            //硬盘写IOPS
+            commonDetail.renderLineCharat("tencent_cloud_plat_res_disk_writeipos_linechart",resId,"KPI28E8B622","硬盘写IOPS","disk_write_iops");
+            //活动告警
+            commonDetail.renderActiveAlarms("tencent_cloud_plat_res_disk_active_alarm",resId);
+        }
+
+        //定时任务
+        var timer = setInterval(function () {
+            reload()
+        },commonDetail.timerTime);
+        commonDetail.detailTimer.push(timer);
+
+    });
+});
\ No newline at end of file

@@ -16,7 +16,7 @@ layui.define(['commonDetail','common'], function (exports) {
         //基本信息指标
         var baseKpi = "KPIE13DD9A3,KPIF74D9D2B,KPIA1CFDB4B,KPI2DC9105C,KPI39C76443,KPIE13DD9A3";
         //关键信息指标
-        var keyKpi = "KPIFDF953D6,KPI4D0D4345,KP152C7778F,KPI7054BC34,KPI31CB8D97,KPI31CB8D97";
+        var keyKpi = "KPIFDF953D6,KPI4D0D4345,KP152C7778F,KPI7054BC34,KPI31CB8D97,KPI592C5FCA";
         //实例信息指标
         var instanceKpi = "KP11782D6AF,KPI352DE256,KPI39C76443,KPI7BB10A71,KPI1AEA4DE2,KPIECA37CB0,KPID9507511,KPIE035F0E7,KPIADAC3034,KPIC29F4C6B,KPIE349B543";
         //性能信息指标
@@ -33,7 +33,7 @@ layui.define(['commonDetail','common'], function (exports) {
             //关键信息
             commonDetail.renderText("tencent_cloud_plat_res_redis_keyinfo",resId,keyKpi);
             //实例信息
-            commonDetail.renderTextCols("tencent_cloud_plat_res_redis_instanceinfo",resId,instanceKpi,2,false);
+            commonDetail.renderTextCols("tencent_cloud_plat_res_redis_instanceinfo",resId,instanceKpi,2);
             //性能信息
             commonDetail.renderText("tencent_cloud_plat_res_redis_performanceinfo",resId,performanceKpi);
             //cpu使用率趋势图

@@ -22,7 +22,7 @@ layui.define(['commonDetail','common'], function (exports) {
         //数据库信息指标
         var dbKpi = "KPI1782D6AF,KPI352DE256,KPI40E40BBD,KPIE035F0E7";
         //DCN信息指标
-        var dcnKpi = "KPIA1CFDB4B,KPIC5FB1952,KPIF1379E3F";
+        var dcnKpi = "KPI93D11ED1,KPIC5FB1952,KPIF1379E3F";
         //分片信息
         var shardKpi = "KPI42A0C43D,KPID1029770,KPI1584BE1C,KPI40E40BBD,KPICB805B91,KPI067DEECB,KPIECA37CB0";
 

@@ -20,7 +20,7 @@ layui.define(['commonDetail','common'], function (exports) {
         //网络资源指标
         var netresKpi = "KPI73562B2B,KPI0EDB5CF2,KPI322BD31F,KPI8204B6B6";
         //计算资源指标
-        var comresKpi = "KPID1029770,KPI7054BC34,KPI31CB8D97,KPI1584BE1C,KPI31CB8D97";
+        var comresKpi = "KPID1029770,KPI7054BC34,KPI31CB8D97,KPI1584BE1C,KPI592C5FCA";
         //存储资源指标
         var storesKpi = "KPICF4940F7,KPI6C16A077,KPIE7E304C4,KPI28E8B622,KPI5DC210DE,KPI25D46638,KPI9F00C7A6";
         //数据磁盘信息
@@ -39,11 +39,11 @@ layui.define(['commonDetail','common'], function (exports) {
             //关键信息
             commonDetail.renderText("tencent_cloud_plat_virtualhost_keyinfo",resId,keyKpi);
             //网络资源信息
-            commonDetail.renderText("tencent_cloud_plat_virtualhost_networkinfo",resId,netresKpi);
+            commonDetail.renderText("tencent_cloud_plat_virtualhost_netresinfo",resId,netresKpi);
             //计算资源信息
-            commonDetail.renderText("tencent_cloud_plat_virtualhost_dbinfo",resId,comresKpi);
+            commonDetail.renderText("tencent_cloud_plat_virtualhost_comresinfo",resId,comresKpi);
             //存储资源信息
-            commonDetail.renderText("tencent_cloud_plat_virtualhost_dcninfo",resId,storesKpi);
+            commonDetail.renderText("tencent_cloud_plat_virtualhost_storesinfo",resId,storesKpi);
             //cpu使用率趋势图
             commonDetail.renderLineCharat("tencent_cloud_plat_virtualhost_cpu_linechart",resId,"KPI7054BC34","CPU使用率","cpu");
             //内存使用率趋势图
@@ -55,7 +55,7 @@ layui.define(['commonDetail','common'], function (exports) {
             //数据磁盘信息
             commonDetail.renderTable("tencent_cloud_plat_virtualhost_dataDisk",false,resId,dataDiskKpi,"数据磁盘信息","dataDisk-");
             //系统盘信息
-            commonDetail.renderTable("tencent_cloud_plat_virtualhost_disk",false,resId,diskKpi,"系统盘信息","systemDisk-");
+            commonDetail.renderTable("tencent_cloud_plat_virtualhost_disk",false,resId,diskKpi,"系统盘信息","systemDisk");
             //活动告警
             commonDetail.renderActiveAlarms("tencent_cloud_plat_virtualhost_active_alarm",resId);
         }

@@ -41,7 +41,7 @@ layui.define(['laytpl', 'layer'], function(exports){
 
     //清除 token，并跳转到登入页
     view.exit = function(){
-        debugger
+        // debugger
         if(window.top.location.hash == '#/bigscreen/daping'){
             layui.use(['commonDetail','DPingdex'], function () {
                 layer.msg("登录凭证失效，无法查看详情页，如需查看详情页面，请重新登录再次进入大屏页面！", {

@@ -5,11 +5,11 @@
             <div class="layui-card">
                 <div class="layui-card-body">
                     <div class="lay-row">
-                        <div class="lay-row-item--big">
+                        <div class="lay-row-item lay-row-item--big">
                             <h5 class="lay-row-title">基本信息<i data-id="tencent_cloud_plat_baseinfo" class="iconfont detail_base_info">&#xe61e;</i></h5>
                             <ul class="info-table" id="tencent_cloud_plat_baseinfo"></ul>
                         </div>
-                        <div class="lay-row-item--small">
+                        <div class="lay-row-item lay-row-item--small">
                             <h5 class="lay-row-title">资源状态</h5>
                             <div class="res-state" id="tencent_cloud_plat_health_state"></div>
                         </div>

+<!--tencent_cloud_plat_res_ckafka详细页面-->
+<article class="page-container template template_redis">
+    <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="tencent_cloud_plat_res_ckafka_baseinfo" class="iconfont detail_base_info">&#xe61e;</i></h5>
+                            <ul class="info-table" id="tencent_cloud_plat_res_ckafka_baseinfo"></ul>
+                        </div>
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">关键信息</h5>
+                            <ul class="info-table" id="tencent_cloud_plat_res_ckafka_keyinfo"></ul>
+                        </div>
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">资源状态</h5>
+                            <div class="res-state" id="tencent_cloud_plat_res_ckafka_health_state"></div>
+                        </div>
+                    </div>
+                    <div class="lay-row">
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">实时告警动态</h5>
+                            <div id="tencent_cloud_plat_res_ckafka_active_alarm"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</article>
+<textarea id="tencent_cloud_plat_res_ckafka_param_id" style="display: none;">{{d}}</textarea>
+<script>
+    layui.use('tencent_cloud_plat_res_ckafka', function (fn) {
+        var $ = layui.$;
+        var parm = $("#tencent_cloud_plat_res_ckafka_param_id").val();
+        if(parm.indexOf('{{d') != -1){
+            fn();
+        }else{
+            fn(JSON.parse(parm));
+        }
+    });
+</script>
\ No newline at end of file

+<!--tencent_cloud_plat_res_disk详细页面-->
+<article class="page-container template template_redis">
+    <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="tencent_cloud_plat_res_disk_baseinfo" class="iconfont detail_base_info">&#xe61e;</i></h5>
+                            <ul class="info-table" id="tencent_cloud_plat_res_disk_baseinfo"></ul>
+                        </div>
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">关键信息<i data-id="tencent_cloud_plat_res_disk_keyinfo" class="iconfont detail_base_info">&#xe61e;</i></h5>
+                            <ul class="info-table" id="tencent_cloud_plat_res_disk_keyinfo"></ul>
+                        </div>
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">资源状态</h5>
+                            <div class="res-state" id="tencent_cloud_plat_res_disk_health_state"></div>
+                        </div>
+                    </div>
+                    <div class="lay-row">
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">硬盘信息</h5>
+                            <ul class="info-table" id="tencent_cloud_plat_res_disk_diskinfo"></ul>
+                        </div>
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">IO信息</h5>
+                            <ul class="info-table" id="tencent_cloud_plat_res_disk_ioinfo"></ul>
+                        </div>
+                    </div>
+                    <div class="lay-row">
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">硬盘读流量</h5>
+                            <div id="tencent_cloud_plat_res_disk_readflow_linechart" class="detail_line_chart"></div>
+                        </div>
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">硬盘写流量</h5>
+                            <div id="tencent_cloud_plat_res_disk_writeflow_linechart" class="detail_line_chart"></div>
+                        </div>
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">硬盘读IOPS</h5>
+                            <div id="tencent_cloud_plat_res_disk_readipos_linechart" class="detail_line_chart"></div>
+                        </div>
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">硬盘写IOPS</h5>
+                            <div id="tencent_cloud_plat_res_disk_writeipos_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="tencent_cloud_plat_res_disk_active_alarm"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</article>
+<textarea id="tencent_cloud_plat_res_disk_param_id" style="display: none;">{{d}}</textarea>
+<script>
+    layui.use('tencent_cloud_plat_res_disk', function (fn) {
+        var $ = layui.$;
+        var parm = $("#tencent_cloud_plat_res_disk_param_id").val();
+        if(parm.indexOf('{{d') != -1){
+            fn();
+        }else{
+            fn(JSON.parse(parm));
+        }
+    });
+</script>
\ No newline at end of file

@@ -19,11 +19,11 @@
                         </div>
                     </div>
                     <div class="lay-row">
-                        <div class="lay-row-item--big">
-                            <h5 class="lay-row-title">实例信息</h5>
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">实例信息<i data-id="tencent_cloud_plat_res_redis_instanceinfo" class="iconfont detail_base_info">&#xe61e;</i></h5>
                             <ul class="info-table" id="tencent_cloud_plat_res_redis_instanceinfo"></ul>
                         </div>
-                        <div class="lay-row-item--small">
+                        <div class="lay-row-item">
                             <h5 class="lay-row-title">性能信息</h5>
                             <ul class="info-table" id="tencent_cloud_plat_res_redis_performanceinfo"></ul>
                         </div>