diff --git a/api/modules/growth.js b/api/modules/growth.js index 94e781a..f23fa2f 100644 --- a/api/modules/growth.js +++ b/api/modules/growth.js @@ -3,8 +3,8 @@ export const getList = (params) => ajax.get(`/manageApi/stu/grow/getStuLearnInfo //获取路径图详情 export const taskList = (id) => ajax.get(`/manageApi/stu/grow/taskList?growId=${id}`); // 获取岗位 -export const getAllPosition = () => ajax.get(`/manageApi/admin/thirdApi/getAllPosition`) +export const getAllPosition = () => ajax.get(`/manageApi/stu/grow/getPositionOfPath`) // 获取职级 export const getAllBandInfo = () => ajax.get(`/manageApi/admin/thirdApi/getAllBandInfo`) //全岗位路径 -export const getFullJobPath = () => ajax.get(`/manageApi/stu/grow/getFullJobPath`); \ No newline at end of file +export const getFullJobPath = (params) => ajax.get(`/manageApi/stu/grow/getFullJobPath?positionIdList=${params.positionIdList}&bandCodeList=${params.bandCodeList}`); \ No newline at end of file diff --git a/pages/learnPath/allPath.vue b/pages/learnPath/allPath.vue index 1011f24..764f2c5 100644 --- a/pages/learnPath/allPath.vue +++ b/pages/learnPath/allPath.vue @@ -107,7 +107,10 @@ } }, onLoad() { - getFullJobPath().then(res=>{ + getFullJobPath({ + positionIdList:this.$route.query.positionIdList || '', + bandCodeList:this.$route.query.bandCodeList || '' + }).then(res=>{ if(res.code == 200){ this.pathData = res.data this.titleList = this.pathData.allBandCodeList diff --git a/pages/learnPath/pathSearch.vue b/pages/learnPath/pathSearch.vue index f2e93f0..051469d 100644 --- a/pages/learnPath/pathSearch.vue +++ b/pages/learnPath/pathSearch.vue @@ -77,23 +77,30 @@ reach(){ this.bandIndexs = [] this.bandItem = [] - this.indexs = [] - this.posiData = [] + this.indexs = [0] + this.posiData = [this.posiLists[0]] this.bandFirst = '' this.bandEnd = '' }, goAllPath(){ - console.log(this.bandItem,this.posiData) + let bandCodeList = this.bandItem.map(item => item.bandCode).join(',') + let positionIdList = this.posiData.map(item => item.positionId).join(',') uni.navigateTo({ - url: '/pages/learnPath/allPath', - + url: `/pages/learnPath/allPath?bandCodeList=${bandCodeList}&positionIdList=${positionIdList}`, }) }, getPosiList(){ getAllPosition().then(res=>{ this.startList = res.data if(res.code == 200 ){ + const majorItem = res.data.find(item => item.isMajor === 1); + if (majorItem) { + const index = res.data.indexOf(majorItem); + res.data.splice(index, 1); + res.data.unshift(majorItem); + } this.posiLists = res.data + this.posiData.push(this.posiLists[0]) this.indexs.push(0) if(this.posiLists.length > 9){ this.posiLists = this.posiLists.slice(0, 9)