diff --git a/src/api/index.js b/src/api/index.js index fa374ea..4096ae7 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -520,6 +520,8 @@ export default { curriculumList: `nakadai/nakadai/curriculum/curriculumList`, createCurriculum: `nakadai/nakadai/curriculum/createCurriculum`, modifyCourse: `nakadai/nakadai/curriculum/modifyCourse`, + schoolCourseProject: `nakadai/nakadai/curriculum/schoolCourseProject`, + // schoolCourseProject: `nakadai/nakadai/curriculum/schoolCourseProject`, // 教师评语 addComment: `evaluation/cevaluation/comment/addComment`, diff --git a/src/assets/img/drag.svg b/src/assets/img/drag.svg new file mode 100644 index 0000000..3fba973 --- /dev/null +++ b/src/assets/img/drag.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/pages/lesson/content/index.vue b/src/pages/lesson/content/index.vue index 9c18a0d..8fcfd73 100644 --- a/src/pages/lesson/content/index.vue +++ b/src/pages/lesson/content/index.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue index 4d341cb..87cb5e7 100644 --- a/src/pages/station/preview/index.vue +++ b/src/pages/station/preview/index.vue @@ -50,7 +50,7 @@
-
+
续费 进入理论 进入实训 @@ -449,11 +449,11 @@ export default { const { query } = this.$route this.fromAdmin ? this.$router.back() : - this.$router.push(`/station?keyword=${query.keyword || ''}&active=${query.active || 0}`) + this.mallId ? this.$router.push(`/station?keyword=${query.keyword || ''}&active=${query.active || 0}`) : this.$router.back() }, init () { - this.insertScript(); - this.getData(); + this.insertScript() + this.getData() this.addRecord() }, async getData () { @@ -476,15 +476,16 @@ export default { await this.$post(`${this.api.recordRecentUsage}?mallId=${this.mallId}`) }, // 查询是否过期 - getStatus () { - this.$get(this.api.whetherToRenewTheFee, { - mallId: this.mallId - }).then(({ isRenew }) => { + async getStatus () { + if (this.mallId) { + const { isRenew } = await this.$get(this.api.whetherToRenewTheFee, { + mallId: this.mallId + }) // 1正常显示资源,0显示续费,-1试用 this.overdue = isRenew - this.getChapter() this.getProgress() - }).catch(res => { }) + } + this.getChapter() }, // 获取章节小节 async getChapter () { @@ -823,15 +824,17 @@ export default { }, // 查询项目 queryProject () { - this.$get(this.api.getProjectBySystemId, { - systemId: this.systemIds, - cId: this.courseId, // 课程id - mallId: this.mallId, - permissions: 0 // 0: 练习,1: 考核 - }).then(res => { - this.projects = res.projects // 实训项目 - this.papers = res.exercisePaperList // 理论试卷 - }).catch(res => { }) + if (this.mallId) { + this.$get(this.api.getProjectBySystemId, { + systemId: this.systemIds, + cId: this.courseId, // 课程id + mallId: this.mallId, + permissions: 0 // 0: 练习,1: 考核 + }).then(res => { + this.projects = res.projects // 实训项目 + this.papers = res.exercisePaperList // 理论试卷 + }).catch(res => { }) + } }, // 进入实验 entryProject (projectId = '', paperId = '') { @@ -1073,7 +1076,7 @@ $height: 700px; } &:hover { - background-color: #ac89fd; + background-color: $main-color; } &.active {