From ecc1b232f0a3c753db5b121e9a6ecb181c4bc277 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 20 九月 2022 16:04:42 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master
---
src/views/systemSetting/baseSetting/role/index.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/role/index.vue b/src/views/systemSetting/baseSetting/role/index.vue
index 1fda798..97f453a 100644
--- a/src/views/systemSetting/baseSetting/role/index.vue
+++ b/src/views/systemSetting/baseSetting/role/index.vue
@@ -10,8 +10,8 @@
</div>
</div>
<div class="addUser">
- <el-button class="addBtn" type="primary" @click="dialogCreate = true">娣诲姞鐢ㄦ埛</el-button>
- <el-dialog :visible.sync="dialogCreate" width="45%">
+ <el-button class="addBtn" type="primary" @click="dialogCreate = true">鏂板缓瑙掕壊</el-button>
+ <el-dialog :visible.sync="dialogCreate" width="45%" v-if="dialogCreate">
<createUser :refresh="getUserList" />
</el-dialog>
</div>
@@ -51,13 +51,13 @@
<span class="line">|</span>
<!-- <span>淇敼瀵嗙爜</span> -->
<!-- <span>鍒犻櫎</span> -->
- <span @click="handleUpdate(scope.row)">淇敼閮ㄩ棬</span>
+ <span @click="handleUpdate(scope.row)">淇敼瑙掕壊</span>
</div>
</template>
</el-table-column>
</el-table>
<!-- 鏌ョ湅淇敼椤甸潰 -->
- <el-dialog :visible.sync="dialogUpdate" width="45%">
+ <el-dialog :visible.sync="dialogUpdate" width="45%" v-if="dialogUpdate">
<updateUser :updateFlag="updateFlag" :userInfo=userInfo />
</el-dialog>
<!-- 鍒嗛〉 -->
@@ -87,7 +87,7 @@
dialogUpdate: false,
updateFlag: false,
userInfo: '',
- totalNum: 200,
+ totalNum: '',
pageSize: 10,
currentPage: 1,
}
@@ -124,6 +124,7 @@
item.status == 1 ? item.status = true : item.status = false;
})
that.tableData = res.data
+ this.totalNum=res.data.length
}
})
},
@@ -137,8 +138,8 @@
item.createTime = helper(item.createTime);
item.status == 1 ? item.status = true : item.status = false;
})
-
- that.tableData = res.data.list
+ this.totalNum=this.
+ this.totalNum=res.data.list.length
}
})
},
@@ -352,5 +353,8 @@
&::v-deep .el-dialog__body {
background-color: #06122c;
}
+ // &::v-deep .el-dialog__title{
+ // color: #4b9bb7;
+ // }
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0