From 85e4aaf8622c9a5be79703072d073a78f5b8d129 Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Wed, 10 Jul 2024 08:59:45 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/tiankongdi/auditinfo/MapList/index.vue        | 2 +-
 .../demo/tiankongdi/curbspotcity/AuditProgress/index.vue     | 1 -
 src/views/demo/tiankongdi/curbspotcity/MapList/index.vue     | 2 +-
 src/views/demo/tiankongdi/curbspotcity/index.vue             | 5 ++++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/demo/tiankongdi/auditinfo/MapList/index.vue b/src/views/demo/tiankongdi/auditinfo/MapList/index.vue
index f33d3d55..e78ef8d2 100644
--- a/src/views/demo/tiankongdi/auditinfo/MapList/index.vue
+++ b/src/views/demo/tiankongdi/auditinfo/MapList/index.vue
@@ -477,7 +477,7 @@
   }
   .sift-div{
     background:#fff;
-     height: 60px;
+     height: 77px;
      padding:19px 13px;
      margin-left: 10px;
      margin-right: 10px;
diff --git a/src/views/demo/tiankongdi/curbspotcity/AuditProgress/index.vue b/src/views/demo/tiankongdi/curbspotcity/AuditProgress/index.vue
index d2f1eca9..98605d46 100644
--- a/src/views/demo/tiankongdi/curbspotcity/AuditProgress/index.vue
+++ b/src/views/demo/tiankongdi/curbspotcity/AuditProgress/index.vue
@@ -24,7 +24,6 @@
     </div>
   </div>
   <div class="data-list">
-    <!-- <div class="data-title">图斑列表</div> -->
     <div class="show-data-list-content">
       <div class="data-item" v-for="(item, index) in dataList" :key="index" @click="emits('showInfo',true,item)">
         <div class="name-div">
diff --git a/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue b/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue
index c8dd5bd8..e75b0a04 100644
--- a/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue
+++ b/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue
@@ -465,7 +465,7 @@ const showInfo = (item) => {
 }
 .sift-div{
     background:#fff;
-     height: 60px;
+     height: 77px;
      padding:19px 13px;
      margin-left: 10px;
      margin-right: 10px;
diff --git a/src/views/demo/tiankongdi/curbspotcity/index.vue b/src/views/demo/tiankongdi/curbspotcity/index.vue
index d224f03d..b0380200 100644
--- a/src/views/demo/tiankongdi/curbspotcity/index.vue
+++ b/src/views/demo/tiankongdi/curbspotcity/index.vue
@@ -66,7 +66,7 @@ function onMapboxLoad():void {
       mapConfig.value = JSON.parse(res.codeValue)
   })
 }
-const showInfo = ref(false)
+const showInfo = ref(true)
 const year = ref<number>()
 const batch = ref()
 const dataList = ref<any>([])
@@ -429,6 +429,9 @@ const resetScreenData = () => {
   infoScreenData.value.markType = ''
   getInfoList()
 }
+onMounted(() => {
+  getInfoList()
+})
 </script>
 
 <style lang="scss" scoped>

From 779899dc33d7244c2debf0fd4135db10fb626c22 Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Wed, 10 Jul 2024 09:53:52 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=8C=89=E7=85=A7UI=20PX=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tiankongdi/curbspotcity/MapList/index.vue | 36 +++++++++++--------
 .../demo/tiankongdi/curbspotcity/index.vue    |  3 +-
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue b/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue
index e75b0a04..7054e17d 100644
--- a/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue
+++ b/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue
@@ -70,7 +70,7 @@
           @change="(value) => emits('mapListScreenChange',value,'streetId')"
         />
       </div>
-      <div class="screen-item" style="width:43.3%">
+      <div class="screen-item" style="width:40%">
         <a-input 
           style="flex:1;margin-left: 10px;"
           v-model:value="props.infoScreenData.mapNo"
@@ -177,7 +177,7 @@
         />
       </div>
     </div>
-    <div class="data-list-div">
+    <div class="data-list-div" style="padding-top: 1px;">
       <div v-for="(item, index) in props.infoDataList" :key="index" class="data-list-item">
         <div class="data-list-layout-div">
           <div class="data-list-title-div">
@@ -191,26 +191,26 @@
             </div>
             <div class="item-mark" v-if="item.isbuildname">{{item.isbuildname}}</div>
           </div>
-          <div class="data-item-type-div">
+          <div class="data-item-type-div" style="cursor:pointer;" @click="() => {}">
             {{item.unitname}}
           </div>
         </div>
         <div class="data-list-info-div">
           <div class="info-layout-div">
-            <div class="info-item">
+            <div class="info-item" style="width: 67px;">
               <div class="info-label">总</div>
               <div class="info-data">{{item.area}}亩</div>
             </div>
