monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 8218df01bc5dc4399f8f6cff15528db0af534b5b 2 parents 0e267e48 cc851f89

Merge branch 'master-mj-ztq' into 'master-mj' 

首页点击资源数量和告警数量跳转页面，拓扑弹窗使用平台方法



See merge request !1099
Inline Side-by-side
Showing 2 changed files with 50 additions and 8 deletions
@@ -1519,7 +1519,19 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1519,7 +1519,19 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1519 }, 1519 },
1520 viewBizTopo: function (busId) { 1520 viewBizTopo: function (busId) {
1521 layer.load(2); 1521 layer.load(2);
1522 - admin.req({ 1522 + let win = window.parent;
  1523 + if (win) {
  1524 + window.parent.postMessage({
  1525 + type: 'openBizTopo',
  1526 + message: {
  1527 + params:{
  1528 + 'busId':busId,
  1529 + },
  1530 + title:"",
  1531 + }
  1532 + }, '*')
  1533 + }
  1534 + /*admin.req({
1523 url: obj.domainName + '/api-web/mxgraph/generateByBusId', 1535 url: obj.domainName + '/api-web/mxgraph/generateByBusId',
1524 data: {busId}, 1536 data: {busId},
1525 success(response) { 1537 success(response) {
@@ -1539,7 +1551,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1539,7 +1551,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1539 layer.closeAll('loading'); 1551 layer.closeAll('loading');
1540 layer.msg('生成业务拓扑失败...', {icon: 2}); 1552 layer.msg('生成业务拓扑失败...', {icon: 2});
1541 } 1553 }
1542 - }); 1554 + });*/
1543 }, 1555 },
1544 1556
1545 /** 1557 /**
@@ -253,7 +253,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -253,7 +253,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
253 if (level && level === 'all') { 253 if (level && level === 'all') {
254 $(this).attr("lay-href", "/alarm/activewarning/bizId=" + _bizId) 254 $(this).attr("lay-href", "/alarm/activewarning/bizId=" + _bizId)
255 } else { 255 } else {
256 - var restype = ''; 256 + /*var restype = '';
257 if (_resType) { 257 if (_resType) {
258 if (_resType == 'HOST') { 258 if (_resType == 'HOST') {
259 _resType = 'operatingSystem' 259 _resType = 'operatingSystem'
@@ -263,7 +263,17 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -263,7 +263,17 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
263 } 263 }
264 $('[lay-id="/biz/list"]').find('.layui-tab-close').trigger('click'); 264 $('[lay-id="/biz/list"]').find('.layui-tab-close').trigger('click');
265 $(this).attr("lay-href", "/biz/list/bizId=" + _bizId + restype); 265 $(this).attr("lay-href", "/biz/list/bizId=" + _bizId + restype);
266 - admin.sideFlexible(); 266 + admin.sideFlexible();*/
  267 + let win = window.parent;
  268 + if (win) {
  269 + window.parent.postMessage({
  270 + type: 'custom-jump-menu-event',
  271 + message: {
  272 + 'path':'Monitoringmanagement/Monitoringview/Listview',
  273 + 'type':"JumpToMenu"
  274 + }
  275 + }, '*')
  276 + }
267 } 277 }
268 }); 278 });
269 //点击告警数字，跳转至告警页面 279 //点击告警数字，跳转至告警页面
@@ -272,7 +282,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -272,7 +282,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
272 var alink = document.createElement('a'); 282 var alink = document.createElement('a');
273 // Start 跳转到告警页面带告警级别 LSQ 2021/12/29 19:34 283 // Start 跳转到告警页面带告警级别 LSQ 2021/12/29 19:34
274 //alarmLevel 3-严重 2-重要 1-一般 4-全部-'' 284 //alarmLevel 3-严重 2-重要 1-一般 4-全部-''
275 - var alarmLevelSelect = $('#select-content-ul .select-list.listActive').data('val'); 285 + /*var alarmLevelSelect = $('#select-content-ul .select-list.listActive').data('val');
276 var alarmLevelVal = ''; 286 var alarmLevelVal = '';
277 if (alarmLevelSelect != 4) { 287 if (alarmLevelSelect != 4) {
278 alarmLevelVal = alarmLevelSelect; 288 alarmLevelVal = alarmLevelSelect;
@@ -283,7 +293,17 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -283,7 +293,17 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
283 //End LSQ 2021/12/29 19:35 293 //End LSQ 2021/12/29 19:35
284 document.body.appendChild(alink); 294 document.body.appendChild(alink);
285 alink.click(); 295 alink.click();
286 - document.body.removeChild(alink); 296 + document.body.removeChild(alink);*/
  297 + let win = window.parent;
  298 + if (win) {
  299 + window.parent.postMessage({
  300 + type: 'custom-jump-menu-event',
  301 + message: {
  302 + 'path':'Alarmcenter/Alarmmanagement',
  303 + 'type':"JumpToMenu"
  304 + }
  305 + }, '*')
  306 + }
287 }); 307 });
288 308
289 bindCardEvent(); 309 bindCardEvent();
@@ -531,7 +551,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -531,7 +551,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
531 } 551 }
532 // Start 跳转到告警页面带告警级别 LSQ 2021/12/29 19:34 552 // Start 跳转到告警页面带告警级别 LSQ 2021/12/29 19:34
533 //alarmLevel 3-严重 2-重要 1-一般 4-全部-'' 553 //alarmLevel 3-严重 2-重要 1-一般 4-全部-''
534 - var alarmLevelSelect = $('#select-content-ul .select-list.listActive').data('val'); 554 + /*var alarmLevelSelect = $('#select-content-ul .select-list.listActive').data('val');
535 var alarmLevelVal = ''; 555 var alarmLevelVal = '';
536 if (alarmLevelSelect != 4) { 556 if (alarmLevelSelect != 4) {
537 alarmLevelVal = alarmLevelSelect; 557 alarmLevelVal = alarmLevelSelect;
@@ -543,7 +563,17 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -543,7 +563,17 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
543 //End LSQ 2021/12/29 19:42 563 //End LSQ 2021/12/29 19:42
544 document.body.appendChild(alink); 564 document.body.appendChild(alink);
545 alink.click(); 565 alink.click();
546 - document.body.removeChild(alink); 566 + document.body.removeChild(alink);*/
  567 + let win = window.parent;
  568 + if (win) {
  569 + window.parent.postMessage({
  570 + type: 'custom-jump-menu-event',
  571 + message: {
  572 + 'path':'Alarmcenter/Alarmmanagement',
  573 + 'type':"JumpToMenu"
  574 + }
  575 + }, '*')
  576 + }
547 }); 577 });
548 578
549 579