From b62c6c9ab29e933fd0333ac183ef837d00aba5d2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 12 七月 2024 18:09:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/router.js | 222 +++++++++++++++++++++++++++++--------------------------
1 files changed, 117 insertions(+), 105 deletions(-)
diff --git a/src/router.js b/src/router.js
index 79a7290..ba0699d 100644
--- a/src/router.js
+++ b/src/router.js
@@ -99,26 +99,40 @@
]
},
{
- path: '/online/study',
+ path: '/education',
component: Layout,
- name: 'OnLineStudy',
+ name: 'EducationPage',
meta: {
- title: '鍦ㄧ嚎瀛︿範',
- icon: 'exam'
+ title: '閮ㄩ棬绠＄悊',
+ icon: 'education'
},
alwaysShow: true,
children: [
{
- path: 'type',
- component: () => import('@/views/onlineStudy/type'),
- name: 'Type',
- meta: { title: '瀛︿範绫诲瀷', noCache: true }
+ path: 'subject/list',
+ component: () => import('@/views/education/subject/list'),
+ name: 'EducationSubjectPage',
+ meta: { title: '閮ㄩ棬璇剧洰', noCache: true }
},
{
- path: 'file',
- component: () => import('@/views/onlineStudy/file'),
- name: 'File',
- meta: { title: '瀛︿範鏂囦欢', noCache: true }
+ path: 'department/list',
+ component: () => import('@/views/education/department/list'),
+ name: 'EducationDepartmentPage',
+ meta: { title: '閮ㄩ棬鍒楄〃', noCache: true }
+ },
+ {
+ path: 'subject/edit',
+ component: () => import('@/views/education/subject/edit'),
+ name: 'EducationSubjectEditPage',
+ meta: { title: '璇剧洰缂栬緫', noCache: true, activeMenu: '/education/subject/list' },
+ hidden: true
+ },
+ {
+ path: 'department/edit',
+ component: () => import('@/views/education/department/edit'),
+ name: 'EducationSubjectEditPage',
+ meta: { title: '閮ㄩ棬缂栬緫', noCache: true, activeMenu: '/education/department/list' },
+ hidden: true
}
]
},
@@ -174,6 +188,12 @@
component: () => import('@/views/exam/personalRandomTemplate/list'),
name: 'personalSimulation',
meta: { title: '闅忔満璇曞嵎', noCache: true }
+ },
+ {
+ path: 'personalRandomTemplate/config',
+ component: () => import('@/views/exam/personalRandomTemplate/config'),
+ name: 'personalSimulationConfig',
+ meta: { title: '闅忔満璇曞嵎閰嶇疆', noCache: true }
},
{
path: 'personalRandomTemplate/edit',
@@ -233,68 +253,6 @@
]
},
{
- path: '/task',
- component: Layout,
- name: 'TaskPage',
- meta: {
- 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 }
- }
- ]
- },
- {
- path: '/education',
- component: Layout,
- name: 'EducationPage',
- meta: {
- title: '閮ㄩ棬绠＄悊',
- icon: 'education'
- },
- alwaysShow: true,
- children: [
- {
- path: 'subject/list',
- component: () => import('@/views/education/subject/list'),
- name: 'EducationSubjectPage',
- meta: { title: '璇剧洰鍒楄〃', noCache: true }
- },
- {
- path: 'department/list',
- component: () => import('@/views/education/department/list'),
- name: 'EducationDepartmentPage',
- meta: { title: '閮ㄩ棬鍒楄〃', noCache: true }
- },
- {
- path: 'subject/edit',
- component: () => import('@/views/education/subject/edit'),
- name: 'EducationSubjectEditPage',
- meta: { title: '璇剧洰缂栬緫', noCache: true, activeMenu: '/education/subject/list' },
- hidden: true
- },
- {
- path: 'department/edit',
- component: () => import('@/views/education/department/edit'),
- name: 'EducationSubjectEditPage',
- meta: { title: '閮ㄩ棬缂栬緫', noCache: true, activeMenu: '/education/department/list' },
- hidden: true
- }
- ]
- },
- {
path: '/answer',
component: Layout,
name: 'AnswerPage',
@@ -338,6 +296,30 @@
]
},
{
+ path: '/online/study',
+ component: Layout,
+ name: 'OnLineStudy',
+ meta: {
+ title: '鍦ㄧ嚎瀛︿範',
+ icon: 'exam'
+ },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'type',
+ component: () => import('@/views/onlineStudy/type'),
+ name: 'Type',
+ meta: { title: '瀛︿範绫诲瀷', noCache: true }
+ },
+ {
+ path: 'file',
+ component: () => import('@/views/onlineStudy/file'),
+ name: 'File',
+ meta: { title: '瀛︿範鏂囦欢', noCache: true }
+ }
+ ]
+ },
+ {
path: '/questionAnswer',
component: Layout,
name: 'questionAnswerPage',
@@ -363,47 +345,71 @@
]
},
{
- path: '/message',
+ path: '/task',
component: Layout,
- name: 'MessagePage',
+ name: 'TaskPage',
meta: {
- title: '娑堟伅涓績',
- icon: 'message'
+ title: '浠诲姟绠＄悊',
+ icon: 'task'
},
alwaysShow: true,
children: [
{
path: 'list',
- component: () => import('@/views/message/list'),
- name: 'MessageListPage',
- meta: { title: '娑堟伅鍒楄〃', noCache: true }
+ component: () => import('@/views/task/list'),
+ name: 'TaskListPage',
+ meta: { title: '浠诲姟鍒楄〃', noCache: true }
},
{
- path: 'send',
- component: () => import('@/views/message/send'),
- name: 'MessageSendPage',
- meta: { title: '娑堟伅鍙戦��', noCache: true }
+ path: 'edit',
+ component: () => import('@/views/task/edit'),
+ name: 'TaskEditPage',
+ meta: { title: '浠诲姟鍒涘缓', noCache: true }
}
]
},
- {
- path: '/log',
- component: Layout,
- name: 'LogPage',
- meta: {
- title: '鏃ュ織涓績',
- icon: 'log'
- },
- alwaysShow: true,
- children: [
- {
- path: 'user/list',
- component: () => import('@/views/log/list'),
- name: 'LogUserPage',
- 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,
+ // name: 'LogPage',
+ // meta: {
+ // title: '鏃ュ織涓績',
+ // icon: 'log'
+ // },
+ // alwaysShow: true,
+ // children: [
+ // {
+ // path: 'user/list',
+ // component: () => import('@/views/log/list'),
+ // name: 'LogUserPage',
+ // meta: { title: '鐢ㄦ埛鏃ュ織', noCache: true }
+ // }
+ // ]
+ // },
// {
// path: '/meeting',
// component: Layout,
@@ -491,16 +497,22 @@
meta: { title: '瀛︾敓鍒楄〃', noCache: true }
},
{
+ path: 'tag/list',
+ component: () => import('@/views/user/tag/list'),
+ name: 'TagAdminPageList',
+ meta: { title: '瀛︾敓鏍囩', noCache: true }
+ },
+ {
path: 'departmentExamine/list',
component: () => import('@/views/user/departmentExamine/list'),
name: 'departmentExamineList',
- meta: { title: '璋冨姩瀹℃牳', noCache: true }
+ meta: { title: '璋冨姩鎻愬璁板綍', noCache: true }
},
{
path: 'UserConditionExamine/list',
component: () => import('@/views/user/UserConditionExamine/list'),
name: 'UserConditionExamineList',
- meta: { title: '鐘舵�佸鏍�', noCache: true }
+ meta: { title: '鐘舵�佹彁瀹¤褰�', noCache: true }
},
]
},
--
Gitblit v1.8.0