From f3f693a10d00b75f1eafe7f029cbd99bd3c9825b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 07 四月 2021 10:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

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

diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index b806be3..a23fdc6 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -44,7 +44,7 @@
 
   .el-dialog__title {
     padding: .03125rem .08333rem;
-    color: @color;
+    color: @color-title;
     cursor: pointer;
     flex-shrink: 0;
   }
@@ -208,6 +208,37 @@
   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 {
@@ -250,4 +281,60 @@
 .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