From 4b0b46d23fb266f65e29cd85b3d9b5b3d5ebb2bc Mon Sep 17 00:00:00 2001 From: jym503558564 <503558564@qq.com> Date: Sun, 22 Mar 2020 11:26:10 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E5=A2=9E=E5=8A=A0=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/asset.js | 8 ++ src/i18n/langs/cn.js | 10 +- src/router/index.js | 10 +- src/views/assets/AdminUserList.vue | 4 +- src/views/assets/SystemUserList.vue | 154 ++++++++++++++++++++++++++++ 5 files changed, 174 insertions(+), 12 deletions(-) create mode 100644 src/views/assets/SystemUserList.vue diff --git a/src/api/asset.js b/src/api/asset.js index fbc529507..34a65daff 100644 --- a/src/api/asset.js +++ b/src/api/asset.js @@ -8,3 +8,11 @@ export function getAdminUserList(data) { }) } +export function getSystemUserList(data) { + return request({ + url: '/api/v1/assets/system-users/', + method: 'get', + params: data + }) +} + diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js index b77210eaa..65d80f0e3 100644 --- a/src/i18n/langs/cn.js +++ b/src/i18n/langs/cn.js @@ -19,7 +19,7 @@ const cn = { 'AssetList': '资产列表', 'DomainList': '网关列表', 'AdminUserList': '管理用户', - 'systemUserList': '系统用户', + 'SystemUserList': '系统用户', 'labelList': '标签管理', 'commandFilterList': '命令过滤', 'platformList': '平台列表', @@ -171,10 +171,10 @@ const cn = { '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 a84fbed39..4aaf05725 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -121,7 +121,7 @@ export const constantRoutes = [ meta: { title: 'DomainList' } }, { - path: 'admin-user', + path: 'admin-user/list', name: 'AdminUserList', component: () => import('@/views/assets/AdminUserList'), meta: { title: 'AdminUserList' } @@ -134,10 +134,10 @@ export const constantRoutes = [ hidden: true }, { - path: 'system-users', - name: 'systemUserList', - component: () => import('@/views/tree/index'), - meta: { title: 'systemUserList' } + path: 'system-user/list', + name: 'SystemUserList', + component: () => import('@/views/assets/SystemUserList.vue'), + meta: { title: 'SystemUserList' } }, { path: 'labels', diff --git a/src/views/assets/AdminUserList.vue b/src/views/assets/AdminUserList.vue index 229a5a2b2..6578effab 100644 --- a/src/views/assets/AdminUserList.vue +++ b/src/views/assets/AdminUserList.vue @@ -107,13 +107,13 @@ export default { // 当每页数量改变触发 this.offset = (this.current_page - 1) * val this.page_size = val - this.getAdminUserList(this.current_page, val, this.offset) + this.getAdminUser(this.current_page, val, this.offset) }, handleCurrentChange(val) { // 当页码改变触发 this.offset = (val - 1) * this.page_size this.current_page = val - this.getAdminUserList(val, this.page_size, this.offset) + this.getAdminUser(val, this.page_size, this.offset) }, getAdminUser(draw, limit, offset) { this.listLoading = true 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 @@ + + + + +