diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index 2a2dbbfe..4c9ba4a7 100644 --- a/src/components/drawers/project/ProjectExamManage.vue +++ b/src/components/drawers/project/ProjectExamManage.vue @@ -377,18 +377,16 @@ export default { // 获取数据 function getData() { - api.AssessmentManagementMessage({ + api.ExamManagementMessage({ + studentName: state.name, pageNo: state.currentPage, pageSize: state.pageSize, - currentStageId: props.datasource.stageId, - type: 1, - pid: props.datasource.projectId, - taskId: props.datasource.id, - taskType: props.datasource.type, - status: state.projectName, - studentName: state.name, + chapterId: props.datasource.chapterId, + type: 2, + taskId: props.datasource.courseId, + targetId: props.datasource.projectId }).then(res=>{ - state.tabledata = res.data.data.records; + state.tabledata = res.data.data.managementDtoList; state.tableDataTotal = res.data.data.total; state.loadingData = false; }) @@ -417,8 +415,8 @@ export default { {/* 导出数据 */} function exportData() { // window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.stageId=="0"?"":props.datasource.stageId}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}&type=${2}`) - window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}`) - + window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?currentStageId=${props.datasource.stageId}&type=${2}&pid=${props.datasource.projectId}&taskId=${props.datasource.courseId}&taskType=${props.datasource.type}`) + {/* api.ExportExam({ "chapterId": props.datasource.chapterId, "targetId": props.datasource.routerId, diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index 903d98c7..666f3f40 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -395,22 +395,21 @@ export default { // 获取数据 function getData() { - api.AssessmentManagementMessage({ + api.ExamManagementMessage({ + studentName: state.name, pageNo: state.currentPage, pageSize: state.pageSize, - currentStageId: props.datasource.chapterId, - type: 2, - pid: props.datasource.routerId, - taskId: props.datasource.id, - taskType: props.datasource.type, - status: state.projectName, - studentName: state.name, + chapterId: props.datasource.chapterId, + type: 1, + taskId: props.datasource.courseId, + targetId: props.datasource.routerId }).then(res=>{ - state.tabledata = res.data.data.records; + state.tabledata = res.data.data.managementDtoList; state.tableDataTotal = res.data.data.total; state.loadingData = false; }) } + // 搜索 function searchTableData() { state.currentPage = 1; @@ -436,7 +435,7 @@ export default { {/* 导出数据 */} function exportData() { // window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`) - window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}`) + window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?currentStageId=${props.datasource.chapterId}&type=${1}&pid=${props.datasource.routerId}&taskId=${props.datasource.courseId}&taskType=${props.datasource.type}`) {/* api.ExportExam({ "chapterId": props.datasource.chapterId,