Authored by 张凯

Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into joke

... ... @@ -95,25 +95,59 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
} else if (v.value != 'null'){
valueStr = v.value;
var old = v.value;
var oldstr=old.replace(v.unit, '');
if("从不过期"==oldstr){
valueStr=oldstr;
}else{
if(v.id=='KPIA04D5BD0' && parseInt(oldstr)>7){
fontColor='color:#D81E06;';
var oldstr = old.replace(v.unit, '');
if ("从不过期" == oldstr) {
valueStr = oldstr;
} else {
if (v.id == 'KPIA04D5BD0' && parseInt(oldstr) > 7) {
fontColor = 'color:#D81E06;';
}
}
titleStr = valueStr;
}
var tips = '<a class="detail_row_menu hide">\n' +
'<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' +
'</a>'
var menuId = "";
if (v.id == 'KPIE13DD9A3') {
v.name = v.name + tips;
menuId = "id=\"" + targetId + "_detail_row_menu\"";
}
var $html = addIconByValue(valueStr);
var resStyle = obj.alarmEleMatchStyle(v.flag,v.id);
li += ' <li><span style="text-align:left;width:40%">' + v.name + '</span>' +
'<span title="' + titleStr + '" style="'+fontColor+'width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;'+resStyle+'">'
+ $html + valueStr +'</span></li>'
var resStyle = obj.alarmEleMatchStyle(v.flag, v.id);
li += ' <li><span ' + menuId + ' style="text-align:left;width:40%">' + v.name + '</span>' +
'<span title="' + titleStr + '" style="' + fontColor + 'width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;' + resStyle + '">'
+ $html + valueStr + '</span></li>'
});
$("#" + targetId).html(li);
fn && fn()
fn && fn();
//初始化监听告警压制需要的数据
var rowMenu = $('#' + targetId).find('.detail_row_menu').eq(0);
rowMenu.attr("data-id", "KPIE13DD9A3");
rowMenu.attr("data-flag", "");
rowMenu.attr("data-name", "监控连接状态");
rowMenu.attr("data-kpiname", "监控连接状态");
rowMenu.attr("data-iswarning", "1");
rowMenu.attr("data-ident", "1");
rowMenu.attr("data-trend", "0");
rowMenu.attr("data-unit", "");
rowMenu.attr('data-hidem', 'true');
rowMenu.attr('data-canca', data.canCA);
rowMenu.attr('data-incaing', data.inCAing);
rowMenu.attr('data-restype', data.resType);
//监听告警压制等操作配置
$('#' + targetId + "_detail_row_menu").hover(function () {
var $that = $(this);
var $btn = $that.find(".detail_row_menu");
if ($btn.length > 0) {
$(".layui-card-body").find(".detail_row_menu:not(.hide)").addClass("hide")
$btn.removeClass("hide");
}
});
//监听过滤压制等事件
filterSuppressMonitor(resId);
});
},
/**
... ...
... ... @@ -7882,4 +7882,7 @@ form[lay-filter="activewarning-form"] .layui-inline {
}
.layui-logo{
pointer-events: none;
}
.detail_menubox li{
font-size: 12px !important;
}
\ No newline at end of file
... ...
... ... @@ -77,14 +77,14 @@
-o-transform-origin: 50% 50%;
transform-origin: 50% 50%;
position: absolute;
max-width: 260px;
max-height: 177px;
max-width: 150px;
max-height: 120px;
width:100%;
height:100%;
text-align: center;
background: url('/vue3/src/assets/images/zjdp/cloud-bg.png') no-repeat;
left: 61px;
top: 26px;
left: 100px;
top: 77px;
}
.ypt .item .ball_c.HuaWeiCloud{
/*background: url('/vue3/src/assets/images/zjdp/HuaWeiCloud.png') no-repeat;*/
... ... @@ -96,8 +96,8 @@
font-size: 14px;
color: #e3e9f0;
position: relative;
top: 96px;
left:-23px;
top: 45px;
left:-9px;
font-weight: bolder;
/**3D旋转*/
/* -webkit-transform:rotate3d(1,1,0.35,45deg) translate3d(-6px,12px,16px);
... ...
... ... @@ -67,7 +67,7 @@ export default {
proxy.checkId=listArray[0]
if(val==0){
proxy.preNext()
proxy.clickNext()
}else{
if(val=='left'){
... ...