From d717492e9ff7dfd56762e1c55a97081a502c871f Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Thu, 24 Mar 2022 11:58:37 +0800
Subject: [PATCH] +专题活动信息中选点bug+专题活动信息中字段补全

---
 src/components/map/mainInThere.vue |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/components/map/mainInThere.vue b/src/components/map/mainInThere.vue
index ab41e1c..2405f20 100644
--- a/src/components/map/mainInThere.vue
+++ b/src/components/map/mainInThere.vue
@@ -58,13 +58,10 @@
       </el-button-group>
     </div>
     <el-button-group id="dataConfirm" style="display: none">
-      <el-button
-        type="success"
-        icon="el-icon-check"
-        @click="useMapData"
-        v-show="notNow"
+      <el-button type="success" icon="el-icon-check" @click="useMapData"
         >确定选择</el-button
       >
+      <!-- v-show="notNow" -->
       <el-button
         type="danger"
         @click="clearUseMapData"
@@ -506,6 +503,7 @@
       if (open) {
         this.openTitle = "";
         this.$parent.closeOpenedMap(); //开放按钮
+        this.drawLayerRoom();
       }
     },
     //取消按钮
@@ -517,14 +515,13 @@
       //返回用数据
       // console.log(this.openDrawChiose, this.nowIndex);
       this.$parent.MapDataShow = false;
-      let val;
-      if (this.openDrawChiose == "openDrawLine") {
-        val = "line";
-      } else if (this.openDrawChiose == "openDrawPoint") {
-        val = "point";
-      } else {
-        val = "notData";
-      }
+      let val =
+        this.openDrawChiose == "openDrawLine"
+          ? "line"
+          : this.openDrawChiose == "openDrawPoint"
+          ? "point"
+          : "notData";
+      // console.log(val);
       this.$parent.backMapDataOurData(val, this.nowIndex);
       // 返回后关闭操作按钮
       this.closeOurBut();
@@ -662,9 +659,9 @@
       );
       that.peopleLineAddlayer.getSource().addFeature(feature_LineString);
       that.butTitle = "重新绘画";
-      if (!this.fromView) {
-        $("#dataConfirm").show(100);
-      }
+      // if (!this.fromView) {
+      $("#dataConfirm").show(100);
+      // }
       if (that.draw != null) {
         that.beginDraw = false;
         that.draw.controlDrawing(true);

--
Gitblit v1.9.3