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

…eb into master-500-dev

@@ -4776,6 +4776,20 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                     templet: '#linkStateTpl',
                     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);
+
+    });
+});
\ No newline at end of file

@@ -16,8 +16,8 @@ layui.define(['tree', 'laypage', 'laytpl', 'commonDetail', 'common'], function (
 
         commonDetail.bindTips();
 
-        //基本信息
-        var jbxxKpiId = "KPIE13DD9A3,KPIF74D9D2B";
+        //基本信息 //lsq 增加nginx版本号 2022-08-25
+        var jbxxKpiId = "KPIE13DD9A3,KPIF74D9D2B,KPICCB7C3D9";
 
         //连接状态
         var ljztKpiId = "KPIC3F788A8,KPIFC36A84E,KPI4E4A62CD,KPI86418BC6,KPID09345D9,KPI6FD06E96,KPI69521E11,KPI8F1AE015";

@@ -137,7 +137,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                             '1': '直接类型',
                             '2': '间接类型'
                         };
-                        var directStr = directEnum[d.direct];
+                        var directStr = d.direct?directEnum[d.direct]:'';
                     }}
                     <span>{{directStr}}</span>
                     </div>

@@ -167,7 +167,6 @@ layui.define(['element', 'admin'], function (exports) {
                 that.sendAjaxData(path,text)
 
             }
-            console.log(text,that.data.handleLog);
         },
         /**
          * 页面其他元素绑定事件
@@ -196,7 +195,6 @@ layui.define(['element', 'admin'], function (exports) {
             if(menuStrArrSecond.length>0){
                 handleStr+='->'+menuStrArrSecond.join(',');
             }
-            console.log("abc",handleStr)
         },
         /**
          * 页面其他元素绑定事件

+<!--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>
\ No newline at end of file