diff --git a/src/router/index.js b/src/router/index.js index fbdf03a01..b7472ea20 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -312,22 +312,12 @@ export const asyncRouter = [ meta: { } }, - { - path: 'map/draw/:mapId/:view', - component: Mapedit, - hidden: true - }, - { - path: 'lesson/edit/:type', - component: LessonEdit, - hidden: true - }, - { + { // 运行图设计 path: 'runPlan/detail/:mapId', component: PlanMonitorDetail, hidden: true }, - { + { // 剧本 path: 'script/home/:mapId', component: ScriptmanageHome, meta: { @@ -335,13 +325,37 @@ export const asyncRouter = [ }, hidden: true }, - { + { // 课程列表 path: 'lesson/home/:mapId', - // /:skinCode component: LessonHome, hidden: true }, - { + { // 操作定义 + path: 'lesson/trainingRule', + component: TrainingRuleList, + hidden: true + }, + { // 操作定义步骤 + path: 'lesson/trainingRule/detail', + hidden: true, + component: TrainingRuleEdit + }, + { // 任务管理 + path: 'lesson/taskManage', + component: Taskmanage, + hidden: true + }, + { // 实训管理 + path: 'lesson/trainingManage/:skinCode', + component: Trainingmanage, + hidden: true + }, + { // 创建课程 + path: 'lesson/edit/:type', + component: LessonEdit, + hidden: true + }, + { // 课程详情 path: 'lesson/details', component: LessonDetail, hidden: true, @@ -358,32 +372,7 @@ export const asyncRouter = [ component: TrainingrecordManage, hidden: true }, - { - path: 'lesson/taskManage', - component: Taskmanage, - hidden: true - }, - { - path: 'lesson/trainingRule', - component: TrainingRuleList, - hidden: true - }, - { - path: 'lesson/trainingRule/detail', - hidden: true, - component: TrainingRuleEdit - }, - { - path: 'lesson/trainingManage/:skinCode', - component: Trainingmanage, - hidden: true - }, - { - path: 'lesson/training/:trainingId/:trainingName', - component: TrainingrecordManage, - hidden: true - }, - { + { // 地图预览 path: 'mapPreview/:mapId', component: MapPreview, hidden: true @@ -416,38 +405,15 @@ export const asyncRouter = [ meta: { } }, - { + { // 地图绘制 path: 'map/draw/:mapId/:view', component: Mapedit, hidden: true }, - { - path: 'lesson/edit/:type', - component: LessonEdit, - hidden: true - }, - { + { // 运行图设计 path: 'runPlan/detail/:mapId', component: PlanMonitorDetail, hidden: true - }, - { - path: 'script/home/:mapId', - component: ScriptmanageHome, - meta: { - i18n: 'router.scriptManage' - }, - hidden: true - }, - { - path: 'lesson/home/:mapId', - component: LessonHome, - hidden: true - }, - { - path: 'lesson/training/:trainingId/:trainingName', - component: TrainingrecordManage, - hidden: true } ] } @@ -507,17 +473,17 @@ export const asyncRouter = [ meta: { }, children: [ - { + { // 仿真详情 path: 'detail/:subSystem', component: DemonstrationDetail, hidden: true }, - { + { // 教学系统 课程列表 path: 'teachHome/:subSystem', component: TeachHome, hidden: true }, - { + { // 课程详情 path: 'teach/:subSystem', component: TeachDetail, hidden: true diff --git a/src/views/lesson/lessoncategory/edit/lesson/index.vue b/src/views/lesson/lessoncategory/edit/lesson/index.vue index e233494a9..8dedf6835 100644 --- a/src/views/lesson/lessoncategory/edit/lesson/index.vue +++ b/src/views/lesson/lessoncategory/edit/lesson/index.vue @@ -60,7 +60,7 @@ import { createLesson, updateLesson, getLessonDetail } from '@/api/jmap/lessondraft'; import { getCommodityMapProduct } from '@/api/management/mapprd'; import { getSkinCodeList } from '@/api/management/mapskin'; -import { UrlConfig } from '@/router/index'; +// import { UrlConfig } from '@/router/index'; export default { name: 'CourseEdit', @@ -187,7 +187,8 @@ export default { } }, back() { - this.$router.push({ path: `${UrlConfig.design.lessonHome}/${this.$route.query.mapId}/${this.$route.query.skinCode}`, query: {cityCode: this.$route.query.cityCode} }); + // this.$router.push({ path: `${UrlConfig.design.lessonHome}/${this.$route.query.mapId}/${this.$route.query.skinCode}`, query: {cityCode: this.$route.query.cityCode} }); + this.$router.go(-1); } } }; diff --git a/src/views/lesson/lessoncategory/index.vue b/src/views/lesson/lessoncategory/index.vue index f359727bc..826a8628e 100644 --- a/src/views/lesson/lessoncategory/index.vue +++ b/src/views/lesson/lessoncategory/index.vue @@ -145,7 +145,7 @@ export default { .box{ height: 100%; display: -webkit-box; - width: 100%; + width: 100%; } }