From f7f245e1c22a4637063006def5045764861f9907 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 16 Jan 2023 17:18:32 +0800
Subject: [PATCH] =?UTF-8?q?--fix=20=E9=9D=A2=E6=8E=88=E8=AF=BE=20=E4=B8=8E?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=86=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddLevelImportStu.vue  | 29 ++-----------------
 .../drawers/project/ProjectFaceStu.vue        | 26 ++++++++---------
 .../drawers/project/ProjectFaceTaskManage.vue | 18 +++++-------
 .../drawers/router/RouterFaceStu.vue          | 14 ++++-----
 .../drawers/router/RouterFaceTeachManage.vue  | 29 ++++++-------------
 src/components/student/TableStudent.vue       |  2 +-
 6 files changed, 41 insertions(+), 77 deletions(-)

diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue
index 4e2c0011..c501c212 100644
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -31,35 +31,12 @@
                 name="uploadFile"
                 :multiple="false"
                 @change="handleChange"
-                :data="
-                  courseType == 1
-                    ? {
+                :data="{
                         targetId: Number(courseId),
-                        type: 3,
+                        type: courseType,
                         userId: userInfo.id,
                         userName: userInfo.realName,
-                      }
-                    : courseType == 3
-                    ? {
-                        targetId: Number(courseId),
-                        type: 1,
-                        userId: userInfo.id,
-                        userName: userInfo.realName,
-                      }
-                    : courseType == 4
-                    ? {
-                        targetId: Number(courseId),
-                        type: 2,
-                        userId: userInfo.id,
-                        userName: userInfo.realName,
-                      }
-                    : {
-                        targetId: Number(courseId),
-                        type: 3,
-                        userId: userInfo.id,
-                        userName: userInfo.realName,
-                      }
-                "
+                      } "
                 :showUploadList="false"
               >
                 <p class="ant-upload-drag-icon">
diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue
index c09d3bba..972d57a9 100644
--- a/src/components/drawers/project/ProjectFaceStu.vue
+++ b/src/components/drawers/project/ProjectFaceStu.vue
@@ -186,7 +186,7 @@
     v-model:AddImpStuvisible="AddImpStuvisible"
     @AddImpStuvisibleClose="AddImpStuvisibleClose"
     :courseId="projectTaskInfo.courseId"
-    :courseType="2"
+    :courseType="3"
   />
   <!-- 批量签到弹窗 -->
   <a-modal
@@ -397,7 +397,7 @@ export default {
         ids: state.selectedStudents,
         taskId: Number(props.projectTaskInfo.projectTaskId),
         taskType: Number(props.projectTaskInfo.type),
-        type: 1,
+        type: 3,
         // userName: "",
       };
       api
@@ -663,7 +663,7 @@ export default {
                       studentName: text.record.studentName,
                       taskId: Number(props.projectTaskInfo.projectTaskId),
                       taskType: Number(props.projectTaskInfo.type),
-                      type: 1,
+                      type: 3,
                       // userName: "",
                     };
                     api
@@ -697,7 +697,7 @@ export default {
                       studentName: text.record.studentName,
                       taskId: Number(props.projectTaskInfo.projectTaskId),
                       taskType: Number(props.projectTaskInfo.type),
-                      type: 1,
+                      type: 3,
                     };
                     api
                       .attendanceLeave(obj)
