From 653c004b4f44396cdb4dce04c17152c7563e37f8 Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 09 四月 2021 11:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

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

diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 3545ff7..46bf141 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -1,5 +1,9 @@
 @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 {
   padding: 0;
@@ -242,19 +246,68 @@
 }
 
 /***************Company 鍥惧眰 鎮诞妗嗘牱寮忋��*********************************/
-.company-bindTooltip {
-  background: @background-color-split;
+.company-bindTooltip{
+  position: absolute;
+  top:0;
+  left: 0;
+  display: flex;
+  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 {
+  //background: @background-color-split;
+  background: none;
   border: none;
   color: red;
-  font-size: 16px;
-  font-weight: 900 !important;
-  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);
+  //font-size: 16px;
   box-shadow: none;
-  -webkit-text-stroke: .5px #fff;
+  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 {
@@ -268,15 +321,15 @@
   list-style: none;
   margin: 0;
   padding: 0;
-  width: 260px;
-  display: flex;
+  //width: 260px;
+  //display: flex;
   flex-wrap: wrap;
 }
 
 .company-bindTooltip-hover ul li {
   margin: 0;
   padding: 3px 0;
-  width: 50%;
+  //width: 50%;
 }
 
 /*************** PublicTable 琛ㄦ牸鏍峰紡銆�*********************************/
@@ -310,6 +363,13 @@
 }
 .el-table tbody tr:hover>td {
   background-color:#28304d !important;
+}
+//淇敼琛ㄦ牸楂樺害
+.el-table td {
+  padding: 0!important;
+  height: 30px;
+  line-height: 30px;
+  font-size: 0.01rem !important;
 }
 /***********************************************鍔ㄧ敾鏁堟灉************/
 .transition{
@@ -345,6 +405,7 @@
   .icon{
     width: 20px;
     margin: 0 auto;
+    font-size: 20px;
   }
 
 }
@@ -354,4 +415,8 @@
   padding: 10px;
   text-align: center;
   border-bottom: 1px solid @background-color-split;
-}
\ No newline at end of file
+}
+
+.el-tabs__header .is-top {
+
+}

--
Gitblit v1.8.0