Auto Commit

c0d49d99 · 63f1bb74d2451104dc7d8b9f · 6bbaf1fe · c0d49d99 · c0d49d99 · c0d49d99
Showing with 15 addition and 7 deletion

src/components/ExportBtn.vue src/components/ExportBtn.vue +3 -2

src/components/SearchGrade.vue src/components/SearchGrade.vue +1 -1

src/components/exportExcel.js src/components/exportExcel.js +11 -4

未找到文件。
--- a/src/components/ExportBtn.vue
+++ b/src/components/ExportBtn.vue
@@ -8,7 +8,8 @@
 import { defineProps, reactive, watch } from 'vue';
 import { exportExcelFunc } from './exportExcel';
 const props = defineProps({
-    tableData: []
+    tableData: [],
+    userId:''
 })

 const state = reactive({
@@ -23,7 +24,7 @@ const onExport = () => {
        return
    }
    state.exportLoading = true
-    exportExcelFunc(state.dataSource, '用户质量分').then(res => {
+    exportExcelFunc(state.dataSource, props.userId).then(res => {
        state.exportLoading = false
        console.log('res', res)
    }).catch(r => {

--- a/src/components/SearchGrade.vue
+++ b/src/components/SearchGrade.vue
@@ -117,7 +117,7 @@ onUnmounted(() => {
    </div>

    <div>
-      <ExportBtn :table-data="state.dataSource" />
+      <ExportBtn :table-data="state.dataSource" :userId="state.searchValue" />
      <a-table :scroll="{ x: 800, y: 600 }" :columns="state.columns" :data-source="state.dataSource"
        :loading="state.loading" :pagination="state.pagination" bordered style="border-bottom:1px solid #f0f0f0;">
        <template #bodyCell="{ column, record }">

--- a/src/components/exportExcel.js
+++ b/src/components/exportExcel.js
 // 输出base64编码
 const base64 = s => window.btoa(unescape(encodeURIComponent(s)));
-const tableToExcel = async (jsonData) => {
+const tableToExcel = async (jsonData, fileName) => {
    return new Promise(resolve => {
        try {
            let str = '<tr>'
            Object.keys(jsonData[0]).forEach(name => {
                const tdStr = `<td>${name}</td>`
-                str += tdStr
+                str += tdStr;
            })
            str += '</tr>'
            for (let i = 0; i < jsonData.length; i++) {
@@ -19,8 +19,9 @@ const tableToExcel = async (jsonData) => {
            }
            const currentTime = new Date()
            const fileSuffix = currentTime.valueOf()
+            const name = fileName + '质量分' + fileSuffix
            // Worksheet名
-            const worksheet = '用户质量分' + fileSuffix
+            const worksheet = '用户质量分';
            const uri = 'data:application/vnd.ms-excel;base64,';
            // 下载的表格模板数据
            const template = `<html xmlns:o="urn:schemas-microsoft-com:office:office" 
@@ -33,7 +34,13 @@ const tableToExcel = async (jsonData) => {
    <meta charset='utf-8' />
    </head><body><table>${str}</table></body></html>`;
            // 下载模板
-            window.location.href = uri + base64(template);
+            // window.location.href = uri + base64(template);
+            downloadLink.href = uri + base64(template);
+            downloadLink.download = name + '.xls';
+            downloadLink.target = '_blank';
+            document.body.appendChild(downloadLink);
+            downloadLink.click();
+            document.body.removeChild(downloadLink);
            resolve(true)
        }
        catch (r) {