diff --git a/src/api/manage/manage.js b/src/api/manage/manage.js index 2faa5767..14319a43 100644 --- a/src/api/manage/manage.js +++ b/src/api/manage/manage.js @@ -20,7 +20,17 @@ const getTaskNum = function(){ const userTaskList = function(data){ return ajax.postJson(baseURL,'/todoTask/queryTodoTaskDetail',data); } - +//领导力必修 +const leadership = function(data){ + return ajax.postJson(baseURL,'/todoTask/leadership',data); +} +//定制化学习 1.学习项目 2.学习路径 +const customized = function(data){ + return ajax.postJson(baseURL,'/todoTask/customized',data); +} +const compulsoryList = function(data){ + return ajax.postJson(baseURL,'/todoTask/compulsoryList',data); +} /**删除学习，取消报名*/ const userDeleteStudy = function(data){ return ajax.postJson(baseURL,'/stu/project/stuCancelEnrollment',data); @@ -37,6 +47,9 @@ const userRsSginupCourse = function(data){ export default { getTaskNum, userTaskList, + leadership, + customized, + compulsoryList, userDeleteStudy, userRsSginupCourse } diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue index 47b535e6..c6fd3d2c 100644 --- a/src/components/UserCenter/menu.vue +++ b/src/components/UserCenter/menu.vue @@ -248,19 +248,19 @@ 我的学习 - + - 学习任务 - - + + - 我报名的 - - - + + - + 我的笔记 @@ -414,6 +414,7 @@ import apicourseStudy from "../../api/modules/courseStudy.js" import {pageList} from "@/api/modules/lecturer" import courseImage from "@/components/Course/courseImage.vue" import testUser from '@/utils/testUsers.js' +import apiManage from '@/api/manage/manage.js' export default { name: 'UcMenu', components: { @@ -441,7 +442,10 @@ export default { isCollapse: false, lastStudy:{}, overlayShow: false, - instructor:0 + instructor:0, + fistTotal:0, + proTotal: 0, + pathTotal:0, }; }, created() { @@ -450,6 +454,7 @@ export default { this.getLastStudy(); //获取讲师认证中条数 this.instructorCertification() + this.learnTotal() }, mounted() { //console.log(this.userInfo.loginName,'this.userInfo.loginName'); @@ -462,6 +467,26 @@ export default { // } }, methods: { + learnTotal(){ + let params = { + pageNo: 1, + pageSize: 10, + cmtask_user_status: "", + cmtask_name: "" + } + //领导力 + apiManage.leadership(params).then(res=>{ + this.fistTotal =parseInt(res.data.total); + }) + //项目 + apiManage.customized(params).then(res=>{ + this.proTotal =parseInt(res.data.total); + }) + //学习路径 + apiManage.compulsoryList(params).then(res=>{ + this.pathTotal =parseInt(res.data.total); + }) + }, //讲师认证条数 instructorCertification(){ pageList({ teacherNo:this.userInfo.userNo,courseName:'', pageNo: 1, pageSize: 10}).then(res=>{ diff --git a/src/views/study/TaskList.vue b/src/views/study/TaskList.vue index b9d0a739..cca5886d 100644 --- a/src/views/study/TaskList.vue +++ b/src/views/study/TaskList.vue @@ -7,6 +7,10 @@
路径图完成情况
--> +
+
学习项目
+
学习路径
+
@@ -107,14 +111,30 @@ export default { keyword:'', formatsec, couresList:[], - total: 0 + total: 0, + isType: null, + typeClass: true, }; }, + watch:{ + '$route': { + handler(to, from) { + console.log('type变化了', to.query.type); + this.isType = to.query.type; + this.loadBoeData(); + }, + immediate: true + } + }, mounted() { this.loadBoeData(); this.getPossData() }, methods: { + learnType(item){ + this.typeClass = item + this.reset() + }, jumpRouter(item) { //location.href=`${this.webBaseUrl}/course/boeframe?id=${item.cmtask_id}`; @@ -157,17 +177,59 @@ export default { cmtask_name:this.params.cmtask_name, } this.loading=true; - apiManage.userTaskList(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; - }) + if(this.isType == 1){ + //领导力必修 + apiManage.leadership(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 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; + }) + } + }else{ + apiManage.userTaskList(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; + }) + } }, search(){ this.page=1; @@ -196,6 +258,31 @@ export default {