From c635366a0b2d71824b1844f61d6837baae4425eb Mon Sep 17 00:00:00 2001
From: cgd <349008059@qq.com>
Date: Thu, 24 Mar 2022 17:28:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=200318=E5=8F=8D=E9=A6=88=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/mycourse/index.js | 11 ++++-
src/views/course/CoursewarePreview.vue | 2 +-
src/views/mycourse/courseLearn/index.vue | 4 +-
.../mycourseList/CourseListByPlanDialog.vue | 33 ++++++++++++++
.../mycourse/mycourseList/MyCourseList.vue | 22 ++++++++--
.../mycourse/mycourseList/TrainingPlan.vue | 43 ++++++-------------
src/views/myhome/index.vue | 32 +++++++-------
src/views/myreport/index.vue | 4 +-
8 files changed, 96 insertions(+), 55 deletions(-)
create mode 100644 src/views/mycourse/mycourseList/CourseListByPlanDialog.vue
diff --git a/src/api/mycourse/index.js b/src/api/mycourse/index.js
index 9ec09b4..5885257 100644
--- a/src/api/mycourse/index.js
+++ b/src/api/mycourse/index.js
@@ -11,6 +11,7 @@ const mycourseApi = {
recommendList: 'sys/recommend/listPage', // 系统推荐课程列表
recommendDetail: 'sys/recommend/detail', // 系统课程推荐详情
trainPlanList: '/myCourse/getMyTrainPlanList', // 培训计划列表
+ getMyTrainPlanCourse: '/myCourse/getMyTrainPlanCourse', // 获取培训计划中的课程列表
getCourseDetail: 'myCourse/getCourseDetail', // 我的课程详情
getCourseCatalogue: 'myCourse/getCourseCatalogue', // 获取课程目录
reqCourseExam: 'testInClass/add', // 课中检测
@@ -19,10 +20,18 @@ const mycourseApi = {
operationList: 'classwork/list', // 作业列表
reqOperationDetail: 'classwork/get', // 作业详情
reqOperationSubmit: 'classwork/submit', // 作业提交
- getMyCourseList: 'studyStatistics/getMyTrainPlanList', // 课程学习统计
+ getMyCourseList: 'studyStatistics/getMyCourseList', // 课程学习统计
addRecord: '/testInClass/addRecord' // pdf学习完成
}
+export function reqMyTrainPlanCourse (data) {
+ return request({
+ url: mycourseApi.getMyTrainPlanCourse,
+ method: 'get',
+ params: data
+ })
+}
+
export function reqAddRecord (data) {
return request({
url: mycourseApi.addRecord,
diff --git a/src/views/course/CoursewarePreview.vue b/src/views/course/CoursewarePreview.vue
index d088457..bbd186a 100644
--- a/src/views/course/CoursewarePreview.vue
+++ b/src/views/course/CoursewarePreview.vue
@@ -165,7 +165,7 @@ export default {
if (this.courseware.videoList.length > 0) {
// 视频截取的封面图
if (this.courseware.image != '' || this.courseware.image) {
- this.images = this.courseware.image.split(',')
+ this.images = this.courseware.image && this.courseware.image.split(',') || []
this.playerOptions.poster = this.images[0]
}
// 课件视频展现
diff --git a/src/views/mycourse/courseLearn/index.vue b/src/views/mycourse/courseLearn/index.vue
index 64c240e..03e1d33 100644
--- a/src/views/mycourse/courseLearn/index.vue
+++ b/src/views/mycourse/courseLearn/index.vue
@@ -184,7 +184,6 @@ export default {
},
// pdf到达底部了
reachBottom: _.debounce(function () {
- console.log('>>>>>>>>>>>>>>>>>>>onPlayerEnded')
console.log('到达了底部')
if (!this.readComplete && this.curVideo.status === 0) {
this.readComplete = true
@@ -243,10 +242,11 @@ export default {
},
// 当视频播放完毕的回调处理
onPlayerEnded () {
+ console.log('>>>>>>>>>>>播放完了')
const { curVideo, courseInfo } = this
// 课件状态必须为未学状态
// 只有必修课切是视频文件才弹出课中检测
- if (curVideo.status === 0 && courseInfo.trainType === 2 && curVideo.courseWay === 1) {
+ if (curVideo.status === 0 && courseInfo.trainType === 1 && curVideo.courseWay === 1) {
this.openCourseExam()
}
},
diff --git a/src/views/mycourse/mycourseList/CourseListByPlanDialog.vue b/src/views/mycourse/mycourseList/CourseListByPlanDialog.vue
new file mode 100644
index 0000000..7dab984
--- /dev/null
+++ b/src/views/mycourse/mycourseList/CourseListByPlanDialog.vue
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mycourse/mycourseList/MyCourseList.vue b/src/views/mycourse/mycourseList/MyCourseList.vue
index f2a0276..21e9eb2 100644
--- a/src/views/mycourse/mycourseList/MyCourseList.vue
+++ b/src/views/mycourse/mycourseList/MyCourseList.vue
@@ -60,13 +60,22 @@