From 16dd01927b73a5a290a183895b1301c399c69944 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 7 Jan 2025 11:21:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E6=8A=A5=E5=91=8A=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js     |  2 +-
 src/config/index.js  |  2 +-
 src/views/Report.vue | 31 ++++++++++++++++++++-----------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 3591986..cce2a38 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -30,7 +30,7 @@ export default {
   batchDeletion: `occupationlab/occupationlab/python/file/data/batchDeletion`,
   myData: `occupationlab/occupationlab/python/file/data/myData`,
   updateReport: `occupationlab/occupationlab/achievement/updateReport`,
-  exportLabReport: `occupationlab/occupationlab/achievement/exportLabReport`,
+  exportLabReport: `${config.host}occupationlab/occupationlab/achievement/exportLabReport`,
   reportDetail: `occupationlab/occupationlab/achievement/reportDetail`,
   getCompetition: `competition/competition/management/getCompetition`,
   whetherCanPaste: `nakadai/nakadai/model/demo/whetherCanPaste`,
diff --git a/src/config/index.js b/src/config/index.js
index d9c983a..40e6150 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -14,7 +14,7 @@ let bankPath = `${location.origin}/systembank` // 银行系统
 // occupationlab.com | 192.168.31.151
 if (isDev) {
   host = 'http://192.168.31.217:9000/'
-  host = 'https://occupationlab.com/'
+  // host = 'https://occupationlab.com/'
   // host = 'https://izhixinyun.com/'
   bankPath = `http://${location.hostname}:8093`
 } else if (isTest) {
diff --git a/src/views/Report.vue b/src/views/Report.vue
index bbfc545..421fca0 100644
--- a/src/views/Report.vue
+++ b/src/views/Report.vue
@@ -147,8 +147,10 @@
 </template>
 
 <script>
+import Cookie from 'js-cookie'
 import { Loading } from "element-ui";
-import util from '@/util'
+import Util from '@/util'
+import Axios from 'axios'
 import breadcrumb from '@/components/breadcrumb'
 import quill from "@/components/quill";
 import Editor from '@tinymce/tinymce-vue'
@@ -156,6 +158,9 @@ import editorConfig from '@/components/tinymceConfig'
 export default {
   data () {
     return {
+      headers: {
+        token: Cookie.get('admin-token'),
+      },
       editorConfig,
       reportId: this.$route.query.reportId,
       title: "实验报告",
@@ -239,7 +244,7 @@ export default {
       }
       this.expData = list
     },
-    exportPage () {
+    async exportPage () {
       const form = Object.assign(this.form, this.infoData)
       const list = JSON.parse(JSON.stringify(this.expData))
       list.map((e, i) => {
@@ -258,17 +263,21 @@ export default {
       this.loadIns = Loading.service({
         background: "#fff"
       });
-      this.$post(this.project ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
-        ...form,
-        experimentalData: list
-      }).then(res => {
-        this.loadIns.close();
-        this.loading = false;
-        util.downloadFileDirect(`实验报告.docx`, new Blob([res]))
-      }).catch(res => {
+
+      try {
+        const res = await Axios.post(this.api[this.project ? 'exportBankExperimentReport' : 'exportLabReport'], {
+          ...form,
+          experimentalData: list
+        }, {
+          headers: this.headers,
+          responseType: 'blob'
+        })
+        const name = res.headers['content-disposition']
+        Util.downloadFileDirect(name ? decodeURI(name) : `实验报告.docx`, new Blob([res.data]))
+      } finally {
         this.loadIns.close();
         this.loading = false;
-      })
+      }
     },
     editReport () { // 编辑实验报告
       if (this.editing) {