From e39b9ba66884821c6cd20e3d277a300d172fdc4c Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Thu, 25 Jul 2024 17:35:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/ReportProject.vue | 55 +++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/views/report/ReportProject.vue b/src/views/report/ReportProject.vue
index 67aa4507..cfc9323b 100644
--- a/src/views/report/ReportProject.vue
+++ b/src/views/report/ReportProject.vue
@@ -263,14 +263,25 @@ export default {
           headers: {
             token: Cookies.get("token"),
           },
-        }).then(
-          (res) => {
-            downLoad(res.data, "项目详情.xlsx");
-          },
-          (err) => {
-            message.error(err);
-          }
-        );
+        }).then((res) => {
+          const reader = new FileReader();
+          reader.onload = function(e) {
+            try {
+              const result = JSON.parse(e.target.result);
+              if (result.status === 200 || result.success) {
+                // 下载文件
+                downLoad(res.data, "项目详情.xlsx");
+              } else {
+                message.error(result.message);
+              }
+            } catch (error) {
+              downLoad(res.data, "项目详情.xlsx");
+            }
+          };
+          reader.readAsText(res.data);
+        }).catch((error) => {
+          message.error(error.response ? error.response.data.message : error.toString());
+        });
       } else {
         const params = {};
         params.status = state.status;
@@ -291,19 +302,25 @@ export default {
           headers: {
             token: Cookies.get("token"),
           },
-        }).then(
-          (res) => {
-            if(res.data.status && res.data.status == 600){
-              message.error(res.data.message);
-            }else{
+        }).then((res) => {
+          const reader = new FileReader();
+          reader.onload = function(e) {
+            try {
+              const result = JSON.parse(e.target.result);
+              if (result.status === 200 || result.success) {
+                // 下载文件
+                downLoad(res.data, "项目详情.xlsx");
+              } else {
+                message.error(result.message);
+              }
+            } catch (error) {
               downLoad(res.data, "项目详情.xlsx");
             }
-            
-          },
-          (err) => {
-            message.error(err);
-          }
-        );
+          };
+          reader.readAsText(res.data);
+        }).catch((error) => {
+          message.error(error.response ? error.response.data.message : error.toString());
+        });
       }
     };
     // 表格数据

From 99a4d76f7f00ca74d7534e6987e4e10bdc425f45 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Fri, 2 Aug 2024 17:02:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E5=BC=80=E8=AF=BE?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=BD=9C=E4=B8=9A=E5=AF=BC=E5=85=A5=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ExportScore.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue
index c93283bb..bb9c9edb 100644
--- a/src/components/drawers/ExportScore.vue
+++ b/src/components/drawers/ExportScore.vue
@@ -254,6 +254,16 @@ export default {
               console.log("查询导入状态", res);
               if (res.data.code === 200) {
                 if (res.data.data.status !== "START") {
+                  if(res.data.data.status === "SUCCESS"){
+                    state.addLoading = false;
+                    state.fileList = [];
+                    state.uploadpercent = -1;
+                    message.destroy(); 
+                    message.error(`当前开课暂无作业，无法导入成绩`);
+                    clearInterval(timer);
+                    clearTimeout(timeouts);
+                    return;
+                  }
                   i++;
                   if (i === 1) {
                     message.destroy();

From 6e7ebc15cfa3511866160f0c3b3a4e94ac580eac Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 5 Aug 2024 17:04:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E5=BC=80=E8=AF=BE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5=E6=88=90?=
 =?UTF-8?q?=E7=BB=A9=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/TableStudent.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 305eb789..001f2e2d 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -162,9 +162,9 @@
             :style="{ display: hideshow ? 'none' : 'block' }"
           >
             <div class="btnsbox">
-              <div class="btn4_tit" @click="showEScoreModal">
+              <!-- <div class="btn4_tit" @click="showEScoreModal">
                 <span>批量录入成绩</span>
-              </div>
+              </div> -->
               <div class="btn4_op1" @click="updateStatus(1)">
                 <span>批量结业</span>
               </div>