diff --git a/src/api/asset.js b/src/api/asset.js new file mode 100644 index 000000000..ffd8a8099 --- /dev/null +++ b/src/api/asset.js @@ -0,0 +1,42 @@ +import request from '@/utils/request' + +export function getAdminUserList(data) { + return request({ + url: '/api/v1/assets/admin-users/', + method: 'get', + params: data + }) +} + +export function getSystemUserList(data) { + return request({ + url: '/api/v1/assets/system-users/', + method: 'get', + params: data + }) +} + +export function getDomainList(data) { + return request({ + url: '/api/v1/assets/domains/', + method: 'get', + params: data + }) +} + +export function getLabelList(data) { + return request({ + url: '/api/v1/assets/labels/', + method: 'get', + params: data + }) +} + +export function getCommandFilterList(data) { + return request({ + url: '/api/v1/assets/cmd-filters/', + method: 'get', + params: data + }) +} + diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js index 6c6b801ce..8f64e0e8b 100644 --- a/src/i18n/langs/cn.js +++ b/src/i18n/langs/cn.js @@ -15,13 +15,13 @@ const cn = { 'Users': '用户管理', 'UserList': '用户列表', 'UserGroupList': '用户组', - 'assets': '资产管理', - 'assetList': '资产列表', - 'domainList': '网关列表', - 'adminUserList': '管理用户', - 'systemUserList': '系统用户', - 'labelList': '标签管理', - 'commandFilterList': '命令过滤', + 'Assets': '资产管理', + 'AssetList': '资产列表', + 'DomainList': '网关列表', + 'AdminUserList': '管理用户', + 'SystemUserList': '系统用户', + 'LabelList': '标签管理', + 'CommandFilterList': '命令过滤', 'platformList': '平台列表', 'applications': '应用管理', 'perms': '权限管理', @@ -163,18 +163,18 @@ const cn = { 'gateway': '网关', 'date_created': '创建日期', // 管理用户 - 'admin_user_list': '管理用户列表', - 'admin_user_detail': '管理用户详情', - 'create_admin_user': '创建管理用户', - 'update_admin_user': '更新管理用户', + 'AdminUserList': '管理用户列表', + 'AdminUserDetail': '管理用户详情', + 'AdminUserCreate': '创建管理用户', + 'AdminUserUpdate': '更新管理用户', 'username': '用户名', 'replace_node_assets_admin_user_with_this': '替换资产的管理员', 'select_nodes': '选择节点', // 系统用户 - 'system_user_list': '系统用户列表', - 'create_system_user': '创建系统用户', - 'update_system_user': '更新系统用户', - 'system_user_detail': '系统用户详情', + 'SystemUserList': '系统用户列表', + 'SystemUserDetail': '系统用户详情', + 'SystemUserCreate': '创建系统用户', + 'SystemUserUpdate': '更新系统用户', 'protocol': '协议', 'login_mode': '登录模式', 'quick_update': '快速更新', diff --git a/src/router/index.js b/src/router/index.js index 188f4e50c..cfd1e817b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -52,7 +52,7 @@ export const constantRoutes = [ { path: '/users', component: Layout, - redirect: '/users/list', + redirect: '/user/list', name: 'Users', meta: { title: 'Users', @@ -102,46 +102,54 @@ export const constantRoutes = [ ] }, { - path: '/static/', + path: '/assets', component: Layout, + redirect: '/asset/list', name: 'assets', - meta: { title: 'assets', icon: 'user' }, + meta: { title: 'Assets', icon: 'user' }, children: [ { - path: 'assets', - name: 'assetList', - component: () => import('@/views/table/index'), - meta: { title: 'assetList' } + path: 'asset/list', + name: 'AssetList', + component: () => import('@/views/assets/AssetList.vue'), + meta: { title: 'AssetList' } }, { - path: 'domains', - name: 'domainList', - component: () => import('@/views/tree/index'), - meta: { title: 'domainList' } + path: 'domain/list', + name: 'DomainList', + component: () => import('@/views/assets/DomainList.vue'), + meta: { title: 'DomainList' } }, { - path: 'admin-users', - name: 'adminUserList', - component: () => import('@/views/table/index'), - meta: { title: 'adminUserList' } + path: 'admin-user/list', + name: 'AdminUserList', + component: () => import('@/views/assets/AdminUserList'), + meta: { title: 'AdminUserList' } }, { - path: 'system-users', - name: 'systemUserList', - component: () => import('@/views/tree/index'), - meta: { title: 'systemUserList' } + path: 'admin-user/detail/:id', + component: () => import('@/views/assets/AdminUserDetail.vue'), // Parent router-view + name: 'AdminUserDetail', + meta: { title: 'AdminUserDetail' }, + hidden: true }, { - path: 'labels', - name: 'labelList', - component: () => import('@/views/table/index'), - meta: { title: 'labelList' } + path: 'system-user/list', + name: 'SystemUserList', + component: () => import('@/views/assets/SystemUserList.vue'), + meta: { title: 'SystemUserList' } }, { - path: 'command-filters', - name: 'commandFilterList', - component: () => import('@/views/tree/index'), - meta: { title: 'commandFilterList' } + path: 'label/list', + name: 'LabelList', + component: () => import('@/views/assets/LabelList.vue'), + meta: { title: 'LabelList' } + }, + { + path: 'cmd-filter/list', + name: 'CommandFilterList', + component: () => import('@/views/assets/CommandFilterList.vue'), + meta: { title: 'CommandFilterList' } }, { path: 'platforms', diff --git a/src/views/assets/AdminUserDetail.vue b/src/views/assets/AdminUserDetail.vue new file mode 100644 index 000000000..25abbf6ab --- /dev/null +++ b/src/views/assets/AdminUserDetail.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/assets/AdminUserList.vue b/src/views/assets/AdminUserList.vue new file mode 100644 index 000000000..6578effab --- /dev/null +++ b/src/views/assets/AdminUserList.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/src/views/assets/AssetList.vue b/src/views/assets/AssetList.vue new file mode 100644 index 000000000..980a522a4 --- /dev/null +++ b/src/views/assets/AssetList.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/assets/CommandFilterList.vue b/src/views/assets/CommandFilterList.vue new file mode 100644 index 000000000..a58246559 --- /dev/null +++ b/src/views/assets/CommandFilterList.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/src/views/assets/DomainList.vue b/src/views/assets/DomainList.vue new file mode 100644 index 000000000..a3f9d0e87 --- /dev/null +++ b/src/views/assets/DomainList.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/src/views/assets/LabelList.vue b/src/views/assets/LabelList.vue new file mode 100644 index 000000000..e0548b71e --- /dev/null +++ b/src/views/assets/LabelList.vue @@ -0,0 +1,123 @@ + + + + + diff --git a/src/views/assets/SystemUserList.vue b/src/views/assets/SystemUserList.vue new file mode 100644 index 000000000..f71e35771 --- /dev/null +++ b/src/views/assets/SystemUserList.vue @@ -0,0 +1,154 @@ + + + + + diff --git a/src/views/users/UserList.vue b/src/views/users/UserList.vue index a7072342f..380b94114 100644 --- a/src/views/users/UserList.vue +++ b/src/views/users/UserList.vue @@ -1,7 +1,7 @@