From e52982d0d7a1e05fface30969c36073155dd05b2 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Wed, 4 Jan 2023 17:54:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE/?=
 =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=9B=BE=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawers/project/ProjectOnlineManage.vue   | 18 ++++--------------
 .../drawers/router/RouterCommonManage.vue     | 19 +++++--------------
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index 8d58f717..61a9ce8a 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -306,6 +306,7 @@ export default {
           currentStageId: props.datasource.stageId,
           type: 1,
           pid: props.datasource.projectId,
+          taskId: props.datasource.projectTaskId, 
           status: state.projectName,
           studentName: state.name,
         });
@@ -316,6 +317,7 @@ export default {
             currentStageId: props.datasource.stageId,
             type: 1,
             pid: props.datasource.projectId,
+            taskId: props.datasource.projectTaskId, 
             status: state.projectName,
             studentName: state.name,
           })
@@ -362,20 +364,8 @@ export default {
 
     // 导出数据
     function exportTaskStu() {
-      api
-        .ExportTaskStudent({
-          pageNo: state.currentPage,
-          pageSize: state.pageSize,
-          currentStageId: props.datasource.stageId,
-          type: 1,
-          pid: props.datasource.projectId,
-        })
-        .then((res) => {
-          console.log(res);
-        })
-        .catch((err) => {
-          console.log(err);
-        });
+      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}`)
+      // window.open(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}&currentStageId=${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 e25e1200..0f1bd82f 100644
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -306,6 +306,7 @@ export default {
           currentStageId: props.datasource.chapterId,
           type: 2,
           pid: props.datasource.routerId,
+          taskId: props.datasource.routerTaskId, 
           status: state.projectName,
           studentName: state.name,
         });
@@ -316,6 +317,7 @@ export default {
             currentStageId: props.datasource.chapterId,
             type: 2,
             pid: props.datasource.routerId,
+            taskId: props.datasource.routerTaskId, 
             status: state.projectName,
             studentName: state.name,
           })
@@ -362,20 +364,9 @@ export default {
 
     // 导出数据
     function exportTaskStu() {
-      api
-        .ExportTaskStudent({
-          pageNo: state.currentPage,
-          pageSize: state.pageSize,
-          currentStageId: props.datasource.chapterId,
-          type: 2,
-          pid: props.datasource.routerId,
-        })
-        .then((res) => {
-          console.log(res);
-        })
-        .catch((err) => {
-          console.log(err);
-        });
+      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}`)
+      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}`)
+      // window.open(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}&currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&status=${state.name}&studentName=${state.projectName}`)
     }
 
     return {