Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

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,

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">
@@ -156,32 +164,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>
@@ -335,6 +341,10 @@ const showInfo = (item) => {
   display: flex;
   flex-direction: column;
 }
+.rollback {
+  background: #fff;
+  padding: 10px;
+}
 .screen-div{
   padding: 10px;
   background: #e6ecfb;
@@ -409,6 +419,7 @@ const showInfo = (item) => {
       .item-data-div{
         display: flex;
         justify-content: space-between;
+        flex-wrap: wrap;
         .item-data-item{
           display:flex;
           align-items: center;