From 1d85f0febade61aa76d15ab7a65e03cf89c92fab Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期五, 05 三月 2021 16:16:25 +0800
Subject: [PATCH] 修改污水管网png图片大小

---
 src/components/panel/LegendPanel.vue         |   31 ++++++++++++++++---------------
 src/components/helpers/ServiceLayerHelper.js |    5 ++++-
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/components/helpers/ServiceLayerHelper.js b/src/components/helpers/ServiceLayerHelper.js
index d0c1599..b344031 100644
--- a/src/components/helpers/ServiceLayerHelper.js
+++ b/src/components/helpers/ServiceLayerHelper.js
@@ -135,11 +135,14 @@
       .bindTooltip(function (layer) {
         const nameId = layer.feature.id
         let name = ''
-        if (nameId.indexOf('涓夐��') !== -1 || nameId.indexOf('鍥涢��') !== -1) {
+        if (nameId.indexOf('涓夐��') !== -1 || nameId.indexOf('鍥涢��') !== -1 || nameId.indexOf('绐ㄤ簳') !== -1) {
           name = layer.feature.properties.pointnumber
         } else {
           name = layer.feature.properties.name
         }
+        if (name === undefined) {
+          name = ''
+        }
         return name
       }, { direction: 'bottom', offset: [0, 15], sticky: true })
       .on('mouseover', function (e) {
diff --git a/src/components/panel/LegendPanel.vue b/src/components/panel/LegendPanel.vue
index f037a64..af1ac12 100644
--- a/src/components/panel/LegendPanel.vue
+++ b/src/components/panel/LegendPanel.vue
@@ -6,7 +6,7 @@
     </div>
     <transition name="fade">
       <div class="legend-content" v-show="legendControl">
-        <div class="legend-content-centent" v-for="(item,index) in legendContents" :key="index">
+        <div class="legend-content-box" v-for="(item,index) in legendContents" :key="index">
           <p>{{ item.title }}</p>
           <ul>
             <li v-for="(ite,inde) in item.items" :key="inde">
@@ -206,11 +206,12 @@
   methods: {
     // 鍥炬爣 鎺у埗鍐呭鐨勫睍绀轰笌闅愯棌
     legendChange () {
-      if (this.legendControl === false) {
-        this.legendControl = true
-      } else {
-        this.legendControl = false
-      }
+      // if (this.legendControl === false) {
+      //   this.legendControl = true
+      // } else {
+      //   this.legendControl = false
+      // }
+      this.legendControl = !this.legendControl
     }
   }
 }
@@ -241,22 +242,22 @@
     0% {
       transform: scale(0);
     }
-    50% {
-      transform: scale(1.2);
-    }
+    //50% {
+    //  transform: scale(1.1);
+    //}
     100% {
       transform: scale(1);
     }
   }
 
   .fade-enter-active {
-    transform-origin: left center;
-    animation: bounce-in 1s;
-  }g
+    transform-origin: right bottom;
+    animation: bounce-in .5s;
+  }
 
   .fade-leave-active {
-    transform-origin: left center;
-    animation: bounce-in 1s reverse;
+    transform-origin: right bottom;
+    animation: bounce-in .5s reverse;
   }
 
   .legend-content {
@@ -268,7 +269,7 @@
     border-radius: 1rem;
     background: #3c7699;
 
-    .legend-content-centent {
+    .legend-content-box {
       p {
         text-align: center;
         color: #ffffff;

--
Gitblit v1.8.0