monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit e49456fe873b8930f83d5c9cf557a2cd1779a84e 2 parents 7c402e76 0e77de54

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

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



See merge request !312
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','
}else{
alarmLevelVal='';
}
alink.setAttribute("lay-href", "/alarm/activewarning/bizId=" + bizId+'/alarmLevel='+alarmLevelVal);
alink.setAttribute("lay-href", "/alarm/activewarning/bizId=" + bizId+'/level='+alarmLevelVal);
//End LSQ 2021/12/29 19:35
document.body.appendChild(alink);
alink.click();
... ... @@ -340,12 +340,15 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
$(".select-normal").hide();
var itemArr=$(".index-banner-item");
itemArr.map((index,item)=>{
if($(item).data('serious')=='0'){
$(item).find('.select-serious').hide();
}
$(item).css('order',$(item).data('serious'))
})
$("#select-content-ul li").unbind("click").on("click",function (){
var dataVal=$(this).data('val');
var dataValLabel=$(this).text();
$('.select-val').text(dataValLabel);
$('.select-val span').text(dataValLabel);
$(this).addClass('listActive').siblings().removeClass("listActive");
if(dataVal=='4'){
$(".select-total").show();
... ... @@ -353,6 +356,9 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
$(".select-normal").hide();
$(".select-serious").hide();
itemArr.map((index,item)=>{
if($(item).data('total')=='0'){
$(item).find('.select-total').hide();
}
$(item).css('order',$(item).data('total'))
})
}else if(dataVal==3){
... ... @@ -361,6 +367,9 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
$(".select-normal").hide();
$(".select-serious").show();
itemArr.map((index,item)=>{
if($(item).data('serious')=='0'){
$(item).find('.select-serious').hide();
}
$(item).css('order',$(item).data('serious'))
})
}else if(dataVal==2){
... ... @@ -369,6 +378,9 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
$(".select-normal").hide();
$(".select-serious").hide();
itemArr.map((index,item)=>{
if($(item).data('important')=='0'){
$(item).find('.select-important').hide();
}
$(item).css('order',$(item).data('important'))
})
}else if(dataVal==1){
... ... @@ -377,6 +389,9 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
$(".select-normal").show();
$(".select-serious").hide();
itemArr.map((index,item)=>{
if($(item).data('normal')=='0'){
$(item).find('.select-normal').hide();
}
$(item).css('order',$(item).data('normal'))
})
}
... ... @@ -413,7 +428,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
alarmLevelVal='';
}
var alink = document.createElement('a');
alink.setAttribute("lay-href", "/alarm/activewarning/restype=" + restype+'/alarmLevel='+alarmLevelVal);
alink.setAttribute("lay-href", "/alarm/activewarning/restype=" + restype+'/level='+alarmLevelVal);
//End LSQ 2021/12/29 19:42
document.body.appendChild(alink);
alink.click();
... ...
... ... @@ -7944,4 +7944,12 @@ form[lay-filter="activewarning-form"] .layui-inline {
.div-select:hover .select-content{
display:block;
}
.arrow-down-alarm{
display: inline-block;
width:8px;
height: 7px;
background-image: url("/src/style/img/icon-arrow-down.png");
background-position: center;
background-size: 100%;
}
/* //End LSQ 2021/12/29 19:52 */
\ No newline at end of file
... ...
... ... @@ -319,13 +319,21 @@
data-bizid="{{item.busId}}">{{item.total}}</span>-->
<span class="index-banner-item-tips select-total" lay-tips="当前有{{item.total}}条告警"
data-bizid="{{item.busId}}">{{item.total}}</span>
{{# } }}
{{# if(item.important) { }}
<span class="index-banner-item-tips select-important" lay-tips="当前有{{item.important}}条告警"
data-bizid="{{item.busId}}">{{item.important}}</span>
{{# } }}
{{# if(item.normal) { }}
<span class="index-banner-item-tips select-normal" lay-tips="当前有{{item.normal}}条告警"
data-bizid="{{item.busId}}">{{item.normal}}</span>
{{# } }}
{{# if(item.serious) { }}
<span class="index-banner-item-tips select-serious" lay-tips="当前有{{item.serious}}条告警"
data-bizid="{{item.busId}}">{{item.serious}}</span>
{{# } }}
</div>
<ul class="gj-detail-info">
<!-- <li data-bizid="{{item.busId}}">-->
... ... @@ -365,7 +373,7 @@
<span class="index-banner-count">业务共 0 个</span>
{{# } }}
<div class="div-select select-margin " >
<div class="select-val">严重告警</div>
<div class="select-val"><span>严重告警</span> <i class="arrow-down-alarm"></i></div>
<ul class="select-content" id="select-content-ul">
<li class="select-list" data-val="4">全部告警</li>
<li class="select-list listActive" data-val="3">严重告警</li>
... ... @@ -459,10 +467,16 @@
data-restype="{{item.resType}}">{{item.total}}</span>-->
<span class="index-banner-item-tips select-total" lay-tips="当前有{{item.total}}条告警"
data-bizid="{{item.busId}}">{{item.total}}</span>
{{# } }}
{{# if(item.important) { }}
<span class="index-banner-item-tips select-important" lay-tips="当前有{{item.important}}条告警"
data-bizid="{{item.busId}}">{{item.important}}</span>
{{# } }}
{{# if(item.normal) { }}
<span class="index-banner-item-tips select-normal" lay-tips="当前有{{item.normal}}条告警"
data-bizid="{{item.busId}}">{{item.normal}}</span>
{{# } }}
{{# if(item.serious) { }}
<span class="index-banner-item-tips select-serious" lay-tips="当前有{{item.serious}}条告警"
data-bizid="{{item.busId}}">{{item.serious}}</span>
{{# } }}
... ...