diff --git a/src/layout/components/ListTables/index.vue b/src/layout/components/ListTables/index.vue index d62f7a565..2f7cef662 100644 --- a/src/layout/components/ListTables/index.vue +++ b/src/layout/components/ListTables/index.vue @@ -29,6 +29,18 @@
+
+ + + + 提交 +
-
+ + + + + + + + - diff --git a/src/views/users/UserGroupEdit.vue b/src/views/users/UserGroupEdit.vue index 61a4b8fed..c4014730b 100644 --- a/src/views/users/UserGroupEdit.vue +++ b/src/views/users/UserGroupEdit.vue @@ -37,7 +37,7 @@ :rows="3" /> - + 重置 {{ buttonTitle }} @@ -151,7 +151,9 @@ export default { width: 80%; margin-left: 10%; } - +.foot_button{ + padding-bottom: 18px ; +} //重置El-select宽度 .el-select{ width: 100%; diff --git a/src/views/users/UserGroupList.vue b/src/views/users/UserGroupList.vue index 361981f3c..b78c4d739 100644 --- a/src/views/users/UserGroupList.vue +++ b/src/views/users/UserGroupList.vue @@ -92,7 +92,7 @@ export default { }, methods: { handleDetail: function(index, row) { - this.$router.push({ name: 'UserDetail', params: { id: row.id }}) + this.$router.push({ name: 'UserGroupDetail', params: { id: row.id }}) }, handleEdit: function(index, row) { this.$router.push({ name: 'UserGroupEdit', params: { id: row.id }}) diff --git a/src/views/users/UserList.vue b/src/views/users/UserList.vue index c4c36aed8..5e35baaec 100644 --- a/src/views/users/UserList.vue +++ b/src/views/users/UserList.vue @@ -5,6 +5,7 @@ tableroute="UserEdit" @SizeChange="handleSizeChange" @CurrentChange="handleCurrentChange" + @MutiSelectChange="handleMutiSelectChange" > - + /> - + /> + + +
{{ group.name }}
+
+ + + + + + + + + + + + + + + + + + + +
{{ $t('usergroup.name') }}:{{ group.name }}
{{ $t('usergroup.created_by') }}:{{ group.created_by }}
{{ $t('usergroup.date_created') }}:{{ group.date_created }}
{{ $t('usergroup.comment') }}:{{ group.comment }}
+
+
+ {{ $t('usergroup.asset_granted') }} +
+ + + + + diff --git a/src/views/users/components/card/index.vue b/src/views/users/components/card/index.vue index e69de29bb..f20fc6424 100644 --- a/src/views/users/components/card/index.vue +++ b/src/views/users/components/card/index.vue @@ -0,0 +1,193 @@ + + + + + diff --git a/src/views/users/components/index.js b/src/views/users/components/index.js index 5025f8bb6..ccbdccb20 100644 --- a/src/views/users/components/index.js +++ b/src/views/users/components/index.js @@ -1,6 +1,2 @@ -export { default as Navbar } from './Navbar' -export { default as Sidebar } from './Sidebar' -export { default as AppMain } from './AppMain' -export { default as BackPlayground } from './BackPlayground' -export { default as ListTables } from './ListTables' -export { default as Footer } from './Footer' +export { default as Tab } from './Tab' +export { default as Card } from './Card'