From e8ffe4b68648909541eecc44c3671719f85493b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Tue, 14 Nov 2023 18:16:11 +0800
Subject: [PATCH] =?UTF-8?q?web=20=E6=A8=A1=E5=9D=97=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=A7=8D=E7=9A=84zip=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/detail.vue | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/views/statistics/detail.vue b/src/views/statistics/detail.vue
index 852f3b6..8e8c170 100644
--- a/src/views/statistics/detail.vue
+++ b/src/views/statistics/detail.vue
@@ -270,9 +270,10 @@
 <script>
 import { saveAs } from 'file-saver'
 import JSZip from 'jszip'
-import { getAction } from '../../api/manage'
+import { getAction, getFileAction } from '../../api/manage'
 const colorList = ['#0D5fff', '#287D3C', '#DF1512', '#F3BF24', '#D3D4DE', '#000000']
 import * as echarts from 'echarts'
+import { fetchAndDownload } from '@/utils/file'
 export default {
   props: {
     allData: {
@@ -628,27 +629,15 @@ export default {
         this.$message.warning('This operation fails. Contact your system administrator')
       }
     },
-    downloadZip() {
-      let fileName = this.currName.replace('.PHD', '')
-      console.log('fileName', fileName)
-      getAction('/webStatistics/radionuclideFile', {
-        sampleId: this.sampleId,
-      }).then(async (res) => {
-        if (res.code && res.code == 500) {
-          this.$message.warning('This operation fails. Contact your system administrator')
-        } else {
-          const arrayBufferView = new Uint8Array(res)
-          const zip = new JSZip()
-          const blob = new Blob([res], { type: 'text/plain' })
-          // saveAs(blob, 'files.txt');
-          // 将文件添加到ZIP中
-          zip.file(`${fileName}.txt`, blob, { binary: true })
-          // 生成ZIP文件
-          const zipContent = await zip.generateAsync({ type: 'blob' })
-          // 保存ZIP文件
-          saveAs(zipContent, fileName)
-        }
-      })
+    async downloadZip() {
+      let url = '/webStatistics/downloadFile'
+      // let params = { sampleId: this.sampleId }
+      let params = { sampleId: 7480344 }
+      try {
+        await fetchAndDownload(url, params, 'get')
+      } catch (error) {
+        console.error(error)
+      }
     },
     viewFile() {
       if (this.fileSrc) {