From 2f86d38cddab00483c1f4bf138e75c5ac800e410 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 10 Jan 2023 16:34:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AD=A6=E5=91=98=E5=BC=B9=E6=A1=86=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E9=87=8D=E6=96=B0=E8=8E=B7=E5=8F=96=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddLevelImportStu.vue      | 10 +++++++---
 src/components/drawers/project/ProjectFaceStu.vue | 11 ++++++++++-
 src/components/drawers/router/RouterFaceStu.vue   | 11 ++++++++++-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue
index 34b9fa3b..708ab66b 100644
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -171,6 +171,7 @@ export default {
     const state = reactive({
       template: process.env.VUE_APP_TEMPLATE + "导入学员模版-1672998102528.xlsx",
       importStudent: process.env.VUE_APP_BASE_API + "admin/student/importStudent",
+      timers: "", // 定时器，用于清空定时器使用
       uploadpercent: -1,
       uploadErr: false, //上传失败
       addLoading: false,
@@ -182,6 +183,7 @@ export default {
       locationHref: location.href.indexOf('http://') !== -1 ? 'http://111.231.196.214:12016/' : location.href.slice(0, location.href.indexOf('/m')) + '/upload/'
     });
     const closeDrawer = () => {
+      clearInterval(state.timers);
       state.fileList = [];
       state.uploadpercent = -1;
       state.addLoading = false;
@@ -191,6 +193,8 @@ export default {
       state.errNum = 0;
       state.downloadErrUrl = "";
       ctx.emit("update:AddImpStuvisible", false);
+      // 通知父组件重新获取学员列表
+      ctx.emit("AddImpStuvisibleClose", false);
     };
 
     const afterVisibleChange = (bool) => {
@@ -228,7 +232,7 @@ export default {
           type: 3
         })
         let i = 0;
-        let timer = setInterval(() => {
+        state.timers = setInterval(() => {
             let uid = info.file.response.data;
             api
               .getImportStatus(uid)
@@ -246,12 +250,12 @@ export default {
                     state.succNum = res.data.data.successNum;
                     state.errNum = res.data.data.failedNum;
                     state.downloadErrUrl = res.data.data.url;
-                    clearInterval(timer);
+                    clearInterval(state.timers);
                   }
                 }
               })
               .catch((err) => {
-                clearInterval(timer);
+                clearInterval(state.timers);
                 state.showBottomBar = true;
                 state.addLoading = false;
                 console.log("查询导入状态失败", err);
diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue
index 35257f02..ab8ed207 100644
--- a/src/components/drawers/project/ProjectFaceStu.vue
+++ b/src/components/drawers/project/ProjectFaceStu.vue
@@ -180,7 +180,7 @@
   <!-- 二维码签到弹窗 -->
   <SignQR v-model:signQRvisible="signQRvisible" />
   <!-- 导入学员抽屉 -->
-  <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" :courseId="projectTaskInfo.courseId" :courseType="2"/>
+  <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" @AddImpStuvisibleClose="AddImpStuvisibleClose" :courseId="projectTaskInfo.courseId" :courseType="2"/>
   <!-- 批量签到弹窗 -->
   <a-modal
     v-model:visible="copyModal"
@@ -727,6 +727,14 @@ export default {
       //     console.log(err);
       //   });
     }
+
+    {/* 添加学员弹框关闭，重新获取学员列表 */}
+    const AddImpStuvisibleClose = () => {
+      console.log('关闭了导入学员弹框')
+      {/* 此处操作重新获取学员列表数据 */}
+      getStudent()
+    }
+
     return {
       ...toRefs(state),
       selectProjectName,
@@ -746,6 +754,7 @@ export default {
       changePaginationStu,
       exportTaskStu,
       clearLine,
+      AddImpStuvisibleClose
     };
   },
 };
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index cd3321d0..e0045294 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -174,7 +174,7 @@
   <!-- 二维码签到弹窗 -->
   <SignQR v-model:signQRvisible="signQRvisible" />
   <!-- 导入学员抽屉 -->
-  <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" :courseId="datasource.courseId" :courseType="1"/>
+  <imp-stu v-model:AddImpStuvisible="AddImpStuvisible"  @AddImpStuvisibleClose="AddImpStuvisibleClose" :courseId="datasource.courseId" :courseType="1" />
   <!-- 批量签到弹窗 -->
   <a-modal
     v-model:visible="copyModal"
@@ -695,6 +695,14 @@ export default {
       state.codeIndex = 1;
       state.codeType = 2;
     };
+
+    {/* 添加学员弹框关闭，重新获取学员列表 */}
+    const AddImpStuvisibleClose = () => {
+      console.log('关闭了导入学员弹框')
+      {/* 此处操作重新获取学员列表数据 */}
+      getStudent()
+    }
+
     return {
       ...toRefs(state),
       selectProjectName,
@@ -715,6 +723,7 @@ export default {
       exportTaskStu,
       clearLine,
       qrcodeVisible,
+      AddImpStuvisibleClose
     };
   },
 };