Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuping
2023-02-26 02:18:52 +08:00
2 changed files with 5 additions and 3 deletions

View File

@@ -855,6 +855,7 @@ export default {
// 导出数据 // 导出数据
function exportTaskStu() { function exportTaskStu() {
debugger
{/* debugger */ } {/* debugger */ }
console.log("props.datasource此处的taskId 应该是router_task 表中主键", props.datasource); console.log("props.datasource此处的taskId 应该是router_task 表中主键", props.datasource);
console.log("props.datasource", props.datasource); console.log("props.datasource", props.datasource);
@@ -862,13 +863,13 @@ export default {
window.open( window.open(
`${process.env.VUE_APP_BASE_API `${process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId }/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId
}&type=2&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}` }&type=2&pid=${props.datasource.routerId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
); );
} else { } else {
window.open( window.open(
`${process.env.VUE_APP_BASE_API `${process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId }/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId
}&type=1&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}` }&type=1&pid=${props.datasource.projectId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
); );
} }

View File

@@ -183,6 +183,7 @@ export default {
}; };
//获取作业详情 //获取作业详情
const getWorkDetail = () => { const getWorkDetail = () => {
debugger
console.log("props.workId, props.stuId", props.workId, props.stuId); console.log("props.workId, props.stuId", props.workId, props.stuId);
getWorkSubmitInfo(props.workId, props.stuId) getWorkSubmitInfo(props.workId, props.stuId)
.then((res) => { .then((res) => {
@@ -346,4 +347,4 @@ export default {
} }
} }
} }
</style> </style>