表头固定

5 years ago · e35996f9b2
parent 0bda2a0c95
commit e35996f9b2
15 changed files with 274 additions and 299 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,3 @@
-/power-service/target/
+target
 /.idea/
 *.iml
--- a/power-admin/src/main/java/com/manage/controller/LoginController.java
+++ b/power-admin/src/main/java/com/manage/controller/LoginController.java
@ -55,10 +55,6 @@ public class LoginController {
            //添加进操作日志
            Power_Log log = new Power_Log();
            if(user != null){
-                //如处于登录状态，先清除缓存
-                //CacheManager.removeCacheByObject(user);
-                //记住
-                MyCookieUtil.remember(request, response);
                //存session密码置空
                //是否记住密码功能
                MyCookieUtil.remember(request, response);
--- a/power-admin/src/main/webapp/WEB-INF/jspf/common.jspf
+++ b/power-admin/src/main/webapp/WEB-INF/jspf/common.jspf
@ -62,8 +62,17 @@
    }
    //重设表格高度
    function reloadTableHeight(tableId) {
-        $("#"+tableId+".fixed-table-container").css({ "padding-bottom": "0px", height: $("#"+tableId+".fixed-table-body table").height() + 20 });
+        //获取表格内容高度
+        var height = $(".fixed-table-body #"+tableId).height();
+        //刷新
        $('#'+tableId).bootstrapTable('resetView', { height: "auto" });
+        //计算body所需高度
+        var tableBodyHeight = height-6;
+        //赋值body高度，且定义最高高度
+        if(maxHeight == 0){
+            maxHeight = tableBodyHeight;
+        }
+        $(".fixed-table-body").css({height:tableBodyHeight,"max-height":maxHeight});
    }
 </script>
 <%@ include file="/WEB-INF/jspf/confirmJsp.jspf"%>
--- a/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp
@ -36,11 +36,6 @@
            width:50%;
            float:left;
        }
-        /*按钮组*/
-        .btns{
-            text-align: right;
-            margin-bottom: 5px;
-        }
        /*模态框*/
        .modal-header{
            text-align: center;
@ -59,9 +54,6 @@
        .operBtns{
            margin-left:10px;
        }
-        .tableDiv{
-            margin-left:14px;
-        }
        .shortInput{
            width:80px;
        }
--- a/power-admin/src/main/webapp/WEB-INF/views/noticeDir/noticePage.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/noticeDir/noticePage.jsp
@ -48,11 +48,6 @@
            width:50%;
            float:left;
        }
-        /*按钮组*/
-        .btns{
-            text-align: right;
-            margin-bottom: 10px;
-        }
        /*模态框*/
        .modal-header{
            text-align: center;
@ -69,11 +64,6 @@
            margin-left: 38px;
            margin-bottom: 16px;
        }
-        .tableDiv{
-            margin-left:15px;
-            margin-right:25px;
-            padding-right: 15px;
-        }
        .shortInput{
            width:80px;
        }
--- a/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp
@ -71,37 +71,19 @@
            padding-top: 3px;
            margin-left: 2%;
        }
-
-        /**查询按钮组*/
-        .btnsDiv {
-            width: 100%;
-            height: 32px;
-            text-align: right;
-            padding-top: 5px;
-            padding-right: 22px;
-        }
-
-        /**表格div*/
-        .tableDiv {
-            margin-left: 14px;
-            margin-top: -9px !important;
-        }
    </style>
 </head>
 <body>
-<div class="main">
-    <div class="">
+<div style="width: 100%;height: 100%;overflow: auto">
+    <div class="row" style="margin-right: 0px;">
+        <div class="col-md-12">
            <div class="panel-heading"><h4>其他管理/日志管理</h4></div>
            <hr>
-        <div class="searchDiv">
-            <div class="searchInput left" style="margin-left: 14px">
-                <div class="searchElement left">
+            <form class="form-inline searchDiv" role="form">
+                <div class="form-group">
                    <label class="labelDiv">日志主题：</label>
-                </div>
-                <div class="searchInputElement left">
                    <input type="text" class="form-control input-sm" id="logTitle" maxlength="50">
                </div>
-            </div>
                <div class="searchInput left">
                    <div class="searchElement left">
                        <label class="labelDiv">日志内容：</label>
@ -133,7 +115,8 @@
                    <button type="button" class="btn btn-sm btn-primary" onclick="refreshTable()">查询</button>
                </div>
            </div>
-        <div class="btnsDiv">
+        </div>
+        <div class="btns">
            <pm:myPermissions permissions="/otherManage/exportExcel">
                <button type="button" class="btn btn-sm btn-primary" onclick="exportExcel()"><i class="fa fa-reply"></i>导出
                </button>
