From 4f35a8b56c12315c82fd5bd136f32da2dcadc5e2 Mon Sep 17 00:00:00 2001 From: chenyabin <Chenab123!> Date: 星期二, 27 四月 2021 09:27:22 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/assets/css/map/map-panel-style.less | 194 +++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 164 insertions(+), 30 deletions(-) diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less index 0a4a136..edb9f1c 100644 --- a/src/assets/css/map/map-panel-style.less +++ b/src/assets/css/map/map-panel-style.less @@ -8,40 +8,45 @@ /*鍏ㄥ眬璁剧疆***********/ -h1, h2, h3, h4, h5, h6, ul, li, p,i ,span,div{ +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; + -moz-user-select: none; /*鐏嫄*/ + -webkit-user-select: none; /*webkit娴忚鍣�*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*鏃╂湡娴忚鍣�*/ + user-select: none; } -.rt{ - float:right; +.rt { + float: right; } -.lt{ - float:left; + +.lt { + float: left; } -.el-button--mini, .el-button--mini.is-round{ + +.el-button--mini, .el-button--mini.is-round { padding: 0.02rem 0.04rem; } + /*闅愯棌*/ -.el-dialog__wrapper{ +.el-dialog__wrapper { height: 0; } -.el-dialog{ + +.el-dialog { margin: 0 !important; position: fixed; z-index: 2000; -// left: 50%; - //bottom:15px; - .el-dialog__header{ + // left: 50%; + //bottom:15px; + .el-dialog__header { border-bottom: 1px solid @background-color-split; } } + i { font-style: normal } @@ -131,6 +136,7 @@ .el-table th, .el-table tr { background-color: transparent; + padding: 0.02rem; } .el-table { @@ -221,13 +227,21 @@ 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; } } @@ -254,11 +268,12 @@ } .hover-bottom:hover, -.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; @@ -367,6 +382,7 @@ .el-table { .cell { padding: 0 3px !important; + i { display: block; font-style: normal; @@ -375,11 +391,9 @@ } } } -.el-table--border{ - border-bottom: 1px solid #ddd; -} -.el-dialog--center .el-dialog__body{ + +.el-dialog--center .el-dialog__body { padding: 0.04rem; } @@ -413,6 +427,23 @@ 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 { background: #28304d; } @@ -430,11 +461,14 @@ padding: 0 !important; font-size: 0.01rem !important; } + .el-scrollbar__wrap { } + /*****婊氬姩鏉�***/ .scroll::-webkit-scrollbar, +.s-map-popup-panel .el-tabs__content::-webkit-scrollbar, .el-table__body-wrapper::-webkit-scrollbar, .el-scrollbar__wrap::-webkit-scrollbar { /*婊氬姩鏉℃暣浣撴牱寮�*/ @@ -443,13 +477,16 @@ } .scroll::-webkit-scrollbar-thumb, +.s-map-popup-panel .el-tabs__content::-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, +.s-map-popup-panel .el-tabs__content::-webkit-scrollbar-track, .el-table__body-wrapper::-webkit-scrollbar-track, .el-scrollbar__wrap::-webkit-scrollbar-track { /*婊氬姩鏉¢噷闈㈣建閬�*/ @@ -459,10 +496,7 @@ } - - /*********瑙e喅妯悜婊氬姩**/ - /***********************************************鍔ㄧ敾鏁堟灉************/ @@ -647,10 +681,110 @@ .fixed-table { background: rgba(0, 16, 30, 1) !important; } -/****************************绉佹湁***/ -.baoBiao{ - .el-dialog.el-dialog--center{ - top:100px; - left: 100px; + +/****************************鎶ヨ〃浜岀骇瀛愬脊妗嗘牱寮�***/ +.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; + } +} + +.btn00fff6{ + background: none;color:#00fff6;border-color:#00fff6 +} +.btn00fff6:hover{ + background: @background-color;color:@color-highlight;border-color:@color-highlight +} + +/****************************搴熸按寮规鍏叡鏍峰紡***/ +.echarts-box { + .tab-scroll { + display: flex; + align-items: center; + justify-content: space-between; + + .time-select { + cursor: pointer; + padding: 5px; + border: 1px solid #2b87c8; + border-radius: 4px; + text-align: center; + color: #fff; + font-size: 11px; + width: 280px; + } + } + + .echarts-form { + height: 0.3rem; + line-height: 0.3rem; + + .demonstration { + color: #00fff6; + font-size: 12px; + margin-left: 10px; + } + + .el-input__inner { + height: 0.15rem; + background-color: #2e4967; + color: #fff; + font-size: 12px; + padding: 0; + border-color: #00fff6; + text-align: center; + } + + .el-button { + margin: 0 15px; + width: 0.3rem; + height: 0.15rem; + display: inline-block; + background-color: #2e4967; + color: #fff; + font-size: 12px; + padding: 0; + border-color: #00fff6; + text-align: center; + } + } + + .el-icon-time:before { + content: " "; + } +} \ No newline at end of file -- Gitblit v1.8.0