diff --git a/power-admin/src/main/webapp/WEB-INF/jspf/common.jspf b/power-admin/src/main/webapp/WEB-INF/jspf/common.jspf
index 326d0b4..6a312f6 100644
--- a/power-admin/src/main/webapp/WEB-INF/jspf/common.jspf
+++ b/power-admin/src/main/webapp/WEB-INF/jspf/common.jspf
@@ -60,5 +60,10 @@
             $("#pageNum").val(pageNum)
         },500)
     }
+    //重设表格高度
+    function reloadTableHeight(tableId) {
+        $("#"+tableId+".fixed-table-container").css({ "padding-bottom": "0px", height: $("#"+tableId+".fixed-table-body table").height() + 20 });
+        $('#'+tableId).bootstrapTable('resetView', { height: "auto" });
+    }
 </script>
 <%@ include file="/WEB-INF/jspf/confirmJsp.jspf"%>
diff --git a/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp b/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp
index 09511f7..84d31bd 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp
@@ -75,11 +75,11 @@
     </style>
 </head>
 <body>
-<div style="width: 100%">
+<div style="width: 100%;height: 100%;overflow: auto">
     <input type="hidden" id="roleId" value="${user.roleId}">
     <input type="hidden" id="checks">
     <input type="hidden" id="userNames">
-    <div class="row">
+    <div class="row" style="margin-right: 0px;">
         <div class="col-md-12">
             <div class="panel-heading"><h4>基本管理/科室管理</h4></div>
             <hr>
diff --git a/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp b/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp
index 78fbd67..b0919e8 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp
@@ -270,7 +270,7 @@
             <div class="page-content-wrapper">
                 <div class="page-content">
                     <div class="container-fluid">
-                        <iframe class="row-fluid" style="height:78%;width:100%;" id="iFrame1" name="iFrame1" scrolling="no" frameborder="0"></iframe>
+                        <iframe class="row-fluid" style="width:100%;" id="iFrame1" name="iFrame1" scrolling="no" frameborder="0"></iframe>
                     </div>
                 </div>
             </div>
@@ -288,5 +288,14 @@
 </div>
 <%@ include file="/WEB-INF/jspf/webSocket.jspf" %>
 <script type="text/javascript" src="${path}/static/js/menu.js?time=2019-12-15"></script>
+<script type="text/javascript">
+    $(document).ready(function () {
+        var headerHeight = $(".main-header").height() || 0;
+        var footerHeight = ($(".main-footer").height() || 0) + 31;
+        var windowHeight = $(window).height();
+        $("#iFrame1").css("height", windowHeight - headerHeight - footerHeight - 36);
+        $("#indexTreeMenu").css("height",windowHeight - headerHeight);
+    })
+</script>
 </body>
 </html>
diff --git a/power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp b/power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp
index fb86912..f04f705 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp
@@ -75,10 +75,10 @@
     </style>
 </head>
 <body>
-<div style="width: 100%">
+<div style="width: 100%;height: 100%;overflow: auto">
     <input type="hidden" id="checks">
     <input type="hidden" id="userNames">
-    <div class="row">
+    <div class="row" style="margin-right: 0px;">
         <div class="col-md-12">
             <div class="panel-heading"><h4>基本管理/角色管理</h4></div>
             <hr>
diff --git a/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp b/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
index bb42997..abefd87 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
@@ -95,10 +95,10 @@
     </style>
 </head>
 <body>
-<div style="width: 100%">
+<div style="width: 100%;height: 100%;overflow: auto">
     <input type="hidden" id="checks">
     <input type="hidden" id="userNames">
-    <div class="row">
+    <div class="row" style="margin-right: 0px;">
         <div class="col-md-12">
             <div class="panel-heading"><h4>基本管理/用户管理</h4></div>
             <hr>
@@ -159,9 +159,7 @@
             <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-bordered"></table>
