diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index 4022af43..4b72fea2 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -36,7 +36,7 @@
起止时间:— @@ -298,7 +298,7 @@ export default { // 获取数据 function getData() { - if (props.datasource.type == 11) { + if (props.datasource.type == 11||props.datasource.type == 9) { // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可 console.log("我是传递的查询参数", { pageNo: state.currentPage, @@ -307,7 +307,7 @@ export default { type: 1, pid: props.datasource.projectId, taskId: props.datasource.projectTaskId, - taskType: 11, + taskType: props.datasource.type, status: state.projectName, studentName: state.name, }); @@ -319,7 +319,7 @@ export default { type: 1, pid: props.datasource.projectId, taskId: props.datasource.projectTaskId, - taskType: 11, + taskType: props.datasource.type, status: state.projectName, studentName: state.name, }) @@ -366,7 +366,7 @@ 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=11`) + 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}`) } diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index f7193cd2..93961917 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -36,7 +36,7 @@
起止时间:— @@ -298,7 +298,7 @@ export default { // 获取数据 function getData() { - if (props.datasource.type == 11) { + if (props.datasource.type == 11 || props.datasource.type == 9) { // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可 console.log("我是传递的查询参数", { pageNo: state.currentPage, @@ -307,7 +307,7 @@ export default { type: 2, pid: props.datasource.routerId, taskId: props.datasource.routerTaskId, - taskType: 11, + taskType: props.datasource.type, status: state.projectName, studentName: state.name, }); @@ -319,7 +319,7 @@ export default { type: 2, pid: props.datasource.routerId, taskId: props.datasource.routerTaskId, - taskType: 11, + taskType: props.datasource.type, status: state.projectName, studentName: state.name, }) @@ -366,8 +366,8 @@ 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=11`) - 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=11`) + 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}`) }