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 | 63 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/src/router.js b/src/router.js
index 2f798d4..9f0ea40 100644
--- a/src/router.js
+++ b/src/router.js
@@ -59,6 +59,13 @@
name: 'MarkPaperDetail',
meta: { title: '闃呭嵎'},
hidden: true
+ },
+ {
+ path: '/exam/monitor',
+ component: () => import('@/views/exam/exam/monitor'),
+ name: 'monitor',
+ meta: { title: '鐩戞帶'},
+ hidden: true
}
]
},
@@ -258,7 +265,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 }
+ },
]
},
{
@@ -293,30 +306,30 @@
}
]
},
- {
- 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: '/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