From e3608132cc667c16ea10f450807e0feddaf55d1f Mon Sep 17 00:00:00 2001 From: 陈泽平 <chenzeping> Date: 星期日, 30 五月 2021 13:32:38 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/assets/css/map/map-panel-style.less | 545 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 481 insertions(+), 64 deletions(-) diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less index 17257c8..1ec2a41 100644 --- a/src/assets/css/map/map-panel-style.less +++ b/src/assets/css/map/map-panel-style.less @@ -1,16 +1,55 @@ @import "_map-variable"; + .leaflet-container, -html,body{ - // font-family: 'Microsoft YaHei'; +html, body { + // font-family: 'Microsoft YaHei'; font: 12px/1.5 "Microsoft YaHei", Arial, Helvetica, sans-serif; } + + /*鍏ㄥ眬璁剧疆***********/ -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 { + 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; + .el-dialog__header { + border-bottom: 1px solid @background-color-split; + } +} + +i { + font-style: normal +} .el-button--primary { color: @color; @@ -97,6 +136,7 @@ .el-table th, .el-table tr { background-color: transparent; + padding: 0.02rem; } .el-table { @@ -110,6 +150,7 @@ thead.is-group th { background: transparent; + padding: 0 } .el-table__expanded-cell { @@ -186,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; } } @@ -213,59 +262,54 @@ 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{ +.el-button { } -.active-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; - color:#fff700 !important; + color: #fff700 !important; } /***************Company 鍥惧眰 鎮诞妗嗘牱寮忋��*********************************/ -.company-bindTooltip{ +.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} - ul{ + + img { + display: block; + width: 35px; + height: 35px; + margin-left: -16px; + margin-top: -16px + } + + ul { width: 120px; margin-left: -60px; text-align: center; display: flex; position: absolute; - top:20px; - left:0; - li{ + top: 20px; + left: 0; + + li { position: absolute; - top:0; - left:0; + top: 0; + left: 0; width: 100%; font-weight: 900; text-shadow: 0 0 4px #fff; @@ -277,6 +321,7 @@ } } } + /*.company-bindTooltip { //background: @background-color-split; background: none; @@ -306,13 +351,14 @@ } } }*/ -.company-bindTooltip:before{ +.company-bindTooltip:before { display: none; } .company-bindTooltip-hover h3 { text-align: center; - border-bottom: 1px solid #0B3B6D; + border-bottom: 1px solid @background-color-split; + color: @color-highlight; margin: 0; padding: 0; } @@ -334,15 +380,11 @@ /*************** PublicTable 琛ㄦ牸鏍峰紡銆�*********************************/ -.el-table{ - .el-table__body-wrapper::-webkit-scrollbar { - width: 0; - height: 0; - background: none; - } - .cell{ +.el-table { + .cell { padding: 0 3px !important; - i{ + + i { display: block; font-style: normal; font-size: 10px; @@ -350,28 +392,57 @@ } } } -.el-table--border th{ + + +.el-dialog--center .el-dialog__body { + padding: 0.04rem; +} + +.el-table--border th { border-right: none; border-left: 1px solid #ddd; - } -.el-table--border th.gutter{border-left: none} + +.el-table--border th.gutter { + border-left: none +} .el-table .cell, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell { text-align: center; } -.el-table th>.cell { + +.el-table th > .cell { color: #00fff6; } -.el-table__row>td{ + +.el-table__row > td { border: none; } -.el-table::before {//鍘绘帀鏈�涓嬮潰鐨勯偅涓�鏉$嚎 + +.el-table::before { //鍘绘帀鏈�涓嬮潰鐨勯偅涓�鏉$嚎 height: 0; } + .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 { @@ -381,21 +452,61 @@ .el-table .success-row { background: #30455f; } -.el-table tbody tr:hover>td { - background-color:#28304d !important; + +.el-table tbody tr:hover > td { + background-color: #28304d !important; } + //淇敼琛ㄦ牸楂樺害 .el-table td { - padding: 0!important; + 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 { + /*婊氬姩鏉℃暣浣撴牱寮�*/ + width: 10px; /*楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉$殑灏哄*/ + height: 10px; +} + +.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 { + /*婊氬姩鏉¢噷闈㈣建閬�*/ + box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); + background: @background-color; + border-radius: 10px; +} + + +/*********瑙e喅妯悜婊氬姩**/ + + /***********************************************鍔ㄧ敾鏁堟灉************/ -.transition{ +.transition { transition: all .5s; - /* transform-origin: top left;*/ + /* transform-origin: top left;*/ animation: bounce-in .2s; } + @keyframes bounce-in { 0% { transform: scale(0); @@ -406,9 +517,10 @@ opacity: 1; } } + /**map 椤甸潰鍥炬爣鎸夐挳*/ .iconBtn { - width:0.26rem; + width: 0.26rem; height: 0.26rem; text-align: center; background: rgba(0, 16, 30, 0.5); @@ -421,17 +533,19 @@ justify-content: center; justify-items: center; border-radius: 0.03rem; - .icon{ + + .icon { width: 20px; margin: 0 auto; font-size: 20px; } } -.panel-title{ + +.panel-title { color: @color-title; font-size: 18px; - padding: 10px; + padding: 5px 10px; text-align: center; border-bottom: 1px solid @background-color-split; } @@ -440,3 +554,306 @@ } +.el-picker-panel { + background: @background-color; + border-color: @color; + color: @color; + + .el-picker-panel__body-wrapper { + background: @background-color; + } + + .el-input__inner { + background: @background-color; + border-color: @color; + } + + .el-date-table td.today span { + color: @color-highlight; + } + + .el-picker-panel__footer { + background: @background-color; + border-top-color: @color; + } + + .el-date-table th { + border-bottom-color: @color; + } + + .el-button { + background: @background-color; + color: @color; + border-color: @color; + } + + .el-button--text { + padding: 7px 15px; + } + +.el-button:hover{ + background: @background-color; + color: @color-highlight; + border-color: @color-highlight; + } + + + .el-input__inner { + color: #fff; + text-align: center; + } + + .el-date-picker__time-header { + border-bottom-color: @background-color-split; + } + + .el-date-picker__header-label { + color: #fff + } +} + +.el-select-dropdown { + background: @background-color; + border-color: @color; + color: @color; + + .el-select-dropdown__item { + color: #fff; + } + + .el-select-dropdown__item.hover { + background: @background-color; + box-shadow: 0 0 5px @color-highlight inset; + } + + .el-select-dropdown__item.selected { + color: @color-highlight; + } +} + +/***********************************************鍙充晶绠$嚎鐩稿叧************/ +.el-tabs__header { + background: none; +} + +.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 { + background: none; + border-bottom: none; + margin: 0; +} + +.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 { + 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; +//} + +/****************************鎶ヨ〃浜岀骇瀛愬脊妗嗘牱寮�***/ +.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; + padding: 5px 0; + .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 { + .demonstration { + color: #00fff6; + font-size: 12px; + margin-left: 10px; + } + + .el-input__inner { + 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: " "; + } +} +.el-tabs--card>.el-tabs__header{ + border-bottom-color: @background-color; +} + +/************leaflet-tooltip 鎮诞妗嗘牱寮忕粺涓�淇敼************/ +.leaflet-tooltip-top, +.leaflet-tooltip-left, +.leaflet-tooltip-right, +.leaflet-tooltip-bottom{ + background-color: @background-color; + box-shadow: 0 0 0.03rem #00fff6; + border-color: #00fff6; + color: @color-highlight; + >div{background-color: @background-color;color: #00fff6} +} +.leaflet-tooltip-top::before{border-top-color: @background-color;} +.leaflet-tooltip-left::before{border-left-color: @background-color;} +.leaflet-tooltip-right::before{border-right-color: @background-color;} +.leaflet-tooltip-bottom::before{border-bottom-color: @background-color;} + + +.el-date-editor.el-input, .el-date-editor.el-input__inner{ + width: 160px; + height: 30px; +} +.el-select.el-select--mini{ + width: 80px; +} +.time-select{ + display:block;text-align: center; +} +.public-bounced-content-left{ + width: 5rem; +} +.echarts-chart>div{ + width: 100%; + height: 1.5rem; +} + +.el-dialog__body{ + padding: 5px; + color: #f2f2f2; +} +.el-collapse-item__header { + display: flex; + align-items: center; + height: 48px; + line-height: 48px; + background-color: @background-color; + color: @color; + cursor: pointer; + border-bottom: 1px solid @color; + font-size: 13px; + font-weight: 500; + transition: border-bottom-color .3s; + outline: 0; +} +.el-collapse-item__wrap{ + background-color: @background-color; + +} +.el-collapse-item__content{ + color: @color; +} + +/************鎼滅储鏁版嵁鍒嗛〉鍔熻兘鎬绘暟閲忔牱寮忔坊鍔�************/ +.page_total { + text-align: right; + margin: 5px 0; + color: @color; +} -- Gitblit v1.8.0