From 2f35b37455acd46c50658a3c56e45db03eaa480a Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 15 五月 2024 10:54:23 +0800
Subject: [PATCH] 合并冲突
---
src/App.vue | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 1706364..500f742 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -151,7 +151,7 @@
.cell {
color: #333;
- padding: 0 17px !important;
+ padding: 0 15px !important;
font-size: 12px;
}
@@ -172,7 +172,7 @@
font-size: 14px;
font-weight: 400;
color: #333;
- padding: 6px 17px !important;
+ padding: 6px 15px !important;
}
/* 鍏ㄥ眬鍒嗛〉鍣ㄦ牱寮� */
@@ -299,4 +299,17 @@
/* 鍏ㄥ眬杈撳叆妗嗘牱寮� */
/* 鍏ㄥ眬鎸夐挳鏍峰紡 */
+ /* 鍏ㄥ眬鎹㈣婧㈠嚭鏍峰紡 */
+ .ellipsis-multiline {
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2; /* 瀹氫箟鏂囨湰鐨勮鏁� */
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ .el-cascader-menu__wrap{
+ height: 300px;
+ }
+
</style>
--
Gitblit v1.9.3