diff --git a/src/api/perms.js b/src/api/perms.js new file mode 100644 index 000000000..59c28e6a9 --- /dev/null +++ b/src/api/perms.js @@ -0,0 +1,22 @@ +import request from '@/utils/request' + +export function getAssetPermissionDetail(id) { + return request({ + url: `/api/v1/perms/asset-permissions/${id}/`, + method: 'get' + }) +} + +export function getRemoteAppPermissionDetail(id) { + return request({ + url: `/api/v1/perms/remote-app-permissions/${id}/`, + method: 'get' + }) +} + +export function getDatabaseAppPermissionDetail(id) { + return request({ + url: `/api/v1/perms/database-app-permissions/${id}/`, + method: 'get' + }) +} diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js index 07290c620..4b1e0f06e 100644 --- a/src/i18n/langs/cn.js +++ b/src/i18n/langs/cn.js @@ -95,10 +95,13 @@ const cn = { 'Perms': '权限管理', 'AssetPermission': '资产授权', 'AssetPermissionCreate': '创建资产授权规则', + 'AssetPermissionUpdate': '更新资产授权规则', 'RemoteAppPermission': '远程应用授权', 'RemoteAppPermissionCreate': '创建远程应用授权规则', + 'RemoteAppPermissionUpdate': '更新远程应用授权规则', 'DatabaseAppPermission': '数据库应用授权', 'DatabaseAppPermissionCreate': '创建数据库应用授权规则', + 'DatabaseAppPermissionUpdate': '更新数据库应用授权规则', 'Sessions': '会话管理', 'SessionOnline': '在线会话', 'SessionOffline': '历史会话', @@ -350,10 +353,30 @@ const cn = { 'UserGroups': '用户组', 'Node': '节点', 'SystemUser': '系统用户', + 'UserCount': '用户数量', + 'UserGroupCount': '用户组数量', + 'AssetCount': '资产数量', + 'NodeCount': '节点数量', + 'SystemUserCount': '系统用户数量', + 'DateStart': '开始日期', + 'DateExpired': '失效日期', + 'DateCreated': '创建日期', + 'CreatedBy': '创建者', + 'Comment': '备注', + 'QuickModify': '快速修改', + 'AssetPermissionDetail': '资产授权详情', + 'UsersAndUserGroups': '用户或用户组', + 'AssetAndNode': '资产或节点', + 'Active': '激活中', // 'RemoteApp': '远程应用', + 'RemoteAppCount': '远程应用数量', + 'RemoteAppPermissionDetail': '远程应用授权详情', + 'Add RemoteApp to this permission': '添加远程应用', // - 'DatabaseApp': '数据库应用' + 'DatabaseApp': '数据库应用', + 'DatabaseAppPermissionDetail': '数据库应用授权详情', + 'Add DatabaseApp to this permission': '添加数据库应用' }, sessions: { 'id': 'ID', diff --git a/src/router/index.js b/src/router/index.js index 679198263..60be72062 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -222,10 +222,24 @@ export const constantRoutes = [ }, { path: 'asset-permissions/create', - component: () => import('@/views/perms/AssetPermissionCreateUpdate'), // Parent router-view + component: () => import('@/views/perms/AssetPermissionCreateUpdate'), name: 'AssetPermissionCreate', hidden: true, - meta: { title: 'AssetPermissionCreate', activeMenu: '/perms/asset-permissions' } + meta: { title: 'AssetPermissionCreate', activeMenu: '/perms/asset-permissions', action: 'create' } + }, + { + path: 'users/:id/update', + component: () => import('@/views/perms/AssetPermissionCreateUpdate.vue'), // Parent router-view + name: 'AssetPermissionUpdate', + hidden: true, + meta: { title: 'AssetPermissionUpdate', activeMenu: '/perms/asset-permissions', action: 'update' } + }, + { + path: 'asset-permissions/:id', + component: () => import('@/views/perms/AssetPermissionDetail'), + name: 'AssetPermissionDetail', + hidden: true, + meta: { title: 'AssetPermissionDetail', activeMenu: '/perms/asset-permissions' } }, { path: 'remote-app-permissions', @@ -235,10 +249,24 @@ export const constantRoutes = [ }, { path: 'remote-app-permissions/create', - component: () => import('@/views/perms/RemoteAppPermissionCreateUpdate'), // Parent router-view + component: () => import('@/views/perms/RemoteAppPermissionCreateUpdate'), name: 'RemoteAppPermissionCreate', hidden: true, - meta: { title: 'RemoteAppPermissionCreate', activeMenu: '/perms/remote-app-permissions' } + meta: { title: 'RemoteAppPermissionCreate', activeMenu: '/perms/remote-app-permissions', action: 'create' } + }, + { + path: 'remote-app-permissions/update', + component: () => import('@/views/perms/RemoteAppPermissionCreateUpdate'), + name: 'RemoteAppPermissionUpdate', + hidden: true, + meta: { title: 'RemoteAppPermissionUpdate', activeMenu: '/perms/remote-app-permissions', action: 'update' } + }, + { + path: 'remote-app-permissions/:id', + component: () => import('@/views/perms/RemoteAppPermissionDetail'), + name: 'RemoteAppPermissionDetail', + hidden: true, + meta: { title: 'RemoteAppPermissionDetail', activeMenu: '/perms/remote-app-permissions' } }, { path: 'database-app-permissions', @@ -252,6 +280,20 @@ export const constantRoutes = [ name: 'DatabaseAppPermissionCreate', hidden: true, meta: { title: 'DatabaseAppPermissionCreate', activeMenu: '/perms/database-app-permissions' } + }, + { + path: 'database-app-permissions/update', + component: () => import('@/views/perms/DatabaseAppPermissionCreateUpdate'), // Parent router-view + name: 'DatabaseAppPermissionUpdate', + hidden: true, + meta: { title: 'DatabaseAppPermissionUpdate', activeMenu: '/perms/database-app-permissions', action: 'update' } + }, + { + path: 'database-app-permissions/:id', + component: () => import('@/views/perms/DatabaseAppPermissionDetail'), + name: 'DatabaseAppPermissionDetail', + hidden: true, + meta: { title: 'DatabaseAppPermissionDetail', activeMenu: '/perms/asset-permissions' } } ] }, @@ -323,7 +365,7 @@ export const constantRoutes = [ { path: 'command-executions/create', name: 'BatchCommand', - component: () => import('@/views/tree/index'), + component: () => import('@/views/jobcenter/CommandExecution'), meta: { title: 'BatchCommand' } }, { diff --git a/src/views/jobcenter/CommandExecution.vue b/src/views/jobcenter/CommandExecution.vue new file mode 100644 index 000000000..8e14bfe30 --- /dev/null +++ b/src/views/jobcenter/CommandExecution.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/src/views/perms/AssetPermissionCreateUpdate.vue b/src/views/perms/AssetPermissionCreateUpdate.vue index d96d96037..3613b778b 100644 --- a/src/views/perms/AssetPermissionCreateUpdate.vue +++ b/src/views/perms/AssetPermissionCreateUpdate.vue @@ -1,5 +1,5 @@ + + diff --git a/src/views/perms/AssetPermissionList.vue b/src/views/perms/AssetPermissionList.vue index ab677c511..49ba9be67 100644 --- a/src/views/perms/AssetPermissionList.vue +++ b/src/views/perms/AssetPermissionList.vue @@ -1,19 +1,24 @@ + + diff --git a/src/views/perms/DatabaseAppPermissionList.vue b/src/views/perms/DatabaseAppPermissionList.vue index 754413cec..5a820e9ab 100644 --- a/src/views/perms/DatabaseAppPermissionList.vue +++ b/src/views/perms/DatabaseAppPermissionList.vue @@ -16,22 +16,25 @@ export default { columns: ['name', 'users', 'user_groups', 'database_apps', 'system_users', 'is_valid', 'actions'], columnsMeta: { users: { - formatter: LengthFormatter + formatter: LengthFormatter, + label: this.$t('perms.User') }, user_groups: { - formatter: LengthFormatter + formatter: LengthFormatter, + label: this.$t('perms.UserGroups') }, database_apps: { - formatter: LengthFormatter + formatter: LengthFormatter, + label: this.$t('perms.DatabaseApp') }, system_users: { - formatter: LengthFormatter + formatter: LengthFormatter, + label: this.$t('perms.SystemUser') } } }, headerActions: { - hasBulkDelete: false, - createRoute: 'DatabaseAppPermissionCreate' + hasBulkDelete: false } } } diff --git a/src/views/perms/RemoteAppPermissionCreateUpdate.vue b/src/views/perms/RemoteAppPermissionCreateUpdate.vue index ef99714e0..e94041896 100644 --- a/src/views/perms/RemoteAppPermissionCreateUpdate.vue +++ b/src/views/perms/RemoteAppPermissionCreateUpdate.vue @@ -1,5 +1,5 @@ + + diff --git a/src/views/perms/RemoteAppPermissionList.vue b/src/views/perms/RemoteAppPermissionList.vue index 115865f90..2f90af01f 100644 --- a/src/views/perms/RemoteAppPermissionList.vue +++ b/src/views/perms/RemoteAppPermissionList.vue @@ -17,22 +17,25 @@ export default { columns: ['name', 'users', 'user_groups', 'remote_apps', 'system_users', 'is_valid', 'actions'], columnsMeta: { users: { - formatter: LengthFormatter + formatter: LengthFormatter, + label: this.$t('perms.User') }, user_groups: { - formatter: LengthFormatter + formatter: LengthFormatter, + label: this.$t('perms.UserGroups') }, remote_apps: { - formatter: LengthFormatter + formatter: LengthFormatter, + label: this.$t('perms.RemoteApp') }, system_users: { - formatter: LengthFormatter + formatter: LengthFormatter, + label: this.$t('perms.SystemUser') } } }, headerActions: { - hasBulkDelete: false, - createRoute: 'RemoteAppPermissionCreate' + hasBulkDelete: false } } }