-            <div class="info-item">
+            <div class="info-item" style="width: 67px;">
               <div class="info-label">耕</div>
               <div class="info-data">{{item.gengdiarea}}亩</div>
             </div>
             <div class="info-item">
-              <div class="info-label">基</div>
+              <div class="info-label" style="width: 80px;">基</div>
               <div class="info-data">{{item.yongjiujibennongtianarea}}亩</div>
             </div>
             <div class="info-item">
-              <div class="info-label">农</div>
+              <div class="info-label" style="width: 80px;">农</div>
               <div class="info-data">{{item.nongyongdiarea}}亩</div>
             </div>
           </div>
@@ -422,12 +422,12 @@ const showInfo = (item) => {
 .screen-div{
   padding: 10px;
   display: flex;
-  width: 100%;
+  width:565px;
   flex-wrap: wrap;
   .screen-item{
     width: 33.3%;
     display: flex;
-    margin-bottom: 3px;
+    margin-bottom: 12px;
     font-family: Alibaba PuHuiTi;
     font-weight: 500;
     font-size: 17px;
@@ -451,15 +451,15 @@ const showInfo = (item) => {
 }
 .top-radio-button-div{
   width:100%;
-  padding:10px 10px 0px 10px;
+  padding:33px 10px 8px 10px;
   .radio-item{
     width:50%;
     text-align: center;
     font-family: Alibaba PuHuiTi;
     font-weight: 400;
     font-size: 20px;
-    height: 37px;
-    line-height: 37px;
+    height: 40px;
+    line-height: 40px;
     user-select: none;
   }
 }
@@ -469,7 +469,7 @@ const showInfo = (item) => {
      padding:19px 13px;
      margin-left: 10px;
      margin-right: 10px;
-     border-radius: 10px;
+     border-radius: 10px 10px 0px 0px;
      display: flex;
      justify-content: space-between;
      .layout-div{
@@ -516,8 +516,8 @@ const showInfo = (item) => {
   .data-list-item{
     background:#fff;
     padding:10px;
-    border-radius:6px;
-    margin-bottom:10px;
+    // border-radius:6px;
+    margin-bottom:1px;
     .data-list-layout-div{
       display:flex;
       justify-content: space-between;
@@ -567,6 +567,8 @@ const showInfo = (item) => {
         color: #696969;
         display: flex;
         align-items: center;
+        cursor:pointer;
+        user-select: none;
       }
     }
     .data-list-info-div{
@@ -612,6 +614,10 @@ const showInfo = (item) => {
       }
     }
   } 
+  .data-list-item:nth-last-child(1){
+    border-bottom-left-radius: 6px;
+    border-bottom-right-radius: 6px
+  }
 }
 .pagination-div{
   height: 60px;
diff --git a/src/views/demo/tiankongdi/curbspotcity/index.vue b/src/views/demo/tiankongdi/curbspotcity/index.vue
index b0380200..4d7e6d47 100644
--- a/src/views/demo/tiankongdi/curbspotcity/index.vue
+++ b/src/views/demo/tiankongdi/curbspotcity/index.vue
@@ -440,7 +440,8 @@ onMounted(() => {
   height: 100%;
   display: flex;
   .show-list{
-    width: 52%;
+    width: 565px;
+    background: #EFEFEF;
     :deep(.ant-spin-nested-loading){
       height: 100%;
     }

From 86c362037f1786e71f03a4f64ed71b043cfe7908 Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Wed, 10 Jul 2024 10:05:30 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=A0=B9=E6=8D=AEUI=20=E8=AE=BE=E7=BD=AEPX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tiankongdi/auditinfo/MapList/index.vue    | 34 +++++++++++--------
 src/views/demo/tiankongdi/auditinfo/index.vue |  3 +-
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/views/demo/tiankongdi/auditinfo/MapList/index.vue b/src/views/demo/tiankongdi/auditinfo/MapList/index.vue
index e78ef8d2..a96838c0 100644
--- a/src/views/demo/tiankongdi/auditinfo/MapList/index.vue
+++ b/src/views/demo/tiankongdi/auditinfo/MapList/index.vue
@@ -28,7 +28,7 @@
           :options="props.batchOptions"
         />
       </div>
-      <div class="screen-item">
+      <div class="screen-item" style="margin-bottom:0px;">
         <div class="screen-item-label">类型</div>
         <a-select
           allowClear
@@ -37,11 +37,11 @@
           :options="markTypeOptions"
         />
       </div>
-      <div class="screen-item" style="width: 44.4%">
+      <div class="screen-item" style="width: 44.4%;margin-bottom:0px;">
         <div class="screen-item-label">图斑号</div>
         <a-input v-model:value="params.geomid" style="flex: 1" />
       </div>
-      <div class="screen-item" style="width: 22.2%;display: flex; justify-content: end">
+      <div class="screen-item" style="width: 22.2%;display: flex; justify-content: end;margin-bottom: 0px;">
           <a-button type="primary" :icon="h(SearchOutlined)" @click="query">查询</a-button>
       </div>
     </div>
@@ -86,7 +86,7 @@
         />
       </div>
     </div>
-    <div class="data-list-div">
+    <div class="data-list-div" style="padding-top: 3px;">
       <div
         v-for="(item, index) in dataList"
         :key="index"
@@ -116,19 +116,19 @@
         </div>
         <div class="data-list-info-div">
           <div class="info-layout-div">
-            <div class="info-item">
+            <div class="info-item" style="width: 79px;">
               <div class="info-label">总</div>
               <div class="info-data">{{item.area}}亩</div>
             </div>
-            <div class="info-item">
+            <div class="info-item" style="width: 79px;">
               <div class="info-label">耕</div>
               <div class="info-data">{{item.gengdi_area}}亩</div>
             </div>
-            <div class="info-item">
+            <div class="info-item" style="width: 90px;">
               <div class="info-label">基</div>
               <div class="info-data">{{item.yongjiujibennongtian_area}}亩</div>
             </div>
-            <div class="info-item">
+            <div class="info-item" style="width: 90px;">
               <div class="info-label">农</div>
               <div class="info-data">{{item.nongyongdi_area}}亩</div>
             </div>
@@ -447,16 +447,16 @@
     flex-direction: column;
   }
   .screen-div {
-    padding: 10px;
+    padding: 10px 10px 19px 10px;
     display: flex;
-    width: 100%;
+    width: 565px;
     // margin-top: 10px;
     flex-wrap: wrap;
     // background: @component-background;
     .screen-item {
       width: 33.3%;
       display: flex;
-      margin-bottom: 3px;
+      margin-bottom: 15px;
       font-family: Alibaba PuHuiTi;
       font-weight: 500;
       font-size: 17px;
@@ -481,7 +481,7 @@
      padding:19px 13px;
      margin-left: 10px;
      margin-right: 10px;
-     border-radius: 10px;
+     border-radius: 10px 10px 0px 0px;
      display: flex;
      justify-content: space-between;
      .layout-div{
@@ -530,8 +530,8 @@
     .data-list-item{
     background:#fff;
     padding:10px;
-    border-radius:6px;
-    margin-bottom:10px;
+    // border-radius:6px;
+    margin-bottom:4px;
     .data-list-layout-div{
       display:flex;
       justify-content: space-between;
@@ -639,7 +639,11 @@
         }
       }
     }
-  } 
+    }
+    .data-list-item:nth-last-child(1){
+      border-bottom-left-radius: 6px;
+      border-bottom-right-radius: 6px;
+    }
   }
   .pagination-div {
     background: @component-background;
diff --git a/src/views/demo/tiankongdi/auditinfo/index.vue b/src/views/demo/tiankongdi/auditinfo/index.vue
index 28cabef5..03f8cbf1 100644
--- a/src/views/demo/tiankongdi/auditinfo/index.vue
+++ b/src/views/demo/tiankongdi/auditinfo/index.vue
@@ -196,7 +196,8 @@
     height: 100%;
     display: flex;
     .show-list {
-      width: 35%;
+      width: 565px;
+      background: #EFEFEF;
     }
     .map-box-div {
       width: 65%;

From e35bbdf69869d9897db766f44a02bb2be59c7c6e Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Wed, 10 Jul 2024 10:15:01 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E4=B8=BE=E8=AF=81=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E3=80=91=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/tiankongdi/auditinfo/MapList/index.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/demo/tiankongdi/auditinfo/MapList/index.vue b/src/views/demo/tiankongdi/auditinfo/MapList/index.vue
index a96838c0..254baa13 100644
--- a/src/views/demo/tiankongdi/auditinfo/MapList/index.vue
+++ b/src/views/demo/tiankongdi/auditinfo/MapList/index.vue
@@ -105,7 +105,10 @@
             </div>
             <div class="item-mark" v-if="item.is_build_name">{{item.is_build_name}}</div>
           </div>
-          <div class="data-item-type-div" :style="`border-color:${item.is_illegal === 0? '#086DEC': item.is_illegal === 1? '#D03542': '#F7710F'}`">
+          <div 
+            class="data-item-type-div" 
+            :style="`border-color:${item.is_illegal === 0? '#086DEC': item.is_illegal === 1? '#D03542': '#F7710F'}`"
+            @click="goAudit(item)">
             <div>
               <div class="type-title">举证</div>
               <div class="type-data" :style="`background:${item.is_illegal === 0? '#086DEC': item.is_illegal === 1? '#D03542': '#F7710F'};`">
@@ -583,6 +586,8 @@
         width: 37px;
         height: 37px;
         border-radius: 4px;
+        cursor: pointer;
+        user-select: none;
         .type-title{
           display:flex;
           align-items:center;