1.修复监测告警配置失败的bug
2.修复点击拓扑图节点,关闭弹窗后无限发送请求的bug 3.修复3DRoom 右侧提示框除中文外其他语言状态下,没有节点的节点组不显示提示框的bug 4.国际化文件更新
This commit is contained in:
@@ -320,6 +320,7 @@ function getDetectInfo(id,type,showStatus){
|
||||
url ="<c:url value='/detection/monitorData.do?action=query&nodeType=2&requestType=newTopo&nodeId="+id+"'/>";
|
||||
url2="<c:url value='/detection/monitorData.do?action=queryEmergentDetail&nodeType=2&requestType=topo&nodeId="+id+"'/>";
|
||||
}
|
||||
|
||||
//异常情况,显示紧急告警列表,否则不显示
|
||||
if(showStatus == 1){
|
||||
//$("#title").show();
|
||||
@@ -331,7 +332,6 @@ function getDetectInfo(id,type,showStatus){
|
||||
top.$("#I4").hide();
|
||||
top.$("#hr").hide();
|
||||
}
|
||||
|
||||
top.$("#I5").attr("src",url);//由于所有数据列表不会出现隐藏的情况,所以标题的确定就有I5来负责
|
||||
|
||||
var thisheight = $(document).height()*0.9;
|
||||
@@ -343,7 +343,10 @@ function getDetectInfo(id,type,showStatus){
|
||||
shade: 0.6,
|
||||
closeBtn: 1,
|
||||
maxmin:true,
|
||||
content: top.$("#nodeList")
|
||||
content: top.$("#nodeList"),
|
||||
cancel: function(index, layero){
|
||||
top.$("#I4").removeAttr("src");
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
@@ -143,7 +143,8 @@ body {
|
||||
var selector = "#"+nodeid;
|
||||
var alramInfo = $(selector).val();
|
||||
showMsg(alramInfo,event);
|
||||
}).mouseout(function(){
|
||||
})
|
||||
$(node).mouseleave(function(){
|
||||
this.animate({"fill-opacity":1},800);
|
||||
hideMsg();
|
||||
})
|
||||
@@ -181,9 +182,9 @@ body {
|
||||
var a = infos[key];
|
||||
if(a.length>13){
|
||||
for(var i = 0 ;i <a.length;i++){
|
||||
if(i%13==0&&i!=0){
|
||||
/* if(i%13==0&&i!=0){
|
||||
inf = inf + "<br/>";
|
||||
}
|
||||
} */
|
||||
inf = inf + a.charAt(i);
|
||||
}
|
||||
}else{
|
||||
@@ -195,7 +196,7 @@ body {
|
||||
}
|
||||
|
||||
}
|
||||
with (oSon){
|
||||
with (oSon){
|
||||
innerHTML = info;
|
||||
style.display = "block";
|
||||
if(navigator.userAgent.indexOf("MSIE")>0) {
|
||||
@@ -214,7 +215,9 @@ body {
|
||||
style.left = x + window.document.body.scrollLeft-200 ;
|
||||
style.top = y + window.document.body.scrollTop-50;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
function hideMsg(){
|
||||
|
||||
Reference in New Issue
Block a user