From 45420c3dee5f10ea0fe8b7175789729257c773b6 Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Wed, 3 Jul 2024 17:11:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E5=9B=BE=E6=96=91=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E3=80=91=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E5=9B=BE?=
 =?UTF-8?q?=E6=96=91=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bootstraps/curbspotcity/MapList/ShowInfoModal/index.vue     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/demo/bootstraps/curbspotcity/MapList/ShowInfoModal/index.vue b/src/views/demo/bootstraps/curbspotcity/MapList/ShowInfoModal/index.vue
index ea1fe720..2ec5a8ed 100644
--- a/src/views/demo/bootstraps/curbspotcity/MapList/ShowInfoModal/index.vue
+++ b/src/views/demo/bootstraps/curbspotcity/MapList/ShowInfoModal/index.vue
@@ -11,6 +11,7 @@
     <a-descriptions-item label="案件编号">{{ case_no }}</a-descriptions-item>
     <a-descriptions-item label="案件名称">{{ case_name }}</a-descriptions-item>
     <a-descriptions-item label="案件描述">{{ case_description }}</a-descriptions-item>
+    <a-descriptions-item label="图斑编号">{{ geomid }}</a-descriptions-item>
     <a-descriptions-item label="案件地址">{{ address }}</a-descriptions-item>
     <a-descriptions-item label="总面积">{{ area? area: '-' }} 亩</a-descriptions-item>
     <a-descriptions-item label="耕地面积">{{ gengdi_area? gengdi_area: '-' }} 亩</a-descriptions-item>
@@ -36,6 +37,7 @@ const {
   gengdi_area,
   guotukongjianguihua_area,
   id,
+  geomid,
   nongyongdi_area,
   shengtaibaohuhongxian_area,
   yongjiujibennongtian_area,

From f11c91a6c09daef7cd97a0f2f8cd26efbf1b8246 Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Wed, 3 Jul 2024 17:23:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E5=9B=BE=E6=96=91=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E3=80=91=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=9C=89=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84=E9=9D=A2=E7=A7=AF=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bootstraps/curbspotcity/MapList/index.vue | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/views/demo/bootstraps/curbspotcity/MapList/index.vue b/src/views/demo/bootstraps/curbspotcity/MapList/index.vue
index 0b578cc5..7a644ca1 100644
--- a/src/views/demo/bootstraps/curbspotcity/MapList/index.vue
+++ b/src/views/demo/bootstraps/curbspotcity/MapList/index.vue
@@ -156,32 +156,30 @@
               </div>
             </div>
           </div>
-          <div class="item-data-div"  style="margin-bottom: 4px;">
-            <div class="item-data-item">
-              <div class="item-mark-div sum-mark">总</div>
-              <div class="area-data">{{ item.area? item.area: '-'}}</div>
-            </div>
-            <div class="item-data-item">
-              <div class="item-mark-div plowland-mark">耕</div>
-              <div class="area-data">{{ item.gengdi_area? item.gengdi_area: '-'}}</div>
-            </div>
-            <div class="item-data-item">
-              <div class="item-mark-div farmland-mark">农</div>
-              <div class="area-data">{{ item.yongjiujibennongtian_area? item.yongjiujibennongtian_area: '-'}}</div>
-            </div>
-          </div>
           <div class="item-data-div">
-            <div class="item-data-item">
+            <div class="item-data-item" v-if="item.area">
+              <div class="item-mark-div sum-mark">总</div>
+              <div class="area-data">{{ item.area}}</div>
+            </div>
+            <div class="item-data-item" v-if="item.gengdi_area">
+              <div class="item-mark-div plowland-mark">耕</div>
+              <div class="area-data">{{ item.gengdi_area}}</div>
+            </div>
+            <div class="item-data-item" v-if="item.yongjiujibennongtian_area">
+              <div class="item-mark-div farmland-mark">农</div>
+              <div class="area-data">{{ item.yongjiujibennongtian_area}}</div>
+            </div>
+            <div class="item-data-item" v-if="item.zhongdianquyu_area">
               <div class="item-mark-div focus-area">重</div>
-              <div class="area-data">{{ item.zhongdianquyu_area? item.zhongdianquyu_area: '-'}}</div>
+              <div class="area-data">{{ item.zhongdianquyu_area}}</div>
             </div>
-            <div class="item-data-item">
+            <div class="item-data-item" v-if="item.guotukongjianguihua_area">
               <div class="item-mark-div padding-mark">规</div>
-              <div class="area-data">{{ item.guotukongjianguihua_area? item.guotukongjianguihua_area: '-'}}</div>
+              <div class="area-data">{{ item.guotukongjianguihua_area}}</div>
             </div>
-            <div class="item-data-item">
+            <div class="item-data-item" v-if="item.shengtaibaohuhongxian_area">
               <div class="item-mark-div adjust-mark">生</div>
-              <div class="area-data">{{ item.shengtaibaohuhongxian_area? item.shengtaibaohuhongxian_area: '-'}}</div>
+              <div class="area-data">{{ item.shengtaibaohuhongxian_area}}</div>
             </div>
           </div>
         </div>
@@ -409,6 +407,7 @@ const showInfo = (item) => {
       .item-data-div{
         display: flex;
         justify-content: space-between;
+        flex-wrap: wrap;
         .item-data-item{
           display:flex;
           align-items: center;

From 687967df594247ab5e16bacea292826b1995902d Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Wed, 3 Jul 2024 17:31:59 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E5=9B=BE=E6=96=91=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E3=80=91=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/bootstraps/curbspotcity/MapList/index.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/demo/bootstraps/curbspotcity/MapList/index.vue b/src/views/demo/bootstraps/curbspotcity/MapList/index.vue
index 7a644ca1..04917da8 100644
--- a/src/views/demo/bootstraps/curbspotcity/MapList/index.vue
+++ b/src/views/demo/bootstraps/curbspotcity/MapList/index.vue
@@ -1,5 +1,12 @@
 <template>
   <div class="content">
+    <div class="rollback">
+      <Icon
+        style="font-size: 20px; cursor: pointer"
+        icon="ant-design:arrow-left-outlined"
+        @click="emits('closeShowInfo', false)"
+      />
+    </div>
     <div class="screen-div">
       <div class="screen-item">
         <div class="screen-item-label">年份</div>
@@ -129,10 +136,11 @@
           <a-button type="primary" size="small" @click="dataListSort('gengdi_area')">
             {{`排序(耕地面积) ${props.infoScreenData.sort === 'gengdi_area'? orderMark(): '-'}`}}
           </a-button>
-          <a-button type="primary" size="small">导出</a-button>
+          <!-- <a-button type="primary" size="small">导出</a-button> -->
           <a-button type="primary" :style="openCollect && 'background: #bf0000;' " size="small" @click="getCollectList">我的收藏</a-button>
           <a-button size="small" @click="emits('getInfoList')">查询</a-button>
           <a-button size="small" @click="emits('resetScreenData')">重置</a-button>
+          <div style="width: 30px;height: 100%"></div>
       </div>
     </div>
     <div class="data-list-div">
@@ -333,6 +341,10 @@ const showInfo = (item) => {
   display: flex;
   flex-direction: column;
 }
+.rollback {
+  background: #fff;
+  padding: 10px;
+}
 .screen-div{
   padding: 10px;
   background: #e6ecfb;