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

src/main/java/com/nis/domain/basics/SysDictInfo.java

@@ -30,6 +30,7 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
 	private SysUser sysDictEditor; //editor_id	修改人员	int	Y	取自sys_user.id
 	private Date editTime; //edit_time	修改时间	date	Y	
 	private Integer levelNo; //层级
+	private Integer isInitianlize; //是否为初始化数据 0：否  1：是  
 	private List<ServiceDictInfo> ChildrenList = new ArrayList<ServiceDictInfo>();//字列表
 	
     private Date beginDate;		// 开始日期
@@ -167,6 +168,12 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
 	public void setConditionType(List<Integer> conditionType) {
 		this.conditionType = conditionType;
 	}
+	public Integer getIsInitianlize() {
+		return isInitianlize;
+	}
+	public void setIsInitianlize(Integer isInitianlize) {
+		this.isInitianlize = isInitianlize;
+	}
 	@JsonIgnore
 	public static void sortList(List<SysDictInfo> list, List<SysDictInfo> sourcelist, Integer parentId, boolean cascade){
 		for (int i=0; i<sourcelist.size(); i++){

src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml

@@ -43,7 +43,8 @@
 		s.creator_id AS "sysDictCreator.id",
 		s.create_time AS createTime,
 		s.editor_id AS "sysDictEditor.id",
-		s.edit_time AS editTime
+		s.edit_time AS editTime,
+		s.is_initianlize AS isInitianlize
 	</sql>
 	
 	   	<sql id="menuJoins">

src/main/java/com/nis/web/service/basics/SysDictInfoService.java

@@ -111,6 +111,7 @@ public class SysDictInfoService extends BaseService{
     	  sysDictInfo.setCreateTime(new Date());
     	  sysDictInfo.setSysDictEditor(user);
     	  sysDictInfo.setEditTime(sysDictInfo.getCreateTime());
+    	  sysDictInfo.setIsInitianlize(0);//是否为初始化数据，默认为0：否
     	  sysDictInfoDao.insertDict(sysDictInfo);
     	  
 		}

src/main/webapp/WEB-INF/views/basics/sysDictList.jsp

@@ -31,13 +31,21 @@
 		function cmd(){
 			var url=arguments[0];
 			var mulitId="";
+			var isinit = true;
 			jQuery("#treeTable").find(":checkbox:checked[name='check']").each(function(){
 			  if(jQuery(this).val()!=""){
+				  if(jQuery(this).prop("placeholder")==1){
+					  isinit = false;
+				  }
 			    mulitId+=jQuery(this).val()+",";
 			  }
 			});
 			if(mulitId!=""){
-				confirmx("<spring:message code='confirm_message'/>", url+"&mulitId="+mulitId);
+				if(isinit){
+					confirmx("<spring:message code='confirm_message'/>", url+"&mulitId="+mulitId);
+				}else{
+					top.$.jBox.tip("<spring:message code='has_initianlize'/>", "<spring:message code='info'/>");
+				}
 			}else{
 				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
 			}
@@ -54,7 +62,17 @@
 				}
 			if(cked.length==1){
 				var url=arguments[0];
-				confirmx("<spring:message code='confirm_message'/>", url+"&sysDictId="+cked.val());
+				if(cked.prop("placeholder")!=1){
+					confirmx("<spring:message code='confirm_message'/>", url+"&sysDictId="+cked.val());
+				}else{
+					if(${fns:getUser().loginId=='admin'}){
+						confirmx("<spring:message code='confirm_message'/>", url+"&sysDictId="+cked.val());
+					}else{
+						top.$.jBox.tip("<spring:message code='hasnopower_toedit_initianlize.'/>", "<spring:message code='info'/>");
+					}
+					
+				}
+				
 				}
 		}
 			
@@ -295,7 +313,7 @@
 							<tbody>
 							<c:forEach items="${list}" var="sysDictInfo" varStatus="se">
 											<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
-												<td><input type="checkbox" class="ckbox" name="check" value="${sysDictInfo.sysDictId}"></td>
+												<td><input type="checkbox" class="ckbox" name="check" value="${sysDictInfo.sysDictId}" placeholder="${fns:getSysDictInfoById(sysDictInfo.sysDictId).isInitianlize}"></td>
 												<%-- <td>${sysDictInfo.showSequence}</td> --%>
 												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemCode}</a></td>
 												<td>${sysDictInfo.itemValue}</td>

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

@@ -62,24 +62,10 @@
 		$("#searchText").click(function(){
 			$(this).val("");
 		});
+
 		
 	});
