diff --git a/src/assets/images/hotforum/01.png b/src/assets/images/hotforum/01.png new file mode 100644 index 00000000..45aa003d Binary files /dev/null and b/src/assets/images/hotforum/01.png differ diff --git a/src/assets/images/hotforum/02.png b/src/assets/images/hotforum/02.png new file mode 100644 index 00000000..59da39f8 Binary files /dev/null and b/src/assets/images/hotforum/02.png differ diff --git a/src/assets/images/hotforum/03.png b/src/assets/images/hotforum/03.png new file mode 100644 index 00000000..fee257f1 Binary files /dev/null and b/src/assets/images/hotforum/03.png differ diff --git a/src/assets/images/hotforum/1.png b/src/assets/images/hotforum/1.png new file mode 100644 index 00000000..cb3d4322 Binary files /dev/null and b/src/assets/images/hotforum/1.png differ diff --git a/src/assets/images/hotforum/2.png b/src/assets/images/hotforum/2.png new file mode 100644 index 00000000..ef90d91a Binary files /dev/null and b/src/assets/images/hotforum/2.png differ diff --git a/src/assets/images/hotforum/3.png b/src/assets/images/hotforum/3.png new file mode 100644 index 00000000..43a903fe Binary files /dev/null and b/src/assets/images/hotforum/3.png differ diff --git a/src/assets/images/hotforum/4.png b/src/assets/images/hotforum/4.png new file mode 100644 index 00000000..c7451d22 Binary files /dev/null and b/src/assets/images/hotforum/4.png differ diff --git a/src/assets/images/hotforum/back.jpg b/src/assets/images/hotforum/back.jpg new file mode 100644 index 00000000..ea96dfc8 Binary files /dev/null and b/src/assets/images/hotforum/back.jpg differ diff --git a/src/assets/images/hotforum/background.jpg b/src/assets/images/hotforum/background.jpg new file mode 100644 index 00000000..cfc730b2 Binary files /dev/null and b/src/assets/images/hotforum/background.jpg differ diff --git a/src/assets/images/hotforum/border.png b/src/assets/images/hotforum/border.png new file mode 100644 index 00000000..705e9a1e Binary files /dev/null and b/src/assets/images/hotforum/border.png differ diff --git a/src/assets/images/hotforum/foot.png b/src/assets/images/hotforum/foot.png new file mode 100644 index 00000000..7257b806 Binary files /dev/null and b/src/assets/images/hotforum/foot.png differ diff --git a/src/assets/images/hotforum/one.png b/src/assets/images/hotforum/one.png new file mode 100644 index 00000000..a2e9c87f Binary files /dev/null and b/src/assets/images/hotforum/one.png differ diff --git a/src/assets/images/hotforum/two.png b/src/assets/images/hotforum/two.png new file mode 100644 index 00000000..941d2e02 Binary files /dev/null and b/src/assets/images/hotforum/two.png differ diff --git a/src/components/Course/homework.vue b/src/components/Course/homework.vue index 978d45b0..856a04fb 100644 --- a/src/components/Course/homework.vue +++ b/src/components/Course/homework.vue @@ -1,61 +1,61 @@ diff --git a/src/components/Course/weikeContent.vue b/src/components/Course/weikeContent.vue index f7177860..f8310736 100644 --- a/src/components/Course/weikeContent.vue +++ b/src/components/Course/weikeContent.vue @@ -1049,6 +1049,7 @@ this.cwareChange.curriculumData = deepClone(this.cware.curriculumData) } }else if(index==2){ + this.homework.content.contentName = this.homework.info.name || '作业' postData.content=this.homework.content; postData.homework=this.homework.info; this.homeworkChange = deepClone(this.homework) @@ -1087,9 +1088,11 @@ this.exam.info.paperContent=JSON.stringify(this.exam.paperJson); } postData.exam=this.exam.info; + postData.content.contentName='考试'; this.examChange = deepClone(this.exam); }else if(index==4){ this.assess.content.content=JSON.stringify(this.assess.json); + this.assess.content.contentName='评估'; postData.content=this.assess.content; } diff --git a/src/components/PdfPreview/index.vue b/src/components/PdfPreview/index.vue index 7983b939..6df44bee 100644 --- a/src/components/PdfPreview/index.vue +++ b/src/components/PdfPreview/index.vue @@ -6,7 +6,7 @@ {{ currentPage }} / {{ pageCount }} -
+
diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index d46a653f..b897e63d 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -36,7 +36,8 @@ 专区 - BOE系列公开课 + 热点论坛 + BOE系列公开课 Grow180 管理者进阶 U选小课堂 @@ -256,6 +257,7 @@ export default { let urlPre = window.location.protocol + "//" + window.location.host; // process.env.VUE_APP_BOE_WEB_URL let obj = { + zero: urlPre + "/pc/hotforum", one: urlPre + "/web/teacherLesson", two: urlPre + "/grow180/login", three: this.webBaseUrl + "/study/index?study=1", diff --git a/src/components/Study/manager.vue b/src/components/Study/manager.vue index 8b133fd9..e68859b9 100644 --- a/src/components/Study/manager.vue +++ b/src/components/Study/manager.vue @@ -95,9 +95,9 @@
- - + +
@@ -285,12 +285,12 @@ - + - 搜索 + 搜索 @@ -344,6 +344,10 @@ export default { manageStudyData: { type: Object, default: () => ({}) + }, + isShowDialog:{ + type: Boolean, + default: false } }, data() { @@ -372,7 +376,9 @@ export default { pageSize: 10, // 每页多少条 count: 0, type: "", - list: [] + list: [], + name: '', + status: '', }, learningRecords: { pageIndex: 1, //第几页 @@ -409,6 +415,21 @@ export default { this.getDetail(); } } + }, + 'study.catalogueShow'(val){ + if(!val){ + this.learningSituation.status = null + this.learningSituation.name = '' + } + }, + isShowDialog(val){ + if(!val){ + this.signup.status = null + this.signup.name = '' + this.learningRecords.status = null + this.learningRecords.name = '' + this.value = '' + } } }, mounted() { @@ -480,6 +501,10 @@ export default { } }); }, + studyContentRecordsSearch(){ + this.learningSituation.pageIndex = 1; + this.studyContentRecords() + }, // 资源里的学习详情 studyContentRecords() { let params = { @@ -700,7 +725,7 @@ export default { if(type=='考试'){ this.typePress = true }else{ - this.typePress = false + this.typePress = true } this.contentId = row.id; this.study.catalogueShow = true; diff --git a/src/router/index.js b/src/router/index.js index 4875ff60..cb2fd49f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -320,6 +320,13 @@ export const constantRoutes = [{ name: 'videotest', meta: {title: '课程视频测试', icon: 'dashboard', noCache: true, affix: true}, }, + { + path: '/hotforum', + hidden: true, + component: (resolve) => require(['@/views/hotforum/Index'], resolve), + name: 'hotforum', + meta: {title: '热点论坛', icon: 'dashboard', noCache: true, affix: true}, + }, { path: '/404', component: (resolve) => require(['@/views/error/404'], resolve), diff --git a/src/views/course/ManageList.vue b/src/views/course/ManageList.vue index 3a9399be..2b019e64 100644 --- a/src/views/course/ManageList.vue +++ b/src/views/course/ManageList.vue @@ -196,7 +196,7 @@ - + diff --git a/src/views/hotforum/Index.vue b/src/views/hotforum/Index.vue new file mode 100644 index 00000000..a7adbfab --- /dev/null +++ b/src/views/hotforum/Index.vue @@ -0,0 +1,179 @@ + + + + + \ No newline at end of file diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue index 7665c229..a82814dd 100644 --- a/src/views/study/coursenew.vue +++ b/src/views/study/coursenew.vue @@ -369,6 +369,7 @@ }, data() { return { + tentative: false, isContentTypeTwo: null, isContentType: null, activeId: '', @@ -658,7 +659,7 @@ }, //替换播放区域 changePlayRes(r,item){ - + this.tentative = false; if(this.appendStudyOtherHandle!=null){ window.clearTimeout(this.appendStudyOtherHandle); } @@ -1454,6 +1455,7 @@ }); }, saveStudyInfo() { + this.tentative = true if(this.isContentType){ if(this.isContentType != this.contentData.contentType){ //定时器产生的，不记录 @@ -1647,7 +1649,7 @@ finishStudyItem() { //设置完成学习的内容,针对于音视频的内容 if (!this.contentData.studyItemId) { //这种可能没有，不过这里也是为了万中那个1 - this.saveStudyInfo(); + !this.tentative && this.saveStudyInfo(); } else { let params = { itemId: this.contentData.studyItemId,