From a075ef6b7cbd09d727068ef3d7e08691775dbb16 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 17:58:58 +0800
Subject: [PATCH] 合并冲突
---
src/components/tool/excel.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/components/tool/excel.vue b/src/components/tool/excel.vue
index afc58d4..52a3a71 100644
--- a/src/components/tool/excel.vue
+++ b/src/components/tool/excel.vue
@@ -19,11 +19,11 @@
border-color: transparent;
cursor: pointer;
}
-
+
#luckysheet .save:hover{
opacity: .8;
}
-
+
#luckysheet .save:active{
opacity: .7;
}
@@ -35,7 +35,7 @@
<script>
// import { data } from 'jquery';
export default {
- props: ['data','title'],
+ props: ['data','execlTitle'],
data() {
return {
}
@@ -49,14 +49,15 @@
templateWrite() {
if(this.data!=null&&this.data!=''){
let option = JSON.parse(this.data)
- option.title = this.title
+ option.title = this.execlTitle
luckysheet.create(option)
}else{
+ console.log(this.execlTitle);
$(function() {
//閰嶇疆椤�
var options = {
container: 'luckysheet',
- title: this.title,
+ title: this.execlTitle,
lang: "zh",
showsheetbar: false,
showstatisticBarConfig: {
@@ -67,7 +68,7 @@
order: '0'
}],
enableAddRow: false,
- row: 100,
+ row: 60,
column: 26,
enableAddBackTop: false,
showtoolbarConfig: {
@@ -88,10 +89,11 @@
myFolderUrl: 'http://127.0.0.1/',
functionButton: '<button onClick="excelClosed()" class="save">淇濆瓨</button>'
}
+ options.title = this.execlTitle
luckysheet.create(options)
})
}
}
}
}
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3