diff --git a/src/router/index.js b/src/router/index.js index 45952a63d..bdbd75af7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -39,6 +39,7 @@ import TrainingRuleEdit from '@/views/lesson/trainingRule/detail/index'; import Trainingmanage from '@/views/lesson/trainingmanage/index'; import LessonEdit from '@/views/lesson/lessoncategory/index'; import LessonHome from '@/views/lesson/home'; +import LessonDetail from '@/views/lesson/details'; import ScriptmanageHome from '@/views/scriptManage/home'; import ScriptDisplay from '@/views/scriptManage/display/index'; @@ -357,11 +358,11 @@ export const asyncRouter = [ component: Mapedit, hidden: true }, - { - path: 'lesson/edit/:type', - component: LessonEdit, - hidden: true - }, + // { + // path: 'lesson/edit/:type', + // component: LessonEdit, + // hidden: true + // }, { path: 'runPlan/detail/:mapId', component: PlanMonitorDetail, @@ -380,6 +381,18 @@ export const asyncRouter = [ component: LessonHome, hidden: true }, + { + path: 'lesson/details', + component: LessonDetail, + hidden: true, + children: [ + { + path: 'edit/:type', + component: LessonEdit, + hidden: true + } + ] + }, { path: 'lesson/training/:trainingId/:trainingName', component: TrainingrecordManage, diff --git a/src/views/approval/lesson/detail.vue b/src/views/approval/lesson/detail.vue index 299666776..f17d8e1b8 100644 --- a/src/views/approval/lesson/detail.vue +++ b/src/views/approval/lesson/detail.vue @@ -1,100 +1,101 @@ diff --git a/src/views/lesson/details.vue b/src/views/lesson/details.vue index 7ab1ebdfe..60fc6aea4 100644 --- a/src/views/lesson/details.vue +++ b/src/views/lesson/details.vue @@ -1,31 +1,50 @@ + diff --git a/src/views/lesson/home.vue b/src/views/lesson/home.vue index 3b429005b..9a9e49b91 100644 --- a/src/views/lesson/home.vue +++ b/src/views/lesson/home.vue @@ -342,6 +342,7 @@ export default { }, goDetail(index, row) { // this.$refs.lessonDetail.show(row.id); + this.$router.push({path: `/design/lesson/details`, query: {lessonId: row.id, skinCode: this.$route.params.skinCode}}); } } }; diff --git a/src/views/lesson/lessoncategory/edit/lesson/index.vue b/src/views/lesson/lessoncategory/edit/lesson/index.vue index 1d50075fd..145c7fd30 100644 --- a/src/views/lesson/lessoncategory/edit/lesson/index.vue +++ b/src/views/lesson/lessoncategory/edit/lesson/index.vue @@ -44,12 +44,12 @@
@@ -178,7 +178,7 @@ export default { this.courseModel = { id: data.id, skinCode: this.$route.query.skinCode, - prdCode: data.prdCode, + prdCode: data.prdCode, name: data.name, remarks: data.remarks }; @@ -187,9 +187,9 @@ export default { }); } }, - back() { - this.$router.back(); - } + back() { + this.$router.back(); + } } }; diff --git a/src/views/lesson/lessoncategory/index.vue b/src/views/lesson/lessoncategory/index.vue index 505804f80..5c6a63fda 100644 --- a/src/views/lesson/lessoncategory/index.vue +++ b/src/views/lesson/lessoncategory/index.vue @@ -1,7 +1,7 @@ diff --git a/src/views/planMonitor/detail.vue b/src/views/planMonitor/detail.vue index ea5874fa4..3b148e9b8 100644 --- a/src/views/planMonitor/detail.vue +++ b/src/views/planMonitor/detail.vue @@ -1,6 +1,6 @@