From 8c9a6b5a627b04e329bfccf2b1f5f192432a650d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 九月 2024 13:50:30 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master

---
 src/components/tool/excel.vue |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/components/tool/excel.vue b/src/components/tool/excel.vue
index 601f628..956fa10 100644
--- a/src/components/tool/excel.vue
+++ b/src/components/tool/excel.vue
@@ -33,13 +33,22 @@
 	#luckysheet .save:active {
 		opacity: .7;
 	}
+  #luckysheet .returnView {
+    width: 50px;
+    height: 26px;
+    background-color: #fff;
+    border: 1px solid #DCDFE6;
+    color: #606266;
+    border-radius: 4px;
+    margin-right: 12px;
+    cursor: pointer;
+  }
 </style>
 <template>
 	<div id="luckysheet"></div>
 </template>
 
 <script>
-import { data } from 'jquery';
 	// import { data } from 'jquery';
 	export default {
 		props: ['data', 'execlTitle'],
@@ -59,7 +68,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 +83,7 @@
 								columnlen: columnlen
 							}
 						}],
-						row: 60,
+						row: 50,
 						column: 26
 					}
 				}
@@ -120,9 +129,11 @@
 					cellFormat: false // 璁剧疆鍗曞厓鏍兼牸寮�
 				},
 				option.myFolderUrl = this.LOCATIONVUE + '/',
-				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>'
+				// 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="excelExport()" class="save">瀵煎嚭</button><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="returnView()" class="returnView">鍙栨秷</button><button onClick="excelClosed()" class="save">淇濆瓨</button>'
+        console.log(luckysheet)
 				luckysheet.create(option)
-			}
+			},
 		}
 	}
 </script>

--
Gitblit v1.9.3