test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(权限管理): 修改表格高度

This commit is contained in:
Captain.B 2021-05-21 10:41:04 +08:00 committed by 刘瑞斌
parent b3a91006c8
commit 1263d9f443
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/src/business/components/settings/system/group/UserGroup.vue
View File

@ -6,7 +6,8 @@
create-tip="创建用户组" title="用户组与权限"/> create-tip="创建用户组" title="用户组与权限"/>
</template> </template>
<el-table :data="groups"> <el-table :data="groups" border class="adjust-table" style="width: 100%"
:height="screenHeight">
<el-table-column prop="name" :label="$t('commons.name')"/> <el-table-column prop="name" :label="$t('commons.name')"/>
<el-table-column prop="type" label="所属类型"> <el-table-column prop="type" label="所属类型">
<template v-slot="scope"> <template v-slot="scope">
@ -30,7 +31,7 @@
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)"> <ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)">
<template v-slot:middle> <template v-slot:middle>
<!-- <ms-table-operator-button tip="复制" icon="el-icon-document-copy" @exec="copy(scope.row)"/>--> <!-- <ms-table-operator-button tip="复制" icon="el-icon-document-copy" @exec="copy(scope.row)"/>-->
<ms-table-operator-button tip="设置权限" icon="el-icon-s-tools" @exec="setPermission(scope.row)"/> <ms-table-operator-button tip="设置权限" icon="el-icon-s-tools" @exec="setPermission(scope.row)"/>
</template> </template>
</ms-table-operator> </ms-table-operator>
@ -76,8 +77,9 @@ export default {
currentPage: 1, currentPage: 1,
pageSize: 10, pageSize: 10,
total: 0, total: 0,
screenHeight: 'calc(100vh - 275px)',
groups: [] groups: []
} };
}, },
activated() { activated() {
this.initData(); this.initData();
@ -95,7 +97,7 @@ export default {
this.total = data.itemCount; this.total = data.itemCount;
this.groups = data.listObject; this.groups = data.listObject;
} }
}) });
}, },
create() { create() {
this.$refs.editUserGroup.open({}, 'create'); this.$refs.editUserGroup.open({}, 'create');
@ -107,19 +109,19 @@ export default {
this.result = this.$get("/user/group/delete/" + row.id, () => { this.result = this.$get("/user/group/delete/" + row.id, () => {
this.$success(this.$t('commons.delete_success')); this.$success(this.$t('commons.delete_success'));
this.initData(); this.initData();
}) });
}, },
del(row) { del(row) {
this.$refs.deleteConfirm.open(row); this.$refs.deleteConfirm.open(row);
}, },
copy(row) { copy(row) {
console.log(row) console.log(row);
}, },
setPermission(row) { setPermission(row) {
this.$refs.editPermission.open(row); this.$refs.editPermission.open(row);
}, },
} }
} };
</script> </script>
<style scoped> <style scoped>

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 097d3a5a00beaa660d34525765d93b35e63f52c0 Subproject commit d5ede4fbffde2f7171fd0c49856ee1f23155c717