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 |   71 ++++++++++++++++++++++++++++++-----
 1 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 76a400e..1ec2a41 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -545,7 +545,7 @@
 .panel-title {
   color: @color-title;
   font-size: 18px;
-  padding: 10px;
+  padding: 5px 10px;
   text-align: center;
   border-bottom: 1px solid @background-color-split;
 }
@@ -591,13 +591,14 @@
     padding: 7px 15px;
   }
 
-  .el-button:hover {
+.el-button:hover{
     background: @background-color;
     color: @color-highlight;
     border-color: @color-highlight;
   }
 
-  .el-input__inner {
+
+   .el-input__inner {
     color: #fff;
     text-align: center;
   }
@@ -679,9 +680,9 @@
   margin: 15px 0;
 }
 
-.fixed-table {
-  background: rgba(0, 16, 30, 1) !important;
-}
+//.fixed-table {
+//  background: rgba(0, 16, 30, 1) !important;
+//}
 
 /****************************鎶ヨ〃浜岀骇瀛愬脊妗嗘牱寮�***/
 .el-tabs__nav-wrap::after {
@@ -738,7 +739,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-
+    padding: 5px 0;
     .time-select {
       cursor: pointer;
       padding: 5px;
@@ -752,9 +753,6 @@
   }
 
   .echarts-form {
-    height: 0.3rem;
-    line-height: 0.3rem;
-
     .demonstration {
       color: #00fff6;
       font-size: 12px;
@@ -762,7 +760,6 @@
     }
 
     .el-input__inner {
-      height: 0.15rem;
       background-color: #2e4967;
       color: #fff;
       font-size: 12px;
@@ -808,3 +805,55 @@
 .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