Merge remote-tracking branch 'origin/develop' into develop

src/components/drawers/StuScoreDetail.vue

@@ -156,6 +156,7 @@ export default {
           score: item.score,
           type: "完成任务",
           from: item.source == "" ? "-" : item.source,
+          typeDesc: item.typeDesc
         };
         array.push(obj);
       });

src/components/drawers/project/ProjectExamManage.vue

@@ -377,11 +377,10 @@ export default {
       };
       batchSendMessage(obj).then(res => {
         console.log(res)
-        message.success("成功");
+        message.success("催促" + props.title + "成功");
       }).catch(err => {
         console.log(err)
       })
-      message.success("催促" + props.title + "成功");
     };
     //导入成绩
     const showEScoreModal = () => {

src/components/drawers/project/ProjectExternalExamManage.vue

@@ -371,12 +371,11 @@
           'chapterId': props.datasource.chapterId,//阶段或关卡Id
         };
         batchSendMessage(obj).then(res => {
+          message.success("催促" + props.title + "成功");
           console.log(res)
-          message.success("成功");
         }).catch(err => {
           console.log(err)
         })
-        message.success("催促" + props.title + "成功");
       };
       //导入成绩
       const showEScoreModal = () => {

src/components/drawers/router/RouterExaminationExternalManage.vue

@@ -376,11 +376,10 @@
         };
         batchSendMessage(obj).then(res => {
           console.log(res)
-          message.success("成功");
+          message.success("催促" + props.title + "成功");
         }).catch(err => {
           console.log(err)
         })
-        message.success("催促" + props.title + "成功");
       };
       //导入成绩
       const showEScoreModal = () => {

src/components/drawers/router/RouterExaminationManage.vue

@@ -378,11 +378,10 @@ export default {
       };
       batchSendMessage(obj).then(res => {
         console.log(res)
-        message.success("成功");
+        message.success("催促" + props.title + "成功");
       }).catch(err => {
         console.log(err)
       })
-      message.success("催促" + props.title + "成功");
     };
     //导入成绩
     const showEScoreModal = () => {