From c2cf40da87715b8cee4639f93c4bb5cab89dae76 Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@nismail.iie.ac.cn>
Date: Tue, 9 Oct 2018 11:30:10 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=AA=97=E5=8F=A3=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E6=94=B9=E5=8F=98=E6=97=B6=E8=A1=A8=E5=A4=B4=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E5=87=BA=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=202.?=
 =?UTF-8?q?=E5=B0=86=E6=8B=93=E6=89=91=E3=80=813d=E6=9C=BA=E6=88=BF?=
 =?UTF-8?q?=E7=9A=84=E5=BC=B9=E6=A1=86=E6=94=B9=E4=B8=BA=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebRoot/js/onmouse.js                            | 16 +++++++++-------
 WebRoot/main.jsp                                 |  5 ++---
 .../detecWarning/detecConfLevelWarningList.jsp   |  4 ++--
 WebRoot/page/show/nodeGroup/newShowTopo.jsp      |  5 ++++-
 WebRoot/page/show/showNodeRoom.jsp               | 14 ++++++++++++--
 5 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/WebRoot/js/onmouse.js b/WebRoot/js/onmouse.js
index 155f322..1fabdf4 100644
--- a/WebRoot/js/onmouse.js
+++ b/WebRoot/js/onmouse.js
@@ -254,7 +254,7 @@ function $id(tid,type,show){// id 类型  alter的消息
 			$cloneHeader.attr("id",defaults.cloneHeader);
 			//行列两层嵌套循环，对应设定克隆表列宽
 	    	//计算表头行数defaults.minRows
-	    	$cloneHeader.find("tr").each(function(row,domEle){		// 克隆表   行循环
+	    	$cloneHeader.find("tr").each(function(row,domEle){// 克隆表   行循环
 	    		if(row<defaults.minRows){
 		    		$colDataOrg = $tableOrg.find("tr").eq(row).children();		// 原数据表 取第row行数据 
 		    		$(domEle).children().each(function(col){		// 克隆表   列循环
@@ -296,8 +296,10 @@ function $id(tid,type,show){// id 类型  alter的消息
 			    div.insertBefore($('body table',window.document).first());		// 将div加入页面中
 			    var $divArray = $(this).closest("div");
 				var divO = $divArray[0];
-			    div.css('top','0px');
-				div.css('display','inline');
+				if (divO.scrollTop > 20) {
+				    div.css('top','0px');
+					div.css('display','inline');
+				}
 			}
 
 			return $("#"+defaults.headerDiv);
@@ -363,14 +365,14 @@ function $id(tid,type,show){// id 类型  alter的消息
 					if(tableOrgPosition.top < divO.scrollTop){
 						var preDivTop=$headerDiv.parent().prevAll("div[id='divTop']");
 						if(preDivTop.length>0){
-							$headerDiv.css('top','28px');
+							$("#"+defaults.headerDiv).css('top','28px');
 						}else{
-							$headerDiv.css('top','0px');
+							$("#"+defaults.headerDiv).css('top','0px');
 						}
-						$headerDiv.css('display','inline');
+						$("#"+defaults.headerDiv).css('display','inline');
 						
 					}else{
-						$headerDiv.css('display','none');
+						$("#"+defaults.headerDiv).css('display','none');
 					}
 				}
 			});
diff --git a/WebRoot/main.jsp b/WebRoot/main.jsp
index e009d36..426094c 100644
--- a/WebRoot/main.jsp
+++ b/WebRoot/main.jsp
@@ -412,7 +412,6 @@ $(function(){
 			
 		}
 		
-		
 </script>
 <style type="text/css">	
 html, body {
@@ -649,8 +648,8 @@ html, body {
 <!-- 3D机房弹框 -->
 <div id="nodeBoxs" style="display:none;"></div>
 <div id="alarmInfo" style="display:none;">
-	<iframe id="I6" name="I6" height="525px" width="100%" border="0"
-		style="background: #FFFFFF;" frameborder="0" src="" scrolling="auto">
+	<iframe id="I6" name="I6" border="0"
+		style="background: #FFFFFF;min-height:400px;min-width:600px" frameborder="0" src="" scrolling="no">
 		i18n_snr.message.frame_n81i
 	</iframe>
 </div>
diff --git a/WebRoot/page/detection/detecWarning/detecConfLevelWarningList.jsp b/WebRoot/page/detection/detecWarning/detecConfLevelWarningList.jsp
index bed20a3..5b2a230 100644
--- a/WebRoot/page/detection/detecWarning/detecConfLevelWarningList.jsp
+++ b/WebRoot/page/detection/detecWarning/detecConfLevelWarningList.jsp
@@ -327,13 +327,13 @@
 		}
 	}
 	function ieBrowser(){
-		if($.browser.msie){
+		/* if($.browser.msie){
 			if($.browser.version.split('.')[0]<=7){
 				return false;
 			}else{
 				return true;//ie8+
 			}
-		}
+		} */
 	}
 
 	//程辉 2013-5-8 新增 导出当前页
diff --git a/WebRoot/page/show/nodeGroup/newShowTopo.jsp b/WebRoot/page/show/nodeGroup/newShowTopo.jsp
index 7fb4d2f..35557c8 100644
--- a/WebRoot/page/show/nodeGroup/newShowTopo.jsp
+++ b/WebRoot/page/show/nodeGroup/newShowTopo.jsp
@@ -333,10 +333,13 @@ function getDetectInfo(id,type,showStatus){
 	}
 
 	top.$("#I5").attr("src",url);//由于所有数据列表不会出现隐藏的情况，所以标题的确定就有I5来负责
+	
+	var thisheight = $(document).height()*0.9;
+	var thiswidth = $(document).width()*0.9;
 	parent.layer.open({
 		type: 1,
 		title: "i18n_st.text.policy_n81i",
-		area:['1024px', '600px'],
+		area:[thiswidth + 'px', thisheight + 'px'],
 		shade: 0.6,
 		closeBtn: 1,
 		maxmin:true,
diff --git a/WebRoot/page/show/showNodeRoom.jsp b/WebRoot/page/show/showNodeRoom.jsp
index 54e2031..117938f 100644
--- a/WebRoot/page/show/showNodeRoom.jsp
+++ b/WebRoot/page/show/showNodeRoom.jsp
@@ -455,7 +455,8 @@ body {
 						 	window.top.layer.open({
 						 		type: 1,
 						 		title: params[1],
-						 		area:['206px', 'auto'],
+						 		area:['206px', ''],
+						 		scrollbar: true,
 						 		content: window.top.$("#nodeBoxs")
 						 	})
 						 }
@@ -470,13 +471,22 @@ body {
 			}else if(nodeType == 1){
 				var url ="<c:url value='/detection/detectionWarning.do?action=queryNE&ip="+nodeip+"&levelAlarm=1"+param+"+&type=3Droom'/>";
 			}
+			var thisheight = $(document).height()*0.9;
+			var thiswidth = $(document).width()*0.9;
 			window.top.layer.open({
 		 		type: 1,
-		 		area:['900px', '600px'],
+		 		maxmin:true,
+		 		area: [thiswidth + 'px', thisheight + 'px'],
+		 		scrollbar: true,
 		 		content: window.top.$("#alarmInfo")
 		 	})
 			window.top.$("#I6").html("");
 			window.top.$("#I6").attr("src",url);
+			window.top.$("#I6").load(function(){
+				var main = window.top.$("#I6");
+				main.height(thisheight);
+				main.width(thiswidth);
+			});
 		}
 		
 		/* function getAlarmInfo(param,nodeip,nodeType){