|
|
@@ -1,10 +1,10 @@
|
|
|
<template>
|
|
|
- <div class="app-container">
|
|
|
- <el-row style="margin-top: 18px;">
|
|
|
+ <div class="app-container app-containerth">
|
|
|
+ <el-row style="margin-top: 18px;" class="searBoxstu" >
|
|
|
<el-col :span="5" class="searBoxs">
|
|
|
- <el-row class="roleBoxui">
|
|
|
- <el-col :span="24" class="roleBotyu">
|
|
|
- <el-row :gutter="10" class="mb8">
|
|
|
+ <el-row class="roleBoxui" >
|
|
|
+ <el-col :span="24" class="roleBotyu" style="height: 100%;">
|
|
|
+ <el-row :gutter="10" class="mb8" style="height: 100%;">
|
|
|
<el-col :span="1.5">
|
|
|
<el-button type="primary" style="background-color: #FF9639;color: #fff;border: none;" plain icon="el-icon-refresh"
|
|
|
@click="efresh" v-hasPermi="['system:role:list']">刷新</el-button>
|
|
|
@@ -25,6 +25,8 @@
|
|
|
{{item.roleName}}
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <pagination sty v-show="totale>0" :total="totale" layout="prev, pager, next" :page.sync="queryParams.pageNum"
|
|
|
+ :limit.sync="queryParams.pageSize" @pagination="getList" small />
|
|
|
</el-col>
|
|
|
<el-col :span="19" class="roleContr">
|
|
|
<el-row class="roleBox">
|
|
|
@@ -75,6 +77,7 @@
|
|
|
:page.sync="queryParamstr.pageNum"
|
|
|
:limit.sync="queryParamstr.pageSize"
|
|
|
@pagination="getDeptTreeselect"
|
|
|
+ class="pajie"
|
|
|
/>
|
|
|
</div>
|
|
|
</el-col>
|
|
|
@@ -132,6 +135,7 @@
|
|
|
showSearch: true,
|
|
|
// 总条数
|
|
|
total: 0,
|
|
|
+ totale:0,
|
|
|
// 角色表格数据
|
|
|
roleList: [],
|
|
|
// 弹出层标题
|
|
|
@@ -157,7 +161,9 @@
|
|
|
queryParams: {
|
|
|
roleName: undefined,
|
|
|
roleId: undefined,
|
|
|
- status: undefined
|
|
|
+ status: undefined,
|
|
|
+ pageNum: 1,
|
|
|
+ pageSize: 10,
|
|
|
},
|
|
|
queryParamstr:{
|
|
|
pageNum: 1,
|
|
|
@@ -227,11 +233,12 @@
|
|
|
/** 查询角色列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
- this.roleList = []
|
|
|
+ this.roleList = []
|
|
|
listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
|
|
|
response => {
|
|
|
if(response.rows.length !==0){
|
|
|
this.roleList = response.rows;
|
|
|
+ this.totale = response.total;
|
|
|
}else{
|
|
|
this.roleList.push({roleName:'暂无数据'})
|
|
|
}
|
|
|
@@ -503,6 +510,11 @@
|
|
|
margin-top: 87px;
|
|
|
}
|
|
|
}
|
|
|
+ .app-containerth{
|
|
|
+ .pajie{
|
|
|
+ bottom: 30px;
|
|
|
+ }
|
|
|
+ }
|
|
|
</style>
|
|
|
<style lang="scss" scoped>
|
|
|
.roleContrBox {
|
|
|
@@ -510,11 +522,12 @@
|
|
|
// border-radius: 6px;
|
|
|
overflow: hidden;
|
|
|
padding: 23px 0;
|
|
|
+ height: calc(95vh - 168px);;
|
|
|
}
|
|
|
|
|
|
.roleContr {
|
|
|
padding-left: 17px;
|
|
|
-
|
|
|
+ height: calc(100% - 168px);
|
|
|
.searContLeft {
|
|
|
padding:0 17px 23px 23px;
|
|
|
// border-right: 2px solid #E5E5E5;
|
|
|
@@ -573,12 +586,17 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ .searBoxstu{
|
|
|
+ // height: 100vh;
|
|
|
+ // height: calc(100vh - 70px);
|
|
|
+ // background-color: #fff;
|
|
|
+ }
|
|
|
.searBoxs {
|
|
|
background-color: #fff;
|
|
|
border-radius: 6px;
|
|
|
padding: 23px;
|
|
|
-
|
|
|
+ height: calc(100vh - 140px); ;
|
|
|
+ min-height: calc(100vh - 140px);
|
|
|
.searBox {
|
|
|
display: flex;
|
|
|
|
|
|
@@ -624,7 +642,7 @@
|
|
|
|
|
|
.searList {
|
|
|
padding: 10px 0;
|
|
|
-
|
|
|
+ height: 70%;
|
|
|
.searItem {
|
|
|
padding: 0 8px;
|
|
|
line-height: 30px;
|
|
|
@@ -642,7 +660,7 @@
|
|
|
|
|
|
.app-container {
|
|
|
background-color: #EFF0FF;
|
|
|
- min-height: calc(100vh - 70px);
|
|
|
+ // min-height: calc(100vh - 70px);
|
|
|
box-sizing: border-box;
|
|
|
box-sizing: border-box;
|
|
|
}
|
yrik