Merge branch 'zcwy_0716_learning' into dev0515

This commit is contained in:
nisen
2024-07-17 09:58:05 +08:00

View File

@@ -298,7 +298,7 @@
<i style="margin-right: 8px;width: 19px;" :style="{color:activeMenu == '/uc/study/task?type=9'?'rgb(51, 121, 251)':'#303133'}" class="el-icon-collection"></i>
<span slot="title">我的必修</span>
</el-menu-item>
<el-submenu v-if="courseNum" index="myelective" v-show="curIdentity == 1">
<el-submenu v-if="courseNum !== 0" index="myelective" v-show="curIdentity == 1">
<template slot="title">
<svg-icon icon-class="mystudy"></svg-icon>
<span>我的选修</span>
@@ -307,7 +307,7 @@
<span slot="title" class="study textl">自选学习</span>
</el-menu-item>
</el-submenu>
<el-menu-item v-if="!courseNum" index="/uc/study/courses" v-show="curIdentity == 1">
<el-menu-item v-if="courseNum === 0" index="/uc/study/courses" v-show="curIdentity == 1">
<!-- <svg-icon :icon-class="activeMenu == '/exam/mytask'?'mybiji-active':'mybiji'"></svg-icon> -->
<svg-icon icon-class="mystudy"></svg-icon>
<span slot="title">我的选修</span>
@@ -443,6 +443,7 @@ export default {
const route = this.$route;
const { meta, path } = route;
console.log(path,meta,'path')
console.log(this.fistTotals,this.growTotal,this.pathTotals,'geshu')
if(path == '/uc/study/task' || path == '/uc/study/growth'){
this.openedsList = ['mystudy']
}
@@ -453,7 +454,7 @@ export default {
return '/uc/study/task?type=9'
}
if(path == '/uc/study/task'){
return '/uc/study/task?type=' + (route.query.type || 1)
return '/uc/study/task?type=' + (route.query.type || this.fistTotals || this.growTotal || this.pathTotals || 2)
}
if(meta.title == '添加受众' || meta.title == '查看受众'){
meta.activeMenu = '/manage/ugroups'
@@ -552,6 +553,7 @@ export default {
})
]
Promise.all(promises).then(() => {
console.log('111111111')
sessionStorage.setItem('totalNums', this.fistTotals + this.pathTotals + this.growTotal);
});
apiManage.queryTaskCounts({}).then(res=>{