From 8bb474b9fcf3f964d7937bcb2c3e7bb2d139bf7c Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 09:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/assets/css/map/map-panel-style.less |  169 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 162 insertions(+), 7 deletions(-)

diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 0a9adea..a23fdc6 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -1,5 +1,13 @@
 @import "_map-variable";
 
+/*鍏ㄥ眬璁剧疆***********/
+h1, h2, h3, h4, h5, h6, ul, li, p {
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}
+
+
 .el-button--primary {
   color: @color;
   background-color: @background-color;
@@ -12,7 +20,6 @@
     text-align: center;
     height: 20px;
     line-height: 20px;
-
     color: @color;
     cursor: pointer;
     -ms-flex-negative: 0;
@@ -37,7 +44,7 @@
 
   .el-dialog__title {
     padding: .03125rem .08333rem;
-    color: @color;
+    color: @color-title;
     cursor: pointer;
     flex-shrink: 0;
   }
@@ -157,13 +164,17 @@
 }
 
 .tools-panel-content {
-  border: 1px solid @background-color-tools;
-  background: @background-color-tools;
+  //position: absolute;
+  //top: 60px;
+  //left: 55px;
+  background: @background-color;
+  border: 0.00521rem solid @color-shadow;
   padding: 0;
-  width: 90px;
+  //width: 90px;
   display: flex;
   flex-wrap: wrap;
   justify-content: space-evenly;
+  margin-left: 55px;
 
   .el-button {
     padding: 0;
@@ -180,6 +191,150 @@
   }
 }
 
-.el-popper[x-placement^=bottom] .popper__arrow::after {
-  border-bottom-color: @background-color-tools;
+.leaflet-control-easyPrint .leaflet-bar .leaflet-control {
+  display: none;
 }
+
+.popper__arrow {
+  display: none !important;
+}
+
+.el-tabs--card > .el-tabs__header .el-tabs__nav {
+  border: none;
+}
+
+.el-tabs--card > .el-tabs__header .el-tabs__item {
+  border: none;
+  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{
+
+}
+.active-button{
+  border: 0.00521rem solid #fff700 !important;
+  box-shadow: 0 0 0.03rem #fff700 !important;
+  color:#fff700 !important;
+}
+
+/***************Company 鍥惧眰 鎮诞妗嗘牱寮忋��*********************************/
+.company-bindTooltip {
+  background: none;
+  border: none;
+  color: red;
+  font-size: 16px;
+  font-weight: 900 !important;
+  text-shadow: 0 0 5px #fff;
+  box-shadow: none;
+}
+
+.company-bindTooltip-hover h3 {
+  text-align: center;
+  border-bottom: 1px solid #0B3B6D;
+  margin: 0;
+  padding: 0;
+}
+
+.company-bindTooltip-hover ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  width: 260px;
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.company-bindTooltip-hover ul li {
+  margin: 0;
+  padding: 3px 0;
+  width: 50%;
+}
+
+/*************** PublicTable 琛ㄦ牸鏍峰紡銆�*********************************/
+.cell {
+  padding: 0;
+}
+
+.el-table .cell, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell {
+  /* padding-left: 10px; */
+  text-align: center;
+}
+.el-table th>.cell {
+  color: #00fff6;
+}
+.el-table__row>td{
+  border: none;
+}
+.el-table::before {//鍘绘帀鏈�涓嬮潰鐨勯偅涓�鏉＄嚎
+  height: 0;
+}
+.el-table td, .el-table th.is-leaf {
+  border: none;
+}
+.el-table .warning-row {
+  background: #28304d;
+}
+
+.el-table .success-row {
+  background: #30455f;
+}
+/***********************************************鍔ㄧ敾鏁堟灉************/
+.transition{
+  transition: all .5s;
+ /* transform-origin: top left;*/
+  animation: bounce-in .2s;
+}
+@keyframes bounce-in {
+  0% {
+    transform: scale(0);
+    opacity: 0;
+  }
+  100% {
+    transform: scale(1);
+    opacity: 1;
+  }
+}
+/**map 椤甸潰鍥炬爣鎸夐挳*/
+.iconBtn {
+  width:0.26rem;
+  height: 0.26rem;
+  text-align: center;
+  background: rgba(0, 16, 30, 0.5);
+  cursor: pointer;
+  color: #00fff6;
+  border: 0.00521rem solid #00fff6;
+  box-shadow: 0 0 0.03rem #00fff6;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  justify-items: center;
+  border-radius: 0.03rem;
+  .icon{
+    width: 20px;
+    margin: 0 auto;
+  }
+
+}
\ No newline at end of file

--
Gitblit v1.8.0