From b17c2ddebcfaeaa48edc1eeca5ee0dc03d9fde90 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 02 七月 2024 09:25:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/router.js |  142 +++++++++++++++++++++++++++++++++++------------
 1 files changed, 106 insertions(+), 36 deletions(-)

diff --git a/src/router.js b/src/router.js
index fd84032..9f0ea40 100644
--- a/src/router.js
+++ b/src/router.js
@@ -45,6 +45,27 @@
         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: '/exam/mark/paper/detail',
+        component: () => import('@/views/exam/exam/MarkPaperDetail'),
+        name: 'MarkPaperDetail',
+        meta: { title: '闃呭嵎'},
+        hidden: true
+      },
+      {
+        path: '/exam/monitor',
+        component: () => import('@/views/exam/exam/monitor'),
+        name: 'monitor',
+        meta: { title: '鐩戞帶'},
+        hidden: true
       }
     ]
   },
@@ -63,7 +84,7 @@
         component: () => import('@/views/class-management/ClassStaff'),
         name: 'Classes',
         hidden: true,
-        meta: { title: '鐝骇鎴愬憳绠＄悊', icon: 'classes', affix: true }
+        meta: { title: '鐝骇鎴愬憳绠＄悊', icon: 'classes' }
       }
     ]
   },
@@ -166,33 +187,56 @@
         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
       }
     ]
   },
   {
-    path: '/task',
+    path: '/train',
     component: Layout,
-    name: 'TaskPage',
+    name: 'TrainPage',
     meta: {
-      title: '浠诲姟绠＄悊',
+      title: '鍦ㄧ嚎鍩硅',
       icon: 'task'
     },
     alwaysShow: true,
     children: [
       {
         path: 'list',
-        component: () => import('@/views/task/list'),
-        name: 'TaskListPage',
-        meta: { title: '浠诲姟鍒楄〃', noCache: true }
-      },
-      {
-        path: 'edit',
-        component: () => import('@/views/task/edit'),
-        name: 'TaskEditPage',
-        meta: { title: '浠诲姟鍒涘缓', noCache: true }
+        component: () => import('@/views/train/index'),
+        name: 'TrainListPage',
+        meta: { title: '鍦ㄧ嚎鍩硅', noCache: true }
       }
     ]
   },
+
+  {
+    path: '/meet',
+    component: () => import('@/views/meet/index'),
+    meta: { title: '鍦ㄧ嚎鏁欏', noCache: true },
+    hidden: true
+  },
+
   {
     path: '/education',
     component: Layout,
@@ -215,7 +259,19 @@
         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 }
+      },
+      {
+        path: 'cheat/list',
+        component: () => import('@/views/education/cheat/list'),
+        name: 'EducationCheatPage',
+        meta: { title: '浣滃紛璁板綍', noCache: true }
+      },
     ]
   },
   {
@@ -233,33 +289,47 @@
         component: () => import('@/views/answer/list'),
         name: 'AnswerPageList',
         meta: { title: '绛斿嵎鍒楄〃', noCache: true }
-      }
-    ]
-  },
-  {
-    path: '/message',
-    component: Layout,
-    name: 'MessagePage',
-    meta: {
-      title: '娑堟伅涓績',
-      icon: 'message'
-    },
-    alwaysShow: true,
-    children: [
-      {
-        path: 'list',
-        component: () => import('@/views/message/list'),
-        name: 'MessageListPage',
-        meta: { title: '娑堟伅鍒楄〃', noCache: true }
       },
       {
-        path: 'send',
-        component: () => import('@/views/message/send'),
-        name: 'MessageSendPage',
-        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
       }
     ]
   },
+  // {
+  //   path: '/message',
+  //   component: Layout,
+  //   name: 'MessagePage',
+  //   meta: {
+  //     title: '娑堟伅涓績',
+  //     icon: 'message'
+  //   },
+  //   alwaysShow: true,
+  //   children: [
+  //     {
+  //       path: 'list',
+  //       component: () => import('@/views/message/list'),
+  //       name: 'MessageListPage',
+  //       meta: { title: '娑堟伅鍒楄〃', noCache: true }
+  //     },
+  //     {
+  //       path: 'send',
+  //       component: () => import('@/views/message/send'),
+  //       name: 'MessageSendPage',
+  //       meta: { title: '娑堟伅鍙戦��', noCache: true }
+  //     }
+  //   ]
+  // },
   {
     path: '/log',
     component: Layout,

--
Gitblit v1.8.0