diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue
index af4595de..82017f3b 100644
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -103,7 +103,7 @@
@@ -210,7 +210,7 @@ export default {
// {
// stageName: "阶段1腾飞班阶段1",
// stageId: 1,
- // taskProcessList: [
+ // taskList: [
// {
// course: "在线",
// name: "如何成为一个产品经理",
@@ -271,10 +271,12 @@ export default {
const changeDown1 = () => {
state.showDown1 = !state.showDown1;
};
- const taskProcessList = (tableData) => {
+ const taskList = (tableData) => {
let data = tableData;
+ console.log('我排序了吗--------------------------》', data)
let array = [];
- data.map((value) => {
+ if(data!=undefined){
+ data.map((value) => {
let obj = {
course:
value.type == 1
@@ -303,7 +305,7 @@ export default {
? "投票"
: "-",
name: value.name,
- projectTaskId: value.projectTaskId,
+ projectId: value.projectId,
complete:
value.status == -1
? "未开始"
@@ -318,12 +320,15 @@ export default {
};
array.push(obj);
});
- array.sort((a,b)=>{return a.projectTaskId - b.projectTaskId})
- console.log('我排序了吗--------------------------》', array)
+ array.sort((a,b)=>{return a.projectId - b.projectId})
+ }
+
+ console.log('我排序了吗-----------1---------------》', array)
return array;
};
const setStageList = (tableData) => {
let data = tableData;
+ console.log("查看了学员1", data);
let array = [];
//无阶段任务
if(data?.length ==1 && data[0].stageId ==0){
@@ -332,7 +337,7 @@ export default {
stageName:"无阶段任务",
stageId:0,
remark:value.remark,
- taskProcessList: taskProcessList(value.taskProcessList),
+ taskList: taskList(value.taskList),
};
array.push(obj);
});
@@ -342,7 +347,7 @@ export default {
stageName: value.stageName,
stageId: value.stageId,
remark:value.remark,
- taskProcessList: taskProcessList(value.taskProcessList),
+ taskList: taskList(value.taskList),
};
if(value.stageId >0){
array.push(obj);
@@ -363,18 +368,19 @@ export default {
state.loading = false
console.log("查看了学员", res.data.data);
let result = res.data.data;
- state.userName = result.userName;
- state.deptName = result.deptName;
- state.jobName = result.jobName;
- state.certCnt = result.certCnt == null ? 0 : result.certCnt;
- state.name = result.name;
- state.currentReqCnt = result.currentReqCnt;
- state.totalReqCnt = result.totalReqCnt;
+ state.userName = result.projectInfo.userName;
+ state.deptName = result.projectInfo.deptName;
+ state.jobName = result.projectInfo.jobName;
+ state.certCnt = result.projectInfo.certCnt == null ? 0 : result.projectInfo.certCnt;
+ state.name = result.projectInfo.name;
+ state.currentReqCnt = result.projectInfo.currentReqCnt;
+ state.totalReqCnt = result.projectInfo.totalReqCnt;
- if (result.stageProcessList.length > 0) {
- state.sort = result.stageProcessList[0].sort;
- setStageList(result.stageProcessList);
+ if (result.stageList.length > 0) {
+ state.sort = result.stageList[0].sort;
+
}
+ setStageList(result.stageList);
});
};
@@ -387,7 +393,7 @@ export default {
changeDown1,
check,
setStageList,
- taskProcessList,
+ taskList,
// change,
};
},