hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-15 13:56:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pingcode-1104' into dev0515

Browse Source 
# Conflicts:
#	src/components/PortalHeader.vue
#	src/components/VideoPlayer/progress-bar.vue
#	src/views/study/coursenew.vue
This commit is contained in:
zhangsir
2024-11-04 16:29:52 +08:00
parent 642907b386 2576fdd070
commit c64969e9b7
9 changed files with 92 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Course/auditCourse1.vue
View File

@@ -637,7 +637,9 @@ export default {
}
this.teacherList = rs.result.teachers;
this.teacherName = rs.result.teachers;
this.teacher = rs.result.teachers.map(res => res.teacherName);
this.teacher = rs.result.teachers.map(item => {
return `${item.teacherName}(${item.userNo})`
});
this.totalContent = rs.result.contents.length; //计算总内容数
if (this.courseInfo.tags != "") {
this.showTags = this.courseInfo.tags.split(",");

4
src/components/Course/auditCourse2.vue
View File

@@ -681,7 +681,9 @@ export default {
}
this.teacherList = rs.result.teachers;
this.teacherName = rs.result.teachers;
this.teacher = rs.result.teachers.map(item => item.teacherName);
this.teacher = rs.result.teachers.map(item => {
return `${item.teacherName}(${item.userNo})`
});
this.showTags = this.courseInfo.tags.split(",");
if (rs.result.course.resOwner3 == "") {
this.resOwnerArray = [