From a7b7b5f1f85bd30b171e17056bf9ae9830fb36cb Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 08 四月 2021 17:22:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

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

diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 247200e..48fc68b 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -1,13 +1,15 @@
 @import "_map-variable";
-
+.leaflet-container,
+html,body{
+ // font-family: 'Microsoft YaHei';
+  font: 12px/1.5 "Microsoft YaHei", Arial, Helvetica, sans-serif;
+}
 /*鍏ㄥ眬璁剧疆***********/
-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 {
@@ -55,6 +57,7 @@
 .select-down {
   border: none !important;
   background-color: @background-color;
+  margin: 0;
 
   //.el-scrollbar{
   //
@@ -201,11 +204,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;
 }
@@ -244,34 +247,123 @@
 
 /***************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;
+  position: absolute;
+  top:0;
+  left: 0;
   display: flex;
-  flex-wrap: wrap;
+  justify-content: center;
+  justify-items: center;
+  img{display: block;width: 30px;height: 30px;margin-left: -15px;margin-top: -15px}
+  ul{
+    width: 120px;
+    margin-left: -60px;
+    text-align: center;
+    display: flex;
+    position: absolute;
+    top:20px;
+    left:0;
+    li{
+      position: absolute;
+      top:0;
+      left:0;
+      width: 100%;
+      font-weight: 900;
+      text-shadow: 0 0 4px #fff;
+      color: red;
+      font-size: 16px;
+      height: 20px;
+      line-height: 18px;
+      overflow: visible;
+    }
+  }
 }
-.company-bindTooltip-hover ul li{
-  margin: 0;
-  padding:3px 0;
-  width: 50%;
+/*.company-bindTooltip {
+  //background: @background-color-split;
+  background: none;
+  border: none;
+  color: red;
+  //font-size: 16px;
+  box-shadow: none;
+  text-shadow: 0 0 5px #fff;
+  filter:Dropshadow(offx=1,offy=0,color=white)
+  Dropshadow(offx=0,offy=1,color=white)
+  Dropshadow(offx=0,offy=-1,color=white)
+  Dropshadow(offx=-1,offy=0,color=white);
+  box-shadow: none;
+  -webkit-text-stroke: 0.1px #fff;
+  font: 16px "Microsoft YaHei", Arial, Helvetica, sans-serif;
+  ul{
+    position: relative;
+    li:not(:first-child){
+      position: absolute;
+      top:0;
+      left:0;
+      width: 100%;
+      font-weight: 900;
+    }
+    li{
+      text-shadow: 0 0 4px #fff;
+    }
+  }
+}*/
+.company-bindTooltip:before{
+  display: 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;
+  font-size: 0.08rem;
+}
+.el-table .warning-row {
+  background: #28304d;
+}
+
+.el-table .success-row {
+  background: #30455f;
+}
+.el-table tbody tr:hover>td {
+  background-color:#28304d !important;
+}
 /***********************************************鍔ㄧ敾鏁堟灉************/
 .transition{
   transition: all .5s;
@@ -306,6 +398,18 @@
   .icon{
     width: 20px;
     margin: 0 auto;
+    font-size: 20px;
   }
 
-}
\ No newline at end of file
+}
+.panel-title{
+  color: @color-title;
+  font-size: 18px;
+  padding: 10px;
+  text-align: center;
+  border-bottom: 1px solid @background-color-split;
+}
+
+.el-tabs__header .is-top {
+  
+}

--
Gitblit v1.8.0