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

Merge branch '250220-pre-126-177-gx' into test20250220

Browse Source
This commit is contained in:
joshen
2025-03-19 09:22:53 +08:00
parent bbaa86ff92 14220b6d4d
commit d212938819
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,13 +48,17 @@ export default {
let name = ''; let name = '';
if (this.course && this.course.name && this.course.name !== '') { if (this.course && this.course.name && this.course.name !== '') {
name = this.course.name.replace('color:#FF0000', 'color:#fff'); name = this.course.name.replace('color:#FF0000', 'color:#fff');
console.log("name gengxindata1 : ",name)
} }
if (this.course && this.course.courseName && this.course.courseName !== '') { if (this.course && this.course.courseName && this.course.courseName !== '') {
name = this.course.courseName.replace('color:#FF0000', 'color:#fff'); name = this.course.courseName.replace('color:#FF0000', 'color:#fff');
console.log("name gengxindata2 : ",name)
} }
if (this.course && this.course.title && this.course.title !== '') { if (this.course && this.course.title && this.course.title !== '') {
name = this.course.title.replace('color:#FF0000', 'color:#fff'); name = this.course.title.replace('color:#FF0000', 'color:#fff');
console.log("name gengxindata3 : ",name)
} }
console.log("name gengxindata4 : ",name)
return name; return name;
// course.name || course.courseName || course.title // course.name || course.courseName || course.title
}, },

1
src/views/study/TaskList.vue
View File

@@ -140,6 +140,7 @@ export default {
headers:{token:getToken(),} headers:{token:getToken(),}
}).then((res) => { }).then((res) => {
console.log('111',res.data.result) console.log('111',res.data.result)
console.log('111 gx2',res.data.result)
// this.porcessData=response.data.data // this.porcessData=response.data.data
this.porcessData.course=Math.floor(res.data.result.course.total === 0 ? 0: (res.data.result.course.completion/res.data.result.course.total)*100) this.porcessData.course=Math.floor(res.data.result.course.total === 0 ? 0: (res.data.result.course.completion/res.data.result.course.total)*100)
this.porcessData.project=Math.floor(res.data.result.project.total === 0 ? 0: (res.data.result.project.completion/res.data.result.project.total)*100) this.porcessData.project=Math.floor(res.data.result.project.total === 0 ? 0: (res.data.result.project.completion/res.data.result.project.total)*100)