From 639ebb6be0049f09087bce52e25d4b148e1e23ec Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Wed, 16 Jan 2019 11:03:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96top.$.jBox=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E5=A4=9A=E6=9D=A1=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
 =?UTF-8?q?=20=E7=82=B9=E5=87=BB=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=90=8E=E5=85=B3=E9=97=ADtop.$.jBox?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=B6=8B=E5=8A=BF=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/static/global/scripts/pzLog.js | 6 +++++-
 src/main/webapp/static/pages/scripts/home.js   | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/static/global/scripts/pzLog.js b/src/main/webapp/static/global/scripts/pzLog.js
index ca2bd5184..6b731fa78 100644
--- a/src/main/webapp/static/global/scripts/pzLog.js
+++ b/src/main/webapp/static/global/scripts/pzLog.js
@@ -661,7 +661,11 @@ function logSearch(cfgId,serviceId){
 		    	title: title,
 		    	width: $(document).width()*0.8,
 		    	height: $(document).height()*0.8,
-		    	buttons: { close : true }
+		    	buttons: { close : true },
+		    	loaded : function(h) {   //隐藏滚动条
+				    	$(".jbox-content", top.document).css( "overflow-y", "hidden"); 
+				   }
+
 			});
 	//alert(cfgId+'======'+url);
 }
diff --git a/src/main/webapp/static/pages/scripts/home.js b/src/main/webapp/static/pages/scripts/home.js
index 4c502cffc..90a3476e2 100644
--- a/src/main/webapp/static/pages/scripts/home.js
+++ b/src/main/webapp/static/pages/scripts/home.js
@@ -16,7 +16,7 @@ var home = function () {
 
 		//顶部导航顶级菜单事件
 		$(".mega-menu li a").click(function(e){
-			
+			top.$.jBox.close(true);
 			var $this = $(this);
 			var next_ul = $this.next("ul");
 			var prev_ul = $this.parents("ul");
@@ -72,7 +72,6 @@ var home = function () {
 				 
 			}*/
 			
-
 		})