--- a/power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp
@ -36,11 +36,6 @@
            width:50%;
            float:left;
        }
-        /*按钮组*/
-        .btns{
-            text-align: right;
-            margin-bottom: 5px;
-        }
        /*模态框*/
        .modal-header{
            text-align: center;
@ -56,9 +51,6 @@
            margin-left: 38px;
            margin-bottom: 16px;
        }
-        .tableDiv{
-            margin-left:14px;
-        }
        .shortInput{
            width:80px;
        }
--- a/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
@ -40,12 +40,6 @@
            width:50%;
            float:left;
        }
-        /*按钮组*/
-        .btns{
-            margin-top:5px;
-            text-align: right;
-            margin-bottom: 5px;
-        }
        /*模态框*/
        .modal-header{
            text-align: center;
@ -64,9 +58,6 @@
        .operBtns{
            margin-left:10px;
        }
-        .tableDiv{
-            margin-left:14px;
-        }
        .shortInput{
            width:80px;
        }
@ -103,7 +94,6 @@
            <div class="panel-heading"><h4>基本管理/用户管理</h4></div>
            <hr>
            <form class="form-inline searchDiv" role="form">
-                <div class="">
                <div class="form-group">
                    <label for="user_name">账号:</label>
                    <input type="text" class="form-control input-sm" id="user_name" maxlength="16"/>
@ -141,7 +131,6 @@
                <div class="form-group">
                    <button type="button" id="queryBtn" class="btn btn-primary btn-sm form-group">查询</button>
                </div>
-                </div>
            </form>
        </div>
    </div>
@ -159,8 +148,10 @@
            <button type="button" class="btn btn-primary btn-sm" onclick="exportExcel()">导出Excel</button>
        </pm:myPermissions>
    </div>
+    <div class="tableDiv">
        <table id="bootstrapTable" class="table text-nowrap table-striped"></table>
    </div>
+</div>
 <!-- 模态框（Modal） -->
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
    <div class="modal-dialog">
--- a/power-admin/src/main/webapp/static/css/comm.css
+++ b/power-admin/src/main/webapp/static/css/comm.css
@ -23,3 +23,15 @@
    margin-top: 3px;
    height: 30px;
 }
+/*表格外层div*/
+.tableDiv{
+    margin-left:14px;
+    margin-right:15px;
+}
+/*按钮组*/
+.btns{
+    margin-top:5px;
+    margin-right:15px;
+    text-align: right;
+    margin-bottom: 5px;
+}
--- a/power-admin/src/main/webapp/static/js/dept.js
+++ b/power-admin/src/main/webapp/static/js/dept.js
@ -1,5 +1,7 @@
 var form = ''
 var pageNumber = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
 $(function(){
    var columns = [];
    columns.push({
--- a/power-admin/src/main/webapp/static/js/noticePage.js
+++ b/power-admin/src/main/webapp/static/js/noticePage.js
@ -1,5 +1,7 @@
 //初始化时间控件
 initDateInput(1);
+//定义表格内容最大高度
+var maxHeight = 0;
 var setting = {
 	view:{
 			fontCss : {"font-family": "微软雅黑","color":"blue"}
--- a/power-admin/src/main/webapp/static/js/roleNotDown.js
+++ b/power-admin/src/main/webapp/static/js/roleNotDown.js
@ -3,6 +3,8 @@
 */
 var pageNumber = 1;
 var form = '';
+//定义表格内容最大高度
+var maxHeight = 0;
 $(function(){
    $('#myModal').modal('hide');
    //先销毁表格
--- a/power-admin/src/main/webapp/static/js/user.js
+++ b/power-admin/src/main/webapp/static/js/user.js
@ -1,5 +1,7 @@
 var pageNumber=1;
 var form = '';
+//定义表格内容最大高度
+var maxHeight = 0;
 $(function(){
    $('#myModal').modal('hide');
    loadDept();
--- a/power-service/src/main/java/com/manage/service/cache/CacheManager.java
+++ b/power-service/src/main/java/com/manage/service/cache/CacheManager.java
@ -49,9 +49,11 @@ public class CacheManager {
    public static void putCache(String key, Cache obj) {
        cacheMap.put(key, obj);
        //移除不属于该token的
+        if(obj.getValue() instanceof Power_UserVo) {
            Power_UserVo powerUser = (Power_UserVo) obj.getValue();
            CacheManager.removeCacheByObject(powerUser, key);
        }
+    }

    public static Cache getCacheInfo(String key) {
        if (hasCache(key)) {
--- a/power-service/target/classes/com/manage/service/cache/CacheManager.class
+++ b/power-service/target/classes/com/manage/service/cache/CacheManager.class