From 3072da92f3c3f08b2ee0ca03ee4e74b12f545b0e Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 26 五月 2021 21:31:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/assets/css/map/map-panel-style.less |  112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 108 insertions(+), 4 deletions(-)

diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 9a8ae8f..133719f 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -357,7 +357,8 @@
 
 .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;
 }
@@ -678,9 +679,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 {
@@ -731,3 +732,106 @@
   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;
+}
+
+/************鎼滅储鏁版嵁鍒嗛〉鍔熻兘鎬绘暟閲忔牱寮忔坊鍔�************/
+.page_total {
+  text-align: right;
+  margin: 5px 0;
+  color: @color;
+}
\ No newline at end of file

--
Gitblit v1.8.0