Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

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);
 }

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 () {
 				 
 			}*/
 			
-
 		})