From d3b4f3cae65bbb251a05fefd15b9841f740ba452 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 18 六月 2024 16:14:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/router.js |   71 ++++++++++++++++++++++++++++++++++-
 1 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/src/router.js b/src/router.js
index d0e8b31..e21caf6 100644
--- a/src/router.js
+++ b/src/router.js
@@ -37,14 +37,40 @@
     ]
   },
   {
-    path: '/exam',
+    path: '/exam1',
     component: Layout,
     children: [
       {
-        path: '/manage',
+        path: '/exam1/manage',
         component: () => import('@/views/exam/exam/ExamManage'),
         name: 'Exam',
         meta: { title: '鑰冭瘯绠＄悊', icon: 'exam', affix: true }
+      },
+      {
+        path: '/exam/mark/paper',
+        component: () => import('@/views/exam/exam/MarkPaper'),
+        name: 'MarkPaper',
+        meta: { title: '闃呭嵎'},
+        hidden: true
+      }
+    ]
+  },
+  {
+    path: '/classes',
+    component: Layout,
+    children: [
+      {
+        path: '/classes/manage',
+        component: () => import('@/views/class-management/Class'),
+        name: 'Classes',
+        meta: { title: '鐝骇绠＄悊', icon: 'classes', affix: true }
+      },
+      {
+        path: '/classes/class-management/Class-staff',
+        component: () => import('@/views/class-management/ClassStaff'),
+        name: 'Classes',
+        hidden: true,
+        meta: { title: '鐝骇鎴愬憳绠＄悊', icon: 'classes' }
       }
     ]
   },
@@ -147,6 +173,27 @@
         name: 'shortAnswerPage',
         meta: { title: '绠�绛旈缂栬緫', noCache: true, activeMenu: '/exam/question/list' },
         hidden: true
+      },
+      {
+        path: 'question/edit/audio',
+        component: () => import('@/views/exam/question/edit/audio'),
+        name: 'audioPage',
+        meta: { title: '璇煶棰樼紪杈�', noCache: true, activeMenu: '/exam/question/list' },
+        hidden: true
+      },
+      {
+        path: 'question/edit/calculate',
+        component: () => import('@/views/exam/question/edit/calculate'),
+        name: 'audioPage',
+        meta: { title: '璁＄畻棰樼紪杈�', noCache: true, activeMenu: '/exam/question/list' },
+        hidden: true
+      },
+      {
+        path: 'question/edit/analysis',
+        component: () => import('@/views/exam/question/edit/analysis'),
+        name: 'audioPage',
+        meta: { title: '鍒嗘瀽棰樼紪杈�', noCache: true, activeMenu: '/exam/question/list' },
+        hidden: true
       }
     ]
   },
@@ -196,6 +243,12 @@
         name: 'EducationSubjectEditPage',
         meta: { title: '瀛︾缂栬緫', noCache: true, activeMenu: '/education/subject/list' },
         hidden: true
+      },
+      {
+        path: 'resource/list',
+        component: () => import('@/views/education/resource/list'),
+        name: 'EducationResourcePage',
+        meta: { title: '鏁欏璧勬簮', noCache: true }
       }
     ]
   },
@@ -214,6 +267,20 @@
         component: () => import('@/views/answer/list'),
         name: 'AnswerPageList',
         meta: { title: '绛斿嵎鍒楄〃', noCache: true }
+      },
+      {
+        path: 'answer-list',
+        component: () => import('@/views/answer/info'),
+        name: 'answerList',
+        meta: { title: '绛斿嵎淇℃伅', noCache: true },
+        hidden: true
+      },
+      {
+        path: 'answer-detail',
+        component: () => import('@/views/answer/detail'),
+        name: 'answerDetail',
+        meta: { title: '绛斿嵎璇︽儏', noCache: true },
+        hidden: true
       }
     ]
   },

--
Gitblit v1.8.0