修改现场测试问题

src/views/govern/device/control/supplementaryRecruitment/history.vue

@@ -107,7 +107,8 @@ import {
     resetEquipmentDelivery,
     governDeviceRegister,
     portableDeviceRegister,
-    portableDeviceAccess
+    portableDeviceAccess,
+    getExcelTemplate
 } from '@/api/cs-system-boot/device'
 import html2canvas from 'html2canvas'
 import { fullUrl } from '@/utils/common'
@@ -456,7 +457,19 @@ const devTypeChange = (e: any) => {
 }
 // 下载模版
 const downLoadFile = () => {
-    window.open(window.location.origin + '/api/cs-device-boot/EquipmentDelivery/getExcelTemplate')
+    getExcelTemplate().then(res => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+        })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a') // 创建a标签
+        link.href = url
+        link.download = '设备导入模版.xlsx' // 设置下载的文件名
+        document.body.appendChild(link)
+        link.click() //执行下载
+        document.body.removeChild(link)
+        ElMessage.success('下载成功')
+    })
 }
 
 // 导入模版

src/views/govern/device/control/tabs/event.vue

@@ -16,6 +16,7 @@ import waveFormAnalysis from './components/waveFormAnalysis.vue'
 import { ArrowLeft } from '@element-plus/icons-vue'
 import { ElMessage } from 'element-plus'
 import { analyseWave } from '@/api/common'
+import { getFileZip } from '@/api/cs-harmonic-boot/datatrend'
 const tableParams: any = ref({})
 const refheader = ref()
 const view = ref(true)
@@ -137,13 +138,20 @@ const tableStore: any = new TableStore({
                         return !row.wavePath
                     },
                     click: row => {
-                        row.loading2 = true
-                        const url = window.location.origin + '/api/cs-harmonic-boot/event/getFileZip?eventId=' + row.id
-                        window.open(url, '_self')
-                        setTimeout(() => {
-                            ElMessage.success('波形下载成功！')
-                            row.loading2 = false
-                        }, 1500)
+                        getFileZip({ eventId: row.id }).then(res => {
+                            let blob = new Blob([res], { type: 'application/zip' }) // console.log(blob) // var href = window.URL.createObjectURL(blob); //创建下载的链接
+                            const url = window.URL.createObjectURL(blob)
+                            const link = document.createElement('a') // 创建a标签
+                            link.href = url
+                            link.download = row.wavePath.split('/')[2] || '波形文件' // 设置下载的文件名
+                            document.body.appendChild(link)
+                            link.click() //执行下载
+                            document.body.removeChild(link) //释放标签
+
+                        })
+
+
+
                     }
                 }
             ]

src/views/govern/device/planData/components/transient.vue

@@ -21,6 +21,7 @@ import { ElMessage } from 'element-plus'
 import waveFormAnalysis from '@/views/govern/device/control/tabs/components/waveFormAnalysis.vue';
 import { analyseWave } from '@/api/common'
 import { mainHeight } from '@/utils/layout'
+import { getFileZip } from '@/api/cs-harmonic-boot/datatrend'
 const props = defineProps({
     activeName: String,
     activeColName: [Object, String]
@@ -141,13 +142,18 @@ const tableStore = new TableStore({
                         return !row.wavePath
                     },
                     click: row => {
-                        row.loading2 = true
-                        const url = window.location.origin + '/api/cs-harmonic-boot/event/getFileZip?eventId=' + row.id
-                        window.open(url, '_self')
-                        setTimeout(() => {
-                            ElMessage.success('波形下载成功！')
-                            row.loading2 = false
-                        }, 1500)
+                        getFileZip({ eventId: row.id }).then(res => {
+                            let blob = new Blob([res], { type: 'application/zip' }) // console.log(blob) // var href = window.URL.createObjectURL(blob); //创建下载的链接
+                            const url = window.URL.createObjectURL(blob)
+                            const link = document.createElement('a') // 创建a标签
+                            link.href = url
+                            link.download = row.wavePath.split('/')[2] || '波形文件' // 设置下载的文件名
+                            document.body.appendChild(link)
+                            link.click() //执行下载
+                            document.body.removeChild(link) //释放标签
+
+                        })
+
                     }
                 }
             ]