monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 661f6209983e395f97afd84f8747eff4677d0664 1 parent e3507380

首页告警级别优化 1、下面单选按钮组没有展示出来 

2、卡片上数量=0的不展示
         3、跳转到告警页面参数不正确（/alarmLevel=3 ==》/level=3）
Inline Side-by-side
Showing 4 changed files with 41 additions and 4 deletions
@@ -258,7 +258,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -258,7 +258,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
258 }else{ 258 }else{
259 alarmLevelVal=''; 259 alarmLevelVal='';
260 } 260 }
261 - alink.setAttribute("lay-href", "/alarm/activewarning/bizId=" + bizId+'/alarmLevel='+alarmLevelVal); 261 + alink.setAttribute("lay-href", "/alarm/activewarning/bizId=" + bizId+'/level='+alarmLevelVal);
262 //End LSQ 2021/12/29 19:35 262 //End LSQ 2021/12/29 19:35
263 document.body.appendChild(alink); 263 document.body.appendChild(alink);
264 alink.click(); 264 alink.click();
@@ -340,12 +340,15 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -340,12 +340,15 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
340 $(".select-normal").hide(); 340 $(".select-normal").hide();
341 var itemArr=$(".index-banner-item"); 341 var itemArr=$(".index-banner-item");
342 itemArr.map((index,item)=>{ 342 itemArr.map((index,item)=>{
  343 + if($(item).data('serious')=='0'){
  344 + $(item).find('.select-serious').hide();
  345 + }
343 $(item).css('order',$(item).data('serious')) 346 $(item).css('order',$(item).data('serious'))
344 }) 347 })
345 $("#select-content-ul li").unbind("click").on("click",function (){ 348 $("#select-content-ul li").unbind("click").on("click",function (){
346 var dataVal=$(this).data('val'); 349 var dataVal=$(this).data('val');
347 var dataValLabel=$(this).text(); 350 var dataValLabel=$(this).text();
348 - $('.select-val').text(dataValLabel); 351 + $('.select-val span').text(dataValLabel);
349 $(this).addClass('listActive').siblings().removeClass("listActive"); 352 $(this).addClass('listActive').siblings().removeClass("listActive");
350 if(dataVal=='4'){ 353 if(dataVal=='4'){
351 $(".select-total").show(); 354 $(".select-total").show();
@@ -353,6 +356,9 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -353,6 +356,9 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
353 $(".select-normal").hide(); 356 $(".select-normal").hide();
354 $(".select-serious").hide(); 357 $(".select-serious").hide();
355 itemArr.map((index,item)=>{ 358 itemArr.map((index,item)=>{
  359 + if($(item).data('total')=='0'){
  360 + $(item).find('.select-total').hide();
  361 + }
356 $(item).css('order',$(item).data('total')) 362 $(item).css('order',$(item).data('total'))
357 }) 363 })
358 }else if(dataVal==3){ 364 }else if(dataVal==3){
@@ -361,6 +367,9 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -361,6 +367,9 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
361 $(".select-normal").hide(); 367 $(".select-normal").hide();
362 $(".select-serious").show(); 368 $(".select-serious").show();
363 itemArr.map((index,item)=>{ 369 itemArr.map((index,item)=>{
  370 + if($(item).data('serious')=='0'){
  371 + $(item).find('.select-serious').hide();
  372 + }
364 $(item).css('order',$(item).data('serious')) 373 $(item).css('order',$(item).data('serious'))
365 }) 374 })
366 }else if(dataVal==2){ 375 }else if(dataVal==2){
@@ -369,6 +378,9 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -369,6 +378,9 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
369 $(".select-normal").hide(); 378 $(".select-normal").hide();
370 $(".select-serious").hide(); 379 $(".select-serious").hide();
371 itemArr.map((index,item)=>{ 380 itemArr.map((index,item)=>{
  381 + if($(item).data('important')=='0'){
  382 + $(item).find('.select-important').hide();
  383 + }
372 $(item).css('order',$(item).data('important')) 384 $(item).css('order',$(item).data('important'))
373 }) 385 })
374 }else if(dataVal==1){ 386 }else if(dataVal==1){
@@ -377,6 +389,9 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -377,6 +389,9 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
377 $(".select-normal").show(); 389 $(".select-normal").show();
378 $(".select-serious").hide(); 390 $(".select-serious").hide();
379 itemArr.map((index,item)=>{ 391 itemArr.map((index,item)=>{
  392 + if($(item).data('normal')=='0'){
  393 + $(item).find('.select-normal').hide();
  394 + }
380 $(item).css('order',$(item).data('normal')) 395 $(item).css('order',$(item).data('normal'))
381 }) 396 })
382 } 397 }
@@ -413,7 +428,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -413,7 +428,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
413 alarmLevelVal=''; 428 alarmLevelVal='';
414 } 429 }
415 var alink = document.createElement('a'); 430 var alink = document.createElement('a');
416 - alink.setAttribute("lay-href", "/alarm/activewarning/restype=" + restype+'/alarmLevel='+alarmLevelVal); 431 + alink.setAttribute("lay-href", "/alarm/activewarning/restype=" + restype+'/level='+alarmLevelVal);
417 //End LSQ 2021/12/29 19:42 432 //End LSQ 2021/12/29 19:42
418 document.body.appendChild(alink); 433 document.body.appendChild(alink);
419 alink.click(); 434 alink.click();
@@ -7944,4 +7944,12 @@ form[lay-filter="activewarning-form"] .layui-inline { @@ -7944,4 +7944,12 @@ form[lay-filter="activewarning-form"] .layui-inline {
7944 .div-select:hover .select-content{ 7944 .div-select:hover .select-content{
7945 display:block; 7945 display:block;
7946 } 7946 }
  7947 +.arrow-down-alarm{
  7948 + display: inline-block;
  7949 + width:8px;
  7950 + height: 7px;
  7951 + background-image: url("/src/style/img/icon-arrow-down.png");
  7952 + background-position: center;
  7953 + background-size: 100%;
  7954 +}
7947 /* //End LSQ 2021/12/29 19:52 */ 7955 /* //End LSQ 2021/12/29 19:52 */
@@ -319,13 +319,21 @@ @@ -319,13 +319,21 @@
319 data-bizid="{{item.busId}}">{{item.total}}</span>--> 319 data-bizid="{{item.busId}}">{{item.total}}</span>-->
320 <span class="index-banner-item-tips select-total" lay-tips="当前有{{item.total}}条告警" 320 <span class="index-banner-item-tips select-total" lay-tips="当前有{{item.total}}条告警"
321 data-bizid="{{item.busId}}">{{item.total}}</span> 321 data-bizid="{{item.busId}}">{{item.total}}</span>
  322 +
  323 + {{# } }}
  324 + {{# if(item.important) { }}
322 <span class="index-banner-item-tips select-important" lay-tips="当前有{{item.important}}条告警" 325 <span class="index-banner-item-tips select-important" lay-tips="当前有{{item.important}}条告警"
323 data-bizid="{{item.busId}}">{{item.important}}</span> 326 data-bizid="{{item.busId}}">{{item.important}}</span>
  327 + {{# } }}
  328 + {{# if(item.normal) { }}
324 <span class="index-banner-item-tips select-normal" lay-tips="当前有{{item.normal}}条告警" 329 <span class="index-banner-item-tips select-normal" lay-tips="当前有{{item.normal}}条告警"
325 data-bizid="{{item.busId}}">{{item.normal}}</span> 330 data-bizid="{{item.busId}}">{{item.normal}}</span>
  331 + {{# } }}
  332 + {{# if(item.serious) { }}
326 <span class="index-banner-item-tips select-serious" lay-tips="当前有{{item.serious}}条告警" 333 <span class="index-banner-item-tips select-serious" lay-tips="当前有{{item.serious}}条告警"
327 data-bizid="{{item.busId}}">{{item.serious}}</span> 334 data-bizid="{{item.busId}}">{{item.serious}}</span>
328 {{# } }} 335 {{# } }}
  336 +
329 </div> 337 </div>
330 <ul class="gj-detail-info"> 338 <ul class="gj-detail-info">
331 <!-- <li data-bizid="{{item.busId}}">--> 339 <!-- <li data-bizid="{{item.busId}}">-->
@@ -365,7 +373,7 @@ @@ -365,7 +373,7 @@
365 <span class="index-banner-count">业务共 0 个</span> 373 <span class="index-banner-count">业务共 0 个</span>
366 {{# } }} 374 {{# } }}
367 <div class="div-select select-margin " > 375 <div class="div-select select-margin " >
368 - <div class="select-val">严重告警</div> 376 + <div class="select-val"><span>严重告警</span> <i class="arrow-down-alarm"></i></div>
369 <ul class="select-content" id="select-content-ul"> 377 <ul class="select-content" id="select-content-ul">
370 <li class="select-list" data-val="4">全部告警</li> 378 <li class="select-list" data-val="4">全部告警</li>
371 <li class="select-list listActive" data-val="3">严重告警</li> 379 <li class="select-list listActive" data-val="3">严重告警</li>
@@ -459,10 +467,16 @@ @@ -459,10 +467,16 @@
459 data-restype="{{item.resType}}">{{item.total}}</span>--> 467 data-restype="{{item.resType}}">{{item.total}}</span>-->
460 <span class="index-banner-item-tips select-total" lay-tips="当前有{{item.total}}条告警" 468 <span class="index-banner-item-tips select-total" lay-tips="当前有{{item.total}}条告警"
461 data-bizid="{{item.busId}}">{{item.total}}</span> 469 data-bizid="{{item.busId}}">{{item.total}}</span>
  470 + {{# } }}
  471 + {{# if(item.important) { }}
462 <span class="index-banner-item-tips select-important" lay-tips="当前有{{item.important}}条告警" 472 <span class="index-banner-item-tips select-important" lay-tips="当前有{{item.important}}条告警"
463 data-bizid="{{item.busId}}">{{item.important}}</span> 473 data-bizid="{{item.busId}}">{{item.important}}</span>
  474 + {{# } }}
  475 + {{# if(item.normal) { }}
464 <span class="index-banner-item-tips select-normal" lay-tips="当前有{{item.normal}}条告警" 476 <span class="index-banner-item-tips select-normal" lay-tips="当前有{{item.normal}}条告警"
465 data-bizid="{{item.busId}}">{{item.normal}}</span> 477 data-bizid="{{item.busId}}">{{item.normal}}</span>
  478 + {{# } }}
  479 + {{# if(item.serious) { }}
466 <span class="index-banner-item-tips select-serious" lay-tips="当前有{{item.serious}}条告警" 480 <span class="index-banner-item-tips select-serious" lay-tips="当前有{{item.serious}}条告警"
467 data-bizid="{{item.busId}}">{{item.serious}}</span> 481 data-bizid="{{item.busId}}">{{item.serious}}</span>
468 {{# } }} 482 {{# } }}