diff --git a/src/store/modules/user.js b/src/store/modules/user.js index cb1fb17b..99909eb5 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -80,24 +80,24 @@ const user = { }) }, refrashStudyTaskCount({ commit }) { - apiManage.getTaskNum().then(res=>{ - if(res.code==200){ - commit('SET_StudyTaskCount',res.data.todoTaskCounts); - }else{ - console.log("获取学习任务数失败:"+res.msg); - } - }) - // apiBoeCourse.cmtaskList({page:1,size:1,get_count:1}).then(res=>{ - // if(res.status==200){ - // let count = 0; - // if(res.result.count > 0){ - // count = res.result.count; - // } - // commit('SET_StudyTaskCount',count); - // }else{ - // console.log("读取学习任务数失败:"+res.message); - // } - // }) + // apiManage.getTaskNum().then(res=>{ + // if(res.code==200){ + // commit('SET_StudyTaskCount',res.data.todoTaskCounts); + // }else{ + // console.log("获取学习任务数失败:"+res.msg); + // } + // }) + apiBoeCourse.cmtaskList({page:1,size:1,get_count:1}).then(res=>{ + if(res.status==200){ + let count = 0; + if(res.result.count > 0){ + count = res.result.count; + } + commit('SET_StudyTaskCount',count); + }else{ + console.log("读取学习任务数失败:"+res.message); + } + }) }, //设置用户身份 SetIdentity({ commit }, iden) { diff --git a/src/views/study/TaskList.vue b/src/views/study/TaskList.vue index 044b022e..c5ad1982 100644 --- a/src/views/study/TaskList.vue +++ b/src/views/study/TaskList.vue @@ -122,17 +122,17 @@ export default { methods: { jumpRouter(item) { - //window.open(`${this.webBaseUrl}/course/boeframe?id=${item.cmtask_id}`,'_self' ) + //window.open(`${this.webBaseUrl}/course/boeframe?id=${item.cmtask_id}`,'_self') + location.href=`${this.webBaseUrl}/course/boeframe?id=${item.cmtask_id}`; + let urlPre=window.location.protocol+'//'+window.location.host; - //location.href=`${this.webBaseUrl}/course/boeframe?id=${item.cmtask_id}`; - if(item.cmtask_type==1){ //学习路径图 - //let params=encodeURIComponent('projectId='+courseId); - //this.$router.push('/forward?to='+studentPath+'/projectdetails¶ms='+params); - - location.href=urlPre+'/fe-student/pathdetails?routerId='+item.cmtask_code - }else if(item.cmtask_type==2){ //学习项目 - location.href=urlPre+'/fe-student/projectdetails?projectId='+item.cmtask_code - } + // if(item.cmtask_type==1){ //学习路径图 + // //let params=encodeURIComponent('projectId='+courseId); + // //this.$router.push('/forward?to='+studentPath+'/projectdetails¶ms='+params); + // location.href=urlPre+'/fe-student/pathdetails?routerId='+item.cmtask_code + // }else if(item.cmtask_type==2){ //学习项目 + // location.href=urlPre+'/fe-student/projectdetails?projectId='+item.cmtask_code + // } }, loadBoeData() { @@ -146,29 +146,29 @@ export default { cmtask_name:this.params.cmtask_name, } this.loading=true; - apiManage.userTaskList(params).then(res=>{ - if(res.code==200){ - this.total = 10; - this.couresList = res.data.records; - }else{ - this.$message.error('查询数据失败:'+res.msg); - } - this.loading=false; - }).catch(()=>{ - this.loading=false; - }) - // apiBoeCourse.cmtaskList(params).then(res=>{ - // if(res.status==200){ - // this.total = res.result.count - // this.couresList = res.result.list; - // }else{ - // this.$message.error('查询数据失败:'+res.message); - // } - // this.loading=false; + // apiManage.userTaskList(params).then(res=>{ + // if(res.code==200){ + // this.total = 10; + // this.couresList = res.data.records; + // }else{ + // this.$message.error('查询数据失败:'+res.msg); + // } + // this.loading=false; + // }).catch(()=>{ + // this.loading=false; + // }) + apiBoeCourse.cmtaskList(params).then(res=>{ + if(res.status==200){ + this.total = res.result.count + this.couresList = res.result.list; + }else{ + this.$message.error('查询数据失败:'+res.message); + } + this.loading=false; - // }).catch(()=>{ - // this.loading=false; - // }) + }).catch(()=>{ + this.loading=false; + }) }, search(){ this.loadBoeData()