From 34c7760746a49b90fa290bb3b342dbc1f51ed8ac Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 14 十二月 2023 10:18:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/mixins/listPage.js | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/admin-web/src/views/mixins/listPage.js b/admin-web/src/views/mixins/listPage.js
index 416cae5..5054212 100644
--- a/admin-web/src/views/mixins/listPage.js
+++ b/admin-web/src/views/mixins/listPage.js
@@ -1,6 +1,7 @@
import * as DateFormatter from '@/utils/DateFormatter';
import {mapGetters} from 'vuex';
import * as dataExport from "@/api/exportExcel"
+import {downLoad} from "@/utils/base";
export default {
data() {
@@ -42,7 +43,6 @@
methods: {
// 瀵煎嚭
handleExport(api, fileName, params) {
- console.log(fileName)
let loading = this.$loading({
lock: true,
text: '瀵煎嚭涓紝璇风◢鍊�...',
@@ -52,24 +52,8 @@
// 鍒ゆ柇鎬绘潯鏁版槸鍚﹀ぇ浜庢渶澶ф敮鎸佹潯鏁�
dataExport[api](params)
.then((res) => {
- const blob = new Blob([res], {type: 'application/vnd.ms-excel'});
- if ('download' in document.createElement('a')) {
- // 闈濱E涓嬭浇
- const elink = document.createElement('a');
- elink.download = `${fileName}.xls`;
- elink.style.display = 'none';
- const URL = window.URL || window.webkitURL
- const href = URL.createObjectURL(blob)
- elink.href = href;
- document.body.appendChild(elink);
- elink.click();
- URL.revokeObjectURL(elink.href);
- document.body.removeChild(elink);
- window.URL.revokeObjectURL(href)
- } else {
- // IE10+涓嬭浇
- navigator.msSaveBlob(blob, `${fileName}.xls`);
- }
+ console.log(res)
+ downLoad(res)
this.$message.success('瀵煎嚭鎴愬姛锛�');
loading.close();
})
--
Gitblit v1.9.1