diff --git a/locales/en.yaml b/locales/en.yaml index acb8fa696..99b31360b 100644 --- a/locales/en.yaml +++ b/locales/en.yaml @@ -22,9 +22,9 @@ menus: hshome: Home hslogin: Login hssysManagement: System Manage - hsBaseinfo: Base Info + hsUser: User Manage hsDict: Dict Manage - hsPost: Post Manage + hsRole: Role Manage hsDept: Dept Manage hseditor: Editor hserror: Error Page diff --git a/locales/zh-CN.yaml b/locales/zh-CN.yaml index df5deaa9f..c31044c01 100644 --- a/locales/zh-CN.yaml +++ b/locales/zh-CN.yaml @@ -22,9 +22,9 @@ menus: hshome: 首页 hslogin: 登陆 hssysManagement: 系统管理 - hsBaseinfo: 基础信息 + hsUser: 用户管理 hsDict: 字典管理 - hsPost: 岗位管理 + hsRole: 角色管理 hsDept: 部门管理 hseditor: 编辑器 hserror: 错误页面 diff --git a/mock/asyncRoutes.ts b/mock/asyncRoutes.ts index d94af5318..d022fd5f1 100644 --- a/mock/asyncRoutes.ts +++ b/mock/asyncRoutes.ts @@ -9,31 +9,33 @@ const systemRouter = { icon: "setting", title: "menus.hssysManagement", i18n: true, - rank: 6 + rank: 11 }, children: [ + // { + // path: "/system/dict/index", + // name: "dict", + // meta: { + // title: "menus.hsDict", + // i18n: true, + // keepAlive: true + // } + // }, { path: "/system/user/index", name: "user", meta: { - title: "menus.hsBaseinfo", + icon: "flUser", + title: "menus.hsUser", i18n: true } }, { - path: "/system/dict/index", - name: "dict", + path: "/system/role/index", + name: "role", meta: { - title: "menus.hsDict", - i18n: true, - keepAlive: true - } - }, - { - path: "/system/post/index", - name: "post", - meta: { - title: "menus.hsPost", + icon: "peoples", + title: "menus.hsRole", i18n: true } }, @@ -41,6 +43,7 @@ const systemRouter = { path: "/system/dept/index", name: "dept", meta: { + icon: "office-building", title: "menus.hsDept", i18n: true } diff --git a/mock/system.ts b/mock/system.ts index 5057dc933..63d2afca4 100644 --- a/mock/system.ts +++ b/mock/system.ts @@ -2,7 +2,7 @@ import { MockMethod } from "vite-plugin-mock"; export default [ { - url: "/system", + url: "/role", method: "post", response: () => { return { diff --git a/package.json b/package.json index 72657aefe..b9e00c7c9 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@ctrl/tinycolor": "^3.4.0", "@logicflow/core": "0.7.1", "@logicflow/extension": "0.7.1", - "@pureadmin/components": "^1.0.3", + "@pureadmin/components": "^1.0.6", "@vueuse/core": "^8.2.0", "@vueuse/motion": "^2.0.0-beta.12", "@vueuse/shared": "^8.2.0", @@ -74,6 +74,7 @@ "@iconify-icons/ep": "^1.2.4", "@iconify-icons/fa": "^1.2.2", "@iconify-icons/fa-solid": "^1.2.2", + "@iconify-icons/fluent": "^1.2.5", "@iconify-icons/ri": "^1.2.1", "@iconify-icons/uil": "^1.2.1", "@iconify/vue": "^3.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 87112f80d..33a3a5447 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,13 +8,14 @@ specifiers: "@iconify-icons/ep": ^1.2.4 "@iconify-icons/fa": ^1.2.2 "@iconify-icons/fa-solid": ^1.2.2 + "@iconify-icons/fluent": ^1.2.5 "@iconify-icons/ri": ^1.2.1 "@iconify-icons/uil": ^1.2.1 "@iconify/vue": ^3.2.0 "@intlify/vite-plugin-vue-i18n": ^3.3.1 "@logicflow/core": 0.7.1 "@logicflow/extension": 0.7.1 - "@pureadmin/components": ^1.0.3 + "@pureadmin/components": ^1.0.6 "@pureadmin/theme": ^0.0.1 "@types/element-resize-detector": 1.1.3 "@types/js-cookie": ^3.0.1 @@ -108,7 +109,7 @@ dependencies: "@ctrl/tinycolor": 3.4.0 "@logicflow/core": 0.7.1 "@logicflow/extension": 0.7.1 - "@pureadmin/components": 1.0.3_vue@3.2.31 + "@pureadmin/components": 1.0.6_vue@3.2.31 "@vueuse/core": 8.2.0_vue@3.2.31 "@vueuse/motion": 2.0.0-beta.12_vue@3.2.31 "@vueuse/shared": 8.2.0_vue@3.2.31 @@ -152,6 +153,7 @@ devDependencies: "@iconify-icons/ep": 1.2.4 "@iconify-icons/fa": 1.2.2 "@iconify-icons/fa-solid": 1.2.2 + "@iconify-icons/fluent": 1.2.5 "@iconify-icons/ri": 1.2.1 "@iconify-icons/uil": 1.2.1 "@iconify/vue": 3.2.0_vue@3.2.31 @@ -988,6 +990,15 @@ packages: "@iconify/types": 1.1.0 dev: true + /@iconify-icons/fluent/1.2.5: + resolution: + { + integrity: sha512-PMPrhYTl8hJ2vVQdLHr1zHvCF14U9kCLMY+CqwX+tCLUvUFct+NT6NphT2MgUmzk7J2BdyHsmjtPWmPVfdxZUw== + } + dependencies: + "@iconify/types": 1.1.0 + dev: true + /@iconify-icons/ri/1.2.1: resolution: { @@ -1230,10 +1241,10 @@ packages: } dev: false - /@pureadmin/components/1.0.3_vue@3.2.31: + /@pureadmin/components/1.0.6_vue@3.2.31: resolution: { - integrity: sha512-+FYkSYma0qUXtqjy81Y3aIafIzoRveTOtPqxGkFqU2Ku1bnrPRjdKnJzn42pJyA5/OQ9WBvaDTKfldOFqEUuIg== + integrity: sha512-k+ZF/vsnLAZDkTGpBqZ44s9LTPZsCDFRnfNNXlGy7+TXInarzopuVWeQHGsPbHB3LPHcNd2/4MBjOq4NKYglpw== } peerDependencies: vue: ^3.2.0 diff --git a/src/api/system.ts b/src/api/system.ts index d35e5cb04..76d6ce49f 100644 --- a/src/api/system.ts +++ b/src/api/system.ts @@ -1,17 +1,17 @@ import { http } from "../utils/http"; -interface postType extends Promise { +interface ResponseType extends Promise { data?: object; code?: number; msg?: string; } -// 获取岗位管理列表 -export const getPostList = (data?: object): postType => { - return http.request("post", "/system", { data }); +// 获取角色管理列表 +export const getRoleList = (data?: object): ResponseType => { + return http.request("post", "/role", { data }); }; // 获取部门管理列表 -export const getDeptList = (data?: object): postType => { +export const getDeptList = (data?: object): ResponseType => { return http.request("post", "/dept", { data }); }; diff --git a/src/components/ReIcon/src/iconifyIconOffline.ts b/src/components/ReIcon/src/iconifyIconOffline.ts index d2db83195..43e20afeb 100644 --- a/src/components/ReIcon/src/iconifyIconOffline.ts +++ b/src/components/ReIcon/src/iconifyIconOffline.ts @@ -101,6 +101,12 @@ addIcon("import", Import); addIcon("export", Export); addIcon("density", ArrowsShrinkV); +// fluent +import Peoples from "@iconify-icons/fluent/people-swap-28-filled"; +import FlUser from "@iconify-icons/fluent/person-12-filled"; +addIcon("peoples", Peoples); +addIcon("flUser", FlUser); + // Iconify Icon在Vue里离线使用(用于内网环境)https://docs.iconify.design/icon-components/vue/offline.html export default defineComponent({ name: "IconifyIcon", diff --git a/src/layout/components/sidebar/sidebarItem.vue b/src/layout/components/sidebar/sidebarItem.vue index 08cb0eea7..aa0b93b66 100644 --- a/src/layout/components/sidebar/sidebarItem.vue +++ b/src/layout/components/sidebar/sidebarItem.vue @@ -1,11 +1,11 @@