From 57e76b55709e8ea88a83ab6c3f665fd9ee7fd64c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 14:23:48 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master

---
 src/components/tool/excel.vue |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/components/tool/excel.vue b/src/components/tool/excel.vue
index c410db2..ce500aa 100644
--- a/src/components/tool/excel.vue
+++ b/src/components/tool/excel.vue
@@ -20,6 +20,12 @@
 		cursor: pointer;
 	}
 
+  #luckysheet .save_i{
+    margin-right: 20px;
+    font-size: 20px;
+    cursor: help;
+  }
+
 	#luckysheet .save:hover {
 		opacity: .8;
 	}
@@ -33,7 +39,7 @@
 </template>
 
 <script>
-import { data } from 'jquery';
+import {exportExcel} from '../../util/downExcelByLuckSheet'
 	// import { data } from 'jquery';
 	export default {
 		props: ['data', 'execlTitle'],
@@ -53,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++){
@@ -68,7 +74,7 @@
 								columnlen: columnlen
 							}
 						}],
-						row: 60,
+						row: 50,
 						column: 26
 					}
 				}
@@ -89,14 +95,14 @@
 					dataVerification: false, // '鏁版嵁楠岃瘉'
 					frozenMode: false, // '鍐荤粨鏂瑰紡'
 					currencyFormat: false, //璐у竵鏍煎紡
-					percentageFormat: false, //鐧惧垎姣旀牸寮�
-					numberDecrease: false, // '鍑忓皯灏忔暟浣嶆暟'
-					numberIncrease: false, // '澧炲姞灏忔暟浣嶆暟
-					moreFormats: false, // '鏇村鏍煎紡'
+					percentageFormat: true, //鐧惧垎姣旀牸寮�
+					numberDecrease: true, // '鍑忓皯灏忔暟浣嶆暟'
+					numberIncrease: true, // '澧炲姞灏忔暟浣嶆暟
+					moreFormats: true, // '鏇村鏍煎紡'
 					strikethrough: false, // '鍒犻櫎绾� (Alt+Shift+5)'
 					underline: false, // '涓嬪垝绾� (Alt+Shift+6)'
 					italic: false, // '鏂滀綋 (Ctrl+I)'
-					textWrapMode: false, // '鎹㈣鏂瑰紡'
+					textWrapMode: true, // '鎹㈣鏂瑰紡'
 					textRotateMode: false, // '鏂囨湰鏃嬭浆鏂瑰紡'
 					conditionalFormat: false, // '鏉′欢鏍煎紡'
 					splitColumn: false, // '鍒嗗垪'
@@ -114,7 +120,7 @@
 					cellFormat: false // 璁剧疆鍗曞厓鏍兼牸寮�
 				},
 				option.myFolderUrl = this.LOCATIONVUE + '/',
-				option.functionButton = '<button onClick="excelClosed()" class="save">淇濆瓨</button>'
+				option.functionButton = '<i class="save_i el-icon-info" title="绯荤粺鏀寔鐨勫彉閲忥細&#10鏍峰搧缂栧彿&#10鏍峰搧鍨嬪彿&#10搴忓彿&#10妫�楠岄」&#10妫�楠屽瓙椤�&#10璁惧鍚嶇О&#10璁惧缂栫爜&#10鍗曚綅&#10瑕佹眰鍊�&#10璇曢獙鏂规硶 | 妫�娴嬫柟娉�&#10鏈�缁堝��&#10缁撹&#10璁＄畻鍊�&#10妫�楠屽��"></i><button onClick="excelClosed()" class="save">淇濆瓨</button>'
 				luckysheet.create(option)
 			}
 		}

--
Gitblit v1.9.3