Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web

wangtao
Commit 47d925f38a01e0456e2fcacd2f7a1b0c499e4bbf 2 parents 899ebae1 93b0976c
Showing 4 changed files with 134 additions and 12 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
hg-monitor-web-base/src/main/resources/static/src/controller/host_x86server.js
hg-monitor-web-base/src/main/resources/static/src/controller/host_x86virtual.js
hg-monitor-web-base/src/main/resources/static/src/style/css/main.css
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
View file @47d925f
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
View file @47d925f
@@ -129,6 +129,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                     var li ='<div style="text-align:center;">'
                         + '<i style="line-height: 150px; padding:20px;font-style:normal;">'+"暂无数据"+'</i>' + '</div>'
                 }
+                //lsq x86服务器增加8个指标后，给信息图标增加数据数量用来判断tip是两列还是一列 2022-06-28
+                $('.detail_base_info').attr('data-count',res.data?res.data.length:0);
+                let newKpi='KPI7C714058,KPIA2EA1646,KPID152C818,KPI780EFE90,KPI1E378242,KPI41B4C1B4,KPI6AC0FB43,KPI6F620E2B';
+                let newKpiArr=newKpi.split(',');
                 $.each(data, function (i, v) {
                     var fontColor='';
                     var valueStr = '';
@@ -163,22 +167,34 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                         }
                         titleStr = valueStr;
                     }
-                    var tips = '<a class="detail_row_menu hide" data-statusf='+statusF+' data-id='+v.id+' data-flag='+v.flag+
+                    //lsq 判断基本信息的指标是否为新增的8个，如果是则有其他的下探 2022-06-29
+                    let nature='true';
+                    if(newKpiArr.indexOf(v.id)!=-1){
+                        nature='false'
+                    }
+                    let name=v.name;
+                    var tips = '<a class="detail_row_menu hide" data-statusf="'+statusF+'" data-id='+v.id+' data-flag='+v.flag+
                         ' data-name='+v.name+' data-kpiname='+v.name+' data-iswarning=1 data-ident=1' +
-                        ' data-trend=0 data-unit="" data-hidem="hidem" data-nature="true" ' +
+                        ' data-trend=0 data-unit="" data-hidem="hidem" data-nature="'+nature+'" ' +
                         // ' data-restype='+((data && data[0])?data[0].resType:"")+'>\n' +
                         ' data-restype='+(v.resType?v.resType:"")+'>\n' +
                         '<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' +
                         '</a>'
                     var menuId = "";
-                    if (v.id == 'KPIE13DD9A3' ||  v.id == 'KPI02786E8D' || status!=-1) {
+                    if (v.id == 'KPIE13DD9A3' ||  v.id == 'KPI02786E8D' || status!=-1 || newKpiArr.indexOf(v.id)!=-1) {
                         v.name = v.name + tips;
-                        menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu'";
+                        menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu' data-resid='"+resId+"'";
                     }
                     var $html = addIconByValue(valueStr);
                     var resStyle = obj.alarmEleMatchStyle(v.flag, v.id);
-                    li += ' <li><span ' + menuId + ' style="text-align:left;width:40%">' + v.name + '</span>' +
-                        '<span title="' + titleStr + '" style="' + fontColor + 'width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;' + resStyle + '">'
+                    //lsq 判断基本信息的指标是否为新增的8个，如果是则数值有下探 2022-06-29
+                    let isProbeDown='';
+                    if(newKpiArr.indexOf(v.id)!=-1){
+                        isProbeDown='isProbeDown'
+                    }
+                    li += ' <li><span ' + menuId + ' style="text-align:left;">' + v.name + '</span>' +
+                        '<span data-kpiid="'+v.id+'" data-flag="'+v.flag+'" data-warning="1" data-ident="1" data-trend="0" data-name="'+name+'"' +
+                        '  class="'+isProbeDown+'" title="' + titleStr + '" style="' + fontColor + 'width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;' + resStyle + '">'
                         + $html + valueStr + '</span></li>'
                 });
                 $("#" + targetId).html(li);
@@ -3572,8 +3588,17 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                 direction || (direction = 2);
                 var len = $(`#${targetId}`).find("li").eq(0).find("span").length;
                 var w = "400px";
