diff --git a/config/routes.ts b/config/routes.ts index 500c4b9..b8be565 100644 --- a/config/routes.ts +++ b/config/routes.ts @@ -14,8 +14,6 @@ export default [ { path: '/admin', redirect: '/admin/dutyinfo' }, { path: '/admin/dutyinfo', name: '值班信息', component: './Admin/DutyInfo' }, { path: '/admin/dutytable', name: '值班表管理', component: './Admin/DutyTable' }, - { path: '/admin/conclusion', name: '值班总结管理', component: './Admin/Conclusion' }, - { path: '/admin/report', name: '反馈信息', component: './Admin/Report' }, { path: '/admin/logs', name: '日志', component: './Admin/Logs' }, ], }, @@ -25,7 +23,8 @@ export default [ icon: 'team', routes: [ { path: '/leader', redirect: '/leader/conclusion' }, - { path: '/leader/conclusion', name: '值班总结', component: './Leader/Conclusion' }, + { path: '/leader/conclusion', name: '值班总结管理', component: './Leader/Conclusion' }, + { path: '/leader/report', name: '反馈信息', component: './Leader/Report' }, ], }, { name: '关于我们', icon: 'thunderbolt', path: '/about', component: './About' }, diff --git a/src/access.ts b/src/access.ts index 3147209..9916d62 100644 --- a/src/access.ts +++ b/src/access.ts @@ -7,5 +7,6 @@ export default function access(initialState: { currentUser?: API.CurrentUser } | const { currentUser } = initialState ?? {}; return { canAdmin: currentUser && currentUser.access === 'admin', + canLeader: currentUser && (currentUser.access === 'leader' || currentUser.access === 'admin'), }; } diff --git a/src/pages/Leader/Conclusion.tsx b/src/pages/Leader/Conclusion.tsx deleted file mode 100644 index d6a98d1..0000000 --- a/src/pages/Leader/Conclusion.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import { Todo } from '@/components'; -import { PageContainer } from '@ant-design/pro-components'; -import { Card } from 'antd'; - -const Logs: React.FC = () => { - return ( - - - - - - ); -}; -export default Logs; \ No newline at end of file diff --git a/src/pages/Admin/Conclusion/conclusionItem.ts b/src/pages/Leader/Conclusion/conclusionItem.ts similarity index 100% rename from src/pages/Admin/Conclusion/conclusionItem.ts rename to src/pages/Leader/Conclusion/conclusionItem.ts diff --git a/src/pages/Admin/Conclusion/index.tsx b/src/pages/Leader/Conclusion/index.tsx similarity index 100% rename from src/pages/Admin/Conclusion/index.tsx rename to src/pages/Leader/Conclusion/index.tsx diff --git a/src/pages/Admin/Report/index.tsx b/src/pages/Leader/Report/index.tsx similarity index 100% rename from src/pages/Admin/Report/index.tsx rename to src/pages/Leader/Report/index.tsx diff --git a/src/pages/Admin/Report/reportItem.ts b/src/pages/Leader/Report/reportItem.ts similarity index 100% rename from src/pages/Admin/Report/reportItem.ts rename to src/pages/Leader/Report/reportItem.ts