mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-13 04:46:44 +08:00
Merge branch 'zcwy_0716_learning' into dev0515
This commit is contained in:
@@ -298,7 +298,12 @@
|
|||||||
<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>
|
<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>
|
<span slot="title">我的必修</span>
|
||||||
</el-menu-item>
|
</el-menu-item>
|
||||||
<el-submenu v-if="courseNum !== 0" index="myelective" 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>
|
||||||
|
</el-menu-item>
|
||||||
|
<el-submenu v-else index="myelective" v-show="curIdentity == 1">
|
||||||
<template slot="title">
|
<template slot="title">
|
||||||
<svg-icon icon-class="mystudy"></svg-icon>
|
<svg-icon icon-class="mystudy"></svg-icon>
|
||||||
<span>我的选修</span>
|
<span>我的选修</span>
|
||||||
@@ -307,11 +312,6 @@
|
|||||||
<span slot="title" class="study textl">自选学习</span>
|
<span slot="title" class="study textl">自选学习</span>
|
||||||
</el-menu-item>
|
</el-menu-item>
|
||||||
</el-submenu>
|
</el-submenu>
|
||||||
<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>
|
|
||||||
</el-menu-item>
|
|
||||||
<el-menu-item index="/exam/mytask" v-show="curIdentity == 1">
|
<el-menu-item index="/exam/mytask" v-show="curIdentity == 1">
|
||||||
<!-- <svg-icon :icon-class="activeMenu == '/exam/mytask'?'mybiji-active':'mybiji'"></svg-icon> -->
|
<!-- <svg-icon :icon-class="activeMenu == '/exam/mytask'?'mybiji-active':'mybiji'"></svg-icon> -->
|
||||||
<i style="margin-right: 8px;width: 19px;" :style="{color:activeMenu == '/exam/mytask'?'rgb(51, 121, 251)':'#303133'}" class="el-icon-reading"></i>
|
<i style="margin-right: 8px;width: 19px;" :style="{color:activeMenu == '/exam/mytask'?'rgb(51, 121, 251)':'#303133'}" class="el-icon-reading"></i>
|
||||||
@@ -457,7 +457,7 @@ export default {
|
|||||||
}
|
}
|
||||||
console.log('2')
|
console.log('2')
|
||||||
if(path == '/uc/study/task'){
|
if(path == '/uc/study/task'){
|
||||||
console.log(route.query.type,(this.fistTotals && 1),'type')
|
console.log('/uc/study/task?type=' + (route.query.type || (this.fistTotals && 1) || 2),'type')
|
||||||
return '/uc/study/task?type=' + (route.query.type || (this.fistTotals && 1) || 2)
|
return '/uc/study/task?type=' + (route.query.type || (this.fistTotals && 1) || 2)
|
||||||
}
|
}
|
||||||
console.log('3')
|
console.log('3')
|
||||||
@@ -532,8 +532,8 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
learnTotal(){
|
learnTotal(){
|
||||||
// const route = this.$route;
|
const route = this.$route;
|
||||||
// const { meta, path } = route;
|
const { meta, path } = route;
|
||||||
let params = {
|
let params = {
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
@@ -563,6 +563,17 @@ export default {
|
|||||||
]
|
]
|
||||||
Promise.all(promises).then(() => {
|
Promise.all(promises).then(() => {
|
||||||
sessionStorage.setItem('totalNums', this.fistTotals + this.pathTotals + this.growTotal);
|
sessionStorage.setItem('totalNums', this.fistTotals + this.pathTotals + this.growTotal);
|
||||||
|
if(path == '/uc/study/task'){
|
||||||
|
if(this.fistTotals != 0){
|
||||||
|
this.$router.push('/uc/study/task?type=1')
|
||||||
|
}else if (this.growTotal != 0){
|
||||||
|
this.$router.push('/uc/study/growth')
|
||||||
|
}else if (this.pathTotals != 0){
|
||||||
|
this.$router.push('/uc/study/task?type=2')
|
||||||
|
}else{
|
||||||
|
this.$router.push('/uc/study/task?type=9')
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
apiManage.queryTaskCounts({}).then(res=>{
|
apiManage.queryTaskCounts({}).then(res=>{
|
||||||
// this.proTotal =parseInt(res.data.count); //学习项目
|
// this.proTotal =parseInt(res.data.count); //学习项目
|
||||||
|
|||||||
Reference in New Issue
Block a user