diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue index 0692b648..a24dab6a 100644 --- a/src/components/drawers/project/ProjectFaceStu.vue +++ b/src/components/drawers/project/ProjectFaceStu.vue @@ -869,7 +869,7 @@ export default { process.env.VUE_APP_BASE_API }/admin/student/exportTaskStudent?currentStageId=${ props.projectTaskInfo.stageId - }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=0` + }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=2&thirdType=2` ); // api // .exportTaskStudent({ diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index 398e83de..3115d3c2 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -274,7 +274,7 @@ export default { title: "工号", dataIndex: "studentUserNo", key: "studentUserNo", - width: 50, + width: '15%', align: "left", className: "h head", customRender: (text) => { @@ -291,8 +291,8 @@ export default { title: "姓名", dataIndex: "studentName", key: "studentName", - width: 50, - align: "left", + width: '10%', + align: "center", className: "h head", customRender: (text) => { return ( @@ -308,7 +308,7 @@ export default { title: "所在部门", dataIndex: "studentDepartName", key: "studentDepartName", - width: 60, + width: '15%', align: "center", className: "h", ellipsis: true, @@ -328,7 +328,7 @@ export default { title: "所在岗位", dataIndex: "studentJobName", key: "studentJobName", - width: 60, + width: '10%', align: "center", ellipsis: true, className: "h", @@ -348,7 +348,7 @@ export default { title: "作业成绩", dataIndex: "workScore", key: "workScore", - width: 60, + width: '10%', align: "center", ellipsis: true, className: "h", @@ -368,7 +368,7 @@ export default { title: "考试成绩", dataIndex: "examinationScore", key: "examinationScore", - width: 60, + width: '10%', align: "center", ellipsis: true, className: "h", @@ -389,7 +389,7 @@ export default { title: "评分", dataIndex: "assessmentScore", key: "assessmentScore", - width: 60, + width: '10%', align: "center", ellipsis: true, className: "h", @@ -410,7 +410,7 @@ export default { title: "任务状态", dataIndex: "finishStatus", key: "finishStatus", - width: 60, + width: '10%', align: "center", ellipsis: true, className: "h", @@ -617,7 +617,7 @@ export default { currentStageId: props.projectTaskInfo.stageId, type: 1, pid: props.projectTaskInfo.projectId, - status: Number(state.projectName), + status: state.projectName, studentName: state.name, taskId: props.projectTaskInfo.projectTaskId, }); @@ -628,7 +628,7 @@ export default { currentStageId: props.projectTaskInfo.stageId, type: 1, pid: props.projectTaskInfo.projectId, - status: Number(state.projectName), + status: state.projectName, studentName: state.name, taskId: props.projectTaskInfo.projectTaskId, taskType: props.projectTaskInfo.type, @@ -683,7 +683,7 @@ export default { `${ process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ props.projectTaskInfo.stageId - }&type=${1}&pid=${props.projectTaskInfo.projectId}taskType=2` + }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=2` ); // api // .exportTaskStudent({ @@ -716,12 +716,12 @@ export default { api .exportHomeWork(obj) .then((res) => { - console.log("导出作业", JSON.parse(res.data).data); - if (JSON.parse(res.data).code === 200) { - message.destroy(); - message.success("导出作业成功"); + console.log("导出作业",res.data.data); + if (res.data.code === 200) { + //message.destroy(); + //message.success("导出作业成功"); state.exportHomeWorkV = true; - state.downloadUrl = JSON.parse(res.data).data; + state.downloadUrl = res.data.data; } }) .catch((err) => { diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue index db64cdf3..467a9815 100644 --- a/src/components/drawers/project/ProjectHomeWorkManage.vue +++ b/src/components/drawers/project/ProjectHomeWorkManage.vue @@ -503,7 +503,7 @@ export default { currentStageId: props.projectTaskInfo.stageId, type: 1, pid: props.projectTaskInfo.projectId, - status: Number(state.projectName), + status: state.projectName, studentName: state.name, taskId: props.projectTaskInfo.projectTaskId, taskType: props.projectTaskInfo.type, @@ -515,7 +515,7 @@ export default { currentStageId: props.projectTaskInfo.stageId, type: 1, pid: props.projectTaskInfo.projectId, - status: Number(state.projectName), + status: state.projectName, studentName: state.name, taskId: props.projectTaskInfo.projectTaskId, taskType: props.projectTaskInfo.type, @@ -562,14 +562,14 @@ export default { state.tableDataTotal2 = 0; getStudent(); }; - + // 导出数据 function exportTaskStu() { window.open( `${ process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ props.projectTaskInfo.stageId - }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=4` + }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=${4}` ); // api // .exportTaskStudent({ @@ -601,12 +601,12 @@ export default { api .exportHomeWork(obj) .then((res) => { - console.log("导出作业", JSON.parse(res.data).data); - if (JSON.parse(res.data).code === 200) { + console.log("导出作业", res.data.data); + if (res.data.code === 200) { // message.destroy(); //message.success("导出作业成功"); state.exportHomeWorkV = true; - state.downloadUrl = JSON.parse(res.data).data; + state.downloadUrl = res.data.data; } }) .catch((err) => { diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue index 9128156b..2e5a40fd 100644 --- a/src/components/drawers/router/RouterFaceTeachManage.vue +++ b/src/components/drawers/router/RouterFaceTeachManage.vue @@ -624,7 +624,7 @@ export default { `${ process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ props.datasource.chapterId - }&type=${2}&pid=${props.datasource.routerId}&taskType=2` + }&type=${2}&pid=${props.datasource.routerId}&taskType=${1}` ); // api // .exportTaskStudent({ @@ -657,12 +657,12 @@ export default { api .exportHomeWork(obj) .then((res) => { - console.log("导出作业", JSON.parse(res.data).data); - if (JSON.parse(res.data).code === 200) { - message.destroy(); - message.success("导出作业成功"); + console.log("导出作业", res.data.data); + if (res.data.code === 200) { + // message.destroy(); + // message.success("导出作业成功"); state.exportHomeWorkV = true; - state.downloadUrl = JSON.parse(res.data).data; + state.downloadUrl = res.data.data; } }) .catch((err) => { diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index 6e1a23fc..7d940560 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -560,7 +560,7 @@ export default { `${ process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ props.datasource.chapterId - }&type=${2}&pid=${props.datasource.routerId}&taskType=4` + }&type=${2}&pid=${props.datasource.routerId}&taskType=${4}` ); // api // .exportTaskStudent({ @@ -592,12 +592,12 @@ export default { api .exportHomeWork(obj) .then((res) => { - console.log("导出作业", JSON.parse(res.data).data); - if (JSON.parse(res.data).code === 200) { + console.log("导出作业", res.data.data); + if (res.data.code === 200) { // message.destroy(); // message.success("导出作业成功"); state.exportHomeWorkV = true; - state.downloadUrl = JSON.parse(res.data).data; + state.downloadUrl = res.data.data; } }) .catch((err) => { diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 169389ea..3caf3865 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -14,7 +14,7 @@ /> - +
@@ -98,9 +99,10 @@ 导入学员 + 导出学习信息 @@ -199,7 +201,7 @@ - +
删除 - +
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index bbe1b0f4..c7c5b6ff 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1859,9 +1859,10 @@ export default { title: "最近学习时间", dataIndex: "lastStudyTime", key: "lastStudyTime", - width: 80, + width: 120, align: "center", className: "h", + ellipsis: true, }, ], loading: false, @@ -3074,6 +3075,7 @@ export default { width: "20%", align: "center", className: "h", + ellipsis: true, // sorter: { // compare: (a, b) => a.stutime - b.stutime, // multiple: 3,