-                if(len && len > 2){
-                    w = '720px';
+                //lsq 判断是否两列显示 2022-06-28
+                var count=$(this).data('count');
+                if(count>12){
+                    //两列显示
+                    w = '820px';
+                    $(`#${targetId}`).addClass('info-table-two')
+                }else{
+                    //一列显示
+                    if(len && len > 2){
+                        w = '720px';
+                    }
                 }
                 var $content = $(`#${targetId}`).clone();
                 $content.find('[lay-tips]').removeAttr('lay-tips');
@@ -3589,7 +3614,20 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                         //添加遮罩层 默认透明度为0.3
                         shade: [0.1, '#00000000'],
                         //是否点击遮罩关闭
-                        shadeClose: true
+                        shadeClose: false,
+                        closeBtn:true,
+                        success:function(){
+                            let resId=$(`#${targetId}` + `_detail_row_menu.statusMenu`).data('resid')
+                            $(`#${targetId}` + `_detail_row_menu.statusMenu`).hover(function () {
+                                var $that = $(this);
+                                var $btn = $that.find(".detail_row_menu");
+                                if ($btn.length > 0) {
+                                    $(".layui-card-body").find(".detail_row_menu:not(.hide)").addClass("hide")
+                                    $btn.removeClass("hide");
+                                }
+                            });
+                            filterSuppressMonitor(resId)
+                        }
                     });
                     //xwx update 资源视图基本信息弹出框bug修改 2021-10-22 --end
                     window.detailTips = detailTips;
@@ -3975,6 +4013,12 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
     function filterSuppressMonitor(resId,isStatusMenubox){
         //菜单按钮点击事件
         $("a.detail_row_menu").off("click").on("click",function (e) {
+            if (e.preventDefault()) {
+                e.preventDefault();
+            }
+            if (e.stopPropagation()) {
+                e.stopPropagation();
+            }
             $("#detail_menubox_id").remove();
             var $menu = $(this);
             var hideM = $menu.data('hidem');
@@ -4114,6 +4158,31 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
             },300)
         });
