From 55f6ac96817157d2e5e066e6a42599aeaf2f7516 Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@nismail.iie.ac.cn>
Date: Tue, 9 Oct 2018 15:34:20 +0800
Subject: [PATCH] =?UTF-8?q?3d=E6=9C=BA=E6=88=BF=E5=A2=9E=E5=8A=A0=E6=9C=80?=
 =?UTF-8?q?=E5=A4=A7=E5=8C=96=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebRoot/main.jsp                   | 2 +-
 WebRoot/page/show/showNodeRoom.jsp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WebRoot/main.jsp b/WebRoot/main.jsp
index 426094c..bfaf28e 100644
--- a/WebRoot/main.jsp
+++ b/WebRoot/main.jsp
@@ -647,7 +647,7 @@ html, body {
 </div>
 <!-- 3D机房弹框 -->
 <div id="nodeBoxs" style="display:none;"></div>
-<div id="alarmInfo" style="display:none;">
+<div id="alarmInfo" style="display:none;height:100%">
 	<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
diff --git a/WebRoot/page/show/showNodeRoom.jsp b/WebRoot/page/show/showNodeRoom.jsp
index c251532..d6376dc 100644
--- a/WebRoot/page/show/showNodeRoom.jsp
+++ b/WebRoot/page/show/showNodeRoom.jsp
@@ -477,14 +477,15 @@ body {
 		 		type: 1,
 		 		area: [thiswidth + 'px', thisheight + 'px'],
 		 		scrollbar: true,
+		 		maxmin: 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);
+				main.height("100%");
+				main.width("100%");
 			});
 		}