From b99485cdd2b42a7d6696e7f1cc4c2e9e422d156f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 9 Mar 2023 13:20:02 +0800
Subject: [PATCH 1/7] =?UTF-8?q?--=20fix=20=E5=9C=A8=E7=BA=BF=E8=AF=BE?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/useCommon.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/utils/useCommon.js b/src/utils/useCommon.js
index 4773b3f3..00bf04c0 100644
--- a/src/utils/useCommon.js
+++ b/src/utils/useCommon.js
@@ -69,9 +69,6 @@ export function useAsyncStu(id, type, func) {
   });
 
   onMounted(() => {
-    console.log(22222222);
-    console.log(id);
-    console.log(type);
     id && type && start();
   });
   return { loading, start };

From 686ea06697357355506bde1207ebff6779cab92d Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 9 Mar 2023 13:21:28 +0800
Subject: [PATCH 2/7] =?UTF-8?q?--=20fix=20=E5=9C=A8=E7=BA=BF=E8=AF=BE?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/useCommon.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/useCommon.js b/src/utils/useCommon.js
index 00bf04c0..8317af46 100644
--- a/src/utils/useCommon.js
+++ b/src/utils/useCommon.js
@@ -63,7 +63,7 @@ export function useAsyncStu(id, type, func) {
     loading.value && dialog({
       duration: 3500,
       cancel: false,
-      content: "您选择的学员正在添加中，请耐心等待，进行其他操作不影响此次添加"
+      content: "您所在项目有学员正在添加中，请耐心等待，进行其他操作不影响此次添加"
     });
     loading.value || (func && func());
   });

From dc4f18e73e25fa5be9c57faaf91cfd3e7bc09dc9 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 9 Mar 2023 14:23:04 +0800
Subject: [PATCH 3/7] style

---
 src/components/drawers/ViewAssess.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue
index 47eb991c..810ff844 100644
--- a/src/components/drawers/ViewAssess.vue
+++ b/src/components/drawers/ViewAssess.vue
@@ -378,6 +378,7 @@ export default {
       position: absolute;
       bottom: 0;
       left: 0;
+      background-color: #fff;
       display: flex;
       align-items: center;
       justify-content: center;

From f29396e34c7230439b712ec4a0188bfd55e26574 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 9 Mar 2023 15:04:11 +0800
Subject: [PATCH 4/7] =?UTF-8?q?--=20fix=20=E5=AF=BC=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/router/RouterCommonManage.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue
index 691550ec..7c7e2889 100644
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -515,8 +515,11 @@ export default {
       }else if(props.datasource.type==11){
         {/* 评估导出 */}
         window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
-      }else{
+      }else if(props.datasource.type==9){
+        {/* 讨论 */}
         window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportDiscussStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
+      }else{
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       }
     }
 

From 6a00d1128823ca734c0cf7b6f72f073b86c28805 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 9 Mar 2023 15:04:59 +0800
Subject: [PATCH 5/7] =?UTF-8?q?--=20fix=20=E5=AF=BC=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/router/RouterCommonManage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue
index 7c7e2889..c5821df4 100644
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -515,7 +515,7 @@ export default {
       }else if(props.datasource.type==11){
         {/* 评估导出 */}
         window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
-      }else if(props.datasource.type==9){
+      }else if(props.datasource.type==8){
         {/* 讨论 */}
         window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportDiscussStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       }else{

From fb8d1aab0b9234e2dfab0facc9033568d2fb5f65 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 9 Mar 2023 15:29:37 +0800
Subject: [PATCH 6/7] style

---
 src/components/drawers/CheckAnsware.vue   |  1 +
 src/views/projectcenter/ProjectManage.vue | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/drawers/CheckAnsware.vue b/src/components/drawers/CheckAnsware.vue
index cdd8b6e4..4c77c7b4 100644
--- a/src/components/drawers/CheckAnsware.vue
+++ b/src/components/drawers/CheckAnsware.vue
@@ -163,6 +163,7 @@ export default {
 </script>
 <style lang="scss">
 .CheckAnsware {
+    z-index: 99999;
     .drawerMain {
         min-width: 400px;
         margin: 0px 32px 0px 32px;
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index a50e05b6..2b475cbb 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -568,7 +568,7 @@
             <span>您确定要复制此项目吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn2" @click="closeCopyModal">
+            <div class="del_btn btn2" @click="closeCopyModal" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="copyProject">
@@ -601,7 +601,7 @@
             </div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn2" @click="closeStopModal">
+            <div class="del_btn btn2" @click="closeStopModal" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="finishProject">
@@ -631,7 +631,7 @@
             <span>您确定要删除此项目吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn2" @click="closeDeleteModal">
+            <div class="del_btn btn2" @click="closeDeleteModal" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="deleteProject">
@@ -661,7 +661,7 @@
             <span>您确定要存为模版吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn2" @click="closeStartModal">
+            <div class="del_btn btn2" @click="closeStartModal" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="templateProject">
@@ -775,7 +775,7 @@
             <div class="back">（项目撤回后学员进度保留，发布后可继续学习）</div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn2" @click="closeBackModal">
+            <div class="del_btn btn2" @click="closeBackModal" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallProject">
@@ -806,7 +806,7 @@
             <div class="back">（项目撤回结束后学员可继续学习）</div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn2" @click="closeBackFinashModal">
+            <div class="del_btn btn2" @click="closeBackFinashModal" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="reFinashedProject">
@@ -866,7 +866,7 @@
             <div class="back"></div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn2" @click="closeReviewModal">
+            <div class="del_btn btn2" @click="closeReviewModal" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="reviewProject">
@@ -897,7 +897,7 @@
             <div class="back"></div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn2" @click="closeRecallReviewModal">
+            <div class="del_btn btn2" @click="closeRecallReviewModal" style="margin-right: 32px;">
               <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallReviewProject">

From 7de159409df1e19d285d07ebfb52384cf78ff368 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Thu, 9 Mar 2023 16:10:32 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index a16b789e..393238b7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
 
 const store = useStore();
 const isLogin = ref(false);
-console.log("版本1.4.4------------");
+console.log("版本1.4.5------------");
 
 // 监听关闭浏览器
 let time1 = ref(0);