diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js b/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js index 07ba964..17bf744 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js @@ -131,6 +131,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele } //lsq x86服务器增加8个指标后,给信息图标增加数据数量用来判断tip是两列还是一列 2022-06-28 $('.detail_base_info').attr('data-count',res.data?res.data.length:0); + $('.detail_base_info').attr('data-infotext','text'); let newKpi='KPI7C714058,KPIA2EA1646,KPID152C818,KPI780EFE90,KPI1E378242,KPI41B4C1B4,KPI6AC0FB43,KPI6F620E2B'; let newKpiArr=newKpi.split(','); $.each(data, function (i, v) { @@ -253,6 +254,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele var flags = ""; var kpiIdList= ""; var data = res.data; + //lsq 详情页基本信息悬浮提示优化 2022-08-09 + $('.detail_base_info').attr('data-count',res.data?res.data.length:0); + $('.detail_base_info').attr('data-infotext','textCols'); if (data.length > 0) { var dataArr = common.splieceGroup(data, cols); var li = ""; @@ -3921,7 +3925,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele var w = "400px"; //lsq 判断是否两列显示 2022-06-28 var count=$(this).data('count'); - if(count>12){ + var info_text=$(this).data('infotext'); + if(count>12 && info_text=='text'){ //两列显示 w = '820px'; $(`#${targetId}`).addClass('info-table-two') @@ -3930,6 +3935,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele if(len && len > 2){ w = '720px'; } + //lsq renderTextCols基本信息悬浮中下探样式 2022-08-09 + if(info_text=='textCols'){ + $(`#${targetId}`).addClass('info-table-three') + } } var $content = $(`#${targetId}`).clone(); $content.find('[lay-tips]').removeAttr('lay-tips'); diff --git a/hg-monitor-web-base/src/main/resources/static/src/style/css/main.css b/hg-monitor-web-base/src/main/resources/static/src/style/css/main.css index ce4bf97..286d539 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/style/css/main.css +++ b/hg-monitor-web-base/src/main/resources/static/src/style/css/main.css @@ -8009,22 +8009,25 @@ form[lay-filter="activewarning-form"] .layui-inline { .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{ +.layui-layer-tips .layui-layer-content .info-table-two .detail_menubox li,.layui-layer-tips .layui-layer-content .info-table-three .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{ +.layui-layer-tips .layui-layer-content .info-table-two .detail_menubox li:hover,.layui-layer-tips .layui-layer-content .info-table-three .detail_menubox li:hover{ color: #fff; background: #0d82e9!important; } -.layui-layer-tips .info-table-two li .detail_menubox{ +.layui-layer-tips .info-table-two li .detail_menubox,.layui-layer-tips .info-table-three li .detail_menubox{ position: fixed; /*padding:0 10px;*/ z-index: 999; background: #fff!important; } +.layui-layer-tips .info-table-three li .detail_menubox li{ + background-color: #FFFFFF!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; }