diff --git a/src/App.vue b/src/App.vue index 39f3d0c6429fc1ef8198329626f67a9b28862614..2cce4275021ace44d70df566aaef1af6c2f575c9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,6 +4,7 @@ \ No newline at end of file + diff --git a/src/locale/lang/en-US/menu.js b/src/locale/lang/en-US/menu.js index f6e61b6b1427a4d823dd8cdb8539cd919544845e..4b3bd771f035e6d70309c4be42374891ae940ed8 100644 --- a/src/locale/lang/en-US/menu.js +++ b/src/locale/lang/en-US/menu.js @@ -23,5 +23,7 @@ export default { "error-404": "404", "error-500": "500", "permission": "permission", - "permission-test": "permission" + "permission-test": "permission", + "system":"system manager", + "userInfo":"user manager" } diff --git a/src/locale/lang/zh-CN/menu.js b/src/locale/lang/zh-CN/menu.js index 957941c6a2662d97f8ff78a7f1555dbce56b1ebb..201407d7db18cea8b1d4f323af22c8becddc06d2 100644 --- a/src/locale/lang/zh-CN/menu.js +++ b/src/locale/lang/zh-CN/menu.js @@ -23,5 +23,7 @@ export default { "error-404": "404", "error-500": "500", "permission": "系统权限", - "permission-test": "权限测试" + "permission-test": "权限测试", + "system":"系统管理", + "userInfo":"用户管理" } diff --git a/src/mock/service/menuList.json b/src/mock/service/menuList.json index d4c605daa7b7794ced36a0a614f2ff9b1d4cf51e..9f8e819ec71ee861e09e1ed77faf667296d4dfb1 100644 --- a/src/mock/service/menuList.json +++ b/src/mock/service/menuList.json @@ -322,10 +322,10 @@ }, { "id": "25", - "parent": "0", + "parent": "27", "path": "/permission", "name": "permission", - "type": "menu", + "type": "dir", "icon": "DatabaseOutlined", "title": "系统权限", "sort": 6, @@ -347,5 +347,33 @@ "hidden": false, "status": true, "i18n": "permission-test" + }, + { + "id": "27", + "parent": "0", + "path": "/system", + "name": "system", + "type": "dir", + "icon": "SettingOutlined", + "title": "系统管理", + "sort": 8, + "link": "", + "hidden": false, + "status": true, + "i18n": "system" + }, + { + "id": "28", + "parent": "27", + "path": "/system/userInfo", + "name": "userInfo", + "type": "menu", + "icon": "DatabaseOutlined", + "title": "用户管理", + "sort": 0, + "link": "", + "hidden": false, + "status": true, + "i18n": "userInfo" } ] diff --git a/src/route/module/main-routes.js b/src/route/module/main-routes.js index fcca42abf8408e5b9d2344e574cbae9674151319..569a5dceb59d5272915b5c5bd858d8ea006fd40c 100644 --- a/src/route/module/main-routes.js +++ b/src/route/module/main-routes.js @@ -20,5 +20,6 @@ export default { 'error-403': () => import('@/view/error/403.vue'), 'error-404': () => import('@/view/error/404.vue'), 'error-500': () => import('@/view/error/500.vue'), - 'permission-test': () => import('@/view/permission/permission.vue') + 'permission-test': () => import('@/view/permission/permission.vue'), + 'userInfo': () => import('@/view/systemManager/userInfo.vue') } diff --git a/src/view/systemManager/userInfo.vue b/src/view/systemManager/userInfo.vue new file mode 100644 index 0000000000000000000000000000000000000000..07e516933f871ddd74122b552127f46da3d1c75e --- /dev/null +++ b/src/view/systemManager/userInfo.vue @@ -0,0 +1,270 @@ + +