navi

src/locales/lang/en.ts

@@ -17,19 +17,22 @@ const locale: LocaleMessages<I18nType.Schema> = {
         route: 'Route',
         user: 'User',
         sort: 'category',
-        student: 'Student',
-        attendance: 'student attendance'
+        student: 'Student'
       },
       lesson: {
         _value: 'Lesson Management',
-        group: 'class',
-        classroom: 'classroom',
         schedule: 'schedule',
         calendar: 'calendar',
-        student: 'group student',
         checkin: 'student sign in',
+        attendance: 'student attendance',
         score: 'score'
       },
+      group: {
+        _value: 'group',
+        group: 'class',
+        classroom: 'classroom',
+        student: 'group student'
+      },
       archives: {
         _value: 'archives',
         students: 'students info'

src/locales/lang/zh-cn.ts

@@ -17,19 +17,22 @@ const locale: LocaleMessages<I18nType.Schema> = {
         route: '课程分类',
         user: '用户管理',
         sort: '课程分类',
-        student: '学生管理',
-        attendance: '学员出勤'
+        student: '学生管理'
       },
       lesson: {
         _value: '课程管理',
-        group: '班级管理',
-        classroom: '教室管理',
         schedule: '排课管理',
         calendar: '课程日历',
-        student: '班级学员',
         checkin: '学员签到',
+        attendance: '学员出勤',
         score: '学生考核'
       },
+      group: {
+        _value: '班级管理',
+        student: '班级学员',
+        classroom: '教室管理',
+        group: '班级管理'
+      },
       archives: {
         _value: '档案管理',
         students: '档案搜索'

src/router/modules/groups.ts

@@ -0,0 +1,51 @@
+const lesson: AuthRoute.Route = {
+  name: 'lesson',
+  path: '/lesson',
+  component: 'basic',
+  children: [
+    {
+      name: 'lesson_group',
+      path: '/lesson/group',
+      component: 'self',
+      meta: {
+        title: '班级管理',
+        i18nTitle: 'message.routes.group.group',
+        permissions: ['admin', 'teacher'],
+        requiresAuth: true,
+        localIcon: 'class'
+      }
+    },
+    {
+      name: 'lesson_student',
+      path: '/lesson/student',
+      component: 'self',
+      meta: {
+        title: '班级学员',
+        i18nTitle: 'message.routes.group.student',
+        permissions: ['admin', 'teacher'],
+        requiresAuth: true,
+        icon: 'typcn:group'
+      }
+    },
+    {
+      name: 'lesson_classroom',
+      path: '/lesson/classroom',
+      component: 'self',
+      meta: {
+        title: '教室管理',
+        i18nTitle: 'message.routes.group.classroom',
+        permissions: ['admin', 'teacher'],
+        requiresAuth: true,
+        localIcon: 'classroom'
+      }
+    }
+  ],
+  meta: {
+    title: '班级管理',
+    i18nTitle: 'message.routes.group._value',
+    localIcon: 'lesson',
+    order: 9
+  }
+};
+
+export default lesson;

src/router/modules/lesson.ts

@@ -3,18 +3,6 @@ const lesson: AuthRoute.Route = {
   path: '/lesson',
   component: 'basic',
   children: [
-    {
-      name: 'lesson_group',
-      path: '/lesson/group',
-      component: 'self',
-      meta: {
-        title: '班级管理',
-        i18nTitle: 'message.routes.lesson.group',
-        permissions: ['admin', 'teacher'],
-        requiresAuth: true,
-        localIcon: 'class'
-      }
-    },
     {
       name: 'lesson_schedule',
       path: '/lesson/schedule',
@@ -60,34 +48,22 @@ const lesson: AuthRoute.Route = {
       }
     },
     {
-      name: 'lesson_student',
-      path: '/lesson/student',
-      component: 'self',
-      meta: {
-        title: '班级学员',
-        i18nTitle: 'message.routes.lesson.student',
-        permissions: ['admin', 'teacher'],
-        requiresAuth: true,
-        icon: 'typcn:group'
-      }
-    },
-    {
-      name: 'lesson_classroom',
-      path: '/lesson/classroom',
+      name: 'lesson_attendance',
+      path: '/lesson/attendance',
       component: 'self',
       meta: {
-        title: '教室管理',
-        i18nTitle: 'message.routes.lesson.classroom',
+        title: '学员出勤',
         permissions: ['admin', 'teacher'],
+        i18nTitle: 'message.routes.lesson.attendance',
         requiresAuth: true,
-        localIcon: 'classroom'
+        icon: 'emojione:kiss-mark'
       }
     }
   ],
   meta: {
     title: '课程管理',
     i18nTitle: 'message.routes.lesson._value',
-    localIcon: 'lesson',
+    icon: 'carbon:book',
     order: 9
   }
 };

src/router/modules/system.ts

@@ -39,18 +39,6 @@ const system: AuthRoute.Route = {
         localIcon: 'academic-cap'
       }
     },
-    {
-      name: 'system_attendance',
-      path: '/system/attendance',
-      component: 'self',
-      meta: {
-        title: '学员出勤',
-        permissions: ['admin', 'teacher'],
-        i18nTitle: 'message.routes.system.attendance',
-        requiresAuth: true,
-        icon: 'emojione:kiss-mark'
-      }
-    },
     {
       name: 'system_sort',
       path: '/system/sort',

src/typings/page-route.d.ts

@@ -40,7 +40,7 @@ declare namespace PageRoute {
     | 'lesson_score'
     | 'lesson_student'
     | 'system'
-    | 'system_attendance'
+    | 'lesson_attendance'
     | 'system_auth'
     | 'system_role'
     | 'system_route'
@@ -73,7 +73,7 @@ declare namespace PageRoute {
     | 'lesson_schedule'
     | 'lesson_score'
     | 'lesson_student'
-    | 'system_attendance'
+    | 'lesson_attendance'
     | 'system_auth'
     | 'system_role'
     | 'system_route'

src/typings/system.d.ts

@@ -331,18 +331,21 @@ declare namespace I18nType {
         user: string;
         sort: string;
         student: string;
-        attendance: string;
       };
       lesson: {
         _value: string;
-        group: string;
-        classroom: string;
         schedule: string;
         calendar: string;
-        student: string;
         checkin: string;
+        attendance: string;
         score: string;
       };
+      group: {
+        _value: string;
+        group: string;
+        student: string;
+        classroom: string;
+      };
       archives: {
         _value: string;
         students: string;

src/views/index.ts

@@ -23,7 +23,7 @@ export const views: Record<
   lesson_schedule: () => import('./lesson/schedule/index.vue'),
   lesson_score: () => import('./lesson/score/index.vue'),
   lesson_student: () => import('./lesson/student/index.vue'),
-  system_attendance: () => import('./system/attendance/index.vue'),
+  lesson_attendance: () => import('./lesson/attendance/index.vue'),
   system_auth: () => import('./system/auth/index.vue'),
   system_role: () => import('./system/role/index.vue'),
   system_route: () => import('./system/route/index.vue'),