From d484086c15b3b0d3bf380a16465a8148626e87a3 Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Fri, 18 Feb 2022 19:29:52 +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/homesteadSurvey/add.vue  | 33 +++++++++++++++++----
 src/views/homesteadSurvey/list.vue | 47 ++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 8d30c315..fa270994 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -339,6 +339,7 @@
             label="备注"
             placeholder="备注"
           />
+          <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -395,7 +396,7 @@
             <p style="flex:1;text-align:right;">个人</p>
           </div>
           <div style="text-align:center;overflow:auto;">
-            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" @click="showzrz=true">查看自然幢信息</van-button>
+            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" @click="showPopupzrz">查看自然幢信息</van-button>
           </div>
         </div>
         <template #right>
@@ -455,7 +456,7 @@
             <p style="flex:1;text-align:right;">个人</p>
           </div>
           <div style="text-align:center;overflow:auto;">
-            <van-button plain round color="#7AC943" size="mini" @click="showfsss=true" style="margin:0 auto;">查看附属设施信息</van-button>
+            <van-button plain round color="#7AC943" size="mini" @click="showPopupfsss" style="margin:0 auto;">查看附属设施信息</van-button>
           </div>
         </div>
         <template #right>
@@ -790,6 +791,7 @@
             placeholder="备注"
             :rules="[{ required: true, message: '' }]"
           />
+          <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -910,6 +912,7 @@
             placeholder="备注"
             :rules="[{ required: true, message: '' }]"
           />
+          <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -1023,6 +1026,7 @@
             placeholder="备注"
             :rules="[{ required: true, message: '' }]"
           />
+          <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -1280,9 +1284,15 @@
 
 <script>
   import {listShyqr} from "@/api/homesteadSurvey/shyqr";
-  import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile} from "@/api/homesteadSurvey/zjdzd";
+  import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile,getQueryLand} from "@/api/homesteadSurvey/zjdzd";
+  import MapGisDrawing from "@/components/Map/MapGisDrawing";
+  import {listZrz,getZrzZjdDmList} from "@/api/homesteadSurvey/zrz";
+  import {listFsss,getFsssZjdDmList} from "@/api/homesteadSurvey/fsss";
+  import { listTown, getTown } from "@/api/homesteadSurvey/town";
+  import { listVillage} from "@/api/homesteadSurvey/village";
   export default {
     name: "homesteadAdd",
+    components: { MapGisDrawing,},
     data() {
       return {
         active:1,
@@ -1349,7 +1359,7 @@
       this.getZjd()
     },
     mounted(){
-
+      this.mapClickLoading();
     },
     methods: {
       // 图片上传前
@@ -1517,15 +1527,18 @@
       },
       showPopupzrz() {
         this.showzrz = true;
+        this.mapClickLoading();
       },
       showPopupfw() {
         this.showfw = true;
       },
       showPopupfsss() {
         this.showfsss = true;
+        this.mapClickLoading();
       },
       showPopup3() {
         this.show3 = true;
+        this.mapClickLoading();
       },
       onSubmit(values) {
         console.log('submit', values);
@@ -1543,7 +1556,17 @@
         }else{
           this.active=1
         }
-      }
+      },//地图加载js------start
+      mapClickLoading(){
+        setTimeout(() => {
+          this.$refs.drewingClickLoading.drawingPaceCountryDarw();
+        }, 500);
+      },
+      /** 查找地图中定位点 */
+      MapTag: function (data) {
+        this.form.theGeom = data;
+      },
+      //地图加载js------end
     }
   }
 </script>
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 56728927..69915f9b 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -381,6 +381,53 @@
         <div class="dwMap" @click="" id="dwMapAll">定位</div>
       </div>
 
+      <!--列表拉取详情-->
+      <div class="homesteadList_wrap" v-show="homesteadListStatus">
+        <div class="main_m">
+          <div class="title_m">
+            <div class="more_icon" @click="homesteadListShrink"></div>
+            <div class="name">筛选列表</div>
+          </div>
+          <div class="noInfo_data">
+            <div class="checkbox">
+              <!-- 全选与不全选模块 -->
+              <div class="thead-checkbox" @click="checkClick">
+                <input type="checkbox" class="checkall">全选
+              </div>
+              <!-- 小复选框选 -->
+              <div class="item-list-checkbox">
+                <div class="item-checkbox"><input type="checkbox" @click="checkClick('fsssMap')" class="checkitem">附属设施</div>
+                <div class="item-checkbox"  @click="checkClick('zrzMap')"><input type="checkbox" class="checkitem">自然幢</div>
+                <div class="item-checkbox"  @click="checkClick('zjdMap')"><input type="checkbox" class="checkitem">宅基地</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!--      &lt;!&ndash;列表 定位&ndash;&gt;-->
+      <!--      <div class="rightIcon_wrap">-->
+      <!--        &lt;!&ndash; <div class="positioning_wrap">-->
+      <!--          <div class="icon"></div>-->
+      <!--        </div> &ndash;&gt;-->
+      <!--        <div class="selectionIcon_wrap" @click="selectionPush">-->
+      <!--          <div class="icon"></div>-->
+      <!--          <div class="text">列表</div>-->
+      <!--        </div>-->
+      <!--      </div>-->
+      <van-overlay :show="selectionIconShow" @click="homesteadListShrink" />
+      <!--图层-->
+      <div class="rightZoom_wrap">
+        <div class="amplification" @click="selectionPushMap">图层</div>
+      </div>
+      <!--放大缩小-->
+      <div class="mapZoom_wrap">
+        <div class="qtMap" @click="">全图</div>
+        <div class="clMap" @click="">测量</div>
+        <div class="hcMap" @click="">核查</div>
+        <div class="htMap" @click="" id="htMapAll">绘图</div>
+        <div class="dwMap" @click="" id="dwMapAll">定位</div>
+      </div>
+
       <!--列表拉取详情-->
       <div class="homesteadList_wrap" v-show="homesteadListStatus">
         <div class="main_m">