Auto Commit

6bbaf1fe · 63f1bb74d2451104dc7d8b9f · 036b1d55 · 6bbaf1fe · 6bbaf1fe · 6bbaf1fe
Showing with 7 addition and 7 deletion

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

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

src/components/exportExcel.js src/components/exportExcel.js +5 -5

未找到文件。
--- a/src/components/ExportBtn.vue
+++ b/src/components/ExportBtn.vue
 <template>
    <div>
        <a-button type="primary" style="margin: 10px 0;" :loading="state.exportLoading" @click="onExport">
-            导出 </a-button>
+            导出Excel </a-button>
    </div>
 </template>
 <script setup>

--- a/src/components/SearchGrade.vue
+++ b/src/components/SearchGrade.vue
@@ -85,7 +85,7 @@ onMounted(() => {
  }
  document.addEventListener('keydown', (e) => {
    console.log(e, 'e')
-    if (e.ctrlKey && e.keyCode === 79) {
+    if (e.ctrlKey && e.keyCode === 89) {
      console.log('Ctrl+y');
      onSearch()
    }

--- a/src/components/exportExcel.js
+++ b/src/components/exportExcel.js
@@ -3,7 +3,6 @@ const base64 = s => window.btoa(unescape(encodeURIComponent(s)));
 const tableToExcel = async (jsonData) => {
    return new Promise(resolve => {
        try {
-            console.log('start', jsonData)
            let str = '<tr>'
            Object.keys(jsonData[0]).forEach(name => {
                const tdStr = `<td>${name}</td>`
@@ -18,8 +17,10 @@ const tableToExcel = async (jsonData) => {
                }
                str += '</tr>';
            }
+            const currentTime = new Date()
+            const fileSuffix = currentTime.valueOf()
            // Worksheet名
-            const worksheet = '用户质量分'
+            const worksheet = '用户质量分' + fileSuffix
            const uri = 'data:application/vnd.ms-excel;base64,';
            // 下载的表格模板数据
            const template = `<html xmlns:o="urn:schemas-microsoft-com:office:office" 
@@ -31,13 +32,12 @@ const tableToExcel = async (jsonData) => {
    </x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]-->
    <meta charset='utf-8' />
    </head><body><table>${str}</table></body></html>`;
-            console.log('str', str)
            // 下载模板
            window.location.href = uri + base64(template);
            resolve(true)
        }
        catch (r) {
-            console.log(r, 'r')
+            console.log(r, 'html excel')
            resolve(false)
        }
    })
@@ -51,7 +51,7 @@ export const exportExcelFunc = async (tableData) => {
            resolve(true)
        }
        catch (r) {
-            console.log(r, 'r')
+            console.log(r, 'exportExcelFunc')
            resolve(false)
        }
    })