From 7b6993e58dbfb640a4a3579feefd9bf840a338d5 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 6 Aug 2024 08:58:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E4=BD=93=E4=BF=AE=E6=94=B9=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Study/manager.vue | 69 ++++++++++++++++++--------------
 1 file changed, 40 insertions(+), 29 deletions(-)

diff --git a/src/components/Study/manager.vue b/src/components/Study/manager.vue
index 8b810c98..f3f949e4 100644
--- a/src/components/Study/manager.vue
+++ b/src/components/Study/manager.vue
@@ -521,40 +521,51 @@ export default {
       }
       // window.open(`/systemapi/xboe/m/course/portal/export?contentId=${params.contentId}&courseName=${params.courseName}&courseId=${params.courseId}&status=${params.status}&name=${params.name}`)
       const url = `/systemapi/xboe/m/course/portal/export?contentId=${params.contentId}&courseName=${params.courseName}&courseId=${params.courseId}&status=${params.status}&name=${params.name}`
+      axios({
+          method: 'get',
+          url: url,
+          // responseType: 'blob',
+          headers: { 'X-Access-Token': getToken() }
+        }).then((res) => {
+          this.isTrue = false;
+          console.log(res,'res')
+          if(res.data.status == 200){
+            if(res.data.result.includes('home')){
+              window.open(res.data.result)
+            }else{
+              this.$message.warning(res.data.result)
+            }
+          }
+        }).catch(err=>{
+          this.isTrue = false;
+          this.$message.error(err.data.message)
+        })
       // axios({
       //     method: 'get',
       //     url: url,
       //     responseType: 'blob',
       //     headers: { 'X-Access-Token': getToken() }
-      //   }).then((res) => {
-      //     this.resolveBlob(res, 'application/zip',`${params.courseName}【作业】`)
-      //   })
-      axios({
-          method: 'get',
-          url: url,
-          responseType: 'blob',
-          headers: { 'X-Access-Token': getToken() }
-        }).then((response) => {
-            if (response.status === 200) {
-              this.isTrue = false;
-              if (!(response.headers['content-type']).startsWith('application/json')) {
-                this.resolveBlob(response, 'application/zip', `${params.courseName}【作业】`);
-              } else {
-                console.log(response,'response')
-                const reader = new FileReader();
-                reader.onload = (e) => {
-                  const errorData = JSON.parse(e.target.result)
-                  this.$message.error(errorData.result)
-                };
-                reader.readAsText(response.data);
-              }
-            }
-          }).catch((error) => {
-            this.isTrue = false;
-            // 错误处理
-            console.log(error);
-            this.$message.error(error.data ? error.data.message : error.toString());
-          });
+      //   }).then((response) => {
+      //       if (response.status === 200) {
+      //         this.isTrue = false;
+      //         if (!(response.headers['content-type']).startsWith('application/json')) {
+      //           this.resolveBlob(response, 'application/zip', `${params.courseName}【作业】`);
+      //         } else {
+      //           console.log(response,'response')
+      //           const reader = new FileReader();
+      //           reader.onload = (e) => {
+      //             const errorData = JSON.parse(e.target.result)
+      //             this.$message.error(errorData.result)
+      //           };
+      //           reader.readAsText(response.data);
+      //         }
+      //       }
+      //     }).catch((error) => {
+      //       this.isTrue = false;
+      //       // 错误处理
+      //       console.log(error);
+      //       this.$message.error(error.data ? error.data.message : error.toString());
+      //     });
     },
     resolveBlob(res, mimeType,filename) {
       const link = document.createElement('a');// 创建a标签