From c98cd1d07a99883d4bd2b9833ce7e91e56a6f1fb Mon Sep 17 00:00:00 2001 From: chenzeping <ChenZeping02609@163.com> Date: 星期一, 19 四月 2021 14:06:08 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/assets/css/map/map-panel-style.less | 135 +++++++++++++++++++++++++++++++------------- 1 files changed, 94 insertions(+), 41 deletions(-) diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less index 8be47de..7c2e6f6 100644 --- a/src/assets/css/map/map-panel-style.less +++ b/src/assets/css/map/map-panel-style.less @@ -6,6 +6,7 @@ font: 12px/1.5 "Microsoft YaHei", Arial, Helvetica, sans-serif; } + /*鍏ㄥ眬璁剧疆***********/ h1, h2, h3, h4, h5, h6, ul, li, p { padding: 0; @@ -13,6 +14,26 @@ list-style: none; } +.rt{ + float:right; +} +.lt{ + float:left; +} +.el-button--mini, .el-button--mini.is-round{ + padding: 0.02rem 0.04rem; +} +/*闅愯棌*/ +.el-dialog__wrapper{ + height: 0; +} +.el-dialog{ + margin: 0 !important; + position: fixed; + z-index: 2000; +// left: 50%; + //bottom:15px; +} i { font-style: normal } @@ -115,6 +136,7 @@ thead.is-group th { background: transparent; + padding: 0 } .el-table__expanded-cell { @@ -218,39 +240,17 @@ 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 { } .hover-bottom:hover, +.hover-bottom.hover{ + box-shadow: 0 0 0.03rem #fff700 inset !important; + color: #fff700 !important; + cursor: pointer; +} .active-button { border: 0.00521rem solid #fff700 !important; box-shadow: 0 0 0.03rem #fff700 !important; @@ -357,17 +357,8 @@ /*************** 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 { display: block; font-style: normal; @@ -375,6 +366,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 { @@ -392,7 +390,6 @@ } .el-table th > .cell { - border: 1px #396d83 solid; color: #00fff6; } @@ -425,6 +422,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; +} + + + + +/*********瑙e喅妯悜婊氬姩**/ + + /***********************************************鍔ㄧ敾鏁堟灉************/ .transition { @@ -556,7 +587,7 @@ } } -/***********************************************鍙充晶瀹樼綉鐩稿叧************/ +/***********************************************鍙充晶绠$嚎鐩稿叧************/ .el-tabs__header { background: none; } @@ -564,25 +595,47 @@ .el-tabs--top .el-tabs__item.is-top:nth-child(2) { padding-left: 20px; } + .el-tabs--border-card { background: none; border: none; box-shadow: none; } -.el-tabs--border-card>.el-tabs__header { + +.el-tabs--border-card > .el-tabs__header { background: none; border-bottom: none; margin: 0; } -.el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active { + +.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active { color: #409EFF; background: none; border: none; } -.el-tabs--border-card>.el-tabs__header .el-tabs__item { + +.el-tabs--border-card > .el-tabs__header .el-tabs__item { border: none; } + .panel-right ::-webkit-scrollbar-thumb { background: none; border: none; } + +.el-card { + margin-top: 15px; + background: rgba(0, 16, 30, 0.5); + border: 0.00521rem solid @color; + box-shadow: 0 0 0.03rem @color; +} + +.clearfix { + display: inline-block; + color: #ffffff; + margin: 15px 0; +} + +.fixed-table { + background: rgba(0, 16, 30, 1) !important; +} -- Gitblit v1.8.0