monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 41b3c56c88468c7dc5a8d08e45ff285ab1056288 2 parents 79fd148e 45ae46ff

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

【1412】 X86服务器（ssh采集）详情页面增加指标展示- #1



See merge request !701
Inline Side-by-side
Showing 4 changed files with 74 additions and 9 deletions
@@ -129,6 +129,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -129,6 +129,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
129 var li ='<div style="text-align:center;">' 129 var li ='<div style="text-align:center;">'
130 + '<i style="line-height: 150px; padding:20px;font-style:normal;">'+"暂无数据"+'</i>' + '</div>' 130 + '<i style="line-height: 150px; padding:20px;font-style:normal;">'+"暂无数据"+'</i>' + '</div>'
131 } 131 }
  132 + //lsq x86服务器增加8个指标后，给信息图标增加数据数量用来判断tip是两列还是一列 2022-06-28
  133 + $('.detail_base_info').attr('data-count',res.data?res.data.length:0);
  134 + let newKpi='KPI7C714058,KPIA2EA1646,KPID152C818,KPI780EFE90,KPI1E378242,KPI41B4C1B4,KPI6AC0FB43,KPI6F620E2B';
  135 + let newKpiArr=newKpi.split(',');
132 $.each(data, function (i, v) { 136 $.each(data, function (i, v) {
133 var fontColor=''; 137 var fontColor='';
134 var valueStr = ''; 138 var valueStr = '';
@@ -171,13 +175,13 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -171,13 +175,13 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
171 '<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' + 175 '<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' +
172 '</a>' 176 '</a>'
173 var menuId = ""; 177 var menuId = "";
174 - if (v.id == 'KPIE13DD9A3' || v.id == 'KPI02786E8D' || status!=-1) { 178 + if (v.id == 'KPIE13DD9A3' || v.id == 'KPI02786E8D' || status!=-1 || newKpiArr.indexOf(v.id)!=-1) {
175 v.name = v.name + tips; 179 v.name = v.name + tips;
176 - menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu'"; 180 + menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu' data-resid='"+resId+"'";
177 } 181 }
178 var $html = addIconByValue(valueStr); 182 var $html = addIconByValue(valueStr);
179 var resStyle = obj.alarmEleMatchStyle(v.flag, v.id); 183 var resStyle = obj.alarmEleMatchStyle(v.flag, v.id);
180 - li += ' <li><span ' + menuId + ' style="text-align:left;width:40%">' + v.name + '</span>' + 184 + li += ' <li><span ' + menuId + ' style="text-align:left;">' + v.name + '</span>' +
181 '<span title="' + titleStr + '" style="' + fontColor + 'width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;' + resStyle + '">' 185 '<span title="' + titleStr + '" style="' + fontColor + 'width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;' + resStyle + '">'
182 + $html + valueStr + '</span></li>' 186 + $html + valueStr + '</span></li>'
183 }); 187 });
@@ -3572,8 +3576,17 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3572,8 +3576,17 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3572 direction || (direction = 2); 3576 direction || (direction = 2);
3573 var len = $(`#${targetId}`).find("li").eq(0).find("span").length; 3577 var len = $(`#${targetId}`).find("li").eq(0).find("span").length;
3574 var w = "400px"; 3578 var w = "400px";
3575 - if(len && len > 2){  
3576 - w = '720px'; 3579 + //lsq 判断是否两列显示 2022-06-28
  3580 + var count=$(this).data('count');
  3581 + if(count>12){
  3582 + //两列显示
  3583 + w = '820px';
  3584 + $(`#${targetId}`).addClass('info-table-two')
  3585 + }else{
  3586 + //一列显示
  3587 + if(len && len > 2){
  3588 + w = '720px';
  3589 + }
3577 } 3590 }
3578 var $content = $(`#${targetId}`).clone(); 3591 var $content = $(`#${targetId}`).clone();
3579 $content.find('[lay-tips]').removeAttr('lay-tips'); 3592 $content.find('[lay-tips]').removeAttr('lay-tips');
@@ -3589,7 +3602,20 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3589,7 +3602,20 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3589 //添加遮罩层 默认透明度为0.3 3602 //添加遮罩层 默认透明度为0.3
3590 shade: [0.1, '#00000000'], 3603 shade: [0.1, '#00000000'],
3591 //是否点击遮罩关闭 3604 //是否点击遮罩关闭
3592 - shadeClose: true 3605 + shadeClose: false,
  3606 + closeBtn:true,
  3607 + success:function(){
  3608 + let resId=$(`#${targetId}` + `_detail_row_menu.statusMenu`).data('resid')
  3609 + $(`#${targetId}` + `_detail_row_menu.statusMenu`).hover(function () {
  3610 + var $that = $(this);
  3611 + var $btn = $that.find(".detail_row_menu");
  3612 + if ($btn.length > 0) {
  3613 + $(".layui-card-body").find(".detail_row_menu:not(.hide)").addClass("hide")
  3614 + $btn.removeClass("hide");
  3615 + }
  3616 + });
  3617 + filterSuppressMonitor(resId)
  3618 + }
