Merge branch 'zcwy_0716_learning' into dev0515

This commit is contained in:
nisen
2024-07-17 18:39:32 +08:00
4 changed files with 14 additions and 4 deletions

View File

@@ -260,6 +260,7 @@ export default {
] ]
Promise.all(promises).then(() => { Promise.all(promises).then(() => {
this.nums = this.fistTotals + this.pathTotals + this.growTotal; this.nums = this.fistTotals + this.pathTotals + this.growTotal;
console.log(this.nums,'this.nums')
sessionStorage.setItem('fistTotals',this.fistTotals) sessionStorage.setItem('fistTotals',this.fistTotals)
sessionStorage.setItem('pathTotals',this.pathTotals) sessionStorage.setItem('pathTotals',this.pathTotals)
sessionStorage.setItem('growTotal',this.growTotal) sessionStorage.setItem('growTotal',this.growTotal)
@@ -277,14 +278,17 @@ export default {
if(this.isTiao){ if(this.isTiao){
if(this.nums == 0){ if(this.nums == 0){
window.location.href = `${this.webBaseUrl}/uc/study/task?type=9`; window.location.href = `${this.webBaseUrl}/uc/study/task?type=9`;
return
} }
// window.location.href = `${this.webBaseUrl}/uc/study/task?type=${this.fistTotals || this.growTotal || this.pathTotals}`; // window.location.href = `${this.webBaseUrl}/uc/study/task?type=${this.fistTotals || this.growTotal || this.pathTotals}`;
if(this.fistTotals != 0){ if(this.fistTotals != 0){
window.location.href = `${this.webBaseUrl}/uc/study/task?type=1`; window.location.href = `${this.webBaseUrl}/uc/study/task?type=1`;
}else if (this.growTotal != 0){ }else if (this.growTotal != 0){
window.location.href = `${this.webBaseUrl}/uc/study/growth`; window.location.href = `${this.webBaseUrl}/uc/study/growth`;
}else{ }else if (this.pathTotals != 0){
window.location.href = `${this.webBaseUrl}/uc/study/task?type=2`; window.location.href = `${this.webBaseUrl}/uc/study/task?type=2`;
}else{
window.location.href = `${this.webBaseUrl}/uc/study/task?type=9`;
} }
}else{ }else{
window.location.href = `${this.webBaseUrl}/uc/study/courses`; window.location.href = `${this.webBaseUrl}/uc/study/courses`;

View File

@@ -634,6 +634,9 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .el-badge__content.is-fixed {
top: 6px !important;
}
.couerscard{ .couerscard{
padding: 0 15px; padding: 0 15px;
} }

View File

@@ -1246,13 +1246,16 @@ export default {
}else{ }else{
if(this.nums == 0){ if(this.nums == 0){
window.location.href = `${this.webBaseUrl}/uc/study/task?type=9`; window.location.href = `${this.webBaseUrl}/uc/study/task?type=9`;
return
} }
if(this.fistTotals != 0){ if(this.fistTotals != 0){
window.location.href = `${this.webBaseUrl}/uc/study/task?type=1`; window.location.href = `${this.webBaseUrl}/uc/study/task?type=1`;
}else if (this.growTotal != 0){ }else if (this.growTotal != 0){
window.location.href = `${this.webBaseUrl}/uc/study/growth`; window.location.href = `${this.webBaseUrl}/uc/study/growth`;
}else{ }else if (this.pathTotals != 0){
window.location.href = `${this.webBaseUrl}/uc/study/task?type=2`; window.location.href = `${this.webBaseUrl}/uc/study/task?type=2`;
}else{
window.location.href = `${this.webBaseUrl}/uc/study/task?type=9`;
} }
} }
}, },

View File

@@ -239,8 +239,8 @@
</div> </div>
<div class="body_right"> <div class="body_right">
<div class="body_item" :style="{width: (142 * t.number) + 'px',flexGrow:titleList.length<=8?1*t.number:none}" v-for="t,i in item.bandCodes"> <div class="body_item" :style="{width: (142 * t.number) + 'px',flexGrow:titleList.length<=8?1*t.number:none}" v-for="t,i in item.bandCodes">
<img v-if="(t && t.isMajorPosition) " src="../../assets/images/growth/CurrentPath.png" alt=""> <img :title="t.growName" v-if="(t && t.isMajorPosition) " src="../../assets/images/growth/CurrentPath.png" alt="">
<img @click="goLearnPath(t)" v-else-if="(t && t.permission)" src="../../assets/images/growth/NoPermissionPath.png" alt=""> <img :title="t.growName" @click="goLearnPath(t)" v-else-if="(t && t.permission)" src="../../assets/images/growth/NoPermissionPath.png" alt="">
<!-- <img v-else-if="!(t && t.permission)" src="../../assets/images/growth/OtherPath.png" alt=""> --> <!-- <img v-else-if="!(t && t.permission)" src="../../assets/images/growth/OtherPath.png" alt=""> -->
<span v-else></span> <span v-else></span>
</div> </div>