diff --git a/.env b/.env index d88b27f1..b22eb5fc 100644 --- a/.env +++ b/.env @@ -3,7 +3,7 @@ VUE_APP_BASE=/manage # api项目基础url VUE_APP_BASE_API=/manageApi # 导出url -VUE_APP_PROXY_URL=http://111.231.196.214/manageApi +VUE_APP_PROXY_URL=http://localhost:30001 # 登录url VUE_APP_LOGIN_URL=https://u-pre.boe.com/web # boe域名 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 2102dcce..6ebb7b2c 100644 --- a/src/components/drawers/project/ProjectFaceStu.vue +++ b/src/components/drawers/project/ProjectFaceStu.vue @@ -822,8 +822,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 d9cb75d4..0f0f66c9 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -671,8 +671,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` ); @@ -726,8 +725,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 bfb07e1f..c66beaa3 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 51baca8c..174abd9f 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 2f00ab89..488f04b5 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 79b2663f..eb5ffc48 100644 --- a/src/components/drawers/router/RouterFaceStu.vue +++ b/src/components/drawers/router/RouterFaceStu.vue @@ -710,7 +710,8 @@ export default { pid: props.datasource.routerId, // status: Number(state.name), studentName: state.name, - currentTaskId: props.datasource.routerTaskId, + taskId: props.datasource.routerTaskId, + taskType: props.datasource.type, }); api .AssessmentManagementMessage({ @@ -721,7 +722,7 @@ export default { pid: props.datasource.routerId, // status: Number(state.name), studentName: state.name, - currentTaskId: props.datasource.routerTaskId, + taskId: props.datasource.routerTaskId, taskType: props.datasource.type, }) .then((res) => { @@ -770,8 +771,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&thirdType=2` ); diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue index f473b6a9..e8261b60 100644 --- a/src/components/drawers/router/RouterFaceTeachManage.vue +++ b/src/components/drawers/router/RouterFaceTeachManage.vue @@ -617,8 +617,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` ); @@ -673,8 +672,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 7f2898a1..426e03bd 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -492,8 +492,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` ); } @@ -698,8 +697,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..7eb2a1be 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 : "" 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}`) } //分页