登陆，主页修改

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/ConstructionMapper.java

@@ -56,4 +56,6 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
 
     void insertDisclose(Construction construction);
 
+    List<Construction> findDisclosePage(Construction construction);
+
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/ConstructionMapper.xml

@@ -364,4 +364,37 @@
 		#{disclose.otherProblem}
 		);
 	</insert>
+
+	<select id="findDisclosePage" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction">
+		select a.project_id,
+		a.require_name,
+		channel,
+		b.requireName,
+		b.capacity,
+		b.sceneSize,
+		b.capacitySize,
+		b.hiddenDanger,
+		b.influenceConstruction,
+		b.projectRepetition,
+		b.implemented,
+		b.transformer,
+		b.lineName,
+		b.quantities,
+		b.rodNumber,
+		b.administrationType,
+		b.precondition,
+		b.placementMode,
+		b.productionDate,
+		b.IntegrateModule,
+		b.needReplace,
+		b.overallTransformation,
+		b.explanationOfNecessity,
+		b.inconsistentDescription,
+		b.policyHandlingInstructions,
+		b.otherProblem,
+		b.implementedContent
+		from xm_project_details  a
+		LEFT JOIN xm_disclose_conclusion b
+		on a.require_name = b.requireName
+	</select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/service/ConstructionService.java

@@ -43,6 +43,14 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 	public Page<Construction> findPage(Page<Construction> page, Construction construction) {
 		return super.findPage(page, construction);
 	}
