monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit 49e9ffb87a05d8ed007e793fa64cb0c15bcfe1d6 1 parent cb430725

fix:#1684 【监控概览】将业务置顶后左下角业务统计数量发现变化（确认是否修改统计规则） 

#1784 【监控概览】选择最后一个业务右击复选框样式问题（复选框溢出外层）
Inline Side-by-side
Showing 2 changed files with 78 additions and 38 deletions
@@ -187,10 +187,22 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -187,10 +187,22 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
187 currentBizId = $(this).data("id"); 187 currentBizId = $(this).data("id");
188 188
189 $("#mainindex_menubox").show(100); 189 $("#mainindex_menubox").show(100);
190 - $("#mainindex_menubox").css({  
191 - 'top': e.pageY + 'px',  
192 - 'left': e.pageX + 'px'  
193 - }); 190 +
  191 + let maxWidth = document.body.offsetWidth;
  192 + if(maxWidth - e.pageX < 120){
  193 + $("#mainindex_menubox").css({
  194 + 'top': e.pageY + 'px',
  195 + 'right': '50px'
  196 + });
  197 + } else {
  198 + $("#mainindex_menubox").css({
  199 + 'top': e.pageY + 'px',
  200 + 'left': e.pageX + 'px'
  201 + });
  202 + }
  203 +
  204 +
  205 +
194 206
195 //子菜单点击事件 207 //子菜单点击事件
196 $("#mainindex_menubox ul>li").unbind("click").on("click", function () { 208 $("#mainindex_menubox ul>li").unbind("click").on("click", function () {
@@ -203,7 +215,11 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -203,7 +215,11 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
203 window.parent.postMessage({ 215 window.parent.postMessage({
204 type: 'custom-jump-menu-event', 216 type: 'custom-jump-menu-event',
205 message: { 217 message: {
206 - 'type':"JumpToAlarmManagement" 218 + 'type':"JumpToAlarmManagement",
  219 + params:{
  220 + "tag":"BUS",
  221 + "id":bizId
  222 + }
207 } 223 }
208 }, '*') 224 }, '*')
209 } 225 }
@@ -235,7 +251,11 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -235,7 +251,11 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
235 type: 'custom-jump-menu-event', 251 type: 'custom-jump-menu-event',
236 message: { 252 message: {
237 'path':'', 253 'path':'',
238 - 'type':"JumpToListView" 254 + 'type':"JumpToListView",
  255 + params:{
  256 + "tag":"BUS",
  257 + "id":bizId
  258 + }
239 } 259 }
240 }, '*') 260 }, '*')
241 } 261 }
@@ -279,31 +299,36 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -279,31 +299,36 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
279 layer.msg('暂无该类型资源', {icon: 0}); 299 layer.msg('暂无该类型资源', {icon: 0});
280 return false; 300 return false;
281 } 301 }
282 - if (level && level === 'all') {  
283 - $(this).attr("lay-href", "/alarm/activewarning/bizId=" + _bizId)  
284 - } else {  
285 - /*var restype = '';  
286 - if (_resType) {  
287 - if (_resType == 'HOST') {  
288 - _resType = 'operatingSystem'  
289 - $(this).attr("data-restype", "operatingSystem"); 302 +
  303 + window.top.postMessage({
  304 + type: 'custom-jump-menu-event',
  305 + message: {
  306 + 'path':'',
  307 + 'type':"JumpToListView",
  308 + params:{
  309 + "tag":"BUS",
  310 + "_resType":_resType,
  311 + "level":level,
  312 + "id":_bizId
290 } 313 }
291 - restype = "/restype=" + _resType  
292 - }  
293 - $('[lay-id="/biz/list"]').find('.layui-tab-close').trigger('click');  
294 - $(this).attr("lay-href", "/biz/list/bizId=" + _bizId + restype);  
295 - admin.sideFlexible();*/  
296 - let win = window.parent;  
297 - if (win) {  
298 - window.parent.postMessage({  
299 - type: 'custom-jump-menu-event',  
300 - message: {  
301 - 'path':'',  
302 - 'type':"JumpToListView"  
303 - }  
304 - }, '*')  
305 } 314 }
306 - } 315 + }, '*');
  316 +
  317 + // if (level && level === 'all') {
  318 + // // $(this).attr("lay-href", "/alarm/activewarning/bizId=" + _bizId)
  319 + // } else {
  320 + // /*var restype = '';
  321 + // if (_resType) {
  322 + // if (_resType == 'HOST') {
  323 + // _resType = 'operatingSystem'
  324 + // $(this).attr("data-restype", "operatingSystem");
  325 + // }
  326 + // restype = "/restype=" + _resType
  327 + // }
  328 + // $('[lay-id="/biz/list"]').find('.layui-tab-close').trigger('click');
  329 + // $(this).attr("lay-href", "/biz/list/bizId=" + _bizId + restype);
  330 + // admin.sideFlexible();*/
  331 + // }
