feat:合并

src/components/drawers/ExportScore.vue

@@ -236,6 +236,12 @@ export default {
       if (status === "done") {
         state.fileName = info.file.name;
         let i = 0;
+        let timeouts = setTimeout(() => {
+          clearInterval(timer)
+          state.addLoading = false;
+          message.destroy(); 
+          message.error(`文件导入超时`);
+        }, 30000);
         let timer = setInterval(() => {
           let uid = info.file.response.data;
           api
@@ -256,25 +262,21 @@ export default {
                   state.downloadErrUrl = res.data.data.url;
                   console.log("props.getStudent", props.getStudent);
                   clearInterval(timer);
+                  clearTimeout(timeouts);
                 }
               } else {
                 state.addLoading = false;
                 message.destroy();
-                message.error(`文件导入超时`);
+                clearTimeout(timeouts);
               }
             })
             .catch((err) => {
               state.addLoading = false;
               clearInterval(timer);
+              clearTimeout(timeouts);
               console.log("查询导入状态失败", err);
             });
         }, 500);
-        setTimeout(() => {
-          clearInterval(timer)
-          state.addLoading = false;
-          message.destroy();
-          message.error(`文件导入超时`);
-        }, 30000);
       } else if (status === "error") {
         state.uploadErr = true;
         message.error(`${info.file.name}上传失败`);

src/components/drawers/project/ProjectExternalExamManage.vue

@@ -296,7 +296,7 @@
             customRender: (text) => {
               return (
                 <div class="racona">
-                  <span> {text.record.score?text.record.score:"-"}</span>
+                  <span> {text.record.score?text.record.score<0?"-":text.record.score:"-"} </span>
                 </div>
               );
             },

src/components/drawers/router/RouterExaminationExternalManage.vue

@@ -300,7 +300,7 @@
             customRender: (text) => {
               return (
                 <div class="racona">
-                  <span> {text.record.score?text.record.score:"-"}</span>
+                  <span> {text.record.score?text.record.score<0?"-":text.record.score:"-"}</span>
                 </div>
               );
             },

src/views/projectcenter/TaskPage.vue

@@ -769,7 +769,7 @@
                     <a-button @click="settingTopFlag(record)" type="link"
                       >{{ record.topFlag ? "取消优秀" : "优秀学员" }}
                     </a-button>
-                    <a-button type="link" @click="showChangeGroupModal(record)"
+                    <a-button type="link" :disabled="record.isLeader === '1'" @click="showChangeGroupModal(record)"
                       >换组
                     </a-button>
                   </template>