+
+	public Page<Construction> findDisclosePage(Page<Construction> page, Construction construction) {
+		dataRuleFilter(construction);
+		construction.setPage(page);
+		page.setList(constructionMapper.findDisclosePage(construction));
+		return page;
+	}
+
 	
 	@Transactional(readOnly = false)
 	public void save(Construction construction) {

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/ConstructionController.java

@@ -5,6 +5,7 @@ package com.jeeplus.modules.sg.managementcenter.activiti.web;
 
 import java.util.*;
 
+import com.jeeplus.core.persistence.Page;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyImportUtils;
 import com.jeeplus.modules.sys.entity.User;
@@ -27,6 +28,9 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 施工交底Controller
  *
@@ -81,11 +85,27 @@ public class ConstructionController extends BaseController {
     }
 
     /**
-     * 人工审核页面
+     * 项目交底结论信息列表
      * */
+    @RequestMapping(value = "discloseList")
+    public String disclose(Construction construction, Model model) {
+        model.addAttribute("construction", construction);
+        return "modules/sg/managementcenter/activiti/discloseList";
+    }
+
     /**
-     * 查看，增加，编辑请假申请表单页面
-     */
+     * 项目交底结论信息数据
+     * */
+    @ResponseBody
+    @RequestMapping(value = "data")
+    public Map<String, Object> data(Construction uploadImages, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<Construction> page = constructionService.findDisclosePage(new Page<Construction>(request, response), uploadImages);
+        return getBootstrapData(page);
+    }
+
+    /**
+     * 人工审核页面
+     * */
     @RequestMapping(value = "artificial")
     public String form2(Construction construction, Model model) {
 //        String proId = construction.getAct().getProcDefId();

src/main/webapp/webpage/modules/sg/managementcenter/activiti/discloseList.js

@@ -0,0 +1,375 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+$(document).ready(function() {
+	$('#projectTable').bootstrapTable({
+		  //请求方法
+               method: 'post',
+               //类型json
+               dataType: "json",
+               contentType: "application/x-www-form-urlencoded",
+               //显示检索按钮
+	           showSearch: true,
+               //显示刷新按钮
+               showRefresh: true,
+               //显示切换手机试图按钮
+               showToggle: true,
+               //显示 内容列下拉框
+    	       showColumns: true,
+    	       //显示到处按钮
+    	       showExport: true,
+    	       //显示切换分页按钮
+    	       showPaginationSwitch: true,
+    	       //最低显示2行
+    	       minimumCountColumns: 2,
+               //是否显示行间隔色
+               striped: true,
+               //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）     
+               cache: false,    
+               //是否显示分页（*）  
+               pagination: true,   
+                //排序方式 
+               sortOrder: "asc",  
+               //初始化加载第一页，默认第一页
+               pageNumber:1,   
+               //每页的记录行数（*）   
+               pageSize: 5,
+               //可供选择的每页的行数（*）    
+               pageList: [5,10, 25, 50, 100],
+               //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
+               url: "${ctx}/managementcenter/activiti/data",
+               //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+               //queryParamsType:'',   
+               ////查询参数,每次调用是会带上这个参数，可自定义                         
+               queryParams : function(params) {
+               	var searchParam = $("#searchForm").serializeJSON();
+               	searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
+               	searchParam.pageSize = params.limit === undefined? -1 : params.limit;
+               	searchParam.orderBy = params.sort === undefined? "" : params.sort+ " "+  params.order;
+                   return searchParam;
+               },
+               //分页方式：client客户端分页，server服务端分页（*）
+               sidePagination: "server",
+               contextMenuTrigger:"right",//pc端 按右键弹出菜单
+               contextMenuTriggerMobile:"press",//手机端 弹出菜单，click：单击， press：长按。
+               contextMenu: '#context-menu',
+               onContextMenuItem: function(row, $el){
+                   if($el.data("item") == "edit"){
+                   		edit(row.id);
+                   }else if($el.data("item") == "view"){
+                       view(row.id);
+                   } else if($el.data("item") == "delete"){
+                        jp.confirm('确认要删除该表单记录吗？', function(){
+                       	jp.loading();
+                       	jp.get("${ctx}/sg/managementcenter/project/delete?id="+row.id, function(data){
+                   	  		if(data.success){
+                   	  			$('#projectTable').bootstrapTable('refresh');
+                   	  			jp.success(data.msg);
+                   	  		}else{
+                   	  			jp.error(data.msg);
+                   	  		}
+                   	  	})
+                   	   
+                   	});
+                      
+                   } 
+               },
+              
+               onClickRow: function(row, $el){
+               },
+               	onShowSearch: function () {
+			$("#search-collapse").slideToggle();
+		},
+               columns: [{
+                       field: 'projectNumber',
+                       title: '工程定义号',
+                       width:120
+
+                   }
+                   ,{
+                       field: 'projectId',
+                       title: '工程编号',
+                       width:110
+
+                   }
+                   ,{
+                       field: 'projectName',
+                       title: '项目名称',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.requireName',
+                       title: '需求项目名称',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.channel',
+                       title: '施工通道',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.capacity',
+                       title: '设备基础是否可以扩容',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.sceneSize',
+                       title: '现场设备尺寸',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.capacitySize',
+                       title: '最多可扩容尺寸',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.hiddenDanger',
+                       title: '方案安全隐患',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.influenceConstruction',
+                       title: '是否存在低压或通信线等影响施工',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.projectRepetition',
+                       title: '立项重复',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.implemented',
+                       title: '是否已实施',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.transformer',
+                       title: '变压器无负荷',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.explanationOfNecessity',
+                       title: '必要性问题说明',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.lineName',
+                       title: '线路名称一致性',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.quantities',
+                       title: '工程量是否一致',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.rodNumber',
+                       title: '设备、开关、杆号一致性',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.inconsistentDescription',
+                       title: '图纸现场不一致说明',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.administrationType',
+                       title: '政处类型',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.precondition',
+                       title: '前置条件',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.policyHandlingInstructions',
+                       title: '政策处理说明',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.placementMode',
+                       title: 'DTU安放方式核查',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.productionDate',
+                       title: '核查环网柜生产日期',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.IntegrateModule',
+                       title: '二次是否是集成模块',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.needReplace',
+                       title: 'PT是否需要更换',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.overallTransformation',
+                       title: '设备是否有整体改造的必要',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.otherProblem',
+                       title: '其它问题描述',
+                       width:110
+                   }
+                   ,{
+                       field: 'disclose.implementedContent',
+                       title: '已实施内容描述',
+                       width:110
+                   }
+		     ]
+		
+		});
+		
+		  
+	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+
+		 
+		  $('#projectTable').bootstrapTable("toggleView");
+		}
+	  
+	  $('#projectTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+                'check-all.bs.table uncheck-all.bs.table', function () {
+            $('#remove').prop('disabled', ! $('#projectTable').bootstrapTable('getSelections').length);
+            $('#view,#edit').prop('disabled', $('#projectTable').bootstrapTable('getSelections').length!=1);
+        });
+		  
+		$("#btnImport").click(function(){
+			jp.open({
+			    type: 2,
+                area: [500, 200],
+                auto: true,
+			    title:"导入数据",
+			    content: "${ctx}/tag/importExcel" ,
+			    btn: ['确定', '关闭'],
+			    	btn1: function(index, layero){
+				        var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+						iframeWin.contentWindow.importExcel('${ctx}/sg/managementcenter/project/import', function (data) {
+							if(data.success){
+								jp.success(data.msg);
+								refresh();
+							}else{
+								jp.error(data.msg);
+							}
+                            jp.close(index);
+						});//调用保存事件
+						return false;
+				  	},
+
+				  btn2: function(index){
+					//  jp.close(index);
+	    	       }
+			}); 
+		});
+    $("#btnImportPicking").click(function(){
+        jp.open({
+            type: 2,
+            area: [500, 200],
+            auto: true,
+            title:"导入领料单",
+            content: "${ctx}/tag/importExcel" ,
+            btn: ['确定', '关闭'],
+            btn1: function(index, layero){
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                iframeWin.contentWindow.importExcel('${ctx}/sg/managementcenter/project/importPicking', function (data) {
+                    if(data.success){
+                        jp.success(data.msg);
+                        refresh();
+                    }else{
+                        jp.error(data.msg);
+                    }
+                    jp.close(index);
+                });//调用保存事件
+                return false;
+            },
+
+            btn2: function(index){
+                //  jp.close(index);
+            }
+        });
+    });
+	 $("#export").click(function(){//导出Excel文件
+			jp.downloadFile('${ctx}/sg/managementcenter/project/export');
+	  });
+    // $("#export1").click(function(){//导出Excel文件
+    //     jp.downloadFile('${ctx}/sg/managementcenter/project/export1');
+    // });
+
+		    
+	  $("#search").click("click", function() {// 绑定查询按扭
+		  $('#projectTable').bootstrapTable('refresh');
+		});
+	 
+	 $("#reset").click("click", function() {// 绑定查询按扭
+		  $("#searchForm  input").val("");
+		  $("#searchForm  select").val("");
+		  $("#searchForm  .select-item").html("");
+		  $('#projectTable').bootstrapTable('refresh');
+		});
+		
+		$('#beginBeginDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		$('#endBeginDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		$('#endDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		
+	});
+		
+  function getIdSelections() {
+        return $.map($("#projectTable").bootstrapTable('getSelections'), function (row) {
+            return row.id
+        });
+    }
+  
+  function deleteAll(){
+
+		jp.confirm('确认要删除该项目管理表单记录吗？', function(){
+			jp.loading();  	
+			jp.get("${ctx}/sg/managementcenter/project/deleteAll?ids=" + getIdSelections(), function(data){
+         	  		if(data.success){
+         	  			$('#projectTable').bootstrapTable('refresh');
+         	  			jp.success(data.msg);
+         	  		}else{
+         	  			jp.error(data.msg);
+         	  		}
+         	  	})
+          	   
+		})
+  }
+
+    //刷新列表
+  function refresh(){
+  	$('#projectTable').bootstrapTable('refresh');
+  }
+  
+   function add(){
+	  jp.openSaveDialog('新增项目管理表单', "${ctx}/sg/managementcenter/project/form",'800px', '500px');
+  }
+
+
+  
+   function edit(id){//没有权限时，不显示确定按钮
+       if(id == undefined){
+	      id = getIdSelections();
+	}
+	jp.openSaveDialog('编辑项目管理表单', "${ctx}/sg/managementcenter/project/form?id=" + id, '800px', '500px');
+  }
+  
+ function view(id){//没有权限时，不显示确定按钮
+      if(id == undefined){
+             id = getIdSelections();
+      }
+        jp.openViewDialog('查看项目管理表单', "${ctx}/sg/managementcenter/project/form?id=" + id, '800px', '500px');
+ }
+
+
+
+</script>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/discloseList.jsp

@@ -0,0 +1,57 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>交底结论信息</title>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<meta name="decorator" content="ani"/>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@include file="/webpage/include/treeview.jsp" %>
+	<%@include file="discloseList.js" %>
+</head>
+<body>
+	<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+	<div class="panel-heading">
+		<h3 class="panel-title">交底结论信息</h3>
+	</div>
+	<div class="panel-body">
+		<!-- 搜索 -->
+		<div id="search-collapse" class="collapse">
+			<div class="accordion-inner">
+				<form:form id="searchForm" modelAttribute="construction" class="form form-horizontal well clearfix">
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<label class="label-item single-overflow pull-left" title="项目需求名称：">项目需求名称：</label>
+						<form:input path="disclose.requireName" htmlEscape="false" maxlength="100"  class=" form-control"/>
+					</div>
+					<div class="col-xs-12 col-sm-6 col-md-4">
+						<div style="margin-top:26px">
+							<a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
+							<a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
+						</div>
+					</div>
+				</form:form>
+			</div>
+		</div>
+
+	<!-- 表格 -->
+	<table id="projectTable"  style="table-layout:fixed"  data-toolbar="#toolbar"></table>
+
+    <!-- context menu -->
+    <ul id="context-menu" class="dropdown-menu">
+    	<shiro:hasPermission name="sg:managementcenter:project:view">
+        <li data-item="view"><a>查看</a></li>
+        </shiro:hasPermission>
+    	<shiro:hasPermission name="sg:managementcenter:project:edit">
+        <li data-item="edit"><a>编辑</a></li>
+        </shiro:hasPermission>
+        <shiro:hasPermission name="sg:managementcenter:project:del">
+        <li data-item="delete"><a>删除</a></li>
+        </shiro:hasPermission>
+        <li data-item="action1"><a>取消</a></li>
+    </ul>  
+	</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sys/login/sysIndex-jp.jsp

@@ -52,52 +52,6 @@
 				<li>
 					<a href="${ctx}/home"  class="J_menuItem"><i class="fa fa-home" style="font-size:14px;"></i></a>
 				</li>
-				<li class="hidden-xs">
-					<a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-language"></i></a>
-					<ul class="dropdown-menu">
-						<li class="${cookie.tab.value!=false?'active':''}">
-							<a id="showTab" href="#">开启tab</a>
-						</li>
-						<li class="${cookie.tab.value==false?'active':''}">
-							<a id="closeTab" href="#">关闭tab</a>
-						</li>
-					</ul>
-				</li>
-
-				<li class="dropdown">
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown">
-						<i class="fa fa-envelope-o"></i>
-						<span class="label label-info">${noReadCount }</span>
-					</a>
-					<ul class="dropdown-menu animated fadeIn">
-						<li class="messages-top text-center">
-							你有  ${noReadCount} 封未读邮件.
-						</li>
-
-						<c:forEach items="${mailPage.list}" var="mailBox">
-
-							<li class="dropdown-messages">
-								<a class="J_menuItem" title="站内信" href="${ctx}/iim/mailBox/detail?id=${mailBox.id}">
-
-									<div class="message-sender">
-											${mailBox.sender.name }<small class="pull-right">${fns:getTime(mailBox.sendtime)}前</small>
-									</div>
-									<div class="message-header">
-											${mailBox.mail.overview} <small class="pull-right">
-										<fmt:formatDate value="${mailBox.sendtime}" pattern="yyyy-MM-dd HH:mm:ss"/></small>
-									</div>
-
-								</a>
-							</li>
-
-						</c:forEach>
-						<li class=" text-center">
-							<a class="J_menuItem" href="${ctx}/iim/mailBox/list?orderBy=sendtime desc">
-								<font color='gray'> <i class="fa fa-envelope"></i>  查看所有邮件</font>
-							</a>
-						</li>
-					</ul>
-				</li>
 				<li class="dropdown">
 					<a href="#" class="dropdown-toggle" data-toggle="dropdown">
 						<i class="fa fa-bell-o"></i>
@@ -217,10 +171,6 @@
 					</ul>
 				</li>
 
-				<li class="hidden-xs">
-					<a href="#" onClick="toggleFullScreen()" data-toggle="fullscreen"><i class="fa fa-arrows-alt"></i></a>
-				</li>
-
 
 				<li class="dropdown admin-dropdown">
 					<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
@@ -233,10 +183,6 @@
 						</li>
 						<li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a>
 						</li>
-						<li><a class="J_menuItem" href="${ctx }/iim/contact/index">我的通讯录</a>
-						</li>
-						<li><a class="J_menuItem" href="${ctx }/iim/mailBox/list">信箱</a>
-						</li>
 						<li><a href="javaScript:changeStyle()">切换成左侧菜单</a>
 						<li><a href="${ctx}/logout">安全退出</a>
 						</li>
@@ -293,10 +239,6 @@
 													</li>
 													<li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a>
 													</li>
-													<li><a class="J_menuItem" href="${ctx }/iim/contact/index">我的通讯录</a>
-													</li>
-													<li><a class="J_menuItem" href="${ctx }/iim/mailBox/list">信箱</a>
-													</li>
 													<li><a href="javaScript:changeStyle()">切换成左侧菜单</a>
 													</li>
 													<li><a href="${ctx}/logout">安全退出</a>

src/main/webapp/webpage/modules/sys/login/sysIndex.jsp

@@ -35,39 +35,6 @@
 			</form>
 			<ul class="nav navbar-nav">
 				<li class="dropdown">
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"><span class="glyphicon glyphicon-envelope"></span><span class="badge badge-green">${noReadCount}</span></a>
-					
-					 <ul class="dropdown-menu animated fadeIn">
-						<li class="messages-top text-center">
-							你有  ${noReadCount} 封未读邮件.
-						</li>
-                          
-                            	 <c:forEach items="${mailPage.list}" var="mailBox">
-                            	 
-                            	  <li class="dropdown-messages">
-		                            	 <a class="J_menuItem" title="站内信" href="${ctx}/iim/mailBox/detail?id=${mailBox.id}">
-			                                           
-											<div class="message-sender">
-												${mailBox.sender.name }<small class="pull-right">${fns:getTime(mailBox.sendtime)}前</small>
-											</div>
-											<div class="message-header">
-												 ${mailBox.mail.overview} <small class="pull-right">
-	                                            <fmt:formatDate value="${mailBox.sendtime}" pattern="yyyy-MM-dd HH:mm:ss"/></small>
-											</div>
-											
-										</a>
-	                                </li>
-	                               
-                                </c:forEach>
-                                <li class=" text-center">
-                                        <a class="J_menuItem" href="${ctx}/iim/mailBox/list?orderBy=sendtime desc">
-                                           <font color='gray'> <i class="fa fa-envelope"></i>  查看所有邮件</font>
-                                        </a>
-                                </li>
-                            </ul>
-			
-				</li>
-				<li class="dropdown">
 					<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button">
 						<span class="glyphicon glyphicon-bell"></span><span class="badge badge-red">${count }</span>
 					</a>
@@ -93,25 +60,7 @@
 					</ul>
 				</li>
 			</ul>
-			<ul class="nav navbar-nav pull-right navbar-right">	
-				<li>
-					<div class="row" style="margin: 10px 10px 0 0;">
-						<div class="col-sm-4">
-							<span  style="margin: 12px 0 0 0;">Tab</span>
-						</div>
-						<div class="col-sm-8">
-							<div class="onoffswitch">
-								<input type="checkbox" name="onoffswitch" class="onoffswitch-checkbox" id="switchTab" ${cookie.tab.value!=false?'checked':''} >
-								<label class="onoffswitch-label" for="switchTab">
-									<span class="onoffswitch-inner"></span>
-									<span class="onoffswitch-switch"></span>
-								</label>
-							</div>
-						</div>
-					</div>
-				
-				</li>
-			
+			<ul class="nav navbar-nav pull-right navbar-right">
 				<li class="dropdown color-picker">
 					<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
 						<span><i class="fa fa-circle"></i></span>
@@ -157,12 +106,6 @@
 						</li>
 					</ul>
 				</li>
-				<li>
-					<a href="#"  onClick="toggleFullScreen()">
-						<span>全屏 </span>
-					</a>
-
-				</li>
 			
 				
 				<li class="dropdown admin-dropdown">
@@ -174,10 +117,6 @@
                           </li>
                           <li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a>
                           </li>
-                          <li><a class="J_menuItem" href="${ctx }/iim/contact/index">我的通讯录</a>
-                          </li>
-                          <li><a class="J_menuItem" href="${ctx }/iim/mailBox/list">信箱</a>
-                          </li>
 							<li><a href="javaScript:changeStyle()">切换成横向菜单</a>
 							</li>
                           <li><a href="${ctx}/logout">安全退出</a>
@@ -196,10 +135,6 @@
                     </li>
                     <li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a>
                     </li>
-                    <li><a class="J_menuItem" href="${ctx }/iim/contact/index">我的通讯录</a>
-                    </li>
-                    <li><a class="J_menuItem" href="${ctx }/iim/mailBox/list">信箱</a>
-                    </li> 
                     <li><a href="${ctx}/logout">安全退出</a>
                     </li>
 				</ul>
@@ -220,10 +155,6 @@
                           </li>
                           <li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a>
                           </li>
-                          <li><a class="J_menuItem" href="${ctx }/iim/contact/index">我的通讯录</a>
-                          </li>
-                          <li><a class="J_menuItem" href="${ctx }/iim/mailBox/list">信箱</a>
-                          </li> 
                           <hr>
 							<li><a href="javaScript:changeStyle()">切换成横向菜单</a>
 							</li>

src/main/webapp/webpage/modules/sys/login/sysLogin.jsp

@@ -66,6 +66,7 @@
 						<input  type="checkbox" id="rememberMe" name="rememberMe" ${rememberMe ? 'checked' : ''} class="ace" />
 						<span class="lbl"> 记住我</span>
 					</label>
+					<div></div>
 					<input type="submit" class="btn btn-white btn-outline btn-lg btn-rounded progress-login"  value="登录">
 				</form>
 			</div>