307 }); 332 });
308 //点击告警数字，跳转至告警页面 333 //点击告警数字，跳转至告警页面
309 $("#indexbizhealth [data-index-banner-item='type'] .index-banner-item-tips").unbind('click').on("click", function () { 334 $("#indexbizhealth [data-index-banner-item='type'] .index-banner-item-tips").unbind('click').on("click", function () {
@@ -563,7 +588,11 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -563,7 +588,11 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
563 type: 'custom-jump-menu-event', 588 type: 'custom-jump-menu-event',
564 message: { 589 message: {
565 'path':'', 590 'path':'',
566 - 'type':"JumpToAlarmManagement" 591 + 'type':"JumpToAlarmManagement",
  592 + params:{
  593 + "level" : level,
  594 + "restype" : _resType
  595 + }
567 } 596 }
568 }, '*') 597 }, '*')
569 }); 598 });
@@ -586,7 +615,11 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -586,7 +615,11 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
586 type: 'custom-jump-menu-event', 615 type: 'custom-jump-menu-event',
587 message: { 616 message: {
588 'path':'', 617 'path':'',
589 - 'type':"JumpToListView" 618 + 'type':"JumpToListView",
  619 + params:{
  620 + "tag":"RES",
  621 + "id":_resType
  622 + }
590 } 623 }
591 }, '*') 624 }, '*')
592 625
@@ -614,11 +647,22 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -614,11 +647,22 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
614 document.body.appendChild(alink); 647 document.body.appendChild(alink);
615 alink.click(); 648 alink.click();
616 document.body.removeChild(alink);*/ 649 document.body.removeChild(alink);*/
  650 +
  651 + var alarmLevelSelect = $('#select-content-ul .select-list.listActive').data('val');
  652 + var alarmLevelVal = '';
  653 + if (alarmLevelSelect != 4) {
  654 + alarmLevelVal = alarmLevelSelect;
  655 + } else {
  656 + alarmLevelVal = '';
  657 + }
617 window.top.postMessage({ 658 window.top.postMessage({
618 type: 'custom-jump-menu-event', 659 type: 'custom-jump-menu-event',
619 message: { 660 message: {
620 - 'path':'',  
621 - 'type':"JumpToAlarmManagement" 661 + 'type' : "JumpToAlarmManagement",
  662 + params:{
  663 + "restype" : restype,
  664 + "alarmLevelVal" : alarmLevelVal
  665 + }
622 } 666 }
623 }, '*') 667 }, '*')
624 }); 668 });
@@ -376,11 +376,7 @@ @@ -376,11 +376,7 @@
376 <div class="flex-bottom"> 376 <div class="flex-bottom">
377 377
378 <div style="width: calc(100% - 200px);"> 378 <div style="width: calc(100% - 200px);">
379 - {{# if(d.data[0] && d.data[0].bizList ) { }}  
380 - <span class="index-banner-count">业务共 {{d.data[0].bizList.length}} 个</span>  
381 - {{# }else{ }}  
382 - <span class="index-banner-count">业务共 0 个</span>  
383 - {{# } }} 379 + <span class="index-banner-count">业务共 {{d.str}} 个</span>
384 </div> 380 </div>
385 381
386 <div class="div-select select-margin " style="width: 100px"> 382 <div class="div-select select-margin " style="width: 100px">