@@ -800,26 +800,26 @@ export default {
       console.log("我是传递的查询参数", props.projectTaskInfo, {
         pageNo: state.currentPage,
         pageSize: state.pageSize,
-        currentStageId: props.projectTaskInfo.stageId,
-        type: 1,
-        pid: props.projectTaskInfo.projectId,
+        // currentStageId: props.projectTaskInfo.stageId,
+        type: 3,
+        pid: props.projectTaskInfo.courseId,
         // status: Number(state.name),
         studentName: state.name,
         signStatus: state.projectName2,
-        taskId: props.projectTaskInfo.projectTaskId,
+        // taskId: props.projectTaskInfo.projectTaskId,
       });
       api
         .AssessmentManagementMessage({
           pageNo: state.currentPage,
           pageSize: state.pageSize,
           currentStageId: props.projectTaskInfo.stageId,
-          type: 1,
-          pid: props.projectTaskInfo.projectId,
+          type: 3,
+          pid: props.projectTaskInfo.courseId,
           // status: Number(state.name),
           studentName: state.name,
-          taskId: props.projectTaskInfo.projectTaskId,
+          // taskId: props.projectTaskInfo.projectTaskId,
           signStatus: state.projectName2,
-          taskType: props.projectTaskInfo.type,
+          // taskType: props.projectTaskInfo.type,
         })
         .then((res) => {
           console.log("获取面授管理学员", res);
@@ -866,7 +866,7 @@ export default {
     function exportTaskStu() {
       console.log("props.projectTaskInfo", props.projectTaskInfo);
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=${1}&taskId=${props.projectTaskInfo.projectTaskId}&pid=${props.projectTaskInfo.projectId}&taskType=2&thirdType=2`
+        `${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=3&pid=${props.projectTaskInfo.courseId}&thirdType=2`
       );
       // api
       //   .exportTaskStudent({
diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue
index 0d26edaf..0a0fbe56 100644
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -613,23 +613,23 @@ export default {
         pageNo: state.currentPage,
         pageSize: state.pageSize,
         currentStageId: props.projectTaskInfo.stageId,
-        type: 1,
-        pid: props.projectTaskInfo.projectId,
+        type: 3,
+        pid: props.projectTaskInfo.courseId,
         status: state.projectName,
         studentName: state.name,
-        taskId: props.projectTaskInfo.projectTaskId,
+        // taskId: props.projectTaskInfo.projectTaskId,
       });
       api
         .AssessmentManagementMessage({
           pageNo: state.currentPage,
           pageSize: state.pageSize,
           currentStageId: props.projectTaskInfo.stageId,
-          type: 1,
-          pid: props.projectTaskInfo.projectId,
+          type: 3,
+          pid: props.projectTaskInfo.courseId,
           status: state.projectName,
           studentName: state.name,
-          taskId: props.projectTaskInfo.projectTaskId,
-          taskType: props.projectTaskInfo.type,
+          // taskId: props.projectTaskInfo.projectTaskId,
+          // taskType: props.projectTaskInfo.type,
         })
         .then((res) => {
           console.log("获取面授管理学员", res);
@@ -733,9 +733,7 @@ export default {
         `${
           process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${
           props.projectTaskInfo.stageId
-        }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${
-          props.projectTaskInfo.projectTaskId
-        }&taskType=${props.projectTaskInfo.type}`
+        }&type=3&pid=${props.projectTaskInfo.courseId}`
       );
     }
 
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index 54117863..f25d73e1 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -181,7 +181,7 @@
     v-model:AddImpStuvisible="AddImpStuvisible"
     @AddImpStuvisibleClose="AddImpStuvisibleClose"
     :courseId="datasource.courseId"
-    :courseType="1"
+    :courseType="3"
   />
   <!-- 批量签到弹窗 -->
   <a-modal
@@ -764,14 +764,14 @@ export default {
         .AssessmentManagementMessage({
           pageNo: state.currentPage,
           pageSize: state.pageSize,
-          currentStageId: props.datasource.chapterId,
-          type: 2,
-          pid: props.datasource.routerId,
+          // currentStageId: props.datasource.chapterId,
+          type: 3,
+          pid: props.datasource.courseId,
           // status: Number(state.name),
           signStatus: state.projectName2,
           studentName: state.name,
-          taskId: props.datasource.routerTaskId,
-          taskType: props.datasource.type,
+          // taskId: props.datasource.routerTaskId,
+          // taskType: props.datasource.type,
         })
         .then((res) => {
           console.log("获取面授管理学员", res);
@@ -822,7 +822,7 @@ export default {
           process.env.VUE_APP_BASE_API
         }/admin/student/exportTaskStudent?currentStageId=${
           props.datasource.chapterId
-        }&type=${2}&pid=${props.datasource.routerId}&taskType=2&thirdType=2&taskId=${props.datasource.routerTaskId}`
+        }&type=3&pid=${props.datasource.courseId}&thirdType=2`
       );
       // api
       //   .exportTaskStudent({
diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue
index 9213d019..8a3bec80 100644
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -549,26 +549,15 @@ export default {
     // 获取数据
     //获取学员
     const getStudent = () => {
-      console.log("我是传递的查询参数", {
-        pageNo: state.currentPage,
-        pageSize: state.pageSize,
-        currentStageId: props.datasource.chapterId,
-        type: 2,
-        pid: props.datasource.routerId,
-        taskId: props.datasource.routerTaskId,
-        taskType: props.datasource.type,
-        status: state.projectName,
-        studentName: state.name,
-      });
       api
         .AssessmentManagementMessage({
           pageNo: state.currentPage,
           pageSize: state.pageSize,
           currentStageId: props.datasource.chapterId,
-          type: 2,
-          pid: props.datasource.routerId,
-          taskId: props.datasource.routerTaskId,
-          taskType: props.datasource.type,
+          type: 3,
+          pid: props.datasource.courseId,
+          // taskId: props.datasource.routerTaskId,
+          // taskType: props.datasource.type,
           status: state.projectName,
           studentName: state.name,
         })
@@ -622,7 +611,7 @@ export default {
         `${
           process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
           props.datasource.chapterId
-        }&type=${2}&pid=${props.datasource.routerId}&taskType=${2}&taskId=${props.datasource.routerTaskId}`
+        }&type=3&pid=${props.datasource.courseId}`
       );
       // api
       //   .exportTaskStudent({
@@ -647,10 +636,10 @@ export default {
       state.downloadUrl = null;
       let obj = {
         currentStageId: props.datasource.chapterId,
-        pid: props.datasource.routerId,
-        taskId: props.datasource.routerTaskId,
-        taskType: props.datasource.type,
-        type: 2,
+        pid: props.datasource.courseId,
+        // taskId: props.datasource.routerTaskId,
+        // taskType: props.datasource.type,
+        type: 3,
       };
       api
         .exportHomeWork(obj)
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 7378abe7..2e234d49 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -362,7 +362,7 @@
     v-model:AddImpStuvisible="AddImpStuvisible"
     @AddImpStuvisibleClose="AddImpStuvisibleClose"
     :courseId="id"
-    :courseType="type === 1 ? 3 : 4"
+    :courseType="type"
   />
 </template>
 <script setup>