diff --git a/src/components/drawers/project/ProjectEvalManage.vue b/src/components/drawers/project/ProjectEvalManage.vue index fd2b24bf..eecc3e8d 100644 --- a/src/components/drawers/project/ProjectEvalManage.vue +++ b/src/components/drawers/project/ProjectEvalManage.vue @@ -273,15 +273,15 @@ export default { { title: "任务状态", - dataIndex: "status", - key: "status", + dataIndex: "finishStatus", + key: "finishStatus", width: 60, align: "center", className: "h", customRender: (text) => { return (
- {text.record.status == 0 || text.record.status==null ? "未开始" :text.record.status == 1 ?"已完成":"进行中"} + {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}
); }, diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index 25a31217..b1cd6316 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -288,15 +288,15 @@ export default { }, { title: "任务状态", - dataIndex: "status", - key: "status", + dataIndex: "finishStatus", + key: "finishStatus", width: 60, align: "center", className: "h", customRender: (text) => { return (
- {text.record.status == 0 || text.record.status==null ? "未开始" :text.record.status == 1 ?"已完成":"进行中"} + {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}
); }, @@ -403,7 +403,7 @@ export default { studentDepartName: res.data.data.studyDetailList[i].studentDepartName, studentJobName: res.data.data.studyDetailList[i].studentJobName, lastStudyTime: res.data.data.studyDetailList[i].finishedTime, - status: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0 + finishStatus: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0 } newData.push(obj) } diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index 08002b48..3a42dc58 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -288,15 +288,15 @@ export default { }, { title: "任务状态", - dataIndex: "status", - key: "status", + dataIndex: "finishStatus", + key: "finishStatus", width: 60, align: "center", className: "h", customRender: (text) => { return (
- {text.record.status == 0 || text.record.status==null ? "未开始" :text.record.status == 1 ?"已完成":"进行中"} + {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}
); }, @@ -402,7 +402,7 @@ export default { studentDepartName: res.data.data.studyDetailList[i].studentDepartName, studentJobName: res.data.data.studyDetailList[i].studentJobName, lastStudyTime: res.data.data.studyDetailList[i].finishedTime, - status: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0 + finishStatus: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0 } newData.push(obj) } diff --git a/src/components/drawers/router/RouterEvaluationManage.vue b/src/components/drawers/router/RouterEvaluationManage.vue index cf6cd5fa..7482efe6 100644 --- a/src/components/drawers/router/RouterEvaluationManage.vue +++ b/src/components/drawers/router/RouterEvaluationManage.vue @@ -274,15 +274,15 @@ { title: "任务状态", - dataIndex: "status", - key: "status", + dataIndex: "finishStatus", + key: "finishStatus", width: 60, align: "center", className: "h", customRender: (text) => { return (
- {text.record.status == 0 || text.record.status==null ? "未开始" :text.record.status == 1 ?"已完成":"进行中"} + {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}
); },