From 41aaf3c396081a45908c9a964c43e523cc4a1f4e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 11 七月 2024 10:55:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/router.js | 111 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 85 insertions(+), 26 deletions(-)
diff --git a/src/router.js b/src/router.js
index 17ffd6e..0391f7c 100644
--- a/src/router.js
+++ b/src/router.js
@@ -50,7 +50,21 @@
path: '/exam/mark/paper',
component: () => import('@/views/exam/exam/MarkPaper'),
name: 'MarkPaper',
- meta: { title: '闃呭嵎'},
+ meta: { title: '闃呭嵎', noCache: true },
+ hidden: true
+ },
+ {
+ path: '/exam/mark/paper/detail',
+ component: () => import('@/views/exam/exam/MarkPaperDetail'),
+ name: 'MarkPaperDetail',
+ meta: { title: '闃呭嵎璇︽儏', noCache: true },
+ hidden: true
+ },
+ {
+ path: '/exam/monitor',
+ component: () => import('@/views/exam/exam/monitor'),
+ name: 'monitor',
+ meta: { title: '鐩戞帶', noCache: true },
hidden: true
}
]
@@ -97,6 +111,19 @@
hidden: true
},
{
+ path: 'teacher/list',
+ component: () => import('@/views/user/teacher/list'),
+ name: 'UserTeacherPageList',
+ meta: { title: '鏁欏笀鍒楄〃', noCache: true }
+ },
+ {
+ path: 'teacher/edit',
+ component: () => import('@/views/user/teacher/edit'),
+ name: 'UserTeacherEdit',
+ meta: { title: '鏁欏笀缂栬緫', noCache: true, activeMenu: '/user/teacher/list' },
+ hidden: true
+ },
+ {
path: 'admin/list',
component: () => import('@/views/user/admin/list'),
name: 'UserAdminPageList',
@@ -131,6 +158,13 @@
component: () => import('@/views/exam/paper/edit'),
name: 'ExamPaperEdit',
meta: { title: '璇曞嵎缂栬緫', noCache: true, activeMenu: '/exam/paper/list' },
+ hidden: true
+ },
+ {
+ path: 'paper/import',
+ component: () => import('@/views/exam/paper/import'),
+ name: 'ExamPaperImport',
+ meta: { title: '璇曞嵎瀵煎叆', noCache: true, activeMenu: '/exam/paper/list' },
hidden: true
},
{
@@ -212,14 +246,15 @@
component: () => import('@/views/train/index'),
name: 'TrainListPage',
meta: { title: '鍦ㄧ嚎鍩硅', noCache: true }
- },
- {
- path: 'meet/index',
- component: () => import('@/views/meet/index'),
- name: 'meet',
- hidden: true
}
]
+ },
+
+ {
+ path: '/meet',
+ component: () => import('@/views/meet/index'),
+ meta: { title: '鍦ㄧ嚎鏁欏', noCache: true },
+ hidden: true
},
{
@@ -250,7 +285,13 @@
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 }
+ },
]
},
{
@@ -286,29 +327,46 @@
]
},
{
- path: '/message',
+ path: '/config',
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: '/setting',
+ name: 'SysSetting',
+ meta: {
+ title: '绯荤粺閰嶇疆',
+ icon: 'answer',
+ affix: true
+ },
+ component: () => import('@/views/sys/SysSetting')
},
- {
- path: 'send',
- component: () => import('@/views/message/send'),
- name: 'MessageSendPage',
- 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: '/log',
component: Layout,
@@ -340,7 +398,8 @@
}
]
},
- { path: '*',
+ {
+ path: '*',
hidden: true,
component: () => import('@/views/error-page/404'),
meta: { title: '404', noCache: true }
--
Gitblit v1.8.0