From b49dbe72e04cf7d890bb21690624dc6a6be7a1ea Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 8 Nov 2021 14:27:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=85=8D=E7=BD=AEbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/buildForm.vue      |  1 +
 .../modules/base/community/buildTable.vue     |  1 +
 .../modules/base/community/communityForm.vue  |  4 +-
 .../modules/base/community/communityTable.vue |  1 +
 src/views/modules/workSys/mapConfig.vue       | 56 +++++++++++++------
 5 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index c53b55ce..78ad23e8 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -277,6 +277,7 @@ export default {
       this.setMarker(lat, lng)
     },
     resetData () {
+      this.keyWords = ''
       this.buildingId = '' //楼栋ID
       this.dataForm = {
         agencyId: '', // 所属组织ID
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index a46e9238..eef64ebe 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -207,6 +207,7 @@ export default {
     },
 
     diaClose () {
+      this.$refs.ref_form.resetData()
       this.formShow = false
     },
 
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 77323e68..c4fc2411 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -126,8 +126,7 @@
                         label-width="150px"
                         style="display: block">
             <el-input class="item_width_1"
-                      maxlength="50"
-                      show-word-limit
+                      maxlength="10"
                       placeholder="请输入小区名称"
                       v-model="propertyForm.name">
             </el-input>
@@ -401,6 +400,7 @@ export default {
       }
     },
     resetData () {
+      this.keyWords = ''
       this.neighborHoodId = '' //小区ID
       this.dataForm = {
         neighborHoodName: '', // 小区名称【不超过50字】
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 95fb78b6..3590e919 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -214,6 +214,7 @@ export default {
     },
 
     diaClose () {
+      this.$refs.ref_form.resetData()
       this.formShow = false
     },
 
diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue
index 2e41fcfe..a3ff77e4 100644
--- a/src/views/modules/workSys/mapConfig.vue
+++ b/src/views/modules/workSys/mapConfig.vue
@@ -22,11 +22,11 @@
                  type="primary"
                  icon="el-icon-edit"
                  @click="handleEditPolygon">{{method==='mEditPolygon'?'取消绘制':'重新绘制'}}</el-button>
-      <el-button v-if="showBtn&&hasPolygon"
+      <!-- <el-button v-if="showBtn&&hasPolygon"
                  style="margin-left:10px"
                  type="primary"
                  icon="el-icon-delete"
-                 @click="handleDelPolygon">删除区域</el-button>
+                 @click="handleDelPolygon">删除区域</el-button> -->
 
     </div>
     <div class="div_back">
@@ -47,9 +47,6 @@
 <script>
 import 'ol/ol.css'
 import { Map, View } from 'ol'
-import { ZoomSlider, Zoom } from 'ol/control.js';
-import ImageLayer from 'ol/layer/Image.js';
-import Static from 'ol/source/ImageStatic.js';
 import TileLayer from 'ol/layer/Tile.js';
 import XYZ from 'ol/source/XYZ.js';
 import VectorLayer from 'ol/layer/Vector.js';
@@ -64,7 +61,6 @@ import Draw from 'ol/interaction/Draw.js';
 import { mapGetters } from "vuex";
 import { Loading } from 'element-ui'; //引入Loading服务
 import { requestPost } from "@/js/dai/request";
-import { transform } from 'ol/proj'
 import { altKeyOnly, click, pointerMove } from 'ol/events/condition';
 
 
@@ -192,7 +188,7 @@ const vueGis = {
 
     },
 
-    //刷新地图
+    //刷新地图  isRefreshView:是否需要重置中心点，如果是绘制、删除区域，不需要，如果是下钻或返回需要
     async refreshMap (isRefreshView) {
       //加载组织数据
       await this.loadOrgData()
@@ -326,20 +322,24 @@ const vueGis = {
 
     //选择feature
     selectFeature (e) {
-      console.log(e)
-      this.selAgencyId = e.selected[0].id_
-      this.subAgencyArray.forEach((element, index) => {
-        if (element.id === e.selected[0].id_) {
-          this.selAgencyIndex = index
-          this.orgChange(index)
-        }
+      // console.log(e)
+
+      if (this.method === undefined || this.method === '') {
+        this.selAgencyId = e.selected[0].id_
+        this.subAgencyArray.forEach((element, index) => {
+          if (element.id === e.selected[0].id_) {
+            this.selAgencyIndex = index
+            this.orgChange(index)
+          }
+
+        });
+      }
 
-      });
 
     },
     //下钻到下一级
     toSubAgency (e) {
-      console.log(e)
+
       if (this.method != 'mAddPolygon' && this.level != 'neighborHood') {
         //下钻到下一级
         this.subAgencyArray.forEach(item => {
@@ -580,6 +580,7 @@ const vueGis = {
         type: "Polygon"
       });
       map.addInteraction(draw);
+
       draw.on('drawend', feature => {
         this.polygonCoor = feature.feature.values_.geometry.flatCoordinates
 
@@ -590,10 +591,28 @@ const vueGis = {
         if (this.polygonCoor.length > 0) {
           coorString = coorString.substring(0, coorString.length - 1)
         }
-        console.log(coorString)
+
+        if (this.method === 'mEditPolygon') {
+          this.$confirm("是否确认覆盖原有区域?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(() => {
+              this.addPolygon(coorString)
+            })
+            .catch(err => {
+              this.loadPolygon(this.subAgencyArray)
+
+
+            });
+
+        } else {
+          this.addPolygon(coorString)
+        }
+
         this.method = ""
         map.removeInteraction(draw);
-        this.addPolygon(coorString)
 
       });
     },
@@ -625,6 +644,7 @@ const vueGis = {
 
 
     },
+
     //删除标注
     async delPolygon () {
       const url = "/gov/org/agency/mapdelarea"