From 5b266823019d2569a299b521a2c1ca2532e5932b Mon Sep 17 00:00:00 2001
From: 63f1bb74d2451104dc7d8b9f <63f1bb74d2451104dc7d8b9f@devide>
Date: Sun, 2 Jul 2023 03:19:40 +0000
Subject: [PATCH] Auto Commit

---
 src/components/ExportBtn.vue   | 14 +++++++++++---
 src/components/SearchGrade.vue | 14 +++++++-------
 src/components/exportExcel.js  |  4 ++--
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/components/ExportBtn.vue b/src/components/ExportBtn.vue
index bb3190e..880d1b3 100644
--- a/src/components/ExportBtn.vue
+++ b/src/components/ExportBtn.vue
@@ -9,12 +9,13 @@ import { defineProps, reactive, watch } from 'vue';
 import { exportExcelFunc } from './exportExcel';
 const props = defineProps({
     tableData: [],
-    userId:''
+    userId: ''
 })
 
 const state = reactive({
     exportLoading: false,
-    dataSource: []
+    dataSource: [],
+    userId: ''
 })
 
 const onExport = () => {
@@ -24,7 +25,7 @@ const onExport = () => {
         return
     }
     state.exportLoading = true
-    exportExcelFunc(state.dataSource, props.userId).then(res => {
+    exportExcelFunc(state.dataSource, state.userId).then(res => {
         state.exportLoading = false
         console.log('res', res)
     }).catch(r => {
@@ -39,4 +40,11 @@ watch(() => props.tableData,
     deep: true,
     immediate: true
 })
+watch(() => props.userId,
+    (val) => {
+        state.userId = val
+    }, {
+    deep: true,
+    immediate: true
+})
 </script>
\ No newline at end of file
diff --git a/src/components/SearchGrade.vue b/src/components/SearchGrade.vue
index 78015cb..bd1590e 100644
--- a/src/components/SearchGrade.vue
+++ b/src/components/SearchGrade.vue
@@ -76,13 +76,13 @@ const onSearch = () => {
 
 
 onMounted(() => {
-  const storageUid = localStorage.getItem('csdnUid')
+  // const storageUid = localStorage.getItem('csdnUid')
   console.log('window.localStorage', localStorage)
-  console.log('storageUid', storageUid)
-  if (storageUid) {
-    state.searchValue = storageUid
-    onSearch()
-  }
+  // console.log('storageUid', storageUid)
+  // if (storageUid) {
+  //   state.searchValue = storageUid
+  //   onSearch()
+  // }
   document.addEventListener('keydown', (e) => {
     console.log(e, 'e')
     if (e.ctrlKey && e.keyCode === 89) {
@@ -117,7 +117,7 @@ onUnmounted(() => {
     </div>
 
     <div>
-      <ExportBtn :table-data="state.dataSource" :userId="state.searchValue" />
+      <ExportBtn :table-data="state.dataSource" :user-id="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 }">
diff --git a/src/components/exportExcel.js b/src/components/exportExcel.js
index b1dfdef..db097a7 100644
--- a/src/components/exportExcel.js
+++ b/src/components/exportExcel.js
@@ -52,10 +52,10 @@ const tableToExcel = async (jsonData, fileName) => {
 };
 
 
-export const exportExcelFunc = async (tableData) => {
+export const exportExcelFunc = async (tableData,name) => {
     return new Promise(async (resolve) => {
         try {
-            await tableToExcel(tableData)
+            await tableToExcel(tableData,name)
             resolve(true)
         }
         catch (r) {
-- 
GitLab