diff --git a/src/api/designPlatform.js b/src/api/designPlatform.js index 5aa8a2e89..ac86826f4 100644 --- a/src/api/designPlatform.js +++ b/src/api/designPlatform.js @@ -82,13 +82,13 @@ export function rejectedLessonRelease(data, id) { }); } -// /** 普通用户申请课程发布和撤销申请 */ -// export function releaseOrCancel(id, status) { -// return request({ -// url: `/api/review/lesson/releaseOrCancel/${id}/${status}`, -// method: 'get' -// }); -// } +/** 普通用户申请课程发布和撤销申请 */ +export function releaseOrCancel(id, status) { + return request({ + url: `/api/review/lesson/releaseOrCancel/${id}/${status}`, + method: 'get' + }); +} /** 管理员获取需审核的剧本列表 ok */ export function reviewScriptList(params) { diff --git a/src/api/jmap/lesson.js b/src/api/jmap/lesson.js index fbb3187b4..dcb7a1f23 100644 --- a/src/api/jmap/lesson.js +++ b/src/api/jmap/lesson.js @@ -8,11 +8,10 @@ export function getPublishLessonList() { }); } /** 获取发布列表树*/ -export function getPublishLessonTree(params) { +export function getPublishLessonTree(id) { return request({ - url: '/api/lesson/tree', - method: 'get', - params: params || {} + url: `/api/lesson/${id}/tree`, + method: 'get' }); } diff --git a/src/api/jmap/lessondraft.js b/src/api/jmap/lessondraft.js index e78d816f8..23b7c3322 100644 --- a/src/api/jmap/lessondraft.js +++ b/src/api/jmap/lessondraft.js @@ -102,3 +102,11 @@ export function getLessonNameByMapIdAndLessonId(model) { method: 'get' }); } + +export function getLessonDrftList(params) { + return request({ + url: `/api/lessonDraft`, + method: 'get', + params: params + }); +} diff --git a/src/api/management/exam.js b/src/api/management/exam.js index 93f5a801b..b22839e9d 100644 --- a/src/api/management/exam.js +++ b/src/api/management/exam.js @@ -1,14 +1,5 @@ import request from '@/utils/request'; -/** 获取考试列表树*/ -export function getCourseLessonTree(params) { - return request({ - url: '/api/exam/tree', - method: 'get', - params: params - }); -} - /** 创建对应课程考题 */ export function setCourseList(data) { return request({ diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue index c0e6daf79..74dcf9d36 100644 --- a/src/components/QueryListPage/QueryListPage.vue +++ b/src/components/QueryListPage/QueryListPage.vue @@ -454,9 +454,9 @@ export default { return this.choose; }, refresh(flag) { - if (flag){ - this.commitQuery(); - } + if (flag) { + this.commitQuery(); + } this.queryList.data = [...this.queryList.data]; } } diff --git a/src/router/index.js b/src/router/index.js index 2ed0c7c3b..ca84942a3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -43,8 +43,10 @@ import ScriptDisplay from '@/views/scriptManage/display/index'; import TeachDetail from '@/views/teach/detail/index'; import TeachPractical from '@/views/teach/practical/index'; +import TeachHome from '@/views/teach/index'; import Pay from '@/views/components/pay/index'; import ExamDetail from '@/views/exam/detail/examDetail'; +import ExamHome from '@/views/exam/index'; import ExamCourseDetail from '@/views/exam/detail/courseDetail'; import ExamResult from '@/views/exam/result'; @@ -251,7 +253,9 @@ export const UrlConfig = { trainingPlatformHome: '/trainingPlatform/home', prodDetail: '/trainingPlatform/detail', teachDetail: '/trainingPlatform/teach', + teachHome: '/trainingPlatform/teachHome', examDetail: '/trainingPlatform/exam', + examHome: '/trainingPlatform/examHome', examRuleManage: '/trainingPlatform/examRule/manage', examRuleDraft: '/trainingPlatform/examRule/Draft', course: '/trainingPlatform/course', @@ -610,11 +614,21 @@ export const asyncRouter = [ component: DemonstrationDetail, hidden: true }, + { + path: 'teachHome/:subSystem', + component: TeachHome, + hidden: true + }, { path: 'teach/:subSystem', component: TeachDetail, hidden: true }, + { + path: 'examHome/:subSystem', + component: ExamHome, + hidden: true + }, { path: 'exam/:examId', component: ExamDetail, diff --git a/src/views/components/pay/index.vue b/src/views/components/pay/index.vue index e17f98540..0bb13d619 100644 --- a/src/views/components/pay/index.vue +++ b/src/views/components/pay/index.vue @@ -127,7 +127,7 @@ export default { this.active = 0; const type = this.$route.query.permissionType; if (type === PermissionType.LESSON) { - this.$router.replace({ path: `${UrlConfig.trainingPlatform.teachDetail}/${this.$route.query.subSystem}`}); + this.$router.replace({ path: `${UrlConfig.trainingPlatform.teachDetail}/${this.$route.query.subSystem}`, query: {lessonId: this.$route.query.lessonId, mapId: this.$route.query.mapId, prdCode: this.$route.query.prdCode}}); } else if (type === PermissionType.EXAM) { this.$router.replace({ path: `${UrlConfig.trainingPlatform.course}/${this.$route.query.subSystem}`}); } else if (type === PermissionType.SCREEN) { diff --git a/src/views/exam/detail/courseDetail.vue b/src/views/exam/detail/courseDetail.vue index f9dfee80e..25f97886a 100644 --- a/src/views/exam/detail/courseDetail.vue +++ b/src/views/exam/detail/courseDetail.vue @@ -21,10 +21,10 @@ @node-expand="nodeExpand" @node-collapse="nodeCollapse" > - - + + -  {{ node.label }} +  {{ node.label }} @@ -51,12 +51,11 @@ diff --git a/src/views/lesson/details.vue b/src/views/lesson/details.vue new file mode 100644 index 000000000..7a0302e3f --- /dev/null +++ b/src/views/lesson/details.vue @@ -0,0 +1,21 @@ + + + diff --git a/src/views/lesson/home.vue b/src/views/lesson/home.vue index 31949755e..3b429005b 100644 --- a/src/views/lesson/home.vue +++ b/src/views/lesson/home.vue @@ -10,85 +10,86 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -98,11 +99,13 @@ diff --git a/src/views/lesson/trainingrecord/category/operateMenu.vue b/src/views/lesson/trainingrecord/category/operateMenu.vue index 89e74c6dd..ec39297d1 100644 --- a/src/views/lesson/trainingrecord/category/operateMenu.vue +++ b/src/views/lesson/trainingrecord/category/operateMenu.vue @@ -1,7 +1,7 @@ @@ -9,13 +9,13 @@ import { DeviceMenu } from '@/scripts/ConstDic'; import { launchFullscreen } from '@/utils/screen'; import PopMenu from '@/components/PopMenu'; -// import TrainingDraft from '../../draft'; +import TrainingDraft from './draft'; export default { name: 'TrainingOperateMenu', components: { PopMenu, - // TrainingDraft + TrainingDraft }, props: { point: { @@ -54,10 +54,10 @@ export default { node: function (val, old) { if (val && val.data) { switch (val.data.type) { - case 'trainingType': + case 'TrainingType': this.menu = this.menuCreate; break; - case 'training': + case 'Training': this.menu = this.menuEdit; break; } @@ -84,6 +84,7 @@ export default { doShow(point) { this.closeEvent(); if (this.$refs && this.$refs.popMenu) { + console.log('22222222333') this.$refs.popMenu.resetShowPosition(point); } this.menuShow = true; diff --git a/src/views/lesson/trainingrecord/category/tree.vue b/src/views/lesson/trainingrecord/category/tree.vue index 0c315da5f..f7b5a2a83 100644 --- a/src/views/lesson/trainingrecord/category/tree.vue +++ b/src/views/lesson/trainingrecord/category/tree.vue @@ -91,6 +91,7 @@ export default { } }, showContextMenu(e, obj, node, vueElem) { + if (obj && obj.type === 'TrainingType' || obj.type === 'Training') { e.preventDefault(); this.point = { diff --git a/src/views/publish/examRule/draft/examFrom.vue b/src/views/publish/examRule/draft/examFrom.vue index f5b0b4429..a885fa57b 100644 --- a/src/views/publish/examRule/draft/examFrom.vue +++ b/src/views/publish/examRule/draft/examFrom.vue @@ -22,7 +22,7 @@ style="float: left; width: calc(100% - 80px);" :disabled="isEdit" /> -  {{$t('publish.durationMinutes')}} +  {{ $t('publish.durationMinutes') }} @@ -59,8 +59,8 @@ - {{$t('publish.trialNo')}} - {{$t('publish.trialYes')}} + {{ $t('publish.trialNo') }} + {{ $t('publish.trialYes') }} @@ -76,7 +76,7 @@ diff --git a/src/views/teach/detail/index.vue b/src/views/teach/detail/index.vue index baad8434a..ce02073d3 100644 --- a/src/views/teach/detail/index.vue +++ b/src/views/teach/detail/index.vue @@ -4,11 +4,6 @@ {{ $t('teach.courseName') }}: {{ courseModel.name }}
-