-    </div>
+    <table id="bootstrapTable" class="table text-nowrap table-striped"></table>
 </div>
 <!-- 模态框（Modal） -->
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
diff --git a/power-admin/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css b/power-admin/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css
index 6ed8bbb..083d50a 100644
--- a/power-admin/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css
+++ b/power-admin/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css
@@ -1 +1 @@
-.fixed-table-container .bs-checkbox,.fixed-table-container .no-records-found{text-align:center}.fixed-table-body thead th .th-inner,.table td,.table th{box-sizing:border-box}.bootstrap-table .table{margin-bottom:0!important;border-bottom:1px solid #ddd;border-collapse:collapse!important;border-radius:1px}.bootstrap-table .table,.bootstrap-table .table>tbody>tr>td,.bootstrap-table .table>tbody>tr>th,.bootstrap-table .table>tfoot>tr>td,.bootstrap-table .table>tfoot>tr>th,.bootstrap-table .table>thead>tr>td{padding:8px!important}.bootstrap-table .table.table-no-bordered>tbody>tr>td,.bootstrap-table .table.table-no-bordered>thead>tr>th{border-right:2px solid transparent}.fixed-table-container{position:relative;clear:both;border:1px solid #ddd;border-radius:4px;-webkit-border-radius:4px;-moz-border-radius:4px}.fixed-table-container.table-no-bordered{border:1px solid transparent}.fixed-table-footer,.fixed-table-header{overflow:hidden}.fixed-table-footer{border-top:1px solid #ddd}.fixed-table-body{overflow-x:auto;overflow-y:auto;height:100%}.fixed-table-container table{width:100%}.fixed-table-container thead th{height:0;padding:0;margin:0;border-left:1px solid #ddd}.fixed-table-container thead th:first-child{border-left:none;border-top-left-radius:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px}.fixed-table-container tbody td .th-inner,.fixed-table-container thead th .th-inner{padding:8px;line-height:24px;vertical-align:top;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.fixed-table-container thead th .sortable{cursor:pointer;background-position:right;background-repeat:no-repeat;padding-right:30px}.fixed-table-container thead th .both{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC')}.fixed-table-container thead th .asc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==)}.fixed-table-container thead th .desc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII=)}.fixed-table-container th.detail{width:30px}.fixed-table-container tbody td{border-left:1px solid #ddd}.fixed-table-container tbody tr:first-child td{border-top:none}.fixed-table-container tbody td:first-child{border-left:none}.fixed-table-container tbody .selected td{background-color:#f5f5f5}.fixed-table-container .bs-checkbox .th-inner{padding:8px 0}.fixed-table-container input[type=radio],.fixed-table-container input[type=checkbox]{margin:0 auto!important}.fixed-table-pagination .pagination-detail,.fixed-table-pagination div.pagination{margin-top:10px;margin-bottom:10px}.fixed-table-pagination div.pagination .pagination{margin:0}.fixed-table-pagination .pagination a{padding:6px 12px;line-height:1.428571429}.fixed-table-pagination .pagination-info{line-height:34px;margin-right:5px}.fixed-table-pagination .btn-group{position:relative;display:inline-block;vertical-align:middle}.fixed-table-pagination .dropup .dropdown-menu{margin-bottom:0}.fixed-table-pagination .page-list{display:inline-block}.fixed-table-toolbar .columns-left{margin-right:5px}.fixed-table-toolbar .columns-right{margin-left:5px}.fixed-table-toolbar .columns label{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429}.fixed-table-toolbar .bars,.fixed-table-toolbar .columns,.fixed-table-toolbar .search{position:relative;margin-top:10px;margin-bottom:10px;line-height:34px}.fixed-table-pagination li.disabled a{pointer-events:none;cursor:default}.fixed-table-loading{display:none;position:absolute;top:42px;right:0;bottom:0;left:0;z-index:99;background-color:#fff;text-align:center}.fixed-table-body .card-view .title{font-weight:700;display:inline-block;min-width:30%;text-align:left!important}.table td,.table th{vertical-align:middle}.fixed-table-toolbar .dropdown-menu{text-align:left;max-height:300px;overflow:auto}.fixed-table-toolbar .btn-group>.btn-group{display:inline-block;margin-left:-1px!important}.fixed-table-toolbar .btn-group>.btn-group>.btn{border-radius:0}.fixed-table-toolbar .btn-group>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.fixed-table-toolbar .btn-group>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}.bootstrap-table .table>thead>tr>th{vertical-align:bottom;border-bottom:1px solid #ddd}.bootstrap-table .table thead>tr>th{padding:0;margin:0}.bootstrap-table .fixed-table-footer tbody>tr>td{padding:0!important}.bootstrap-table .fixed-table-footer .table{border-bottom:none;border-radius:0}.pull-right .dropdown-menu{right:0;left:auto}p.fixed-table-scroll-inner{width:100%;height:200px}div.fixed-table-scroll-outer{top:0;left:0;visibility:hidden;width:200px;height:150px;overflow:hidden}
\ No newline at end of file
+.fixed-table-container .bs-checkbox,.fixed-table-container .no-records-found{text-align:center}.fixed-table-body thead th .th-inner,.table td,.table th{box-sizing:border-box}.bootstrap-table .table{margin-bottom:0!important;border-bottom:1px solid #ddd;border-collapse:collapse!important;border-radius:1px}.bootstrap-table .table,.bootstrap-table .table>tbody>tr>td,.bootstrap-table .table>tbody>tr>th,.bootstrap-table .table>tfoot>tr>td,.bootstrap-table .table>tfoot>tr>th,.bootstrap-table .table>thead>tr>td{padding:8px!important}.bootstrap-table .table.table-no-bordered>tbody>tr>td,.bootstrap-table .table.table-no-bordered>thead>tr>th{border-right:2px solid transparent}.fixed-table-container{position:relative;clear:both;border:1px solid #ddd;border-radius:4px;-webkit-border-radius:4px;-moz-border-radius:4px}.fixed-table-container.table-no-bordered{border:1px solid transparent}.fixed-table-footer,.fixed-table-header{overflow:hidden}.fixed-table-footer{border-top:1px solid #ddd}.fixed-table-body{overflow-x:auto;overflow-y:auto;/*height:100%*/}.fixed-table-container table{width:100%}.fixed-table-container thead th{height:0;padding:0;margin:0;border-left:1px solid #ddd}.fixed-table-container thead th:first-child{border-left:none;border-top-left-radius:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px}.fixed-table-container tbody td .th-inner,.fixed-table-container thead th .th-inner{padding:8px;line-height:24px;vertical-align:top;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.fixed-table-container thead th .sortable{cursor:pointer;background-position:right;background-repeat:no-repeat;padding-right:30px}.fixed-table-container thead th .both{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC')}.fixed-table-container thead th .asc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==)}.fixed-table-container thead th .desc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII=)}.fixed-table-container th.detail{width:30px}.fixed-table-container tbody td{border-left:1px solid #ddd}.fixed-table-container tbody tr:first-child td{border-top:none}.fixed-table-container tbody td:first-child{border-left:none}.fixed-table-container tbody .selected td{background-color:#f5f5f5}.fixed-table-container .bs-checkbox .th-inner{padding:8px 0}.fixed-table-container input[type=radio],.fixed-table-container input[type=checkbox]{margin:0 auto!important}.fixed-table-pagination .pagination-detail,.fixed-table-pagination div.pagination{margin-top:10px;margin-bottom:10px}.fixed-table-pagination div.pagination .pagination{margin:0}.fixed-table-pagination .pagination a{padding:6px 12px;line-height:1.428571429}.fixed-table-pagination .pagination-info{line-height:34px;margin-right:5px}.fixed-table-pagination .btn-group{position:relative;display:inline-block;vertical-align:middle}.fixed-table-pagination .dropup .dropdown-menu{margin-bottom:0}.fixed-table-pagination .page-list{display:inline-block}.fixed-table-toolbar .columns-left{margin-right:5px}.fixed-table-toolbar .columns-right{margin-left:5px}.fixed-table-toolbar .columns label{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429}.fixed-table-toolbar .bars,.fixed-table-toolbar .columns,.fixed-table-toolbar .search{position:relative;margin-top:10px;margin-bottom:10px;line-height:34px}.fixed-table-pagination li.disabled a{pointer-events:none;cursor:default}.fixed-table-loading{display:none;position:absolute;top:42px;right:0;bottom:0;left:0;z-index:99;background-color:#fff;text-align:center}.fixed-table-body .card-view .title{font-weight:700;display:inline-block;min-width:30%;text-align:left!important}.table td,.table th{vertical-align:middle}.fixed-table-toolbar .dropdown-menu{text-align:left;max-height:300px;overflow:auto}.fixed-table-toolbar .btn-group>.btn-group{display:inline-block;margin-left:-1px!important}.fixed-table-toolbar .btn-group>.btn-group>.btn{border-radius:0}.fixed-table-toolbar .btn-group>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.fixed-table-toolbar .btn-group>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}.bootstrap-table .table>thead>tr>th{vertical-align:bottom;border-bottom:1px solid #ddd}.bootstrap-table .table thead>tr>th{padding:0;margin:0}.bootstrap-table .fixed-table-footer tbody>tr>td{padding:0!important}.bootstrap-table .fixed-table-footer .table{border-bottom:none;border-radius:0}.pull-right .dropdown-menu{right:0;left:auto}p.fixed-table-scroll-inner{width:100%;height:200px}div.fixed-table-scroll-outer{top:0;left:0;visibility:hidden;width:200px;height:150px;overflow:hidden}
\ No newline at end of file
diff --git a/power-admin/src/main/webapp/static/js/dept.js b/power-admin/src/main/webapp/static/js/dept.js
index 41eafb2..9e14ba0 100644
--- a/power-admin/src/main/webapp/static/js/dept.js
+++ b/power-admin/src/main/webapp/static/js/dept.js
@@ -76,7 +76,7 @@ $(function(){
     //先销毁表格
     $('#bootstrapTable').bootstrapTable({
         //表格高度
-        height: getHeight(),
+        //height: getHeight(),
         method : 'get',
         url :path+ "/dept/pageList",//请求路径
         striped : true, //是否显示行间隔色
@@ -103,8 +103,9 @@ $(function(){
         columns : columns,
         onLoadSuccess: function(){  //加载成功时执行
             $(".page-list").show();
-            $("th").css({'text-align':'center','vertical-align':'middle'})
-            $("td").css({'text-align':'center','vertical-align':'middle'})
+            $("th").css({'text-align':'center','vertical-align':'middle'});
+            $("td").css({'text-align':'center','vertical-align':'middle'});
+            reloadTableHeight("bootstrapTable");
         },
         //监听分页点击事件
         onPageChange: function(num, type) {
@@ -387,10 +388,6 @@ $('#queryBtn').click(function () {
     $("#checks").val("");
     refresh();
 })
-//获取table的高度
-function getHeight() {
-    return $(window).height() * 0.8;
-}
 //刷新表格
 function refresh() {
     $('#bootstrapTable').bootstrapTable('refresh',{
diff --git a/power-admin/src/main/webapp/static/js/roleNotDown.js b/power-admin/src/main/webapp/static/js/roleNotDown.js
index ba3d4c4..1377342 100644
--- a/power-admin/src/main/webapp/static/js/roleNotDown.js
+++ b/power-admin/src/main/webapp/static/js/roleNotDown.js
@@ -8,7 +8,7 @@ $(function(){
     //先销毁表格
     $('#bootstrapTable').bootstrapTable({
         //表格高度
-        height: getHeight(),
+        //height: getHeight(),
         method : 'get',
         url : path+ "/role/pageList",//请求路径
         striped : true, //是否显示行间隔色
@@ -100,8 +100,9 @@ $(function(){
         ],
         onLoadSuccess: function(){  //加载成功时执行
             $(".page-list").show();
-            $("th").css({'text-align':'center','vertical-align':'middle'})
-            $("td").css({'text-align':'center','vertical-align':'middle'})
+            $("th").css({'text-align':'center','vertical-align':'middle'});
+            $("td").css({'text-align':'center','vertical-align':'middle'});
+            reloadTableHeight("bootstrapTable");
         },
         //监听分页点击事件
         onPageChange: function(num, type) {
diff --git a/power-admin/src/main/webapp/static/js/user.js b/power-admin/src/main/webapp/static/js/user.js
index 41edb3c..528f3c8 100644
--- a/power-admin/src/main/webapp/static/js/user.js
+++ b/power-admin/src/main/webapp/static/js/user.js
@@ -7,7 +7,7 @@ var form = '';
         //先销毁表格
         $('#bootstrapTable').bootstrapTable({
             //表格高度
-            height: getHeight(),
+            //height: getHeight(),
             method : 'get',
             url :path+ "/user/pageList",//请求路径
             striped : true, //是否显示行间隔色
@@ -136,8 +136,9 @@ var form = '';
             ],
             onLoadSuccess: function(){  //加载成功时执行
                 $(".page-list").show();
-                $("th").css({'text-align':'center','vertical-align':'middle'})
-                $("td").css({'text-align':'center','vertical-align':'middle'})
+                $("th").css({'text-align':'center','vertical-align':'middle'});
+                $("td").css({'text-align':'center','vertical-align':'middle'});
+                reloadTableHeight("bootstrapTable");
             },
             //监听分页点击事件
             onPageChange: function(num, type) {
@@ -470,10 +471,6 @@ function saveForm(){
         })
     }
 }
-//获取table的高度
-function getHeight() {
-    return $(window).height() * 0.8;
-}
 //刷新表格
 function refresh() {
     $('#bootstrapTable').bootstrapTable('refresh',{
