From 1c85fcd8b875eee60e3a948ee94a53988b88eac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Tue, 2 Jan 2024 15:57:30 +0800
Subject: [PATCH] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoard/renfang/index.vue | 61 +++++++++++++++------------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue
index 22b9af927..16765562c 100644
--- a/src/views/dataBoard/renfang/index.vue
+++ b/src/views/dataBoard/renfang/index.vue
@@ -115,8 +115,8 @@
 
         <div class="m-search">
           <div class="btn" @click="searchModule.displayedCard = true">
-            <img src="@/assets/images/renfang/search_border.png" class="border" alt="">
-            <img src="@/assets/images/renfang/search_icon.png" class="icon" alt="">
+            <img alt="" class="border" src="@/assets/images/renfang/search_border.png">
+            <img alt="" class="icon" src="@/assets/images/renfang/search_icon.png">
           </div>
 
           <div v-show="searchModule.displayedCard" class="card">
@@ -264,14 +264,17 @@
                 </div>
                 <div class="item-per">
                   <span>较上月</span>
-                  <img
-                      v-if="item.growth >= 0"
-                      src="~@/assets/images/shuju/renfang/index/up.png"
-                  />
-                  <img
-                      v-else
-                      src="~@/assets/images/shuju/renfang/index/down.png"
-                  />
+                  <template v-if="item.growth !== 0">
+                    <img
+                        v-if="item.growth > 0"
+                        src="~@/assets/images/shuju/renfang/index/up.png"
+                    />
+                    <img
+                        v-else
+                        src="~@/assets/images/shuju/renfang/index/down.png"
+                    />
+                  </template>
+                  <span v-else style="width: 20px"></span>
                   <b>{{ item.growthAbs }}</b>
                   <span>人</span>
                 </div>
@@ -302,7 +305,7 @@
                 <div class="item-per">
                   <span>较上一年</span>
                   <img
-                      v-if="item.growth >= 0"
+                      v-if="item.isTop"
                       src="~@/assets/images/shuju/renfang/index/up.png"
                   />
                   <img
@@ -627,20 +630,20 @@ export default {
           let title = "";
           let detailJson = item.detail_json;
           // if (searchModule.resultTab == 0) {
-            title = item.name;
-            if (typeof item.detail_json == "string") {
-              try {
-                detailJson = JSON.parse(item.detail_json);
-              } catch (e) {
-                console.log(e);
-              }
+          title = item.name;
+          if (typeof item.detail_json == "string") {
+            try {
+              detailJson = JSON.parse(item.detail_json);
+            } catch (e) {
+              console.log(e);
             }
-           if (type == "1") {
+          }
+          if (type == "1") {
             title = item.user_name;
           } else if (type == "2") {
             title = detailJson.village;
           } else if (type == "3") {
-             console.log(item,'detailJson')
+            console.log(item, 'detailJson')
             title = detailJson.village + "-" + detailJson.building;
           } else if (type == "4") {
             title = item.center_addre;
@@ -721,8 +724,8 @@ export default {
               name: resiCategoryMap[item.categoryName] || "",
               count: item.categoryCount,
               ratio: ((100 * item.categoryCount) / data.resiCount).toFixed(0),
-              growth: 0,
-              growthAbs: Math.abs(item.growth) || '--',
+              growth: item.growth,
+              growthAbs: item.growth === 0 ? 0 : Math.abs(item.growth),
             };
           });
         }
@@ -821,23 +824,27 @@ export default {
 .map-bottom {
   margin: 0 17px;
 }
+
 .m-search {
-  top: 595px!important;
+  top: 595px !important;
+
   .btn {
     position: relative;
     width: 56px;
     height: 56px;
     margin-left: 12px;
+
     .border {
+      position: absolute;
+      top: 0;
+      left: 0;
+      //animation-iteration-count: infinite;
       width: 56px;
       height: 56px;
       animation: autobiography 2s infinite;
-      //animation-iteration-count: infinite;
       animation-timing-function: linear;
-      position: absolute;
-      left: 0;
-      top: 0;
     }
+
     .icon {
       width: 56px;
       height: 56px;