diff --git a/src/api/modules/coursePortal.js b/src/api/modules/coursePortal.js index 16fcdb60..2fe2d9bf 100644 --- a/src/api/modules/coursePortal.js +++ b/src/api/modules/coursePortal.js @@ -55,19 +55,19 @@ const detail = function(id,preview) { const ranking = function(data) { return ajax.post('/xboe/m/course/portal/ranking',data); } -/* -评分榜 +/* +评分榜 @param num 要几条传几条 不传默认五条 */ const scorelist=function(num){ return ajax.get(`/xboe/m/course/portal/score-list?num=${num}`); -} +} /** * 按课程IDs获取教师 - * @param {课程IDs} ids - * @returns + * @param {课程IDs} ids + * @returns */ const getTeacherByCourseIDs = function(ids){ return ajax.postJson('/xboe/m/course/portal/query-teacher', ids); @@ -81,6 +81,14 @@ const studyCounts=function(num){ const courseSearch=function(query){ return ajax.post('/xboe/m/course/fulltext/search',query); } + +/** + * 课程学习进度的详细信息 + * @param {String} id + */ +const detailStudy = function(courseId,aid) { + return ajax.get(`/xboe/m/course/portal/detail-study?courseId=${courseId}&aid=${aid}`); +} export default { list, pageList, @@ -89,5 +97,6 @@ export default { scorelist, getTeacherByCourseIDs, studyCounts, - courseSearch + courseSearch, + detailStudy } diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss index 2456b741..820b4522 100644 --- a/src/assets/styles/portal-index.scss +++ b/src/assets/styles/portal-index.scss @@ -685,7 +685,7 @@ height: 370px; padding: 30px 45px; .personal-box{ - margin-left: 16px; + // margin-left: 16px; margin-top: 20px; margin-bottom: 28px; } diff --git a/src/components/Study/manager.vue b/src/components/Study/manager.vue index 06b4ba37..3c3adf88 100644 --- a/src/components/Study/manager.vue +++ b/src/components/Study/manager.vue @@ -153,7 +153,7 @@
- 课程目录: + 课程目录:
@@ -251,10 +251,11 @@
- + @@ -262,9 +263,10 @@ {{scope.row.status == 9? '已完成':'未开始'}} - + @@ -349,6 +351,7 @@ export default { resOwnerListMap:[], sysTypeListMap:[], catalogList: [], + courseStudyList: [], sysType: "", // sysTypeList: sysTypeList, treeList: [], @@ -468,7 +471,7 @@ export default { } this.catalogTree = treeList; this.catalogList = treeList; - + } else { this.$message.error(rs.message); } @@ -553,6 +556,15 @@ export default { this.$message.error(rs.message); } }); + }, + getStudyDetail(courseId,aid){ + apiCoursePortal.detailStudy(courseId,aid).then(res =>{ + if (res.status == 200) { + this.courseStudyList=res.result; + }else { + this.courseStudyList=[]; + } + }); }, loadStudyData(courseId) { let $this=this; @@ -636,9 +648,10 @@ export default { status: this.signup.status, //状态 name: this.signup.name, //姓名 pageIndex: this.study.pageIndex, - pageSize: this.study.pageSize + pageSize: this.study.pageSize, + aid:this.study.aid }; - + apicourseStudy.findSignup(params).then(res => { if (res.status === 200) { let ids = []; @@ -703,7 +716,8 @@ export default { // this.study.detailType = row.courseType; // this.study.examineId = row.courseId; this.study.detailShow = true; - this.getRecordDetail(row.courseId); + this.getStudyDetail(row.courseId,row.aid); + } } }; diff --git a/src/views/Index.vue b/src/views/Index.vue index 5056895e..d365bbdc 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -935,7 +935,8 @@ position: absolute; right: 8%; top: 105px; - background: url('/images/homeWu/personal-bgimg.png'); + // background: url('/images/homeWu/personal-bgimg.png'); + background: rgba($color: #fff, $alpha: 0.2); border-radius: 8px; z-index: 999; backdrop-filter: blur(10px); @@ -946,7 +947,6 @@ width: 68px; height: 68px; margin: 0 auto; - ::v-deep .el-avatar { width: 68px; height: 68px; diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index 2142483b..dfee3d44 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -391,11 +391,13 @@ export default { } }, handleScroll() { + let innerw = document.querySelector("#fixd-box"); let innerHeight = document.querySelector('#case-list-content').clientHeight let pdfTopBox = document.querySelector('#comments-box') let pdfPreview = document.querySelector('#pdfPreview') //pdf盒子距离顶部的高度 let contentDiv = document.querySelector('#content-div').clientWidth; - let outerHeight = document.documentElement.clientHeight + let outerHeight = document.documentElement.clientHeight; + let outerWidth = innerw.clientWidth; let scrollTop = document.documentElement.scrollTop if ((outerHeight + scrollTop + 350) >= innerHeight) { if(this.moreState == 1 && this.course.pageIndex < 4) { @@ -412,7 +414,7 @@ export default { } if(scrollTop > 630) { this.isTopBoxShow = true; - document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -4420px;width:245.5px"; + document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -442px;width:"+outerWidth+"px"; } else { document.querySelector('#fixd-box').style.cssText = "position: static"; } diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue index dd29c6d0..105546f4 100644 --- a/src/views/portal/case/Index.vue +++ b/src/views/portal/case/Index.vue @@ -1,6 +1,6 @@