3593 }); 3619 });
3594 //xwx update 资源视图基本信息弹出框bug修改 2021-10-22 --end 3620 //xwx update 资源视图基本信息弹出框bug修改 2021-10-22 --end
3595 window.detailTips = detailTips; 3621 window.detailTips = detailTips;
@@ -3975,6 +4001,12 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3975,6 +4001,12 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3975 function filterSuppressMonitor(resId,isStatusMenubox){ 4001 function filterSuppressMonitor(resId,isStatusMenubox){
3976 //菜单按钮点击事件 4002 //菜单按钮点击事件
3977 $("a.detail_row_menu").off("click").on("click",function (e) { 4003 $("a.detail_row_menu").off("click").on("click",function (e) {
  4004 + if (e.preventDefault()) {
  4005 + e.preventDefault();
  4006 + }
  4007 + if (e.stopPropagation()) {
  4008 + e.stopPropagation();
  4009 + }
3978 $("#detail_menubox_id").remove(); 4010 $("#detail_menubox_id").remove();
3979 var $menu = $(this); 4011 var $menu = $(this);
3980 var hideM = $menu.data('hidem'); 4012 var hideM = $menu.data('hidem');
@@ -20,7 +20,10 @@ layui.define(['commonDetail','common', 'admin'], function (exports) { @@ -20,7 +20,10 @@ layui.define(['commonDetail','common', 'admin'], function (exports) {
20 } 20 }
21 21
22 //基本信息 22 //基本信息
23 - var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI67076676,KPI9311A2A3,KPI30D23EF4,KPI1C777D98,KPIA04D5BD0,KPID3EBE40F,KPI0990CD44,KPI8266B678,KPI1584BE1C,KPI0E5EB8ED,KPI05227E45,KPI899DBD7B"; 23 + // var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI67076676,KPI9311A2A3,KPI30D23EF4,KPI1C777D98,KPIA04D5BD0,KPID3EBE40F,KPI0990CD44,KPI8266B678,KPI1584BE1C,KPI0E5EB8ED,KPI05227E45,KPI899DBD7B";
  24 + //lsq 增加了8个性能指标 'KPI7C714058,KPIA2EA1646,KPID152C818,KPI780EFE90,KPI1E378242,KPI41B4C1B4,KPI6AC0FB43,KPI6F620E2B' 2022-06-28
  25 + var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI67076676,KPI9311A2A3,KPI30D23EF4,KPI1C777D98,KPIA04D5BD0,KPID3EBE40F,KPI0990CD44,KPI8266B678,KPI1584BE1C,KPI0E5EB8ED,KPI05227E45,KPI899DBD7B" +
  26 + ",KPI7C714058,KPIA2EA1646,KPID152C818,KPI780EFE90,KPI1E378242,KPI41B4C1B4,KPI6AC0FB43,KPI6F620E2B";
24 //文件系统 27 //文件系统
25 var filesyskpi = "KPI7AC1664E,KPI449F5365,KPIA91F44E7,KPI98306224,KPIE25925F7,KPI77C28BBA"; 28 var filesyskpi = "KPI7AC1664E,KPI449F5365,KPIA91F44E7,KPI98306224,KPIE25925F7,KPI77C28BBA";
26 //INODE信息 29 //INODE信息
@@ -19,7 +19,10 @@ layui.define(['commonDetail','common', 'admin'], function (exports) { @@ -19,7 +19,10 @@ layui.define(['commonDetail','common', 'admin'], function (exports) {
19 commonDetail.bindTips(); 19 commonDetail.bindTips();
20 20
21 //基本信息 21 //基本信息
22 - var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI67076676,KPI9311A2A3,KPI30D23EF4,KPI1C777D98,KPI78AC0D1B,KPIE9501365,KPIA04D5BD0,KPI899DBD7B,KPID3EBE40F,KPI0990CD44,KPI8266B678,KPI1584BE1C,KPI0E5EB8ED,KPI05227E45,KPI1AF5B3C6"; 22 + // var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI67076676,KPI9311A2A3,KPI30D23EF4,KPI1C777D98,KPI78AC0D1B,KPIE9501365,KPIA04D5BD0,KPI899DBD7B,KPID3EBE40F,KPI0990CD44,KPI8266B678,KPI1584BE1C,KPI0E5EB8ED,KPI05227E45,KPI1AF5B3C6";
  23 + //lsq 增加了8个性能指标 'KPI7C714058,KPIA2EA1646,KPID152C818,KPI780EFE90,KPI1E378242,KPI41B4C1B4,KPI6AC0FB43,KPI6F620E2B' 2022-06-28
  24 + var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI67076676,KPI9311A2A3,KPI30D23EF4,KPI1C777D98,KPI78AC0D1B,KPIE9501365,KPIA04D5BD0,KPI899DBD7B,KPID3EBE40F,KPI0990CD44,KPI8266B678,KPI1584BE1C,KPI0E5EB8ED,KPI05227E45,KPI1AF5B3C6" +
  25 + ",KPI7C714058,KPIA2EA1646,KPID152C818,KPI780EFE90,KPI1E378242,KPI41B4C1B4,KPI6AC0FB43,KPI6F620E2B";
23 //文件系统 26 //文件系统
24 var filesyskpi = "KPI7AC1664E,KPI449F5365,KPIA91F44E7,KPI98306224,KPIE25925F7,KPI77C28BBA"; 27 var filesyskpi = "KPI7AC1664E,KPI449F5365,KPIA91F44E7,KPI98306224,KPIE25925F7,KPI77C28BBA";
25 //INODE信息 28 //INODE信息
@@ -7985,4 +7985,31 @@ form[lay-filter="activewarning-form"] .layui-inline { @@ -7985,4 +7985,31 @@ form[lay-filter="activewarning-form"] .layui-inline {
7985 margin-left: 10px; 7985 margin-left: 10px;
7986 text-align: center; 7986 text-align: center;
7987 } 7987 }
7988 -/* //End XuHaoJie 2022/2/17 9:51 TODO 即时消息结束*/  
  7988 +/* //End XuHaoJie 2022/2/17 9:51 TODO 即时消息结束*/
  7989 +/*start lsq x86增加了8个指标后的基本信息样式 2022-06-28*/
  7990 +.layui-layer-tips .info-table-two{
  7991 + display: flex;
  7992 + flex-wrap: wrap;
  7993 +}
  7994 +.layui-layer-tips .layui-layer-content .info-table-two li{
  7995 + width:50%;
  7996 +}
  7997 +.layui-layer-tips .info-table-two li:nth-child(4n-1){
  7998 + background-color: #262323 !important;
  7999 +}
  8000 +.layui-layer-tips .info-table-two li:nth-child(2n){
  8001 + background-color: inherit !important;
  8002 +}
  8003 +.layui-layer-tips .info-table-two li:nth-child(4n){
  8004 + background-color: #262323 !important;
  8005 +}
  8006 +.layui-layer-content .info-table li span:first-child{
  8007 + width:40%!important;
  8008 +}
  8009 +.layui-layer-tips .layui-layer-content .info-table-two li span:first-child{
  8010 + flex:2;
  8011 +}
  8012 +.layui-layer-tips .layui-layer-content .info-table-two .detail_menubox li{
  8013 + width:100%;
  8014 +}
  8015 +/*end lsq 2022-06-28*/