diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue index 360a05b1..73aa0434 100644 --- a/src/components/drawers/AddLevelImportStu.vue +++ b/src/components/drawers/AddLevelImportStu.vue @@ -34,7 +34,7 @@ :data=" courseType == 1 ? { - stageId: Number(courseId), + targetId: Number(courseId), type: 3, userId: userId, userName: userName, diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue index da45233e..741de9f2 100644 --- a/src/components/drawers/ViewAssess.vue +++ b/src/components/drawers/ViewAssess.vue @@ -195,7 +195,7 @@ export default { console.log('我是传递过来的参数2', props.basicdata) api.QueryAssessmentDetail({ "assessmentSubmitId": props.datasource.assessmentSubmitId, - "courseId": props.datasource.courseId, + "courseId": props.basicdata.assessmentId, "studentId": props.datasource.studentId }).then(res=>{ console.log(res) diff --git a/src/components/drawers/project/ProjectEvalManage.vue b/src/components/drawers/project/ProjectEvalManage.vue index 4efce258..36963621 100644 --- a/src/components/drawers/project/ProjectEvalManage.vue +++ b/src/components/drawers/project/ProjectEvalManage.vue @@ -405,8 +405,8 @@ export default { // 导出数据 function exportTaskStu() { - window.open(`${process.env.VUE_APP_PROXY_URL}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_PROXY_URL}admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}¤tStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&status=${state.name}&studentName=${state.projectName}`) + 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/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}¤tStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&status=${state.name}&studentName=${state.projectName}`) } return { diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index ea6ef595..ffe2b381 100644 --- a/src/components/drawers/project/ProjectExamManage.vue +++ b/src/components/drawers/project/ProjectExamManage.vue @@ -414,7 +414,7 @@ export default { {/* 导出数据 */} function exportData() { - window.open(`${process.env.VUE_APP_PROXY_URL}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/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`) {/* api.ExportExam({ "chapterId": props.datasource.chapterId, "targetId": props.datasource.routerId, diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue index 9ef15484..e8d1a29a 100644 --- a/src/components/drawers/project/ProjectFaceStu.vue +++ b/src/components/drawers/project/ProjectFaceStu.vue @@ -867,8 +867,7 @@ export default { console.log("props.projectTaskInfo", props.projectTaskInfo); window.open( `${ - process.env.VUE_APP_PROXY_URL - }admin/student/exportTaskStudent?currentStageId=${ + process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ props.projectTaskInfo.stageId }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=0` ); diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index bc3a48f7..a13e2c1d 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -676,8 +676,7 @@ export default { console.log("props.projectTaskInfo", props.projectTaskInfo); window.open( `${ - process.env.VUE_APP_PROXY_URL - }admin/student/exportTaskStudent?currentStageId=${ + process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ props.projectTaskInfo.stageId }&type=${1}&pid=${props.projectTaskInfo.projectId}taskType=2` ); @@ -731,8 +730,7 @@ export default { console.log("props.projectTaskInfo", props.projectTaskInfo); window.open( `${ - process.env.VUE_APP_PROXY_URL - }admin/student/exportHomeWork?currentStageId=${ + process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${ props.projectTaskInfo.stageId }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${ props.projectTaskInfo.projectTaskId diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue index 51e914ae..ac2e3067 100644 --- a/src/components/drawers/project/ProjectHomeWorkManage.vue +++ b/src/components/drawers/project/ProjectHomeWorkManage.vue @@ -566,8 +566,7 @@ export default { function exportTaskStu() { window.open( `${ - process.env.VUE_APP_PROXY_URL - }admin/student/exportTaskStudent?currentStageId=${ + process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ props.projectTaskInfo.stageId }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=4` ); @@ -621,8 +620,7 @@ export default { console.log("props.projectTaskInfo", props.projectTaskInfo); window.open( `${ - process.env.VUE_APP_PROXY_URL - }admin/student/exportHomeWork?currentStageId=${ + process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${ props.projectTaskInfo.stageId }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${ props.projectTaskInfo.projectTaskId diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index de7748da..1aff9909 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -451,8 +451,8 @@ export default { // 导出数据 function exportTaskStu() { - window.open(`${process.env.VUE_APP_PROXY_URL}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_PROXY_URL}admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}¤tStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&status=${state.name}&studentName=${state.projectName}`) + 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/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}¤tStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&status=${state.name}&studentName=${state.projectName}`) } return { diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index 0919ca2b..3e1b5cff 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -453,9 +453,9 @@ export default { // 导出数据 function exportTaskStu() { - console.log(`${process.env.VUE_APP_PROXY_URL}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_PROXY_URL}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_PROXY_URL}admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}¤tStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&status=${state.name}&studentName=${state.projectName}`) + console.log(`${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/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/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}¤tStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&status=${state.name}&studentName=${state.projectName}`) } return { diff --git a/src/components/drawers/router/RouterEvaluationManage.vue b/src/components/drawers/router/RouterEvaluationManage.vue index d7f71520..b31b466e 100644 --- a/src/components/drawers/router/RouterEvaluationManage.vue +++ b/src/components/drawers/router/RouterEvaluationManage.vue @@ -404,9 +404,9 @@ export default { // 导出数据 function exportTaskStu() { - console.log(`${process.env.VUE_APP_PROXY_URL}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_PROXY_URL}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_PROXY_URL}admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}¤tStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&status=${state.name}&studentName=${state.projectName}`) + console.log(`${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/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/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}¤tStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&status=${state.name}&studentName=${state.projectName}`) } return { diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index fd068db2..ee7b8dd3 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -433,7 +433,7 @@ export default { {/* 导出数据 */} function exportData() { - window.open(`${process.env.VUE_APP_PROXY_URL}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/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`) {/* api.ExportExam({ "chapterId": props.datasource.chapterId, "targetId": props.datasource.routerId, diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue index 3587a9ea..c0245c10 100644 --- a/src/components/drawers/router/RouterFaceStu.vue +++ b/src/components/drawers/router/RouterFaceStu.vue @@ -757,6 +757,7 @@ export default { // status: Number(state.name), studentName: state.name, taskId: props.datasource.routerTaskId, + taskType: props.datasource.type, }); api .AssessmentManagementMessage({ @@ -816,8 +817,8 @@ export default { console.log("props.datasource", props.datasource); window.open( `${ - process.env.VUE_APP_PROXY_URL - }admin/student/exportTaskStudent?currentStageId=${ + process.env.VUE_APP_BASE_API + }/admin/student/exportTaskStudent?currentStageId=${ props.datasource.chapterId }&type=${2}&pid=${props.datasource.routerId}&taskType=2&thirdType=2` ); diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue index a8985d95..d767cd43 100644 --- a/src/components/drawers/router/RouterFaceTeachManage.vue +++ b/src/components/drawers/router/RouterFaceTeachManage.vue @@ -622,8 +622,7 @@ export default { console.log("props.datasource", props.datasource); window.open( `${ - process.env.VUE_APP_PROXY_URL - }admin/student/exportTaskStudent?currentStageId=${ + process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ props.datasource.chapterId }&type=${2}&pid=${props.datasource.routerId}&taskType=2` ); @@ -678,8 +677,7 @@ export default { console.log("props.datasource", props.datasource); window.open( `${ - process.env.VUE_APP_PROXY_URL - }admin/student/exportHomeWork?currentStageId=${ + process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${ props.datasource.chapterId }&type=${2}&pid=${props.datasource.routerId}&taskId=${ props.datasource.routerTaskId diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index b3fe017b..7c69218a 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -576,8 +576,7 @@ export default { console.log("props.datasource", props.datasource); window.open( `${ - process.env.VUE_APP_PROXY_URL - }admin/student/exportTaskStudent?currentStageId=${ + process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ props.datasource.chapterId }&type=${2}&pid=${props.datasource.routerId}&taskType=4` ); @@ -631,8 +630,7 @@ export default { console.log("props.datasource", props.datasource); window.open( `${ - process.env.VUE_APP_PROXY_URL - }admin/student/exportHomeWork?currentStageId=${ + process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${ props.datasource.chapterId }&type=${2}&pid=${props.datasource.routerId}&taskId=${ props.datasource.routerTaskId diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 9d2ae440..a2d9fdfc 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -503,8 +503,7 @@ function exportTaskStu() { console.log("props.datasource", props.datasource); window.open( `${ - process.env.VUE_APP_PROXY_URL - }admin/student/exportTaskStudent?type=${1}&pid=${props.id}&taskType=0` + process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&taskType=0` ); } @@ -709,8 +708,7 @@ const exportHomeWorkShow = () => { const exportStu = () => { window.open( `${ - process.env.VUE_APP_PROXY_URL - }admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2` + process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2` ); }; diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index e893422e..f679d180 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -4994,7 +4994,7 @@ export default defineComponent({ } window.open( - `${process.env.VUE_APP_PROXY_URL}admin/offcourse/export?pageNo=${ + `${process.env.VUE_APP_BASE_API}/admin/offcourse/export?pageNo=${ state.currentPage1 }&pageSize=${state.pageSize1}&auditStatus=${ state.auditStatus ? state.auditStatus : "" @@ -5004,7 +5004,7 @@ export default defineComponent({ state.createName ? state.createName : "" }&endTime=${endTime ? endTime : ""}&beginTime=${ startTime ? startTime : "" - }` + }&type=3` ); { diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue index e3b6a89b..43acfa15 100644 --- a/src/views/research/ManagePage.vue +++ b/src/views/research/ManagePage.vue @@ -154,7 +154,7 @@ export default { // 导出学员信息 function exportStudentInfo() { - window.open(`${process.env.VUE_APP_PROXY_URL}admin/assessment/manage/exportAssessmentMessage?assessmentId=${state.basicInfo.assessmentId}`) + window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?assessmentId=${state.basicInfo.assessmentId}`) } //分页