From c169ee517f0620f86689ea08db5e3e24f01446bc Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 15 四月 2021 17:58:28 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/assets/css/map/map-panel-style.less | 76 ++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 35 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 83a6ced..7bcc3d5 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -48,7 +48,6 @@
}
.el-dialog {
- height: 500px;
border: 0.00521rem solid @color;
box-shadow: 0 0 0.03rem @color;
background: rgba(0, 16, 30, 0.8);
@@ -222,33 +221,6 @@
margin-left: 10px;
}
-.el-scrollbar__wrap {
-
-}
-
-.el-scrollbar__wrap::-webkit-scrollbar {
- /*婊氬姩鏉℃暣浣撴牱寮�*/
- width: 5px; /*楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄*/
- height: 1px;
-}
-
-.el-scrollbar__wrap::-webkit-scrollbar-thumb {
- /*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
- border-radius: 10px;
- background: none;
-}
-
-.el-scrollbar__wrap::-webkit-scrollbar-track {
- /*婊氬姩鏉￠噷闈㈣建閬�*/
- box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
- background: none;
- border-radius: 10px;
-}
-
-#el-scrollbar__wrap::-webkit-scrollbar-button { /*婊氬姩鏉′袱绔殑鎸夐挳锛屽彲浠ョ敤display:none璁╁叾涓嶆樉绀猴紝涔熷彲浠ユ坊鍔犺儗鏅浘鐗囷紝棰滆壊鏀瑰彉鏄剧ず鏁堟灉锛堜綅缃�2锛�*/
- background: #74D334;
-}
-
/*******************鎿嶄綔鎸夐挳鐐瑰嚮閫変腑鏁翠綋鏍峰紡******************************/
.el-button {
@@ -366,13 +338,6 @@
/*************** PublicTable 琛ㄦ牸鏍峰紡銆�*********************************/
.el-table {
- border: 1px solid #396d83 !important;
-
- .el-table__body-wrapper::-webkit-scrollbar {
- width: 0;
- height: 0;
- background: none;
- }
.cell {
padding: 0 3px !important;
i {
@@ -382,6 +347,13 @@
line-height: 12px;
}
}
+}
+.el-table--border{
+ border-bottom: 1px solid #ddd;
+}
+
+.el-dialog--center .el-dialog__body{
+ padding: 0.04rem;
}
.el-table--border th {
@@ -431,6 +403,40 @@
padding: 0 !important;
font-size: 0.01rem !important;
}
+.el-scrollbar__wrap {
+
+}
+/*****婊氬姩鏉�***/
+.scroll::-webkit-scrollbar,
+.el-table__body-wrapper::-webkit-scrollbar,
+.el-scrollbar__wrap::-webkit-scrollbar {
+ /*婊氬姩鏉℃暣浣撴牱寮�*/
+ width: 10px; /*楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄*/
+ height: 10px;
+}
+
+.scroll::-webkit-scrollbar-thumb,
+.el-table__body-wrapper::-webkit-scrollbar-thumb,
+.el-scrollbar__wrap::-webkit-scrollbar-thumb {
+ /*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
+ border-radius: 10px;
+ background: #000;
+}
+.scroll::-webkit-scrollbar-track,
+.el-table__body-wrapper::-webkit-scrollbar-track,
+.el-scrollbar__wrap::-webkit-scrollbar-track {
+ /*婊氬姩鏉￠噷闈㈣建閬�*/
+ box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+ background: @background-color;
+ border-radius: 10px;
+}
+
+
+
+
+/*********瑙ｅ喅妯悜婊氬姩**/
+
+
/***********************************************鍔ㄧ敾鏁堟灉************/
.transition {
--
Gitblit v1.8.0