diff --git a/src/api/system/organiza.js b/src/api/system/organiza.js index 67bf0541..0934f54d 100644 --- a/src/api/system/organiza.js +++ b/src/api/system/organiza.js @@ -21,8 +21,14 @@ const treeList = function (query) { const listByParent = function (parentId) { return ajax.get('/xboe/org/list-by-parent?parentId='+parentId); } -export default { - treeList, - listByParent + +const getSimple = function (id) { + return ajax.get('/xboe/org/simple?id='+id); +} + +export default { + treeList, + listByParent, + getSimple } diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue index 7afa9996..ec8cfea2 100644 --- a/src/views/study/coursenew.vue +++ b/src/views/study/coursenew.vue @@ -336,7 +336,7 @@ }, computed: { ...mapGetters(['userInfo']), - catalogTree() { + catalogTree(){ let treeList = []; this.completed = []; let $this = this; @@ -379,7 +379,7 @@ } }) }, - onPlayVideo(time) { + onPlayVideo(time){ this.playerBoxShow = false; this.notePlay = null; setTimeout(() => { @@ -1171,7 +1171,7 @@ margin: 20px 80px; .course-playbox { background-color: #fff; - min-height: 745px; + min-height: 545px; display: flex; justify-content: space-between; .course-player{ //内容播放区域 @@ -1254,21 +1254,21 @@ } - .course-info-row{ - padding: 10px 0; - font-size: 18px; - color: #343434; - img{ - width:18px - } - .course-info-text{ + .course-info-row{ + padding: 10px 0; + font-size: 18px; + color: #343434; + img{ + width:18px + } + .course-info-text{ margin: 10px 0; font-size: 14px; text-indent: 2em; color: #666666; word-break: break-all; - } - } + } + } //右侧老师部分头部及标题 .cteacher-top { background-color: #fff; @@ -1292,6 +1292,7 @@ padding: 36px; } +//以下是未整理的样式,上面的整理之后的样式 .coures-note { min-height: 500px; padding-left: 17px; @@ -1306,36 +1307,6 @@ .note-info {} } - .coures-tearch { - margin-top: 24px; - margin-left: 20px; - } - - - .mltit { - - // width: 70%; - // width: ; - word-break: break-all; - // line-height: 25px; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 1; - } - - .catalog-text { - width: 70%; - overflow: hidden; - word-break: break-all; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 1; - height: 40px; - } - .player-box { position: absolute; // top: 62px; @@ -1363,36 +1334,35 @@ } } - .score { - display: flex; - justify-content: center; - align-items: center; - - .el-rate { - display: inline-block; - } - - .score-text { - font-size: 28px; - color: #ffb30f; - font-family: 'Arial'; - margin-left: 23px; - // font-weight: 600; - } - - // margin-bottom: 19px; - .score-no { - color: #ffb30f; - padding: 5px 0; - background: #efefef; - border-radius: 20px; - width: 65px; - font-size: 12px; - font-weight: 600; - text-align: center; - } + .score-text { + font-size: 28px; + color: #ffb30f; + font-family: 'Arial'; + margin-left: 23px; + // font-weight: 600; } + // .score { + // display: flex; + // justify-content: center; + // align-items: center; + + // .el-rate { + // display: inline-block; + // } + // // margin-bottom: 19px; + // .score-no { + // color: #ffb30f; + // padding: 5px 0; + // background: #efefef; + // border-radius: 20px; + // width: 65px; + // font-size: 12px; + // font-weight: 600; + // text-align: center; + // } + // } + .portal-content-title { font-weight: 600; padding: 10px;