From 9f5a532c9213a34c7da9271cffd0ec2eb90461b4 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期五, 17 五月 2024 15:03:31 +0800
Subject: [PATCH] Merge branch 'dev-zhang'
---
src/router.js | 203 +++++++++++++++++++++++++-------------------------
1 files changed, 103 insertions(+), 100 deletions(-)
diff --git a/src/router.js b/src/router.js
index 5013f6c..23690a2 100644
--- a/src/router.js
+++ b/src/router.js
@@ -26,7 +26,7 @@
{
path: '/',
component: Layout,
- redirect: '/dashboard',
+ redirect: '/login',
children: [
{
path: 'dashboard',
@@ -70,6 +70,49 @@
name: 'UserAdminEdit',
meta: { title: '绠＄悊鍛樼紪杈�', noCache: true, activeMenu: '/user/admin/list' },
hidden: true
+ },
+ {
+ path: 'departmentExamine/list',
+ component: () => import('@/views/user/departmentExamine/list'),
+ name: 'departmentExamineList',
+ meta: { title: '璋冨姩瀹℃牳', noCache: true }
+ },
+ {
+ path: 'tag/list',
+ component: () => import('@/views/user/tag/list'),
+ name: 'TagAdminPageList',
+ meta: { title: '瀛︾敓鏍囩', noCache: true }
+ },
+ {
+ path: 'tag/edit',
+ component: () => import('@/views/user/tag/edit'),
+ name: 'TagAdminEdit',
+ meta: { title: '鏍囩缂栬緫', noCache: true, activeMenu: '/user/tag/list' },
+ hidden: true
+ }
+ ]
+ },
+ {
+ 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 }
}
]
},
@@ -139,6 +182,12 @@
name: 'personalSimulationEdit',
meta: { title: '璇曞嵎缂栬緫', noCache: true, activeMenu: '/exam/personalSimulation/list' },
hidden: true
+ },
+ {
+ path: 'feedback/list',
+ component: () => import('@/views/feedback/list'),
+ name: 'feedback',
+ meta: { title: '閿欓鍙嶉', noCache: true }
},
{
path: 'personalSimulation/list/mathList',
@@ -277,6 +326,31 @@
]
},
{
+ path: '/questionAnswer',
+ component: Layout,
+ name: 'questionAnswerPage',
+ meta: {
+ title: '闂瓟绠＄悊',
+ icon: 'question'
+ },
+ alwaysShow: true,
+ children: [
+ {
+ path: '/list',
+ component: () => import('@/views/questionAnswer/list'),
+ name: 'questionAnswerPage',
+ meta: { title: '闂瓟鍒楄〃', noCache: true }
+ },
+ {
+ path: '/edit',
+ component: () => import('@/views/questionAnswer/edit'),
+ name: 'questionAnswerEdit',
+ meta: { title: '闂瓟缂栬緫', noCache: true, activeMenu: '/questionAnswer/list' },
+ hidden: true
+ }
+ ]
+ },
+ {
path: '/message',
component: Layout,
name: 'MessagePage',
@@ -378,7 +452,7 @@
{
path: '/',
component: Layout,
- redirect: '/dashboard',
+ redirect: '/login',
children: [
{
path: 'dashboard',
@@ -389,6 +463,24 @@
]
},
{
+ path: '/user',
+ component: Layout,
+ name: 'UserPage',
+ meta: {
+ title: '鐢ㄦ埛绠＄悊',
+ icon: 'users'
+ },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'student/list',
+ component: () => import('@/views/user/student/list'),
+ name: 'UserStudentPageList',
+ meta: { title: '瀛︾敓鍒楄〃', noCache: true }
+ },
+ ]
+ },
+ {
path: '/exam',
component: Layout,
name: 'ExamPage',
@@ -396,6 +488,7 @@
title: '鍗烽绠＄悊',
icon: 'exam'
},
+ alwaysShow: true,
children: [
{
path: 'paper/list',
@@ -409,31 +502,6 @@
name: 'ExamPaperEdit',
meta: { title: '璇曞嵎缂栬緫', noCache: true, activeMenu: '/exam/paper/list' },
hidden: true
- },
- {
- path: 'question/list',
- component: () => import('@/views/exam/question/list'),
- name: 'ExamQuestionPageList',
- meta: { title: '棰樼洰鍒楄〃', noCache: true }
- },
- {
- path: 'question/edit/singleChoice',
- component: () => import('@/views/exam/question/edit/single-choice'),
- name: 'singleChoicePage',
- meta: { title: '鍗曢�夐缂栬緫', noCache: true, activeMenu: '/exam/question/list' },
- hidden: true
- },
- {
- path: 'simulation/list',
- component: () => import('@/views/exam/simulation/list'),
- name: 'personalSimulationList',
- meta: { title: '妯℃嫙鍒楄〃', noCache: true }
- },
- {
- path: 'personalSimulation/list',
- component: () => import('@/views/exam/personalSimulation/list'),
- name: 'personalSimulation',
- meta: { title: '涓汉妯℃嫙', noCache: true }
},
{
path: 'personalRandomTemplate/list',
@@ -454,65 +522,6 @@
name: 'personalSimulationEdit',
meta: { title: '璇曞嵎缂栬緫', noCache: true, activeMenu: '/exam/personalSimulation/list' },
hidden: true
- },
- {
- path: 'personalSimulation/list/mathList',
- component: () => import('@/views/exam/mathList/list.vue'),
- name: 'multiplemathList',
- meta: { title: '妯℃嫙鍒楄〃璇︽儏', noCache: true, activeMenu: '/exam/mathList/list' },
- hidden: true
- },
- {
- path: 'question/edit/multipleChoice',
- component: () => import('@/views/exam/question/edit/multiple-choice'),
- name: 'multipleChoicePage',
- meta: { title: '澶氶�夐缂栬緫', noCache: true, activeMenu: '/exam/question/list' },
- hidden: true
- },
- {
- path: 'question/edit/trueFalse',
- component: () => import('@/views/exam/question/edit/true-false'),
- name: 'trueFalsePage',
- meta: { title: '鍒ゆ柇棰樼紪杈�', noCache: true, activeMenu: '/exam/question/list' },
- hidden: true
- },
- {
- path: 'question/edit/gapFilling',
- component: () => import('@/views/exam/question/edit/gap-filling'),
- name: 'gapFillingPage',
- meta: { title: '濉┖棰樼紪杈�', noCache: true, activeMenu: '/exam/question/list' },
- hidden: true
- },
- {
- path: 'question/edit/shortAnswer',
- component: () => import('@/views/exam/question/edit/short-answer'),
- name: 'shortAnswerPage',
- meta: { title: '绠�绛旈缂栬緫', noCache: true, activeMenu: '/exam/question/list' },
- hidden: true
- }
- ]
- },
- {
- 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 }
}
]
},
@@ -527,18 +536,6 @@
alwaysShow: true,
children: [
{
- path: 'list',
- component: () => import('@/views/answer/list'),
- name: 'AnswerPageList',
- meta: { title: '绛斿嵎鍒楄〃', noCache: true }
- },
- {
- path: 'sheetStatistics',
- component: () => import('@/views/answer/sheetStatistics.vue'),
- name: 'AnswerPageList',
- meta: { title: '绛斿嵎缁熻', noCache: true }
- },
- {
path: 'achievementStatistics',
component: () => import('@/views/answer/achievementStatistics.vue'),
name: 'AnswerPageList',
@@ -550,7 +547,13 @@
name: 'AnswerPageList',
meta: { title: '鎴愮哗缁熻璇︽儏', noCache: true, activeMenu: '/exam/gradeDetails/list' },
hidden: true
- }
+ },
+ {
+ path: 'sheetStatistics',
+ component: () => import('@/views/answer/sheetStatistics.vue'),
+ name: 'AnswerPageList',
+ meta: { title: '绛斿嵎缁熻', noCache: true }
+ },
]
},
{
@@ -574,7 +577,7 @@
]
const router = new Router({
- routes: sessionStorage.getItem('deptAdmin') === '1' ? deptAdminRoutes : constantRoutes
+ routes: constantRoutes
})
export {
--
Gitblit v1.8.0