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 |   61 ++++++++++++++++++++++--------
 1 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 247200e..a23fdc6 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -1,13 +1,11 @@
 @import "_map-variable";
 
 /*鍏ㄥ眬璁剧疆***********/
-h1,h2,h3,h4,h5,h6,ul,li,p{
+h1, h2, h3, h4, h5, h6, ul, li, p {
   padding: 0;
   margin: 0;
   list-style: none;
 }
-
-
 
 
 .el-button--primary {
@@ -201,11 +199,11 @@
   display: none !important;
 }
 
-.el-tabs--card>.el-tabs__header .el-tabs__nav{
+.el-tabs--card > .el-tabs__header .el-tabs__nav {
   border: none;
 }
 
-.el-tabs--card>.el-tabs__header .el-tabs__item{
+.el-tabs--card > .el-tabs__header .el-tabs__item {
   border: none;
   margin-left: 10px;
 }
@@ -243,35 +241,66 @@
 }
 
 /***************Company 鍥惧眰 鎮诞妗嗘牱寮忋��*********************************/
-.company-bindTooltip{
-  background:none;
-  border:none;
-  color:red;
+.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{
+
+.company-bindTooltip-hover h3 {
   text-align: center;
-  border-bottom:1px solid #0B3B6D;
+  border-bottom: 1px solid #0B3B6D;
   margin: 0;
-  padding:0;
+  padding: 0;
 }
-.company-bindTooltip-hover ul{
+
+.company-bindTooltip-hover ul {
   list-style: none;
   margin: 0;
-  padding:0;
+  padding: 0;
   width: 260px;
   display: flex;
   flex-wrap: wrap;
 }
-.company-bindTooltip-hover ul li{
+
+.company-bindTooltip-hover ul li {
   margin: 0;
-  padding:3px 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;

--
Gitblit v1.8.0