From 04bc0531fcbd149eb85addea1b555efc8599b17d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Wed, 23 Feb 2022 11:29:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=9C=B0=E5=9B=BE=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/list.vue | 37 ++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 43e79b23..09b711d3 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -733,6 +733,33 @@
         </van-form>
       </div>
     </van-popup>
+
+    <!--绘制结束弹窗开始-->
+    <van-popup v-model:show="showhzht" style="width: 94%;border-radius: 15PX">
+      <div style="height: 200px;padding: 0 3%;">
+        <h1 style="font-size: 0.35rem;font-weight: 400;border-bottom: 1px solid #ccc; line-height: 0.8rem;"><i style="display: inline-block;width: 1%;height: 0.4rem;background: #7ac943;vertical-align: middle;margin-right: 1%;"></i>是否完成绘制<van-icon name="cross" color="#666666" style="position: absolute;right: 2%;top: 0.1rem" @click="showhzht = false" /></h1>
+
+        <div style="text-align: center;margin-top: 30PX">
+          <p style="font-size: 0.3rem;display: inline-block;background: #ccc;padding: 15PX 10%;border-radius: 30PX;color: #FFF;margin-right: 10%;" @click="showhzlx = true,showhzht = false">否</p>
+          <p style="font-size: 0.3rem;display: inline-block;background: #7ac943;padding: 15PX 10%;border-radius: 30PX;color: #FFF;">是</p>
+        </div>
+      </div>
+    </van-popup>
+
+    <!--  background: #ccc  -->
+
+    <van-popup v-model:show="showhzlx" style="width: 94%;border-radius: 15PX">
+      <div style="height: 200px;padding: 0 3%;">
+        <h1 style="font-size: 0.35rem;font-weight: 400;border-bottom: 1px solid #ccc; line-height: 0.8rem;"><i style="display: inline-block;width: 1%;height: 0.4rem;background: #7ac943;vertical-align: middle;margin-right: 1%;"></i>请选择绘制类型<van-icon name="cross" color="#666666" style="position: absolute;right: 2%;top: 0.1rem" @click="showhzlx = false,showhzht = true" /></h1>
+
+        <div style="text-align: center;margin-top: 30PX">
+          <p style="font-size: 0.3rem;display: inline-block;background: #7ac943;padding: 15PX 10%;border-radius: 30PX;color: #FFF;margin-right: 2%;">宅基地</p>
+          <p style="font-size: 0.3rem;display: inline-block;background: #b026ff;padding: 15PX 10%;border-radius: 30PX;color: #FFF;margin-right: 2%;">自然幢</p>
+          <p style="font-size: 0.3rem;display: inline-block;background: #3ac2db;padding: 15PX 10%;border-radius: 30PX;color: #FFF;">附属设施</p>
+        </div>
+      </div>
+    </van-popup>
+    <!--绘制结束弹窗结束-->
   </div>
 </template>
 
@@ -753,6 +780,8 @@
         return {
           // 使用权人表单弹出
           shownh:false,
+          showhzht:false,
+          showhzlx:false,
           showhncylist:false,
           showhncy:false,
           activeBtn:1,
@@ -1715,7 +1744,8 @@
                 //_this.coordinateList = coordinate.toString();
                 //提示当前坐标是否绘制完成
                 if(that.coordinate != "" && that.coordinate !=null) {
-                  htMapAllFu();
+                  that.showhzht = true;
+                  // htMapAllFu();
                 }else {
                   console.log("6");
                   $("#htMapAll").trigger("click");
@@ -1734,7 +1764,7 @@
                 })
                 .then(() => {
                   //$("#drawRemove").trigger("click");
-                  map.removeLayer(drawing);
+                  map.removeInteraction(draw_map);
                   that.coordinate = "";
                 })
                 .catch(() => {
@@ -2586,6 +2616,9 @@
 
 <style scoped lang="scss">
 
+  .closeIcon{
+
+  }
   .bannerBg{
     width: 100%;
     color:#fff;