From 729d25527e32abd405cd679fb4b8645014a2c4a3 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Sat, 25 Feb 2023 22:02:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E9=95=BF=E4=B8=8D?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=8D=A2=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 3a486ee1..3703d254 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/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>

From c855f03fc91d6a312a8e778b7a83725a5083660f Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sat, 25 Feb 2023 22:02:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BD=9C=E4=B8=9A=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=8A=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ExportScore.vue | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue
index c555a587..b3ee5147 100644
--- a/src/components/drawers/ExportScore.vue
+++ b/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}上传失败`);

From 6a401739618ad3fc5cf532aa4e95438cdf34e534 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sat, 25 Feb 2023 22:07:46 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=E5=A4=96=E9=83=A8=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E5=AD=A6=E5=91=98=E6=88=90=E7=BB=A9=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/project/ProjectExternalExamManage.vue    | 2 +-
 .../drawers/router/RouterExaminationExternalManage.vue          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/project/ProjectExternalExamManage.vue b/src/components/drawers/project/ProjectExternalExamManage.vue
index 61f62857..49b7f074 100644
--- a/src/components/drawers/project/ProjectExternalExamManage.vue
+++ b/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>
               );
             },
diff --git a/src/components/drawers/router/RouterExaminationExternalManage.vue b/src/components/drawers/router/RouterExaminationExternalManage.vue
index 84cc0c66..cae1c3ed 100644
--- a/src/components/drawers/router/RouterExaminationExternalManage.vue
+++ b/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>
               );
             },