Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-lushangqing

@@ -4776,6 +4776,20 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                     templet: '#linkStateTpl',
                     templet: '#linkStateTpl',
                     sort: true
                     sort: true
                 }
                 }
+            ],
+            "DATABASE_OGG": [
+                {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
+                {
+                    field: 'resName', title: '资源名称', minWidth: 250, sort: true,
+                    templet: '<div><span data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" class="layui-table-link">{{ d.resName }}</span></div>'
+                },
+                {field: 'shortName', title: '别名', width: 100, align: 'center', sort: true, templet:'#shortNameTpl'},
+                {field: 'health', title: '健康状态', width: 86, 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: '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'}
             ]
             ]
         },
         },
         /**
         /**

+layui.define(['commonDetail', 'common', 'admin'], function (exports) {
+    var commonDetail = layui.commonDetail;
+    var common = layui.common;
+    var admin = layui.admin;
+    //对外暴露的接口
+    exports('database_ogg', function (data) {
+        var resId = '';
+        var showFlag = common.getUrlParam("show");
+        if (showFlag && showFlag == '0') {
+            resId = common.getUrlParam("resId");
+        } else {
+            resId = data.resId;
+        }
+
+        commonDetail.bindTips();
+        
+        // 基本信息
+        var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B";
+
+        // ogg信息
+        var oggkpi = "KPI95C50C7C,KPIEC53A8C4,KPI03937134,KPI1A122D84,KPI16282DF0";
+
+        reload();
+
+        //渲染页面
+        function reload() {
+
+            //基本信息
+            commonDetail.renderText("databaseogg_baseinfo",resId,jbxxKpi);
+            //资源状态
+            commonDetail.renderResHealth("databaseogg_health_state",resId);
+
+            // ogg信息
+            commonDetail.renderTable("databaseogg_ogginfo", false, resId, oggkpi, 'ogg运行情况', 'ogg-', 'ext, rr.KPI1A122D84 desc, rr.KPI16282DF0', 'desc');
+
+
+            // 告警信息
+            commonDetail.renderActiveAlarms('databaseogg_alarmlist', resId)
+        }
+
+        //定时任务
+        var timer = setInterval(function () {
+            reload()
+        }, commonDetail.timerTime);
+        commonDetail.detailTimer.push(timer);
+
+    });
+});

@@ -126,3 +126,14 @@
     content: '';
     content: '';
 }
 }
 
 
+.self-monitor{
+    background: url('../img/menu/self-monitor.png') !important;
+    width: 15px;
+    height: 15px;
+    margin-top: -7px !important;
+}
+
+.self-monitor:before {
+    content: '';
+}
+

+<!--ogg详细页面-->
+<article class="page-container template">
+    <div class="page-panel">
+        <div class="main">
+            <div class="layui-card">
+                <div class="lay-row">
+                    <div class="lay-row-item">
+                        <h5 class="lay-row-title">基本信息<i data-id="databaseogg_baseinfo" class="iconfont detail_base_info">&#xe61e;</i></h5>
+                        <ul class="info-table" id="databaseogg_baseinfo"></ul>
+                    </div>
+                    <div class="lay-row-item">
+                        <h5 class="lay-row-title">资源状态</h5>
+                        <div class="res-state" id="databaseogg_health_state"></div>
+                    </div>
+                </div>
+                <div class="layui-card-body">
+                    <div class="lay-row" id="databaseogg_ogginfoHide">
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">ogg运行情况<span id="databaseogg_ogginfoMore" class="layui-table-link">更多</span></h5>
+                            <div id="databaseogg_ogginfo"></div>
+                        </div>
+                    </div>
+                    
+                    <div class="lay-row">
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">实时告警动态</h5>
+                            <div id="databaseogg_alarmlist"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</article>
+<textarea id="database_ogg_param_id" style="display: none;">{{d}}</textarea>
+<script>
+    layui.use('database_ogg', function (fn) {
+        var $ = layui.$;
+        var parm = $("#database_ogg_param_id").val();
+        if(parm.indexOf('{{d') != -1){
+            fn();
+        }else{
+            fn(JSON.parse(parm));
+        }
+    });
+</script>

@@ -84,7 +84,7 @@ export default {
         // 获取左侧树结构
         // 获取左侧树结构
         let loadTree = () => {
         let loadTree = () => {
             proxy.$http.get("/api-web/v32/res/list/tree", {}, function (res) {
             proxy.$http.get("/api-web/v32/res/list/tree", {}, function (res) {
-                if (res && res.data) {
+                if (res && res.data && res.data.length > 0) {
                     treeData.value = res.data
                     treeData.value = res.data
 
 
                     let first = res.data[0];
                     let first = res.data[0];