系统管理功能完善

ealpha · May 9, 2017 · 8e0eb54 · 8e0eb54
1 parent 233a3ba
commit 8e0eb54
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 20 deletions.
diff --git a/xproject-admin/src/main/webapp/admin/role/index.html b/xproject-admin/src/main/webapp/admin/role/index.html
@@ -126,8 +126,8 @@ <h3 class="el-title">
 							</template>
 						</el-table-column>
 					</el-table>
-					<div class="el-search-list-pager" v-show="showRoleQueryPager">
-						<el-pagination class="el-pagination-small" @current-change="onRoleQueryCurrentPageChange" :current-page="roleQueryForm.currentPage" :page-size="roleQueryForm.pageSize" layout="slot, prev, pager, next, total" :total="roleQueryTotal">
+					<div class="el-search-list-pager">
+						<el-pagination v-show="showRoleQueryPager" class="el-pagination-small" @current-change="onRoleQueryCurrentPageChange" :current-page="roleQueryForm.currentPage" :page-size="roleQueryForm.pageSize" layout="slot, prev, pager, next, total" :total="roleQueryTotal">
 					  		<div class="el-pagination-pagesize">
 					  			<span>每页显示</span>
 					  			<el-button-group>

diff --git a/xproject-admin/src/main/webapp/admin/user/index.html b/xproject-admin/src/main/webapp/admin/user/index.html
@@ -131,8 +131,8 @@ <h3 class="el-title">
 							</template>
 						</el-table-column>
 					</el-table>
-					<div class="el-search-list-pager" v-show="showUserQueryPager">
-						<el-pagination class="el-pagination-small" @current-change="onUserQueryCurrentPageChange" :current-page="userQueryForm.currentPage" :page-size="userQueryForm.pageSize" layout="slot, prev, pager, next, total" :total="userQueryTotal">
+					<div class="el-search-list-pager">
+						<el-pagination v-show="showUserQueryPager" class="el-pagination-small" @current-change="onUserQueryCurrentPageChange" :current-page="userQueryForm.currentPage" :page-size="userQueryForm.pageSize" layout="slot, prev, pager, next, total" :total="userQueryTotal">
 					  		<div class="el-pagination-pagesize">
 					  			<span>每页显示</span>
 					  			<el-button-group>
@@ -367,8 +367,8 @@ <h3 class="el-title">
 										<el-table-column label="角色描述" prop="description"></el-table-column>
 										<el-table-column label="创建时间" prop="createTime" width="100" align="center" sortable></el-table-column>
 									</el-table>
-									<div class="el-search-list-pager" v-show="showRoleQueryPager">
-										<el-pagination class="el-pagination-small" @current-change="onRoleQueryCurrentPageChange" :current-page="roleQueryForm.currentPage" :page-size="roleQueryForm.pageSize" layout="prev, pager, next, total" :total="roleQueryTotal">
+									<div class="el-search-list-pager">
+										<el-pagination v-show="showRoleQueryPager" class="el-pagination-small" @current-change="onRoleQueryCurrentPageChange" :current-page="roleQueryForm.currentPage" :page-size="roleQueryForm.pageSize" layout="prev, pager, next, total" :total="roleQueryTotal">
 									  	</el-pagination>
 									</div>
 								</div>

diff --git a/xproject-admin/src/main/webapp/resources/components/element-ui/element-1.2.8.min.js b/xproject-admin/src/main/webapp/resources/components/element-ui/element-1.2.8.min.js
diff --git a/xproject-admin/src/main/webapp/resources/components/element-ui/element.min.js b/xproject-admin/src/main/webapp/resources/components/element-ui/element.min.js
diff --git a/...admin/src/main/webapp/resources/components/element-ui/theme-default/element-1.2.8.min.css b/...admin/src/main/webapp/resources/components/element-ui/theme-default/element-1.2.8.min.css
diff --git a/...ct-admin/src/main/webapp/resources/components/element-ui/theme-default/element.custom.css b/...ct-admin/src/main/webapp/resources/components/element-ui/theme-default/element.custom.css
@@ -695,6 +695,8 @@ a {
 .el-search-list-pager {
 	padding: 10px 0 0 0;
 	text-align: right;
+	box-sizing: border-box;
+	height: 42px;
 }
 
 .el-upload__tip {
@@ -1356,7 +1358,8 @@ a {
 	overflow: hidden !important;
 }
 .el-table.loading {
-	height: 350px !important;
+	min-height: 250px !important;
+	max-height: 450px !important;
 }
 .el-table.loading > .el-table__body-wrapper {
 	overflow: hidden !important;

diff --git a/xproject-admin/src/main/webapp/resources/components/element-ui/theme-default/element.min.css b/xproject-admin/src/main/webapp/resources/components/element-ui/theme-default/element.min.css