From 1affdcd9afe519ab6b8d2fa35882eddd9d634660 Mon Sep 17 00:00:00 2001
From: liuminjian <517059477@qq.com>
Date: Sun, 1 Aug 2021 19:01:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homestead/index.vue | 45 ++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/views/homestead/index.vue b/src/views/homestead/index.vue
index 8ace95c7..c88a9a83 100644
--- a/src/views/homestead/index.vue
+++ b/src/views/homestead/index.vue
@@ -14,9 +14,9 @@
     <div class="map_area" id="mapWrap"></div>
     <!--列表 定位-->
     <div class="rightIcon_wrap">
-      <div class="positioning_wrap">
+      <!-- <div class="positioning_wrap">
         <div class="icon"></div>
-      </div>
+      </div> -->
       <div
         class="selectionIcon_wrap"
   
@@ -156,7 +156,7 @@
             <div class="icon"></div>
           </div>
         </div>
-        <div class="m_list">
+        <!-- <div class="m_list">
           <div class="positioning">
             <div class="icon"></div>
           </div>
@@ -170,7 +170,7 @@
           <div class="scale">
             <div class="icon"></div>
           </div>
-        </div>
+        </div> -->
 
         <div class="m_list">
           <div class="closes gray" @click="searchBarOperFun('false')">
@@ -246,7 +246,7 @@
         </div>
       </div>
     </div>
-    <div id="info" ></div>
+    <div id="info" style="display:none" ></div>
     <!--房地全部信息展示-->
     <div class="landHomesteadDetails_wrap" v-show="landHomesteadDetailsVisibile">
       <!---农房-->
@@ -328,11 +328,17 @@
         <!--上传图片-->
         <div class="uploadPictures_block">
           <div class="statusQuo">
-            <div class="picture"></div>
+            <div class="picture" v-if="houseInfoLookList.frontHouse==''"></div>
+            <div class="picture" v-if="houseInfoLookList.frontHouse!=''">
+               <img :src="houseInfoLookList.frontHouse" />
+            </div>
             <div class="describe">现<br />状<br />图<br />片</div>
           </div>
           <div class="statusQuo">
-            <div class="picture"></div>
+            <div class="picture" v-if="houseInfoLookList.behindHouse==''"></div>
+            <div class="picture" v-if="houseInfoLookList.behindHouse!=''">
+               <img :src="houseInfoLookList.behindHouse" />
+            </div>
             <div class="describe">历<br />史<br />图<br />片</div>
           </div>
         </div>
@@ -398,11 +404,17 @@
         <!--上传图片-->
         <div class="uploadPictures_block">
           <div class="statusQuo">
-            <div class="picture"></div>
+            <div class="picture" v-if="landInfoLookList.frontland==''"></div>
+            <div class="picture" v-if="landInfoLookList.frontland!=''">
+               <img :src="landInfoLookList.frontland" />
+            </div>
             <div class="describe">现<br />状<br />图<br />片</div>
           </div>
           <div class="statusQuo">
-            <div class="picture"></div>
+             <div class="picture" v-if="landInfoLookList.behindland==''"></div>
+            <div class="picture" v-if="landInfoLookList.behindland!=''">
+               <img :src="landInfoLookList.behindland" />
+            </div>
             <div class="describe">历<br />史<br />图<br />片</div>
           </div>
         </div>
@@ -1889,6 +1901,7 @@ export default {
                     obj.behindHouse =  trs.find("td").eq(25).text(); //图片后
                     _this.houseInfoList = obj;
                     _this.houseInfoLookList =obj;
+
   
 
                   } else {
@@ -1896,6 +1909,9 @@ export default {
                     //农地
                     let obj = {};
                     let trs = $("#info .featureInfo").find("tr:eq(1)");
+                    let zjId = trs.find("td").eq(0).text();
+                    let zjIdNum = zjId.replace('t_geo_hc_land.','');
+                    obj.id = zjIdNum;  //	主键id
                     obj.xm =  trs.find("td").eq(1).text(); //序号
                     obj.cm = trs.find("td").eq(2).text(); //村名
                     obj.cbrmc  = trs.find("td").eq(3).text(); //承包人名称
@@ -1907,12 +1923,12 @@ export default {
                     obj.lzsynx = trs.find("td").eq(9).text(); //流转剩余年限
                     obj.sfylzyx  = trs.find("td").eq(10).text(); //是否流转意向
                     obj.cdm = trs.find("td").eq(11).text(); //村代码 
-                    obj.orgCode = trs.find("td").eq(12).text(); //行政区化代码
-                    obj.frontland =  trs.find("td").eq(15).text(); //图片前
-                    obj.behindland = trs.find("td").eq(16).text(); //图片后
+                    obj.orgCode = trs.find("td").eq(15).text(); //行政区化代码
+                    obj.frontland =  trs.find("td").eq(18).text(); //图片前
+                    obj.behindland = trs.find("td").eq(19).text(); //图片后
                     _this.landInfoList = obj;
                     _this.landInfoLookList = obj;
-                  
+      
                   }
                 }, 300);
 
@@ -3195,7 +3211,7 @@ export default {
         .localhref {
           height: 36px;
           flex: 0 0 36px;
-          background: url("../../assets/images/homestead/others_location.png")
+          background: url("../../assets/images/homestead/farmlandEditSwitch_close.png")
             no-repeat;
           background-size: 100% 100%;
         }
@@ -3224,6 +3240,7 @@ export default {
           .picture {
             flex: 1;
             background: #000;
+            img{width: 100%; height: 100%;}
           }
           .describe {
             flex: 0 0 32px;