From 8dfd73c39a437779164ef7d71aa71973d4903b00 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Wed, 12 Aug 2020 15:47:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E9=AB=98?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- power-admin/src/main/webapp/WEB-INF/jspf/common.jspf | 5 +++++ .../src/main/webapp/WEB-INF/views/deptDir/dept.jsp | 4 ++-- .../src/main/webapp/WEB-INF/views/loginDir/index.jsp | 11 ++++++++++- .../main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp | 4 ++-- .../src/main/webapp/WEB-INF/views/userDir/user.jsp | 8 +++----- .../bootstrap-table/bootstrap-table.min.css | 2 +- power-admin/src/main/webapp/static/js/dept.js | 11 ++++------- power-admin/src/main/webapp/static/js/roleNotDown.js | 7 ++++--- power-admin/src/main/webapp/static/js/user.js | 11 ++++------- 9 files changed, 35 insertions(+), 28 deletions(-) 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" }); + } <%@ 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 @@ -
+
-
+

基本管理/科室管理

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 @@
- +
@@ -288,5 +288,14 @@
<%@ include file="/WEB-INF/jspf/webSocket.jspf" %> + 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 @@ -
+
-
+

基本管理/角色管理

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 @@ -
+
-
+

基本管理/用户管理

@@ -159,9 +159,7 @@
-
-
-
+