From abe84ba77a867d4f755199021f9b6e10e3af971b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 01 七月 2024 16:29:27 +0800
Subject: [PATCH] 合并冲突
---
src/components/tool/excel.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/tool/excel.vue b/src/components/tool/excel.vue
index 601f628..ce500aa 100644
--- a/src/components/tool/excel.vue
+++ b/src/components/tool/excel.vue
@@ -39,7 +39,7 @@
</template>
<script>
-import { data } from 'jquery';
+import {exportExcel} from '../../util/downExcelByLuckSheet'
// import { data } from 'jquery';
export default {
props: ['data', 'execlTitle'],
@@ -59,7 +59,7 @@
} else {
let rowlen = {}
let columnlen = {}
- for(let a = 0; a<60; a++){
+ for(let a = 0; a<50; a++){
rowlen[''+a] = 40
}
for(let a = 0; a<26; a++){
@@ -74,7 +74,7 @@
columnlen: columnlen
}
}],
- row: 60,
+ row: 50,
column: 26
}
}
--
Gitblit v1.9.3