From 38fea8139670d34cedea336fbd1ba34fc92bcf02 Mon Sep 17 00:00:00 2001 From: chenzeping <ChenZeping02609@163.com> Date: 星期四, 22 四月 2021 21:34:59 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/assets/css/map/map-panel-style.less | 74 +++++++++++++++++++++++++++++++----- 1 files changed, 63 insertions(+), 11 deletions(-) diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less index 7c2e6f6..51d8c87 100644 --- a/src/assets/css/map/map-panel-style.less +++ b/src/assets/css/map/map-panel-style.less @@ -8,10 +8,15 @@ /*鍏ㄥ眬璁剧疆***********/ -h1, h2, h3, h4, h5, h6, ul, li, p { +h1, h2, h3, h4, h5, h6, ul, li, p,i ,span,div{ padding: 0; margin: 0; list-style: none; + -moz-user-select:none; /*鐏嫄*/ + -webkit-user-select:none; /*webkit娴忚鍣�*/ + -ms-user-select:none; /*IE10*/ + -khtml-user-select:none; /*鏃╂湡娴忚鍣�*/ + user-select:none; } .rt{ @@ -33,6 +38,9 @@ z-index: 2000; // left: 50%; //bottom:15px; + .el-dialog__header{ + border-bottom: 1px solid @background-color-split; + } } i { font-style: normal @@ -123,6 +131,7 @@ .el-table th, .el-table tr { background-color: transparent; + padding: 0.02rem; } .el-table { @@ -213,13 +222,20 @@ margin: 5px; width: 30px; height: 30px; - background: @background-color-tools; + color: #00fff6; + background: rgba(0, 16, 30, 0.7); + border: 0.00521rem solid #00fff6; vertical-align: middle !important; img { width: 16px; height: 16px; } + } + .el-button.hover{ + color: @color-highlight; + border: .00521rem solid @color-highlight; + box-shadow: 0 0 .03rem @color-highlight; } } @@ -260,18 +276,18 @@ /***************Company 鍥惧眰 鎮诞妗嗘牱寮忋��*********************************/ .company-bindTooltip { position: absolute; - top: 0; - left: 0; + top: 10px; + left: 8px; display: flex; justify-content: center; justify-items: center; img { display: block; - width: 30px; - height: 30px; - margin-left: -15px; - margin-top: -15px + width: 35px; + height: 35px; + margin-left: -16px; + margin-top: -16px } ul { @@ -367,9 +383,7 @@ } } } -.el-table--border{ - border-bottom: 1px solid #ddd; -} + .el-dialog--center .el-dialog__body{ padding: 0.04rem; @@ -403,6 +417,19 @@ .el-table td, .el-table th.is-leaf { font-size: 0.08rem; +} +.el-table .has-gutter tr th{ + border:1px solid @background-color-split; +} +.el-table .has-gutter tr th .cell{ + color: #fff; +} +.el-table--border{ + // border:1px solid @background-color-split; + border:none +} +.el-table--border::after, .el-table--group::after, .el-table::before{ + background:none; } .el-table .warning-row { @@ -639,3 +666,28 @@ .fixed-table { background: rgba(0, 16, 30, 1) !important; } +/****************************鎶ヨ〃浜岀骇瀛愬脊妗嗘牱寮�***/ +.el-tabs__nav-wrap::after{background: none;} +.el-tabs__header{margin-bottom: 0.04rem; + .is-active{color: @color-highlight} +} +.el-tabs__active-bar{ + background: @color-highlight; +} + +.el-popover.popovers{ + background: @background-color; + padding: 0; + border: 0.00521rem solid @color; + overflow: hidden; + box-shadow: 0 0 0.03rem @color; + .el-popover__title{color: #fff;margin: 0;padding:0.06rem; background: @background-color;border-bottom: 1px solid @background-color-split} + .refinery { + background-color: @background-color; + + } + .waste-water{ + background-color: @background-color; + } +} + -- Gitblit v1.8.0