diff --git a/package.json b/package.json
index 90a5181..3f7d59c 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,8 @@
"mockjs2": "1.0.8",
"moment": "^2.24.0",
"nprogress": "^0.2.0",
+ "pdfh5": "^1.4.2",
+ "pdfobject": "^2.2.7",
"qs": "^6.10.3",
"react-draft-wysiwyg": "^1.14.7",
"store": "^2.0.12",
@@ -41,6 +43,7 @@
"vue-cropper": "0.4.9",
"vue-echarts": "^6.0.2",
"vue-i18n": "^8.17.4",
+ "vue-pdf-app": "^2.1.0",
"vue-print-nb": "^1.7.5",
"vue-quill-editor": "^3.0.6",
"vue-router": "^3.1.2",
diff --git a/src/api/mycourse/index.js b/src/api/mycourse/index.js
index 0c37cf3..f0710c3 100644
--- a/src/api/mycourse/index.js
+++ b/src/api/mycourse/index.js
@@ -10,6 +10,7 @@ const mycourseApi = {
centerSign: 'project/terminalTrain/sign', // 集中培训签到
recommendList: 'sys/recommend/listPage', // 系统推荐课程列表
recommendDetail: 'sys/recommend/detail', // 系统课程推荐详情
+ trainPlanList: '/myCourse/getMyTrainPlanList', // 培训计划列表
getCourseDetail: 'myCourse/getCourseDetail', // 我的课程详情
getCourseCatalogue: 'myCourse/getCourseCatalogue', // 获取课程目录
reqCourseExam: 'testInClass/add', // 课中检测
@@ -18,7 +19,7 @@ const mycourseApi = {
operationList: 'classwork/list', // 作业列表
reqOperationDetail: 'classwork/get', // 作业详情
reqOperationSubmit: 'classwork/submit', // 作业提交
- getMyCourseList: 'studyStatistics/getMyCourseList' // 课程学习统计
+ getMyCourseList: 'studyStatistics/getMyTrainPlanList' // 课程学习统计
}
export function reqChangePassword (data) {
@@ -94,6 +95,14 @@ export function reqMyCourseList (params) {
})
}
+export function reqMyTrainPlanList (params) {
+ return request({
+ url: mycourseApi.trainPlanList,
+ method: 'get',
+ params: params
+ })
+}
+
export function reqAddMyCourse (params) {
return request({
url: mycourseApi.addMyCourse,
diff --git a/src/views/mycourse/courseLearn/PdfView.vue b/src/views/mycourse/courseLearn/PdfView.vue
new file mode 100644
index 0000000..c396a51
--- /dev/null
+++ b/src/views/mycourse/courseLearn/PdfView.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mycourse/courseLearn/index.vue b/src/views/mycourse/courseLearn/index.vue
index 67a6359..7700bb3 100644
--- a/src/views/mycourse/courseLearn/index.vue
+++ b/src/views/mycourse/courseLearn/index.vue
@@ -43,6 +43,8 @@
+
+
@@ -53,6 +55,7 @@ import { videoPlayer } from 'vue-video-player'
import CourseCatalogue from './CourseCatalogue.vue'
import SimulationTest from './SimulationTest.vue'
import ExamDialog from './ExamDialog.vue'
+import PdfView from './PdfView.vue'
import OperationModule from './OperationModule.vue'
import StatisticalLearning from './StatisticalLearning.vue'
import { reqCourseDetail, reqCourseCatalogue } from '@/api/mycourse/index'
@@ -64,6 +67,7 @@ export default {
SimulationTest,
ExamDialog,
StatisticalLearning,
+ PdfView,
videoPlayer
},
data () {
diff --git a/src/views/mycourse/mycourseList/TrainingPlan.vue b/src/views/mycourse/mycourseList/TrainingPlan.vue
index 6e4def1..f661e68 100644
--- a/src/views/mycourse/mycourseList/TrainingPlan.vue
+++ b/src/views/mycourse/mycourseList/TrainingPlan.vue
@@ -9,13 +9,13 @@
:data="loadDataYear"
:rowKey="record => record.id"
>
-
- 必修课
- 选修课
+
+ 进行中
+ 已过期
-
+
@@ -37,13 +37,13 @@
:data="loadDataUnit"
:rowKey="record => record.id"
>
-
- 必修课
- 选修课
+
+ 进行中
+ 已过期
-
+
@@ -61,7 +61,7 @@