monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit a4e3b2e071e6085828af67f0d6520a943978bc67 2 parents c727738d 607b2bae

Merge branch 'master-v32-lushangqing' into 'master' 

【961】 详情页监控连接状态压制次数和压制指标样式重叠严重



See merge request !837
Inline Side-by-side
Showing 2 changed files with 16 additions and 4 deletions
@@ -131,6 +131,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -131,6 +131,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
131 } 131 }
132 //lsq x86服务器增加8个指标后，给信息图标增加数据数量用来判断tip是两列还是一列 2022-06-28 132 //lsq x86服务器增加8个指标后，给信息图标增加数据数量用来判断tip是两列还是一列 2022-06-28
133 $('.detail_base_info').attr('data-count',res.data?res.data.length:0); 133 $('.detail_base_info').attr('data-count',res.data?res.data.length:0);
  134 + $('.detail_base_info').attr('data-infotext','text');
134 let newKpi='KPI7C714058,KPIA2EA1646,KPID152C818,KPI780EFE90,KPI1E378242,KPI41B4C1B4,KPI6AC0FB43,KPI6F620E2B'; 135 let newKpi='KPI7C714058,KPIA2EA1646,KPID152C818,KPI780EFE90,KPI1E378242,KPI41B4C1B4,KPI6AC0FB43,KPI6F620E2B';
135 let newKpiArr=newKpi.split(','); 136 let newKpiArr=newKpi.split(',');
136 $.each(data, function (i, v) { 137 $.each(data, function (i, v) {
@@ -253,6 +254,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -253,6 +254,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
253 var flags = ""; 254 var flags = "";
254 var kpiIdList= ""; 255 var kpiIdList= "";
255 var data = res.data; 256 var data = res.data;
  257 + //lsq 详情页基本信息悬浮提示优化 2022-08-09
  258 + $('.detail_base_info').attr('data-count',res.data?res.data.length:0);
  259 + $('.detail_base_info').attr('data-infotext','textCols');
256 if (data.length > 0) { 260 if (data.length > 0) {
257 var dataArr = common.splieceGroup(data, cols); 261 var dataArr = common.splieceGroup(data, cols);
258 var li = ""; 262 var li = "";
@@ -3921,7 +3925,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3921,7 +3925,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3921 var w = "400px"; 3925 var w = "400px";
3922 //lsq 判断是否两列显示 2022-06-28 3926 //lsq 判断是否两列显示 2022-06-28
3923 var count=$(this).data('count'); 3927 var count=$(this).data('count');
3924 - if(count>12){ 3928 + var info_text=$(this).data('infotext');
  3929 + if(count>12 && info_text=='text'){
3925 //两列显示 3930 //两列显示
3926 w = '820px'; 3931 w = '820px';
3927 $(`#${targetId}`).addClass('info-table-two') 3932 $(`#${targetId}`).addClass('info-table-two')
@@ -3930,6 +3935,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3930,6 +3935,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3930 if(len && len > 2){ 3935 if(len && len > 2){
3931 w = '720px'; 3936 w = '720px';
3932 } 3937 }
  3938 + //lsq renderTextCols基本信息悬浮中下探样式 2022-08-09
  3939 + if(info_text=='textCols'){
  3940 + $(`#${targetId}`).addClass('info-table-three')
  3941 + }
3933 } 3942 }
3934 var $content = $(`#${targetId}`).clone(); 3943 var $content = $(`#${targetId}`).clone();
3935 $content.find('[lay-tips]').removeAttr('lay-tips'); 3944 $content.find('[lay-tips]').removeAttr('lay-tips');
@@ -8009,22 +8009,25 @@ form[lay-filter="activewarning-form"] .layui-inline { @@ -8009,22 +8009,25 @@ form[lay-filter="activewarning-form"] .layui-inline {
8009 .layui-layer-tips .layui-layer-content .info-table-two li span:first-child{ 8009 .layui-layer-tips .layui-layer-content .info-table-two li span:first-child{
8010 flex:2; 8010 flex:2;
8011 } 8011 }
8012 -.layui-layer-tips .layui-layer-content .info-table-two .detail_menubox li{ 8012 +.layui-layer-tips .layui-layer-content .info-table-two .detail_menubox li,.layui-layer-tips .layui-layer-content .info-table-three .detail_menubox li{
8013 width:100%; 8013 width:100%;
8014 padding:15px 20px; 8014 padding:15px 20px;
8015 box-sizing: border-box; 8015 box-sizing: border-box;
8016 cursor: pointer; 8016 cursor: pointer;
8017 } 8017 }
8018 -.layui-layer-tips .layui-layer-content .info-table-two .detail_menubox li:hover{ 8018 +.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{
8019 color: #fff; 8019 color: #fff;
8020 background: #0d82e9!important; 8020 background: #0d82e9!important;
8021 } 8021 }
8022 -.layui-layer-tips .info-table-two li .detail_menubox{ 8022 +.layui-layer-tips .info-table-two li .detail_menubox,.layui-layer-tips .info-table-three li .detail_menubox{
8023 position: fixed; 8023 position: fixed;
8024 /*padding:0 10px;*/ 8024 /*padding:0 10px;*/
8025 z-index: 999; 8025 z-index: 999;
8026 background: #fff!important; 8026 background: #fff!important;
8027 } 8027 }
  8028 +.layui-layer-tips .info-table-three li .detail_menubox li{
  8029 + background-color: #FFFFFF!important;
  8030 +}
8028 .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){ 8031 .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){
8029 background: #fff!important; 8032 background: #fff!important;
8030 } 8033 }