fix

src/api/index.js

@@ -107,8 +107,8 @@ export default {
   reportDetail: `occupationlab/occupationlab/achievement/reportDetail`, // 成绩报告详情
   updateReport: `occupationlab/occupationlab/achievement/updateReport`, // 更新成绩报告
   schoolCourseByAchievement: `nakadai/nakadai/curriculum/schoolCourseByAchievement`, // 获取学校购买订单后的课程
-  exportLabReport: `occupationlab/occupationlab/achievement/exportLabReport`,
-  exportBankExperimentReport: `occupationlab/occupationlab/achievement/exportBankExperimentReport`,
+  exportLabReport: `${host}occupationlab/occupationlab/achievement/exportLabReport`,
+  exportBankExperimentReport: `${host}occupationlab/occupationlab/achievement/exportBankExperimentReport`,
   queryBcJudgmentPointByBcId: 'judgment/judgment/bcJudgmentPoint/queryBcJudgmentPointByBcId',
   editExperimentalData: 'occupationlab/occupationlab/experimentalReport/editExperimentalData',
   getSystemIdBySchool: `occupationlab/occupationlab/projectManage/getSystemIdBySchool`,

src/layouts/header/index.vue

@@ -238,10 +238,10 @@ export default {
           const route = list.find(e => e.path === defaultPath) ? defaultPath : list[0].path // 如果有默认路由的权限，则跳转到默认路由，否则跳转到第一个
           window.open(process.env.NODE_ENV === 'development' ?
             `http://192.168.31.125:8081/#${route}` :
-            `${location.origin}/admin/#${route}`)
+            `${location.origin}/admin/#${route}`, 'newTab')
         }).catch(err => { })
       } else {
-        window.open(this.$router.resolve(path).href + (this.$route.query.q ? `?q=${Date.now()}` : ''))
+        window.open(this.$router.resolve(path).href + (this.$route.query.q ? `?q=${Date.now()}` : ''), 'newTab')
       }
     },
     // 免费试用

src/pages/record/trialReport/index.vue

@@ -148,7 +148,9 @@
 import { Loading } from "element-ui";
 import html2Canvas from "html2canvas";
 import JsPDF from "jspdf";
-import util from "@/libs/util";
+import Setting from '@/setting'
+import Util from '@/libs/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/editor'
 export default {
   data () {
     return {
+      headers: {
+        token: Util.session.get(Setting.tokenKey)
+      },
       routes: [],
       editorConfig,
       fromPython: this.$route.query.python, // 来自python子系统
@@ -300,7 +305,7 @@ export default {
     back () {
       history.back()
     },
-    exportPage () {
+    async exportPage () {
       this.loadIns = Loading.service({
         background: "#fff"
       })
@@ -317,15 +322,20 @@ export default {
         delete e.lcStudentAnswer
       })
       form.purpose = form.purpose.replace(/<[^>]+>/g, '')
-      this.$post(this.isLc ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
-        ...form,
-        experimentalData: list
-      }).then(res => {
-        util.downloadFileDirect(`实验报告.docx`, new Blob([res]))
-        this.loadIns.close()
-      }).catch(res => {
+
+      try {
+        const res = await Axios.post(this.api[this.isLc ? '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()
-      })
+      }
     },
     exportPage1 () { // 导出实验报告
       this.loadIns = Loading.service({
@@ -373,7 +383,7 @@ export default {
       if (this.editing) {
         this.$post(this.api.updateReport, this.infoData).then(res => {
           this.editing = false;
-          util.successMsg("修改成功");
+          Util.successMsg("修改成功");
         }).catch(err => { });
       } else {
         this.editing = true;

src/pages/station/preview/index.vue

@@ -950,7 +950,7 @@ export default {
           window.open(`http://${Setting.zcPath}?systemId=${systemId}&courseId=${this.courseId}&projectId=${this.curProject}&token=${token}&userId=${this.userId}&classId=1&mallId=${this.mallId}${Setting.isTest ? '&beta=1' : ''}`);
         } else if (systemId == 19) {
           // 沙盘
-          window.open(`${Setting.sandPath}/#/?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&mallId=${this.mallId}&systemId=${this.systemIds}&projectId=${this.curProject}&assessmentId=&classId=&stopTime=&referrer=${encodeURIComponent(location.href)}`, 'sand')
+          location.href = `${Setting.sandPath}/#/?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&mallId=${this.mallId}&systemId=${this.systemIds}&projectId=${this.curProject}&assessmentId=&classId=&stopTime=&referrer=${encodeURIComponent(location.href)}`
         } else {
           // python系统
           this.toPython(this.curProject)