diff --git a/apps/web/src/app/admin/assessmentstandard/assessment-standardpage.tsx b/apps/web/src/app/admin/assessmentstandard/assessment-standardpage.tsx new file mode 100644 index 0000000..e01ef41 --- /dev/null +++ b/apps/web/src/app/admin/assessmentstandard/assessment-standardpage.tsx @@ -0,0 +1,3 @@ +export default function AssessmentStandardPage() { + return
AssessmentStandardPage
; +} diff --git a/apps/web/src/app/admin/base-setting/page.tsx b/apps/web/src/app/admin/base-setting/page.tsx index b5dcc83..f58d151 100755 --- a/apps/web/src/app/admin/base-setting/page.tsx +++ b/apps/web/src/app/admin/base-setting/page.tsx @@ -128,7 +128,7 @@ export default function BaseSettingPage() { -
+ {/*
@@ -141,7 +141,7 @@ export default function BaseSettingPage() { name={["appConfig", "slideLinks"]}> -
+
*/} {/*
, + [ + getItem("基本设置", "/admin/base-setting", null, null, null), + getItem("用户管理", "/admin/user", null, null, null), + getItem("组织架构", "/admin/department", null, null, null), + getItem("角色管理", "/admin/role", null, null, null), + getItem("考核标准管理", "/admin/assessment-standard", null, null, null), + ], + null, + ), ]; const NavigationMenu: React.FC = () => { @@ -76,7 +89,12 @@ const NavigationMenu: React.FC = () => { // 添加考核成绩子路径的匹配规则 "^/assessment/positionassessment": ["/assessment"], "^/assessment/commonassessment": ["/assessment"], - "^/assessment/sportsassessment": ["/assessment"] + "^/assessment/sportsassessment": ["/assessment"], + "^/admin/base-setting": ["/admin"], + "^/admin/department": ["/admin"], + "^/admin/role": ["/admin"], + "^/admin/assessment-standard": ["/admin"], + "^/admin/user": ["/admin"], }; // 同时在 useEffect 中更新路径判断逻辑 @@ -89,6 +107,12 @@ const NavigationMenu: React.FC = () => { location.pathname.startsWith("/assessment/") || location.pathname === "/plan/weekplan" || location.pathname === "/plan/monthplan" + ) + { + setSelectedKeys([location.pathname]); + setOpenKeys([location.pathname.split('/').slice(0, 2).join('/')]); + } else if ( + location.pathname.startsWith("/admin/") ) { setSelectedKeys([location.pathname]); setOpenKeys([location.pathname.split('/').slice(0, 2).join('/')]); diff --git a/apps/web/src/components/layout/admin/AdminLayout.tsx b/apps/web/src/components/layout/admin/AdminLayout.tsx index ed2cd5a..26412dd 100755 --- a/apps/web/src/components/layout/admin/AdminLayout.tsx +++ b/apps/web/src/components/layout/admin/AdminLayout.tsx @@ -2,14 +2,14 @@ import { Outlet } from "react-router-dom"; import { Layout } from "antd"; import { adminRoute } from "@web/src/routes/admin-route"; -import AdminSidebar from "./AdminSidebar"; +// import AdminSidebar from "./AdminSidebar"; const { Content } = Layout; export default function AdminLayout() { return ( - + {/* */} diff --git a/apps/web/src/routes/admin-route.tsx b/apps/web/src/routes/admin-route.tsx index 62a0f0a..fd986d5 100755 --- a/apps/web/src/routes/admin-route.tsx +++ b/apps/web/src/routes/admin-route.tsx @@ -15,6 +15,7 @@ import WithAuth from "../components/utils/with-auth"; import { CustomRouteObject } from "./types"; import StaffPage from "../app/admin/staff/page"; import AdminLayout from "../components/layout/admin/AdminLayout"; +import AssessmentStandardPage from "../app/admin/assessmentstandard/assessment-standardpage"; export const adminRoute: CustomRouteObject = { path: "admin", @@ -58,7 +59,7 @@ export const adminRoute: CustomRouteObject = { }, }, { - path: "staff", + path: "user", name: "用户管理", icon: , element: ( @@ -74,31 +75,37 @@ export const adminRoute: CustomRouteObject = { ), handle: { crumb() { - return 用户管理; + return 用户管理; }, }, }, { - path: "term", - name: "分类配置", + path: "assessment-standard", + name: "考核标准管理", icon: , - element: ( - - - - ), - handle: { - crumb() { - return 分类配置; - }, - }, + element: }, + // { + // path: "term", + // name: "分类配置", + // icon: , + // element: ( + // + // + // + // ), + // handle: { + // crumb() { + // return 分类配置; + // }, + // }, + // }, { path: "role", name: "角色管理", diff --git a/apps/web/src/routes/index.tsx b/apps/web/src/routes/index.tsx index df11ea0..b7cb040 100755 --- a/apps/web/src/routes/index.tsx +++ b/apps/web/src/routes/index.tsx @@ -13,6 +13,8 @@ import MainLayout from "../app/main/layout/MainLayout"; import DailyPage from "../app/main/daily/page"; import Dashboard from "../app/main/home/page"; import WeekPlanPage from "../app/main/plan/weekplan/page"; +import AdminLayout from "../components/layout/admin/AdminLayout"; +import { adminRoute } from "./admin-route"; interface CustomIndexRouteObject extends IndexRouteObject { name?: string; breadcrumb?: string; @@ -42,6 +44,7 @@ export const routes: CustomRouteObject[] = [ return 主页; }, }, + children: [ { element: , @@ -88,12 +91,18 @@ export const routes: CustomRouteObject[] = [ } ] }, + { + path: "/admin", + element: , + children: adminRoute.children, + } ], }, ], }, + { path: "/login", breadcrumb: "登录",