{{ $t('teach.courseDescription') }}: - - {{ courseModel.remarks }} - -

@@ -22,18 +17,15 @@ highlight-current :default-expanded-keys="expandList" :span="22" + @node-click="clickEvent" @node-expand="nodeExpand" @node-collapse="nodeCollapse" > - -  {{ node.label }} -  {{ node.label }} - - 开始实训 - 购买 - + + +  {{ node.label }} +  {{ node.label }} -
@@ -56,11 +48,13 @@ diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue index 2e6be1f80..a78102c3f 100644 --- a/src/views/trainingPlatform/demonList.vue +++ b/src/views/trainingPlatform/demonList.vue @@ -117,11 +117,13 @@ export default { switch (resp.data.type) { case 'Exam': this.setLocalRoute(`${UrlConfig.trainingPlatform.course}/${obj.id}`); - this.$router.push({ path: `${UrlConfig.trainingPlatform.course}/${obj.id}`}); + // this.$router.push({ path: `${UrlConfig.trainingPlatform.course}/${obj.id}`}); + this.$router.push({ path: `${UrlConfig.trainingPlatform.examHome}/${obj.id}`}); break; case 'Lesson': this.setLocalRoute(`${UrlConfig.trainingPlatform.teachDetail}/${obj.id}`); - this.$router.push({ path: `${UrlConfig.trainingPlatform.teachDetail}/${obj.id}`}); + // this.$router.push({ path: `${UrlConfig.trainingPlatform.teachDetail}/${obj.id}`}); + this.$router.push({ path: `${UrlConfig.trainingPlatform.teachHome}/${obj.id}`}); break; case 'Simulation': this.setLocalRoute(`${UrlConfig.trainingPlatform.prodDetail}/${obj.id}?mapId=${this.mapId}`); diff --git a/src/views/trainingPlatform/index.vue b/src/views/trainingPlatform/index.vue index ef3cc883f..a141eb171 100644 --- a/src/views/trainingPlatform/index.vue +++ b/src/views/trainingPlatform/index.vue @@ -1,72 +1,72 @@