Merge branch 'pre-release' into 'release'

Pre release

See merge request !74

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);

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;

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;

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==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{
+        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}`)
       }
     }
 

src/utils/useCommon.js

@@ -63,15 +63,12 @@ export function useAsyncStu(id, type, func) {
     loading.value && dialog({
       duration: 3500,
       cancel: false,
-      content: "您选择的学员正在添加中，请耐心等待，进行其他操作不影响此次添加"
+      content: "您所在项目有学员正在添加中，请耐心等待，进行其他操作不影响此次添加"
     });
     loading.value || (func && func());
   });
 
   onMounted(() => {
-    console.log(22222222);
-    console.log(id);
-    console.log(type);
     id && type && start();
   });
   return { loading, start };

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">