From b155fc6663b18b9f8428529056ce16817e2caae1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 21 三月 2024 16:50:51 +0800
Subject: [PATCH] 合并冲突
---
src/components/tool/excel.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/tool/excel.vue b/src/components/tool/excel.vue
index afc58d4..ece94a6 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;
}
@@ -67,7 +67,7 @@
order: '0'
}],
enableAddRow: false,
- row: 100,
+ row: 60,
column: 26,
enableAddBackTop: false,
showtoolbarConfig: {
@@ -94,4 +94,4 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3