Commit 6dc19f4796d89e2c4a9cd28ca77ab4d38cde3471

Authored by 梁保满
1 parent dc015b2d

路由及文件名调整

Showing 29 changed files with 32 additions and 36 deletions
src/router/index.js
... ... @@ -15,36 +15,29 @@ const ExaminationPaperRecycle = () => import("@/views/examinationPaper/recycle")
15 15 const ExaminationPaperArchiving = () => import("@/views/examinationPaper/archiving")
16 16 const Portrait = () => import("@/views/portrait/index")
17 17 const PortraitDetail = () => import("@/views/portrait/detail")
18   -const CSExaminationPaper = () => import("@/views/examinationPaper/index")
19   -// const CSExaminationPaperAdd = () => import("@/views/standard/examinationPaper/add")
20   -// const CSExaminationPaperEdit = () => import("@/views/standard/examinationPaper/edit")
21   -// const CSExaminationPaperRecycle = () => import("@/views/standard/examinationPaper/recycle")
22   -const CSExaminationPaperAdd = () => import("@/views/examinationPaper/add")
23   -const CSExaminationPaperEdit = () => import("@/views/examinationPaper/edit")
24   -const CSExaminationPaperRecycle = () => import("@/views/examinationPaper/recycle")
25 18  
26 19  
27   -const Ask = () => import("@/views/standard/ask/index")
28   -const AskAnalysis = () => import("@/views/standard/ask/analysis")
29   -const AskArchiving = () => import("@/views/standard/ask/archiving")
30   -const Test = () => import("@/views/standard/test/index")
31   -const TestAnalysis = () => import("@/views/standard/test/analysis")
32   -const TestArchiving = () => import("@/views/standard/test/archiving")
33   -const DataSync = () => import("@/views/standard/dataSync/index")
34   -const Card = () => import("@/views/standard/card/index")
35   -const Analysis = () => import("@/views/standard/analysis/index")
36   -const Device = () => import("@/views/standard/device/index")
37   -const DeviceLog = () => import("@/views/standard/device/log")
38   -const Down = () => import("@/views/standard/down/index")
39   -const DownClient = () => import("@/views/standard/down/client")
40   -const SetUpAccount = () => import("@/views/standard/setUp/account")
41   -const SetUpConglomerate = () => import("@/views/standard/setUp/conglomerate")
42   -const SetUpSchool = () => import("@/views/standard/setUp/school")
43   -const SetUpTeacher = () => import("@/views/standard/setUp/teacher")
44   -const SetUpStudent = () => import("@/views/standard/setUp/student")
45   -const ArchivedClazz = () => import("@/views/standard/setUp/archivedClazz")
46   -
  20 +const Ask = () => import("@/views/basic/ask/index")
  21 +const AskAnalysis = () => import("@/views/basic/ask/analysis")
  22 +const AskArchiving = () => import("@/views/basic/ask/archiving")
  23 +const Test = () => import("@/views/basic/test/index")
  24 +const TestAnalysis = () => import("@/views/basic/test/analysis")
  25 +const TestArchiving = () => import("@/views/basic/test/archiving")
  26 +const DataSync = () => import("@/views/basic/dataSync/index")
  27 +const Card = () => import("@/views/basic/card/index")
  28 +const Analysis = () => import("@/views/basic/analysis/index")
  29 +const Device = () => import("@/views/basic/device/index")
  30 +const DeviceLog = () => import("@/views/basic/device/log")
  31 +const Down = () => import("@/views/basic/down/index")
  32 +const DownClient = () => import("@/views/basic/down/client")
  33 +const SetUpAccount = () => import("@/views/basic/setUp/account")
  34 +const SetUpConglomerate = () => import("@/views/basic/setUp/conglomerate")
  35 +const SetUpSchool = () => import("@/views/basic/setUp/school")
  36 +const SetUpTeacher = () => import("@/views/basic/setUp/teacher")
  37 +const SetUpStudent = () => import("@/views/basic/setUp/student")
  38 +const ArchivedClazz = () => import("@/views/basic/setUp/archivedClazz")
47 39  
  40 +// 个人版
48 41 const PersonalAsk = () => import("@/views/personal/ask/index")
49 42 const PersonalAskAnalysis = () => import("@/views/personal/ask/analysis")
50 43 const PersonalArchiving = () => import("@/views/personal/ask/archiving")
... ... @@ -56,6 +49,7 @@ const PersonalSetUpStudent = () => import("@/views/personal/setUp/student")
56 49 const PersonalDown = () => import("@/views/personal/down/index")
57 50 const PersonalUserInfo = () => import("@/views/personal/userInfo/index")
58 51  
  52 +// 超级管理员
59 53 const AdminDevice = () => import("@/views/admin/device/index")
60 54 const AdminDeviceLog = () => import("@/views/admin/device/log")
61 55 const AdminAccount = () => import("@/views/admin/account/index")
... ... @@ -64,9 +58,9 @@ const AdminClientVersion = () => import("@/views/admin/clientVersion/index")
64 58 /**
65 59 * v1.4
66 60 */
67   -const SetUpClazz = () => import("@/views/standard/setUp/clazz")
68   -const Archived = () => import("@/views/standard/setUp/archived")
69   -const DeviceError = () => import("@/views/standard/device/error")
  61 +const SetUpClazz = () => import("@/views/basic/setUp/clazz")
  62 +const Archived = () => import("@/views/basic/setUp/archived")
  63 +const DeviceError = () => import("@/views/basic/device/error")
