diff --git a/src/router/index.js b/src/router/index.js index 73ad9e9..1235392 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -15,36 +15,29 @@ const ExaminationPaperRecycle = () => import("@/views/examinationPaper/recycle") const ExaminationPaperArchiving = () => import("@/views/examinationPaper/archiving") const Portrait = () => import("@/views/portrait/index") const PortraitDetail = () => import("@/views/portrait/detail") -const CSExaminationPaper = () => import("@/views/examinationPaper/index") -// const CSExaminationPaperAdd = () => import("@/views/standard/examinationPaper/add") -// const CSExaminationPaperEdit = () => import("@/views/standard/examinationPaper/edit") -// const CSExaminationPaperRecycle = () => import("@/views/standard/examinationPaper/recycle") -const CSExaminationPaperAdd = () => import("@/views/examinationPaper/add") -const CSExaminationPaperEdit = () => import("@/views/examinationPaper/edit") -const CSExaminationPaperRecycle = () => import("@/views/examinationPaper/recycle") -const Ask = () => import("@/views/standard/ask/index") -const AskAnalysis = () => import("@/views/standard/ask/analysis") -const AskArchiving = () => import("@/views/standard/ask/archiving") -const Test = () => import("@/views/standard/test/index") -const TestAnalysis = () => import("@/views/standard/test/analysis") -const TestArchiving = () => import("@/views/standard/test/archiving") -const DataSync = () => import("@/views/standard/dataSync/index") -const Card = () => import("@/views/standard/card/index") -const Analysis = () => import("@/views/standard/analysis/index") -const Device = () => import("@/views/standard/device/index") -const DeviceLog = () => import("@/views/standard/device/log") -const Down = () => import("@/views/standard/down/index") -const DownClient = () => import("@/views/standard/down/client") -const SetUpAccount = () => import("@/views/standard/setUp/account") -const SetUpConglomerate = () => import("@/views/standard/setUp/conglomerate") -const SetUpSchool = () => import("@/views/standard/setUp/school") -const SetUpTeacher = () => import("@/views/standard/setUp/teacher") -const SetUpStudent = () => import("@/views/standard/setUp/student") -const ArchivedClazz = () => import("@/views/standard/setUp/archivedClazz") - +const Ask = () => import("@/views/basic/ask/index") +const AskAnalysis = () => import("@/views/basic/ask/analysis") +const AskArchiving = () => import("@/views/basic/ask/archiving") +const Test = () => import("@/views/basic/test/index") +const TestAnalysis = () => import("@/views/basic/test/analysis") +const TestArchiving = () => import("@/views/basic/test/archiving") +const DataSync = () => import("@/views/basic/dataSync/index") +const Card = () => import("@/views/basic/card/index") +const Analysis = () => import("@/views/basic/analysis/index") +const Device = () => import("@/views/basic/device/index") +const DeviceLog = () => import("@/views/basic/device/log") +const Down = () => import("@/views/basic/down/index") +const DownClient = () => import("@/views/basic/down/client") +const SetUpAccount = () => import("@/views/basic/setUp/account") +const SetUpConglomerate = () => import("@/views/basic/setUp/conglomerate") +const SetUpSchool = () => import("@/views/basic/setUp/school") +const SetUpTeacher = () => import("@/views/basic/setUp/teacher") +const SetUpStudent = () => import("@/views/basic/setUp/student") +const ArchivedClazz = () => import("@/views/basic/setUp/archivedClazz") +// 个人版 const PersonalAsk = () => import("@/views/personal/ask/index") const PersonalAskAnalysis = () => import("@/views/personal/ask/analysis") const PersonalArchiving = () => import("@/views/personal/ask/archiving") @@ -56,6 +49,7 @@ const PersonalSetUpStudent = () => import("@/views/personal/setUp/student") const PersonalDown = () => import("@/views/personal/down/index") const PersonalUserInfo = () => import("@/views/personal/userInfo/index") +// 超级管理员 const AdminDevice = () => import("@/views/admin/device/index") const AdminDeviceLog = () => import("@/views/admin/device/log") const AdminAccount = () => import("@/views/admin/account/index") @@ -64,9 +58,9 @@ const AdminClientVersion = () => import("@/views/admin/clientVersion/index") /** * v1.4 */ -const SetUpClazz = () => import("@/views/standard/setUp/clazz") -const Archived = () => import("@/views/standard/setUp/archived") -const DeviceError = () => import("@/views/standard/device/error") +const SetUpClazz = () => import("@/views/basic/setUp/clazz") +const Archived = () => import("@/views/basic/setUp/archived") +const DeviceError = () => import("@/views/basic/device/error") /** * 重写路由的push方法 @@ -76,7 +70,6 @@ Router.prototype.push = function push(location) { return routerPush.call(this, location).catch(error => error) } Vue.use(Router) -let routeName = en.routeName let defaultRouter = [ { path: "/", @@ -146,7 +139,7 @@ let defaultRouter = [ children: [] } ] - +//标准版路由表 let addrouters = [ { path: "/examinationPaper", @@ -483,6 +476,7 @@ let addrouters = [ // ] // }, ] +//长水版路由表 let csAddrouters = [ { path: "/examinationPaper", @@ -495,14 +489,14 @@ let csAddrouters = [ path: "/examinationPaper", iconCls: "fa fa-file-text", // 图标样式class name: "examinationPaper", - component: CSExaminationPaper, + component: ExaminationPaper, children: [] }, { path: "/examinationPaperAdd", iconCls: "", // 图标样式class name: "examinationPaperAdd", - component: CSExaminationPaperAdd, + component: ExaminationPaperAdd, parent: "examinationPaper", children: [] }, @@ -510,7 +504,7 @@ let csAddrouters = [ path: "/examinationPaperEdit", iconCls: "", // 图标样式class name: "修改答题卡", - component: CSExaminationPaperEdit, + component: ExaminationPaperEdit, parent: "examinationPaper", children: [] }, @@ -518,7 +512,7 @@ let csAddrouters = [ path: "/examinationPaperRecycle", iconCls: "", // 图标样式class name: "回收站答题卡", - component: CSExaminationPaperRecycle, + component: ExaminationPaperRecycle, parent: "examinationPaper", children: [] }, @@ -752,6 +746,7 @@ let csAddrouters = [ }, ] +//个人版版路由表 const addroutersPersonal = [ { path: "/setUpStudent", @@ -954,6 +949,7 @@ const addroutersPersonal = [ }, ] +// 超级管理员路由表 const addRoutersAdmin = [ { path: "/account", diff --git a/src/views/standard/analysis/index.vue b/src/views/basic/analysis/index.vue index 0ab8b3e..0ab8b3e 100644 --- a/src/views/standard/analysis/index.vue +++ b/src/views/basic/analysis/index.vue diff --git a/src/views/standard/analysis/indexOld.vue b/src/views/basic/analysis/indexOld.vue index cb85746..cb85746 100644 --- a/src/views/standard/analysis/indexOld.vue +++ b/src/views/basic/analysis/indexOld.vue diff --git a/src/views/standard/ask/analysis.vue b/src/views/basic/ask/analysis.vue index a83b49f..a83b49f 100644 --- a/src/views/standard/ask/analysis.vue +++ b/src/views/basic/ask/analysis.vue diff --git a/src/views/standard/ask/archiving.vue b/src/views/basic/ask/archiving.vue index 5e3d438..5e3d438 100644 --- a/src/views/standard/ask/archiving.vue +++ b/src/views/basic/ask/archiving.vue diff --git a/src/views/standard/ask/index.vue b/src/views/basic/ask/index.vue index 71b1053..71b1053 100644 --- a/src/views/standard/ask/index.vue +++ b/src/views/basic/ask/index.vue diff --git a/src/views/standard/card/index.vue b/src/views/basic/card/index.vue index d1b5553..d1b5553 100644 --- a/src/views/standard/card/index.vue +++ b/src/views/basic/card/index.vue diff --git a/src/views/standard/dataSync/index.vue b/src/views/basic/dataSync/index.vue index 18cb7b1..18cb7b1 100644 --- a/src/views/standard/dataSync/index.vue +++ b/src/views/basic/dataSync/index.vue diff --git a/src/views/standard/device/error.vue b/src/views/basic/device/error.vue index a2e0579..a2e0579 100644 --- a/src/views/standard/device/error.vue +++ b/src/views/basic/device/error.vue diff --git a/src/views/standard/device/index.vue b/src/views/basic/device/index.vue index 07fbf45..07fbf45 100644 --- a/src/views/standard/device/index.vue +++ b/src/views/basic/device/index.vue diff --git a/src/views/standard/device/log.vue b/src/views/basic/device/log.vue index eb6ecea..eb6ecea 100644 --- a/src/views/standard/device/log.vue +++ b/src/views/basic/device/log.vue diff --git a/src/views/standard/down/client.vue b/src/views/basic/down/client.vue index 4077096..4077096 100644 --- a/src/views/standard/down/client.vue +++ b/src/views/basic/down/client.vue diff --git a/src/views/standard/down/index.vue b/src/views/basic/down/index.vue index 3b64cef..3b64cef 100644 --- a/src/views/standard/down/index.vue +++ b/src/views/basic/down/index.vue diff --git a/src/views/standard/examinationPaper/add.vue b/src/views/basic/examinationPaper/add.vue index 6f3e240..6f3e240 100644 --- a/src/views/standard/examinationPaper/add.vue +++ b/src/views/basic/examinationPaper/add.vue diff --git a/src/views/standard/examinationPaper/detail.vue b/src/views/basic/examinationPaper/detail.vue index 4611414..4611414 100644 --- a/src/views/standard/examinationPaper/detail.vue +++ b/src/views/basic/examinationPaper/detail.vue diff --git a/src/views/standard/examinationPaper/edit.vue b/src/views/basic/examinationPaper/edit.vue index 4736cc5..4736cc5 100644 --- a/src/views/standard/examinationPaper/edit.vue +++ b/src/views/basic/examinationPaper/edit.vue diff --git a/src/views/standard/examinationPaper/index.vue b/src/views/basic/examinationPaper/index.vue index 6c3fe42..6c3fe42 100644 --- a/src/views/standard/examinationPaper/index.vue +++ b/src/views/basic/examinationPaper/index.vue diff --git a/src/views/standard/examinationPaper/recycle.vue b/src/views/basic/examinationPaper/recycle.vue index 110986a..110986a 100644 --- a/src/views/standard/examinationPaper/recycle.vue +++ b/src/views/basic/examinationPaper/recycle.vue diff --git a/src/views/standard/setUp/account.vue b/src/views/basic/setUp/account.vue index 58ed870..58ed870 100644 --- a/src/views/standard/setUp/account.vue +++ b/src/views/basic/setUp/account.vue diff --git a/src/views/standard/setUp/archived.vue b/src/views/basic/setUp/archived.vue index 89d0b56..89d0b56 100644 --- a/src/views/standard/setUp/archived.vue +++ b/src/views/basic/setUp/archived.vue diff --git a/src/views/standard/setUp/archivedClazz.vue b/src/views/basic/setUp/archivedClazz.vue index 1540917..1540917 100644 --- a/src/views/standard/setUp/archivedClazz.vue +++ b/src/views/basic/setUp/archivedClazz.vue diff --git a/src/views/standard/setUp/clazz.vue b/src/views/basic/setUp/clazz.vue index ae01e44..ae01e44 100644 --- a/src/views/standard/setUp/clazz.vue +++ b/src/views/basic/setUp/clazz.vue diff --git a/src/views/standard/setUp/conglomerate.vue b/src/views/basic/setUp/conglomerate.vue index cae63c6..cae63c6 100644 --- a/src/views/standard/setUp/conglomerate.vue +++ b/src/views/basic/setUp/conglomerate.vue diff --git a/src/views/standard/setUp/school.vue b/src/views/basic/setUp/school.vue index 003999e..003999e 100644 --- a/src/views/standard/setUp/school.vue +++ b/src/views/basic/setUp/school.vue diff --git a/src/views/standard/setUp/student.vue b/src/views/basic/setUp/student.vue index c7c5ff0..c7c5ff0 100644 --- a/src/views/standard/setUp/student.vue +++ b/src/views/basic/setUp/student.vue diff --git a/src/views/standard/setUp/teacher.vue b/src/views/basic/setUp/teacher.vue index bd9f177..bd9f177 100644 --- a/src/views/standard/setUp/teacher.vue +++ b/src/views/basic/setUp/teacher.vue diff --git a/src/views/standard/test/analysis.vue b/src/views/basic/test/analysis.vue index bc84cc3..bc84cc3 100644 --- a/src/views/standard/test/analysis.vue +++ b/src/views/basic/test/analysis.vue diff --git a/src/views/standard/test/archiving.vue b/src/views/basic/test/archiving.vue index 9c51c60..9c51c60 100644 --- a/src/views/standard/test/archiving.vue +++ b/src/views/basic/test/archiving.vue diff --git a/src/views/standard/test/index.vue b/src/views/basic/test/index.vue index 4a99ebd..4a99ebd 100644 --- a/src/views/standard/test/index.vue +++ b/src/views/basic/test/index.vue