From 36830ece3be7b456bcb49c2117a527db12852ec4 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Wed, 14 Aug 2024 18:12:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=86=85=E5=AE=B9=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E4=BB=98=E6=AC=BE=E8=AE=A1=E5=88=92=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E3=80=81=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataShow/leftBottom.vue | 13 ++++++-------
 src/views/lease/plan.vue          |  8 ++++----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/views/dataShow/leftBottom.vue b/src/views/dataShow/leftBottom.vue
index e7cbf95..bdc9cfa 100644
--- a/src/views/dataShow/leftBottom.vue
+++ b/src/views/dataShow/leftBottom.vue
@@ -50,15 +50,15 @@ export default {
         {
           text: "土地资产",
           num: 99966,
-          unit: "亩",
+          unit: "平方米",
           tag: "land",
           icon: "tudi"
         },
         {
-          text: "房屋资产",
+          text: "汇总数据",
           num: 8888,
-          unit: "平方",
-          tag: "house",
+          unit: "",
+          tag: "static",
           icon: "fangwu"
         }
       ]
@@ -78,9 +78,8 @@ export default {
           case "land":
             total += lands.reduce((a,b) => a + parseFloat(b.dengjimianji ?? 0),0)
             return total.toFixed(2);
-          case "house":
-            total += houses.reduce((a,b) => a + parseFloat(b.dengjimianji ?? 0),0)
-            return total.toFixed(2);
+          case "static":
+            return `土地 ${lands.length}处，房产 ${houses.length}处`;
           default:
             return total.toFixed(2);
         }
diff --git a/src/views/lease/plan.vue b/src/views/lease/plan.vue
index 71e7037..6a9194b 100644
--- a/src/views/lease/plan.vue
+++ b/src/views/lease/plan.vue
@@ -589,26 +589,26 @@ export default {
             let tags = [
               ...row?.land?.map((i) =>
                 (
-                  <Tag type="dot" color="#3fa45a" style="background: #e5f4ea !important;">{i.name}</Tag>
+                  <Tag color="primary" style="background: #e5f4ea !important;">{i.name}</Tag>
                 )
               ),
               ...row?.houses?.map((i) =>
                 (
-                  <Tag type="dot" color="#2254e4" style="background: #e8edfc !important">{i.name}</Tag>
+                  <Tag color="success" style="background: #e8edfc !important">{i.name}</Tag>
                 )
               ),
             ]
             return (
               <div>
                 {
-                  tags.slice(0, 2)
+                  tags.slice(0, 1)
                 }
                 <el-popover>
                   <el-link slot="reference"
                            type="primary"
                            style={{
                              "word-break": "keep-all",
-                             display: tags.length > 2 ? "inline" : "none",
+                             display: tags.length > 1 ? "inline" : "none",
                            }}>更多</el-link>
                   <div slot="default">
                     {