70 64  
71 65 /**
72 66 * 重写路由的push方法
... ... @@ -76,7 +70,6 @@ Router.prototype.push = function push(location) {
76 70 return routerPush.call(this, location).catch(error => error)
77 71 }
78 72 Vue.use(Router)
79   -let routeName = en.routeName
80 73 let defaultRouter = [
81 74 {
82 75 path: "/",
... ... @@ -146,7 +139,7 @@ let defaultRouter = [
146 139 children: []
147 140 }
148 141 ]
149   -
  142 +//标准版路由表
150 143 let addrouters = [
151 144 {
152 145 path: "/examinationPaper",
... ... @@ -483,6 +476,7 @@ let addrouters = [
483 476 // ]
484 477 // },
485 478 ]
  479 +//长水版路由表
486 480 let csAddrouters = [
487 481 {
488 482 path: "/examinationPaper",
... ... @@ -495,14 +489,14 @@ let csAddrouters = [
495 489 path: "/examinationPaper",
496 490 iconCls: "fa fa-file-text", // 图标样式class
497 491 name: "examinationPaper",
498   - component: CSExaminationPaper,
  492 + component: ExaminationPaper,
499 493 children: []
500 494 },
501 495 {
502 496 path: "/examinationPaperAdd",
503 497 iconCls: "", // 图标样式class
504 498 name: "examinationPaperAdd",
505   - component: CSExaminationPaperAdd,
  499 + component: ExaminationPaperAdd,
506 500 parent: "examinationPaper",
507 501 children: []
508 502 },
... ... @@ -510,7 +504,7 @@ let csAddrouters = [
510 504 path: "/examinationPaperEdit",
511 505 iconCls: "", // 图标样式class
512 506 name: "修改答题卡",
513   - component: CSExaminationPaperEdit,
  507 + component: ExaminationPaperEdit,
514 508 parent: "examinationPaper",
515 509 children: []
516 510 },
... ... @@ -518,7 +512,7 @@ let csAddrouters = [
518 512 path: "/examinationPaperRecycle",
519 513 iconCls: "", // 图标样式class
520 514 name: "回收站答题卡",
521   - component: CSExaminationPaperRecycle,
  515 + component: ExaminationPaperRecycle,
522 516 parent: "examinationPaper",
523 517 children: []
524 518 },
... ... @@ -752,6 +746,7 @@ let csAddrouters = [
752 746 },
753 747 ]
754 748  
  749 +//个人版版路由表
755 750 const addroutersPersonal = [
756 751 {
757 752 path: "/setUpStudent",
... ... @@ -954,6 +949,7 @@ const addroutersPersonal = [
954 949 },
955 950 ]
956 951  
  952 +// 超级管理员路由表
957 953 const addRoutersAdmin = [
958 954 {
959 955 path: "/account",
... ...
src/views/standard/analysis/index.vue renamed to src/views/basic/analysis/index.vue
src/views/standard/analysis/indexOld.vue renamed to src/views/basic/analysis/indexOld.vue
src/views/standard/ask/analysis.vue renamed to src/views/basic/ask/analysis.vue
src/views/standard/ask/archiving.vue renamed to src/views/basic/ask/archiving.vue
src/views/standard/ask/index.vue renamed to src/views/basic/ask/index.vue
src/views/standard/card/index.vue renamed to src/views/basic/card/index.vue
src/views/standard/dataSync/index.vue renamed to src/views/basic/dataSync/index.vue
src/views/standard/device/error.vue renamed to src/views/basic/device/error.vue
src/views/standard/device/index.vue renamed to src/views/basic/device/index.vue
src/views/standard/device/log.vue renamed to src/views/basic/device/log.vue
src/views/standard/down/client.vue renamed to src/views/basic/down/client.vue
src/views/standard/down/index.vue renamed to src/views/basic/down/index.vue
src/views/standard/examinationPaper/add.vue renamed to src/views/basic/examinationPaper/add.vue
src/views/standard/examinationPaper/detail.vue renamed to src/views/basic/examinationPaper/detail.vue
src/views/standard/examinationPaper/edit.vue renamed to src/views/basic/examinationPaper/edit.vue
src/views/standard/examinationPaper/index.vue renamed to src/views/basic/examinationPaper/index.vue
src/views/standard/examinationPaper/recycle.vue renamed to src/views/basic/examinationPaper/recycle.vue
src/views/standard/setUp/account.vue renamed to src/views/basic/setUp/account.vue
src/views/standard/setUp/archived.vue renamed to src/views/basic/setUp/archived.vue
src/views/standard/setUp/archivedClazz.vue renamed to src/views/basic/setUp/archivedClazz.vue
src/views/standard/setUp/clazz.vue renamed to src/views/basic/setUp/clazz.vue
src/views/standard/setUp/conglomerate.vue renamed to src/views/basic/setUp/conglomerate.vue
src/views/standard/setUp/school.vue renamed to src/views/basic/setUp/school.vue
src/views/standard/setUp/student.vue renamed to src/views/basic/setUp/student.vue
src/views/standard/setUp/teacher.vue renamed to src/views/basic/setUp/teacher.vue
src/views/standard/test/analysis.vue renamed to src/views/basic/test/analysis.vue
src/views/standard/test/archiving.vue renamed to src/views/basic/test/archiving.vue
src/views/standard/test/index.vue renamed to src/views/basic/test/index.vue