Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/api/index.js

@@ -426,6 +426,9 @@ export default {
         getProjectInfoById (params) {
             return fetch(`/v1/science-admin/com-project/getProjectInfoById/`, params)
         },
+        export (params) {
+            return fetch(`/v1/science-admin/com-project/export/`, params)
+        },
         save (params) {
             return fetch(`/v1/science-admin/com-project/save`, params, 'post', 'json')
         },

src/views/report/task/components/taskView.vue

@@ -10,7 +10,7 @@
       </div>
       <div class="page-footer">
         <!-- 申报项目详情 -->
-        <!-- <a-button type="primary" @click="onExport">导出</a-button> -->
+        <a-button type="primary" @click="onExport">导出</a-button>
         <task-info v-model="formData" :tabsData.sync="tabsData" />
       </div>
     </a-spin>
@@ -147,20 +147,30 @@ export default {
       }
     },
     onExport () {
-      this.$api.project.export({ id: this.value }).then((res) => {
-        let blob = new Blob([res], {
-          type: "application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=utf-8",
-        });
-        const fileName = this.formData.projName + '.doc';
-        let downloadElement = document.createElement('a')
-        let href = window.URL.createObjectURL(blob); //创建下载的链接
-        downloadElement.href = href;
-        downloadElement.download = fileName; //下载后文件名
-        document.body.appendChild(downloadElement);
-        downloadElement.click(); //点击下载
-        document.body.removeChild(downloadElement); //下载完成移除元素
-        window.URL.revokeObjectURL(href); //释放blob
-      })
+      axios({
+        url: "/v1/science-admin/com-project/export1/" + this.value,
+        method: 'GET',
+        responseType: "blob",
+        headers: {
+          Authorization: 'Bearer ' + getToken(),
+          'Content-Type': 'application/pdf;charset=utf-8'
+        }
+      }).then(response => {
+        console.log(response)
+        const blob = new Blob([response.data], { type: 'application/pdf' });
+        const url = window.URL.createObjectURL(blob);
+        const link = document.createElement('a');
+        link.href = url;
+        const filename = response.headers['content-disposition'] ? decodeURIComponent(response.headers['content-disposition'].split('filename=')[1]) : '项目报告.pdf';
+        link.setAttribute("download", filename);
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+        window.URL.revokeObjectURL(url);
+      }).catch(error => {
+        console.error('下载文件出错:', error);
+        this.$message.error('下载文件失败');
+      });
     },
     callback (key) {
       var index = parseInt(key)