Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp

@@ -13,6 +13,7 @@
 	$(document)
 			.ready(
 					function() {
+						$(".glyphicon-plus").first().click();
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));

src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp

@@ -13,6 +13,7 @@
 	$(document)
 			.ready(
 					function() {
+						$(".glyphicon-plus").first().click();
 						/* $("#cancel").on("click", function() {
 							window.history.back();
 						});*/

src/main/webapp/WEB-INF/views/home.jsp

@@ -103,8 +103,12 @@ function page_turn(id, functionId,level, name, url,obj){
 
 
     App.scrollTo()
-
-    App.startPageLoading({animate:true});
+    //日志增加遮罩层
+// 	if(url.search("/nis/log/")!=-1){
+// 		loading();
+// 	}else{
+	    App.startPageLoading({animate:true});
+// 	}
 	//调入页面
 	if(url.indexOf("?")>0){
 		url = url+"&functionId="+functionId;