From c2a76789f02d0d89e30b8a8d5fa2a7c553e6478b Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Thu, 21 Sep 2023 11:26:28 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-3174=20feat=EF=BC=9Anotebook=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BApdf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/notebookTab.vue     |  4 +-
 .../snapshotProgress/snapshotProgress.vue     | 37 +++++++++++--------
 .../components/page/notebook/notebookList.vue |  3 ++
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/notebookTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/notebookTab.vue
index b796d57cc..9564f2740 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/notebookTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/notebookTab.vue
@@ -538,13 +538,13 @@ export default {
         if (window.navigator.msSaveOrOpenBlob) {
           // 兼容ie11
           const blobObject = new Blob([res.data])
-          window.navigator.msSaveOrOpenBlob(blobObject, this.obj.name)
+          window.navigator.msSaveOrOpenBlob(blobObject, this.obj.name + '.json')
         } else {
           const url = URL.createObjectURL(new Blob([res.data]))
           const a = document.createElement('a')
           document.body.appendChild(a) // 此处增加了将创建的添加到body当中
           a.href = url
-          a.download = this.obj.name
+          a.download = this.obj.name + '.json'
           a.target = '_blank'
           a.click()
           a.remove() // 将a标签移除
diff --git a/nezha-fronted/src/components/common/snapshotProgress/snapshotProgress.vue b/nezha-fronted/src/components/common/snapshotProgress/snapshotProgress.vue
index 00adb4907..c6d744a8e 100644
--- a/nezha-fronted/src/components/common/snapshotProgress/snapshotProgress.vue
+++ b/nezha-fronted/src/components/common/snapshotProgress/snapshotProgress.vue
@@ -35,6 +35,7 @@
 </template>
 
 <script>
+import axios from 'axios'
 import bus from '@/libs/bus'
 
 function create (f) {
@@ -145,34 +146,26 @@ export default {
     downloadSnapshot () {
       let total = 10
       let loaded = 0
-      this.$get(`/visual/${this.api}/snapshot/download/` + this.tid, {}, {
+      axios.get(`/visual/${this.api}/snapshot/download/` + this.tid, {
+        responseType: 'blob',
         onDownloadProgress: function (progressEvent) {
           // 处理原生进度事件
           total = progressEvent.total
           loaded = progressEvent.loaded
         }
       }).then(res => {
-        const self = this
         const fileName = this.showPanel.name
-        if (res.type == 'application/json') {
-          const reader = new FileReader() // 创建一个FileReader实例
-          reader.readAsText(res, 'utf-8') // 读取文件,结果用字符串形式表示
-          reader.onload = function () { // 读取完成后,**获取reader.result**
-            const { msg } = JSON.parse(reader.result)
-            self.$message.error(msg) // 弹出错误提示
-          }
-          return
-        }
         if (loaded < total) {
-          this.$message.error(res.msg || res.error || res || this.$t('NetWork Error'))
+          this.$message.error(res.msg || res.error || this.$t('NetWork Error'))
+          this.prevent_opt.import = false
           return
         }
         if (window.navigator.msSaveOrOpenBlob) {
           // 兼容ie11
-          const blobObject = new Blob([res])
+          const blobObject = new Blob([res.data])
           window.navigator.msSaveOrOpenBlob(blobObject, fileName + '.' + (this.showPanel.format || 'html'))
         } else {
-          const blob = new Blob([res])
+          const blob = new Blob([res.data])
           const link = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 下载链接
           link.href = href
@@ -184,8 +177,20 @@ export default {
         }
         this.prevent_opt.import = false
         this.$emit('update:snapshotVisible', false)
-      }, (res) => {
-        this.$message.error(res.msg || res.error)
+      }, error => {
+        const $self = this
+        const reader = new FileReader()
+        reader.onload = function (event) {
+          const responseText = reader.result
+          const exception = JSON.parse(responseText)
+          if (exception.message) {
+            $self.$message.error(exception.message)
+          } else {
+            console.error(error)
+          }
+        }
+        reader.readAsText(error.response.data)
+        this.prevent_opt.import = false
       })
     },
     // 关闭定时器 取消任务
diff --git a/nezha-fronted/src/components/page/notebook/notebookList.vue b/nezha-fronted/src/components/page/notebook/notebookList.vue
index e870edeac..785bbc177 100644
--- a/nezha-fronted/src/components/page/notebook/notebookList.vue
+++ b/nezha-fronted/src/components/page/notebook/notebookList.vue
@@ -201,6 +201,9 @@ export default {
           if (!this.isExportHtml) {
             this.onScroll()
           } else {
+            setTimeout(() => {
+              window.dataJson.AllChartDataload = true
+            }, 1000)
             this.onScroll(999999)
           }
           setTimeout(() => {