diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index df788684..001cd067 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -222,7 +222,8 @@ export default { if(this.studyTaskCount>0){ this.isTiao = true; }else{ - this.isTiao = false; + // this.isTiao = false; + this.isTiao = true; } // let params = { // // keyword:this.keyword, diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue index a588ae32..62daf33e 100644 --- a/src/components/UserCenter/menu.vue +++ b/src/components/UserCenter/menu.vue @@ -281,7 +281,7 @@ 领导力必修 @@ -289,8 +289,8 @@ 专业力必修 - - 定制化学习 + + 定制化学习 @@ -463,12 +463,12 @@ export default { overlayShow: false, instructor:0, fistTotal:0, - fistTotals:0, + fistTotals:1, proTotal: 0, - proTotals: 0, + proTotals: 1, pathTotal:0, - pathTotals:0, - growTotal: 0, + pathTotals:1, + growTotal: 1, openedsList:[] }; }, @@ -503,9 +503,9 @@ export default { this.fistTotals =parseInt(res.data.total); }) //项目 - apiManage.customized(params).then(res=>{ - this.proTotals =parseInt(res.data.total); - }) + // apiManage.customized(params).then(res=>{ + // this.proTotals =parseInt(res.data.total); + // }) //学习路径 apiManage.compulsoryList(params).then(res=>{ this.pathTotals =parseInt(res.data.total); @@ -513,10 +513,12 @@ export default { getList(this.userInfo.aid).then(res=>{ if(res.code == 200 && Object.keys(res.data).length){ this.growTotal = 1 + }else{ + this.growTotal = 0 } }) apiManage.queryTaskCounts().then(res=>{ - this.proTotal =parseInt(res.data.count); //学习项目 + // this.proTotal =parseInt(res.data.count); //学习项目 this.fistTotal =parseInt(res.data.count1); // 领导力必修 this.pathTotal =parseInt(res.data.count2); // 学习路径 // this.growTotal = parseInt(res.data.count3); //成长路径 diff --git a/src/views/study/TaskList.vue b/src/views/study/TaskList.vue index 740fdffd..70d11a8e 100644 --- a/src/views/study/TaskList.vue +++ b/src/views/study/TaskList.vue @@ -11,10 +11,10 @@
路径图完成情况
--> -
+
@@ -163,6 +163,9 @@ export default { }else if(item.cmtask_type==3){ let pushUrl=`/course/boeframe?id=${item.cmtask_id}&type=3`; this.$router.push(pushUrl); + }else if(item.cmtask_type==4){ + let params=encodeURIComponent('projectId='+item.cmtask_id); + this.$router.push('/forward?to='+studentPath+'/projectdetails¶ms='+params); } }, getPossData(){ @@ -205,31 +208,17 @@ export default { }) }else if (this.isType == 2){ //定制化学习 - if(this.typeClass == 1){ - apiManage.customized(params).then(res=>{ - if(res.code==200){ - this.total =parseInt(res.data.total); - this.couresList = res.data.records; - }else{ - this.$message.error('查询数据失败:'+res.msg); - } - this.loading=false; - }).catch(()=>{ - this.loading=false; - }) - }else{ - apiManage.compulsoryList(params).then(res=>{ - if(res.code==200){ - this.total =parseInt(res.data.total); - this.couresList = res.data.records; - }else{ - this.$message.error('查询数据失败:'+res.msg); - } - this.loading=false; - }).catch(()=>{ - this.loading=false; - }) - } + apiManage.compulsoryList(params).then(res=>{ + if(res.code==200){ + this.total =parseInt(res.data.total); + this.couresList = res.data.records; + }else{ + this.$message.error('查询数据失败:'+res.msg); + } + this.loading=false; + }).catch(()=>{ + this.loading=false; + }) }else{ apiManage.userTaskList(params).then(res=>{ if(res.code==200){