+        //lsq 新增的8个指标中数值点击打开性能曲线图 2022-06-28
+        $(".isProbeDown").unbind('click').click(function (e) {
+            if (e.preventDefault()) {
+                e.preventDefault();
+            }
+            if (e.stopPropagation()) {
+                e.stopPropagation();
+            }
+            let kpiId=$(this).data('kpiid');
+            let flag=$(this).data('flag');
+            let warning=$(this).data('warning');
+            let ident=$(this).data('ident');
+            let trend=$(this).data('trend');
+            let name=$(this).data('name');
+            var params = {
+                resId: resId,
+                kpiId: kpiId,
+                flag: flag,
+                warning: warning,
+                ident: ident,
+                trend: trend,
+                name: name
+            };
+            common.openLineChart(name, params);
+        });
         //点击空白处隐藏弹出菜单
         $(document).click(function(event){
             var _con = $('a.detail_row_menu');  // 设置目标区域
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/host_x86server.js
View file @47d925f
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/host_x86server.js
View file @47d925f
@@ -20,7 +20,10 @@ layui.define(['commonDetail','common', 'admin'], function (exports) {
         }
         //基本信息
-        var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI67076676,KPI9311A2A3,KPI30D23EF4,KPI1C777D98,KPIA04D5BD0,KPID3EBE40F,KPI0990CD44,KPI8266B678,KPI1584BE1C,KPI0E5EB8ED,KPI05227E45,KPI899DBD7B";
+        // var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI67076676,KPI9311A2A3,KPI30D23EF4,KPI1C777D98,KPIA04D5BD0,KPID3EBE40F,KPI0990CD44,KPI8266B678,KPI1584BE1C,KPI0E5EB8ED,KPI05227E45,KPI899DBD7B";
+        //lsq 增加了8个性能指标 'KPI7C714058,KPIA2EA1646,KPID152C818,KPI780EFE90,KPI1E378242,KPI41B4C1B4,KPI6AC0FB43,KPI6F620E2B' 2022-06-28
+        var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI67076676,KPI9311A2A3,KPI30D23EF4,KPI1C777D98,KPIA04D5BD0,KPID3EBE40F,KPI0990CD44,KPI8266B678,KPI1584BE1C,KPI0E5EB8ED,KPI05227E45,KPI899DBD7B" +
+            ",KPI7C714058,KPIA2EA1646,KPID152C818,KPI780EFE90,KPI1E378242,KPI41B4C1B4,KPI6AC0FB43,KPI6F620E2B";
         //文件系统
         var filesyskpi = "KPI7AC1664E,KPI449F5365,KPIA91F44E7,KPI98306224,KPIE25925F7,KPI77C28BBA";
         //INODE信息
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/host_x86virtual.js
View file @47d925f
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/host_x86virtual.js
View file @47d925f
@@ -19,7 +19,10 @@ layui.define(['commonDetail','common', 'admin'], function (exports) {
         commonDetail.bindTips();
         //基本信息
-        var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI67076676,KPI9311A2A3,KPI30D23EF4,KPI1C777D98,KPI78AC0D1B,KPIE9501365,KPIA04D5BD0,KPI899DBD7B,KPID3EBE40F,KPI0990CD44,KPI8266B678,KPI1584BE1C,KPI0E5EB8ED,KPI05227E45,KPI1AF5B3C6";
+        // var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI67076676,KPI9311A2A3,KPI30D23EF4,KPI1C777D98,KPI78AC0D1B,KPIE9501365,KPIA04D5BD0,KPI899DBD7B,KPID3EBE40F,KPI0990CD44,KPI8266B678,KPI1584BE1C,KPI0E5EB8ED,KPI05227E45,KPI1AF5B3C6";
+        //lsq 增加了8个性能指标 'KPI7C714058,KPIA2EA1646,KPID152C818,KPI780EFE90,KPI1E378242,KPI41B4C1B4,KPI6AC0FB43,KPI6F620E2B' 2022-06-28
+        var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI67076676,KPI9311A2A3,KPI30D23EF4,KPI1C777D98,KPI78AC0D1B,KPIE9501365,KPIA04D5BD0,KPI899DBD7B,KPID3EBE40F,KPI0990CD44,KPI8266B678,KPI1584BE1C,KPI0E5EB8ED,KPI05227E45,KPI1AF5B3C6" +
+            ",KPI7C714058,KPIA2EA1646,KPID152C818,KPI780EFE90,KPI1E378242,KPI41B4C1B4,KPI6AC0FB43,KPI6F620E2B";
         //文件系统
         var filesyskpi = "KPI7AC1664E,KPI449F5365,KPIA91F44E7,KPI98306224,KPIE25925F7,KPI77C28BBA";
         //INODE信息
--- a/hg-monitor-web-base/src/main/resources/static/src/style/css/main.css
View file @47d925f
+++ b/hg-monitor-web-base/src/main/resources/static/src/style/css/main.css
View file @47d925f
@@ -7985,4 +7985,51 @@ form[lay-filter="activewarning-form"] .layui-inline {
     margin-left: 10px;
     text-align: center;
 }
-/* //End XuHaoJie 2022/2/17 9:51 TODO  即时消息结束*/
+/* //End XuHaoJie 2022/2/17 9:51 TODO  即时消息结束*/
+/*start lsq x86增加了8个指标后的基本信息样式 2022-06-28*/
+.layui-layer-tips .info-table-two{
+    display: flex;
+    flex-wrap: wrap;
+}
+.layui-layer-tips .layui-layer-content .info-table-two li{
+    width:50%;
+}
+.layui-layer-tips .info-table-two li:nth-child(4n-1){
+    background-color: #262323 !important;
+}
+.layui-layer-tips .info-table-two li:nth-child(2n){
+    background-color: inherit !important;
+}
+.layui-layer-tips .info-table-two li:nth-child(4n){
+    background-color: #262323 !important;
+}
+.layui-layer-content .info-table li span:first-child{
+    width:40%!important;
+}
+.layui-layer-tips .layui-layer-content .info-table-two li span:first-child{
+    flex:2;
+}
+.layui-layer-tips .layui-layer-content .info-table-two .detail_menubox li{
+    width:100%;
+    padding:15px 20px;
+    box-sizing: border-box;
+    cursor: pointer;
+}
+.layui-layer-tips .layui-layer-content .info-table-two .detail_menubox li:hover{
+    color: #fff;
+    background: #0d82e9!important;
+}
+.layui-layer-tips .info-table-two li .detail_menubox{
+    position: fixed;
+    /*padding:0 10px;*/
+    z-index: 999;
+    background: #fff!important;
+}
+.layui-layer-tips .info-table-two li .detail_menubox li:nth-child(4n-1),.layui-layer-tips .info-table-two li .detail_menubox li:nth-child(4n){
+    background: #fff!important;
+}
+.isProbeDown{
+    cursor: pointer;
+    text-decoration: underline;
+}
+/*end lsq 2022-06-28*/