From e59a71579f6afd21c76f9d45c3b3f09c28d03c41 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 27 五月 2024 14:37:22 +0800
Subject: [PATCH] 合并冲突
---
src/App.vue | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 3a329af..b35af6c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -110,9 +110,16 @@
}
.el-popover {
+ max-height: 80vh;
+ overflow-y: auto;
+ overflow-x: hidden;
padding: 0;
z-index: 9999 !important;
}
+
+ .el-popover::-webkit-scrollbar{
+ width: 0;
+ }
.el-popper .popper__arrow {
display: none;
@@ -144,7 +151,7 @@
.cell {
color: #333;
- padding: 0 17px !important;
+ padding: 0 15px !important;
font-size: 12px;
}
@@ -165,7 +172,7 @@
font-size: 14px;
font-weight: 400;
color: #333;
- padding: 6px 17px !important;
+ padding: 6px 15px !important;
}
/* 鍏ㄥ眬鍒嗛〉鍣ㄦ牱寮� */
@@ -300,4 +307,13 @@
overflow: hidden;
text-overflow: ellipsis;
}
+
+ .el-cascader-menu__wrap{
+ height: 300px;
+ }
+
+ .el-table-filter__list-item{
+ font-size: 12px;
+ line-height: 32px;
+ }
</style>
--
Gitblit v1.9.3