-	//面包屑导航
+
-/* 	$(function(){
-	
-		$("div ul li a").click(function(){
-			if(typeof $(this).attr("id") !='undefined'){
-				$("#menutwo").text($(this).text().trim());
-				$("#menuthree").text("");
-			}else{
-				$("#menuthree").text($(this).text().trim());
-			}
-// 			var urlto=this+"";
-// 			var ur="${ctx}"+urlto.split("nis")[1];
-// 			$("#menutwo").attr("href",ur);
-			})
-}) */
-	
 //页面跳转函数 level:级别，1顶级，2有子级。name:菜单名称，有多级#间隔。url：访问路径。object：点击元素对象。
 function page_turn(id, level, name, url,obj){
 	var $object = $("#menu_"+id);//点击当前级别
@@ -117,28 +103,88 @@ function page_turn(id, level, name, url,obj){
 		$header.append("<li><a href='javascript:void(0);'>"+breadcrumbs[i]+"</a>"+circle+"</li>");
 	}
 	
+
+
+    App.scrollTo()
+
+    App.startPageLoading({animate:true});
+    
 	//调入页面
 	window.frames['mainFrame'].location=url;
+     
+    $("#mainFrame").load(function(){
+    	 App.stopPageLoading();
+    });
+	
+    
 
-	App.scrollTo()
-	
 }
-	
+
+
 function searchMenu() {
-	var search_txt = $("#searchText").val();
+	
-	if(search_txt.indexOf('_')!=-1){
+	if ($('body').hasClass("page-sidebar-closed")) {
-		search_txt = search_txt.substring(search_txt.lastIndexOf('_'));
+        if ($('.sidebar-search').hasClass('open') === false) {
-		$("#menu"+search_txt+" >a").trigger('click');
+            if ($('.page-sidebar-fixed').size() === 1) {
-	}else {
+                $('.page-sidebar .sidebar-toggler').click(); //trigger sidebar toggle button
-		alert('未找到该菜单！');
+
-	}
+            }
+            $('.sidebar-search').addClass("open");
+        } else {
+
+          searchForm();
+        }
+    } else {
+    	searchForm()
+    }
+
+    if ($('.sidebar-search').size() !== 0) {
+        $('.sidebar-search .input-group').on('click', function(e){
+            e.stopPropagation();
+        });
+
+        $('body').on('click', function() {
+            if ($('.sidebar-search').hasClass('open')) {
+                $('.sidebar-search').removeClass("open");
+            }
+        });
+    }
+}
+
+function searchForm() {
+	
+	 var search_txt = $("#searchText").val();
+		if(search_txt.indexOf('_')!=-1){
+			search_txt = search_txt.substring(search_txt.lastIndexOf('_'));
+			$("#menu"+search_txt+" >a").trigger('click');
+		}else {
+			alert('未找到该菜单！');
+		} 
+}
+
+function changeFrameHeight() {
+
+	var iframe = $("#mainFrame");
+	var clientHeight = $(window).height();
+
+	var headerHeight = $(".page-header").height();
+	var barHeight = $(".page-bar").height();
+	var footerHeight = $(".page-footer").height();
+	var paddingHeight  =  20; 
+
+	iframe.contents().find(".page-content").addClass("page-content-body");
+	iframe.prop("height",clientHeight-headerHeight-barHeight-footerHeight-paddingHeight);
+
+}
+window.onresize=function(){
+	changeFrameHeight();
 }
 
 </script>
 </head>
 
 
-<body class="page-header-fixed page-sidebar-closed-hide-logo page-content-white">
+<body class="page-header-fixed page-sidebar-closed-hide-logo page-content-white ">
 	<!-- BEGIN HEADER -->
 	<div class="page-header navbar navbar-fixed-top">
 
@@ -150,6 +196,10 @@ function searchMenu() {
 					src="${pageContext.request.contextPath}/static/layouts/layout/img/logo.png"
 					alt="logo" class="logo-default" />
 				</a>
+				
+				<div class="menu-toggler sidebar-toggler">
+                     <span></span>
+                 </div>
 			</div>
 			<!-- END LOGO -->
 
@@ -220,7 +270,7 @@ function searchMenu() {
 				     	
 				     	 
 				
-                         <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" >
+                         <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" >
                          	<i class="fa fa-language"></i><span class="username username-hide-on-mobile" id="lang_text">  </span>
                          </a>
                         
@@ -234,7 +284,7 @@ function searchMenu() {
 					<!-- BEGIN USER LOGIN DROPDOWN -->
 					<li class="dropdown dropdown-user"><a href="javascript:;"
 						class="dropdown-toggle" data-toggle="dropdown"
-						data-hover="dropdown" data-close-others="true"> <img alt=""
+						data-close-others="true"> <img alt=""
 							class="img-circle"
 							src="${pageContext.request.contextPath}/static/pages/img/avatar.png" />
 							<span class="username username-hide-on-mobile"> 
@@ -318,7 +368,7 @@ function searchMenu() {
 				</div>
 				
 		
-				 <iframe id="mainFrame" name="mainFrame" width="100%" onload="home.setIframeHeight(this)" src="${pageContext.request.contextPath }/nis/index" frameborder="0" srcolling="no">
+				 <iframe id="mainFrame" name="mainFrame" width="100%" onload="changeFrameHeight()" src="${pageContext.request.contextPath }/nis/index" frameborder="0" srcolling="no">
 					  浏览器不支持嵌入式框架或配置为不显示嵌入式框架。
 			     </iframe>
 				

src/main/webapp/WEB-INF/views/sys/userList.jsp

@@ -187,7 +187,7 @@
 						<td>${fns:getOfficeDesc(user.office.id)}</td>
 						<td><a href="${ctx}/sys/user/form?id=${user.id}">${user.loginId}</a></td>
 						<td>${user.name}</td>
-						<td>${user.identity eq 1 ?'信访办':'办理人员'}</td>
+						<td>${user.identity eq 1 ?'管理人员':'普通人员'}</td>
 						<td>${user.email}</td>
 						<td><fmt:formatDate value="${user.createTime}"
 								pattern="yyyy-MM-dd HH:mm:ss" /></td>

src/main/webapp/static/global/css/components.css

@@ -21591,5 +21591,42 @@ Color library demo
 }
 
 
- 
+.none-data {
- 
+	position: absolute;
+	display: block;
+	padding: 20px 15px;
+	background-color: #fff;
+	border-bottom: 1px solid #ddd;
+	text-align: center;
+	margin-top: -1px;	
+	width: 100%;
+	left: 0;
+}
+
+
+@media (max-width: 1480px) {
+    .mega-menu >li >a {
+		white-space: nowrap;
+		min-width: 108px;
+		width: 108px;
+		text-align:center;
+		overflow: hidden; 
+		text-overflow:ellipsis;
+	}
+	
+	 .mega-menu >li >a:hover {
+		width: 100%;
+		overflow: visible; 
+		text-overflow: inherit;
+	}
+	
+}
+    
+    
+.mega-menu .dropdown-menu {
+	min-width: 190px;
+}
+    
+    
+
+

src/main/webapp/static/layouts/layout/css/layout.css

@@ -1572,10 +1572,10 @@ b-menu>li>.sub-menu>li>a {
  box-shadow:none!important
 }
 .page-container-bg-solid .page-bar,.page-content-white .page-bar {
- background-color:#fff;
+ background-color: #fff;
- position:relative;
+position: relative;
- padding:0 20px;
+padding: 0 15px;
- margin:-25px -20px 0;
+margin: -0px 0px 0;
 }
 .page-container-bg-solid .page-bar .page-breadcrumb,.page-content-white .page-bar .page-breadcrumb {
  padding:11px 0
@@ -1606,10 +1606,19 @@ b-menu>li>.sub-menu>li>a {
 .page-container-bg-solid .page-bar .page-toolbar .btn.btn-sm,.page-content-white .page-bar .page-toolbar .btn.btn-sm {
  margin-top:0
 }
-.page-content {
+
- margin-top:0;
+.page-content-body {
- padding-top: 15px;
+  margin-top:0;
- background-color:#fff
+  padding-top: 15px;
+  background-color:#fff;
+  position: absolute;
+  left: 0;
+  right: 0;
+  overflow-y: auto;
+  padding-left: 15px;
+  padding-right: 15px;
+  height: 100%;
+ 
 }
 .page-content .row {
 
@@ -1638,7 +1647,8 @@ b-menu>li>.sub-menu>li>a {
   margin-left:235px;
   margin-top:0;
   min-height:600px;
-  padding:25px 20px 10px
+  background-color: #fff;
+  /* padding:25px 20px 10px */
  }
  .page-content-wrapper .page-content.no-min-height {
   min-height:auto
@@ -1711,7 +1721,8 @@ b-menu>li>.sub-menu>li>a {
 .page-footer {
  padding:8px 20px 5px;
  font-size:13px;
- height:33px
+ height:33px;
+ background-color: #333;
 }
 .page-footer:after,.page-footer:before {
  content:" ";