diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
index ae9a7fc9f..5347986f3 100644
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@@ -203,14 +203,14 @@
 import { requestPost } from "@/js/dai/request";
 import People from "@/views/modules/visual/basicinfo/people";
 import gridMap from "@/views/modules/visual/command/cpts/map";
-import cptCard from "@/views/modules/visual/cpts/card";
-import { Loading } from "element-ui"; //引入Loading服务
-import { mapGetters } from "vuex";
 // import gridMapOl from "@/views/modules/visual/command/cpts/map-ol";
 import sidemenuLeft from "@/views/modules/visual/command/cpts/sidemenu-left";
 import sidemenu1 from "@/views/modules/visual/command/cpts/yantai-sidemenu1";
 import sidemenu2 from "@/views/modules/visual/command/cpts/yantai-sidemenu2";
+import cptCard from "@/views/modules/visual/cpts/card";
 import ScreenLoading from "@/views/modules/visual/cpts/loading";
+import { Loading } from "element-ui"; //引入Loading服务
+import { mapGetters } from "vuex";
 
 import demandInfo from "@/views/modules/visual/command/cpts/demandInfo";
 import eventInfo from "@/views/modules/visual/command/cpts/eventInfo";
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index 5b7d8935d..dfb9c2fe7 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -1,398 +1,397 @@
 <template>
-  <div style="position: relative">
+    <div style="position: relative">
 
-    <!-- 组织路由 -->
-
-    <div class="div_top">
-      <div class="router_line"></div>
-      <div class="div_router">
-        <div v-if="!showPeopleInfo">
-          <span class="router_child">五大图层</span>
-        </div>
-        <div v-if="showPeopleInfo"> <span class="router_parents"
-                @click="handleClickRouter">五大图层<span class="arrow">></span></span>
-
-          <span class="router_child">个人档案</span>
-        </div>
-      </div>
-    </div>
-
-    <div v-show="!showPeopleInfo"
-         class="div_content">
-
-      <div class="div_map"
-           id="map"
-           ref="map">
-      </div>
-
-      <div class="div_data">
-        <div class="div_tips">
-          <cpt-card>
-            <div class="div_coverage">
-
-              <div class="coverage_item"
-                  @click="handleClickCoverage(index)"
-                  v-for="(item,index) in coverageTypesList"
-                  :key="index">
-                <img :src="item.select?selImg:noSelImg" />
-                <span>{{item.label}}</span>
-              </div>
-            </div>
-            <div class="div_category">
-              <div v-for="(item,index) in categoryListshow"
-                    :key="index"
-                    class="category_item">
-
-                <div v-for="(colItem,colIndex) in item"
-                      :key="colIndex"
-                      class="list_item"
-                      @click="handleClickCategory(index,colIndex)">
-                  <img :src="colItem.dataIcon"
-                        alt />
-                  <div :class="['item_content',colItem.sel?'item_content_sel':'']">{{colItem.categoryName}}
-
-                  </div>
+        <!-- 组织路由 -->
 
+        <div class="div_top">
+            <div class="router_line"></div>
+            <div class="div_router">
+                <div v-if="!showPeopleInfo">
+                    <span class="router_child">五大图层</span>
                 </div>
+                <div v-if="showPeopleInfo"> <span class="router_parents"
+                          @click="handleClickRouter">五大图层<span class="arrow">></span></span>
 
-              </div>
+                    <span class="router_child">个人档案</span>
+                </div>
             </div>
-          </cpt-card>
         </div>
 
-        <div class="div_info">
-          <cpt-card>
-            <div class="div_search_list">
-              <el-input size="mini"
-                        WarningColor='warning'
-                        placeholder="请输入搜索内容"
-                        v-model="search">
-                <i slot="prefix"
-                  class="icon">
-                  <img src="../../../../../assets/img/modules/visual/sousuo.png"
-                      alt />
-                </i>
-              </el-input>
-
-              <div class="btn"
-                  @click="handleSearch">搜索</div>
+        <div v-show="!showPeopleInfo"
+             class="div_content">
 
-            </div>
-            <div class="m-tb">
-
-              <div class="tb">
-                <cpt-tb :col-list="demand.colList"
-                        :loading="demand.loading"
-                        :header="demand.header"
-                        :list="demand.list"
-                        @handleClickRow="handleClickRow"></cpt-tb>
-
-              </div>
-              <div class="m-pagination">
-                <el-pagination hide-on-single-page :current-page="demand.pageNo"
-                              :page-size="demand.pageSize"
-                              :total="demand.total"
-                              background
-                              layout="prev, pager, next,total"
-                              @current-change="handlePageNoChange_demand">
-                </el-pagination>
-              </div>
+            <div class="div_map"
+                 id="map"
+                 ref="map">
             </div>
 
-          </cpt-card>
-        </div>
+            <div class="div_data">
+                <div class="div_tips">
+                    <cpt-card>
+                        <div class="div_coverage">
+
+                            <div class="coverage_item"
+                                 @click="handleClickCoverage(index)"
+                                 v-for="(item,index) in coverageTypesList"
+                                 :key="index">
+                                <img :src="item.select?selImg:noSelImg" />
+                                <span>{{item.label}}</span>
+                            </div>
+                        </div>
+                        <div class="div_category">
+                            <div v-for="(item,index) in categoryListshow"
+                                 :key="index"
+                                 class="category_item">
+
+                                <div v-for="(colItem,colIndex) in item"
+                                     :key="colIndex"
+                                     class="list_item"
+                                     @click="handleClickCategory(index,colIndex)">
+                                    <img :src="colItem.dataIcon"
+                                         alt />
+                                    <div :class="['item_content',colItem.sel?'item_content_sel':'']">{{colItem.categoryName}}
+
+                                    </div>
+
+                                </div>
+
+                            </div>
+                        </div>
+                    </cpt-card>
+                </div>
 
-      </div>
-    </div>
-    <div id="popup"
-         style="display: none;"
-         class="ol-popup">
-      <a href="#"
-         id="popup-closer"
-         class="ol-popup-closer"></a>
-
-      <div id="popup-content"
-           class="popup-content">
-        <div v-show="selPlaceType==='resi'|| selPlaceType === 'special_resi'">
-          <div class="popTitle">居民信息</div>
-          <div class="popContentTitle">姓名：
-            <span>{{ selInfo.icUserName }}</span>
-          </div>
-          <div class="popContentTitle">所属网格：
-            <span>{{ selInfo.gridName }}</span>
-          </div>
-          <div class="popContentTitle">所属小区：
-            <span>{{ selInfo.villageName }}</span>
-          </div>
-          <div class="popContentTitle">本地户籍：
-            <span>{{ selInfo.isBdhjShow }}</span>
-          </div>
-
-          <div class="popContentTitle">联系电话：
-            <span>{{ selInfo.mobile }}</span>
-          </div>
-          <div class="popContentTitle">性别：
-            <span>{{ selInfo.genderShow }}</span>
-          </div>
-          <div class="popContentTitle">证件号：
-            <span>{{ selInfo.idCard }}</span>
-          </div>
-
-          <div class="popContentTitle">工作单位：
-            <span>{{ selInfo.gzdw?selInfo.gzdw:'--' }}</span>
-          </div>
-          <div class="popContentTitle">人户状况：
-            <span>{{ selInfo.rhzkShow }}</span>
-          </div>
-          <div class="div_resi_more">
-            <div @click="toPeople"
-                 class="span_resi_more">更多</div>
-          </div>
-        </div>
-        <div v-show="selPlaceType==='dangerous_chemicals'">
-          <div class="popTitle">企业信息</div>
-          <div class="popContentTitle">企业名称：
-            <span>{{ selInfo.name }}</span>
-          </div>
-          <div class="popContentTitle">企业类型：
-            <span>{{ selInfo.categoryName }}</span>
-          </div>
-          <div class="popContentTitle">周边安全距离：
-            <span>{{ selInfo.safeDistance }}</span>
-          </div>
-          <div class="popContentTitle">危化品种类：
-            <span>{{ selInfo.dangerTypeName }}</span>
-          </div>
-          <div class="popContentTitle">负责人：
-            <span>{{ selInfo.principalName }}</span>
-          </div>
-          <div class="popContentTitle">联系电话：
-            <span>{{ selInfo.principalMobile }}</span>
-          </div>
-          <div class="popContentTitle">经营地址：
-            <span>{{ selInfo.address }}</span>
-          </div>
-          <div class="popContentTitle">备注：
-            <span>{{ selInfo.remark }}</span>
-          </div>
-        </div>
-        <div v-show="selPlaceType==='public_service'||selPlaceType==='city_management'||selPlaceType==='superior_resource'">
-          <div class="popTitle">场所信息</div>
-          <div class="popContentTitle">场所名称：
-            <span>{{ selInfo.name }}</span>
-          </div>
-          <div class="popContentTitle">场所分类：
-            <span>{{ selInfo.categoryName }}</span>
-          </div>
-          <div class="popContentTitle">占地面积：
-            <span>{{ selInfo.areaCovered }}</span>
-          </div>
-          <div class="popContentTitle">容纳人数：
-            <span>{{ selInfo.capacity }}</span>
-          </div>
-          <div class="popContentTitle">地址：
-            <span>{{ selInfo.address }}</span>
-          </div>
-        </div>
-        <div v-show="selPlaceType==='event'">
-          <div class="popTitle">难点痛点</div>
-          <div class="popContentTitle">所属网格：
-            <span>{{ selInfo.gridName }}</span>
-          </div>
-          <div class="popContentTitle">发生时间：
-            <span>{{ selInfo.happenTime }}</span>
-          </div>
-          <div class="popContentTitle">事件内容：
-            <span>{{ selInfo.eventContent }}</span>
-          </div>
-
-          <div v-if="selInfo.imageList&&selInfo.imageList.length>0"
-               class="m-info-prop">
-            <span>图片：</span>
-            <div class="m-info-pics">
-              <img :src="src"
-                   :key="src"
-                   style="width:100px;height:100px;padding-right:10px"
-                   v-for="src in eventInfo.imageList"
-                   @click="watchImg(src)" />
+                <div class="div_info">
+                    <cpt-card>
+                        <div class="div_search_list">
+                            <el-input size="mini"
+                                      WarningColor='warning'
+                                      placeholder="请输入搜索内容"
+                                      v-model="search">
+                                <i slot="prefix"
+                                   class="icon">
+                                    <img src="../../../../../assets/img/modules/visual/sousuo.png"
+                                         alt />
+                                </i>
+                            </el-input>
+
+                            <div class="btn"
+                                 @click="handleSearch">搜索</div>
+
+                        </div>
+                        <div class="m-tb">
+
+                            <div class="tb">
+                                <cpt-tb :col-list="demand.colList"
+                                        :loading="demand.loading"
+                                        :header="demand.header"
+                                        :list="demand.list"
+                                        @handleClickRow="handleClickRow"></cpt-tb>
+
+                            </div>
+                            <div class="m-pagination">
+                                <el-pagination hide-on-single-page
+                                               :current-page="demand.pageNo"
+                                               :page-size="demand.pageSize"
+                                               :total="demand.total"
+                                               background
+                                               layout="prev, pager, next,total"
+                                               @current-change="handlePageNoChange_demand">
+                                </el-pagination>
+                            </div>
+                        </div>
+
+                    </cpt-card>
+                </div>
 
             </div>
-          </div>
-
-          <div v-if="selInfo.voiceList&&selInfo.voiceList.length>0"
-               class="m-info-prop">
-            <span>音频：</span>
-            <div class="m-info-pics">
-              <audio controls>
-                <source :src="item.url"
-                        type=""
-                        :key="item.url"
-                        v-for="item in eventInfo.voiceList" />
-              </audio>
+        </div>
+        <div id="popup"
+             style="display: none;"
+             class="ol-popup">
+            <a href="#"
+               id="popup-closer"
+               class="ol-popup-closer"></a>
+
+            <div id="popup-content"
+                 class="popup-content">
+                <div v-show="selPlaceType==='resi'|| selPlaceType === 'special_resi'">
+                    <div class="popTitle">居民信息</div>
+                    <div class="popContentTitle">姓名：
+                        <span>{{ selInfo.icUserName }}</span>
+                    </div>
+                    <div class="popContentTitle">所属网格：
+                        <span>{{ selInfo.gridName }}</span>
+                    </div>
+                    <div class="popContentTitle">所属小区：
+                        <span>{{ selInfo.villageName }}</span>
+                    </div>
+                    <div class="popContentTitle">本地户籍：
+                        <span>{{ selInfo.isBdhjShow }}</span>
+                    </div>
+
+                    <div class="popContentTitle">联系电话：
+                        <span>{{ selInfo.mobile }}</span>
+                    </div>
+                    <div class="popContentTitle">性别：
+                        <span>{{ selInfo.genderShow }}</span>
+                    </div>
+                    <div class="popContentTitle">证件号：
+                        <span>{{ selInfo.idCard }}</span>
+                    </div>
+
+                    <div class="popContentTitle">工作单位：
+                        <span>{{ selInfo.gzdw?selInfo.gzdw:'--' }}</span>
+                    </div>
+                    <div class="popContentTitle">人户状况：
+                        <span>{{ selInfo.rhzkShow }}</span>
+                    </div>
+                    <div class="div_resi_more">
+                        <div @click="toPeople"
+                             class="span_resi_more">更多</div>
+                    </div>
+                </div>
+                <div v-show="selPlaceType==='dangerous_chemicals'">
+                    <div class="popTitle">企业信息</div>
+                    <div class="popContentTitle">企业名称：
+                        <span>{{ selInfo.name }}</span>
+                    </div>
+                    <div class="popContentTitle">企业类型：
+                        <span>{{ selInfo.categoryName }}</span>
+                    </div>
+                    <div class="popContentTitle">周边安全距离：
+                        <span>{{ selInfo.safeDistance }}</span>
+                    </div>
+                    <div class="popContentTitle">危化品种类：
+                        <span>{{ selInfo.dangerTypeName }}</span>
+                    </div>
+                    <div class="popContentTitle">负责人：
+                        <span>{{ selInfo.principalName }}</span>
+                    </div>
+                    <div class="popContentTitle">联系电话：
+                        <span>{{ selInfo.principalMobile }}</span>
+                    </div>
+                    <div class="popContentTitle">经营地址：
+                        <span>{{ selInfo.address }}</span>
+                    </div>
+                    <div class="popContentTitle">备注：
+                        <span>{{ selInfo.remark }}</span>
+                    </div>
+                </div>
+                <div v-show="selPlaceType==='public_service'||selPlaceType==='city_management'||selPlaceType==='superior_resource'">
+                    <div class="popTitle">场所信息</div>
+                    <div class="popContentTitle">场所名称：
+                        <span>{{ selInfo.name }}</span>
+                    </div>
+                    <div class="popContentTitle">场所分类：
+                        <span>{{ selInfo.categoryName }}</span>
+                    </div>
+                    <div class="popContentTitle">占地面积：
+                        <span>{{ selInfo.areaCovered }}</span>
+                    </div>
+                    <div class="popContentTitle">容纳人数：
+                        <span>{{ selInfo.capacity }}</span>
+                    </div>
+                    <div class="popContentTitle">地址：
+                        <span>{{ selInfo.address }}</span>
+                    </div>
+                </div>
+                <div v-show="selPlaceType==='event'">
+                    <div class="popTitle">难点痛点</div>
+                    <div class="popContentTitle">所属网格：
+                        <span>{{ selInfo.gridName }}</span>
+                    </div>
+                    <div class="popContentTitle">发生时间：
+                        <span>{{ selInfo.happenTime }}</span>
+                    </div>
+                    <div class="popContentTitle">事件内容：
+                        <span>{{ selInfo.eventContent }}</span>
+                    </div>
+
+                    <div v-if="selInfo.imageList&&selInfo.imageList.length>0"
+                         class="m-info-prop">
+                        <span>图片：</span>
+                        <div class="m-info-pics">
+                            <img :src="src"
+                                 :key="src"
+                                 style="width:100px;height:100px;padding-right:10px"
+                                 v-for="src in eventInfo.imageList"
+                                 @click="watchImg(src)" />
+
+                        </div>
+                    </div>
+
+                    <div v-if="selInfo.voiceList&&selInfo.voiceList.length>0"
+                         class="m-info-prop">
+                        <span>音频：</span>
+                        <div class="m-info-pics">
+                            <audio controls>
+                                <source :src="item.url"
+                                        type=""
+                                        :key="item.url"
+                                        v-for="item in eventInfo.voiceList" />
+                            </audio>
+
+                        </div>
+
+                    </div>
+                    <div class="popContentTitle">反映渠道：
+                        <span>{{ selInfo.sourceTypeName|| "--" }}</span>
+                    </div>
+                    <div class="popContentTitle">地址：
+                        <span>{{ selInfo.address || "--" }}</span>
+                    </div>
+                    <div class="popContentTitle">报事人：
+                        <span>{{selInfo.name || "--" }}</span>
+                    </div>
+                    <div class="popContentTitle">联系电话：
+                        <span>{{ selInfo.mobile || "--" }}</span>
+                    </div>
+                    <div class="popContentTitle">证件号：
+                        <span>{{ selInfo.idCard || "--" }}</span>
+                    </div>
 
-            </div>
+                </div>
+                <div v-show="selPlaceType==='community_org'">
+                    <div class="popTitle">组织信息</div>
+                    <div class="popContentTitle">组织名称：
+                        <span>{{ selInfo.organizationName }}</span>
+                    </div>
+                    <div class="popContentTitle">组织分类：
+                        <span>{{ selInfo.categoryName }}</span>
+                    </div>
+                    <div class="popContentTitle">组织人数：
+                        <span>{{ selInfo.organizationPersonCount }}</span>
+                    </div>
+                    <div class="popContentTitle">组织成员：
+                        <span>{{ selInfo.organizationPersonnelShow }}</span>
+                    </div>
+                    <div class="popContentTitle">服务事项：
+                        <span>{{ selInfo.serviceItem }}</span>
+                    </div>
+                    <div class="popContentTitle">负责人：
+                        <span>{{ selInfo.principalName }}</span>
+                    </div>
+                    <div class="popContentTitle">联系电话：
+                        <span>{{ selInfo.principalPhone }}</span>
+                    </div>
+                    <div class="popContentTitle">创建时间：
+                        <span>{{ selInfo.organizationCreatedTime }}</span>
+                    </div>
+                </div>
 
-          </div>
-          <div class="popContentTitle">反映渠道：
-            <span>{{ selInfo.sourceTypeName|| "--" }}</span>
-          </div>
-          <div class="popContentTitle">地址：
-            <span>{{ selInfo.address || "--" }}</span>
-          </div>
-          <div class="popContentTitle">报事人：
-            <span>{{selInfo.name || "--" }}</span>
-          </div>
-          <div class="popContentTitle">联系电话：
-            <span>{{ selInfo.mobile || "--" }}</span>
-          </div>
-          <div class="popContentTitle">证件号：
-            <span>{{ selInfo.idCard || "--" }}</span>
-          </div>
+                <div v-show="selPlaceType==='group_rent'">
+                    <div class="popTitle">房屋信息</div>
+                    <div class="popContentTitle">房屋名称：
+                        <span>{{ selInfo.houseName }}</span>
+                    </div>
+                    <div class="popContentTitle">房屋类型：
+                        <span>{{ selInfo.houseTypeName }}</span>
+                    </div>
+                    <div class="popContentTitle">房屋用途：
+                        <span>{{ selInfo.purposeName }}</span>
+                    </div>
+                    <div class="popContentTitle">房屋状态：
+                        <span>{{ selInfo.rentName }}</span>
+                    </div>
+                    <div class="popContentTitle">房主姓名：
+                        <span>{{ selInfo.ownerName }}</span>
+                    </div>
+                    <div class="popContentTitle">联系方式：
+                        <span>{{ selInfo.ownerPhone }}</span>
+                    </div>
+                    <div class="popContentTitle">房主证件号：
+                        <span>{{ selInfo.ownerIdCard }}</span>
+                    </div>
 
-        </div>
-        <div v-show="selPlaceType==='community_org'">
-          <div class="popTitle">组织信息</div>
-          <div class="popContentTitle">组织名称：
-            <span>{{ selInfo.organizationName }}</span>
-          </div>
-          <div class="popContentTitle">组织分类：
-            <span>{{ selInfo.categoryName }}</span>
-          </div>
-          <div class="popContentTitle">组织人数：
-            <span>{{ selInfo.organizationPersonCount }}</span>
-          </div>
-          <div class="popContentTitle">组织成员：
-            <span>{{ selInfo.organizationPersonnelShow }}</span>
-          </div>
-          <div class="popContentTitle">服务事项：
-            <span>{{ selInfo.serviceItem }}</span>
-          </div>
-          <div class="popContentTitle">负责人：
-            <span>{{ selInfo.principalName }}</span>
-          </div>
-          <div class="popContentTitle">联系电话：
-            <span>{{ selInfo.principalPhone }}</span>
-          </div>
-          <div class="popContentTitle">创建时间：
-            <span>{{ selInfo.organizationCreatedTime }}</span>
-          </div>
-        </div>
+                </div>
+                <div v-show="selPlaceType==='enterprise_patrol'">
+                    <div class="popTitle">企事业信息</div>
+                    <div class="popContentTitle">场所类型：
+                        <span>{{ selInfo.placeTypeName }}</span>
+                    </div>
+                    <div class="popContentTitle">场所区域：
+                        <span>{{ selInfo.gridName }}</span>
+                    </div>
+                    <div class="popContentTitle">场所名称：
+                        <span>{{ selInfo.placeOrgName }}</span>
+                    </div>
+                    <div class="popContentTitle">场所地址：
+                        <span>{{ selInfo.address }}</span>
+                    </div>
+                    <div class="popContentTitle">规模：
+                        <span>{{ selInfo.scale }}</span>
+                    </div>
+                    <div class="popContentTitle">负责人：
+                        <span>{{ selInfo.personInCharge }}</span>
+                    </div>
+                    <div class="popContentTitle">联系电话：
+                        <span>{{ selInfo.mobile }}</span>
+                    </div>
 
-        <div v-show="selPlaceType==='group_rent'">
-          <div class="popTitle">房屋信息</div>
-          <div class="popContentTitle">房屋名称：
-            <span>{{ selInfo.houseName }}</span>
-          </div>
-          <div class="popContentTitle">房屋类型：
-            <span>{{ selInfo.houseTypeName }}</span>
-          </div>
-          <div class="popContentTitle">房屋用途：
-            <span>{{ selInfo.purposeName }}</span>
-          </div>
-          <div class="popContentTitle">房屋状态：
-            <span>{{ selInfo.rentName }}</span>
-          </div>
-          <div class="popContentTitle">房主姓名：
-            <span>{{ selInfo.ownerName }}</span>
-          </div>
-          <div class="popContentTitle">联系方式：
-            <span>{{ selInfo.ownerPhone }}</span>
-          </div>
-          <div class="popContentTitle">房主证件号：
-            <span>{{ selInfo.ownerIdCard }}</span>
-          </div>
+                </div>
+                <div v-show="selPlaceType==='party_unit'">
+                    <div class="popTitle">联建单位信息</div>
+                    <div class="popContentTitle">单位名称：
+                        <span>{{ selInfo.unitName }}</span>
+                    </div>
+                    <div class="popContentTitle">分类：
+                        <span>{{ selInfo.typeName }}</span>
+                    </div>
+                    <div class="popContentTitle">服务事项：
+                        <span>{{ selInfo.serviceMatterListShow }}</span>
+                    </div>
+                    <div class="popContentTitle">联系人：
+                        <span>{{ selInfo.contact }}</span>
+                    </div>
+                    <div class="popContentTitle">联系电话：
+                        <span>{{ selInfo.contactMobile }}</span>
+                    </div>
+                    <div class="popContentTitle">在职党员：
+                        <span>{{ selInfo.memberCount }}</span>
+                    </div>
+                    <div class="popContentTitle">备注：
+                        <span>{{ selInfo.remark }}</span>
+                    </div>
+                    <div class="popContentTitle">地理位置：
+                        <span>{{ selInfo.address }}</span>
+                    </div>
+                </div>
 
-        </div>
-        <div v-show="selPlaceType==='enterprise_patrol'">
-          <div class="popTitle">企事业信息</div>
-          <div class="popContentTitle">场所类型：
-            <span>{{ selInfo.placeTypeName }}</span>
-          </div>
-          <div class="popContentTitle">场所区域：
-            <span>{{ selInfo.gridName }}</span>
-          </div>
-          <div class="popContentTitle">场所名称：
-            <span>{{ selInfo.placeOrgName }}</span>
-          </div>
-          <div class="popContentTitle">场所地址：
-            <span>{{ selInfo.address }}</span>
-          </div>
-          <div class="popContentTitle">规模：
-            <span>{{ selInfo.scale }}</span>
-          </div>
-          <div class="popContentTitle">负责人：
-            <span>{{ selInfo.personInCharge }}</span>
-          </div>
-          <div class="popContentTitle">联系电话：
-            <span>{{ selInfo.mobile }}</span>
-          </div>
+            </div>
 
         </div>
-        <div v-show="selPlaceType==='party_unit'">
-          <div class="popTitle">联建单位信息</div>
-          <div class="popContentTitle">单位名称：
-            <span>{{ selInfo.unitName }}</span>
-          </div>
-          <div class="popContentTitle">分类：
-            <span>{{ selInfo.typeName }}</span>
-          </div>
-          <div class="popContentTitle">服务事项：
-            <span>{{ selInfo.serviceMatterListShow }}</span>
-          </div>
-          <div class="popContentTitle">联系人：
-            <span>{{ selInfo.contact }}</span>
-          </div>
-          <div class="popContentTitle">联系电话：
-            <span>{{ selInfo.contactMobile }}</span>
-          </div>
-          <div class="popContentTitle">在职党员：
-            <span>{{ selInfo.memberCount }}</span>
-          </div>
-          <div class="popContentTitle">备注：
-            <span>{{ selInfo.remark }}</span>
-          </div>
-          <div class="popContentTitle">地理位置：
-            <span>{{ selInfo.address }}</span>
-          </div>
-        </div>
-
-      </div>
 
+        <people v-if="showPeopleInfo"
+                :uid="selUserId"
+                ref="ref_people"></people>
     </div>
 
-    <people v-if="showPeopleInfo"
-            :uid="selUserId"
-            ref="ref_people"></people>
-  </div>
-
 </template>
 
 <script>
 // import 'ol/ol.css'
-import { Map, View } from 'ol'
+import { Map, View } from 'ol';
+import Feature from "ol/Feature.js";
+import Overlay from 'ol/Overlay';
+import { boundingExtent } from 'ol/extent.js';
+import GeoJSON from 'ol/format/GeoJSON.js';
+import Point from "ol/geom/Point.js";
+import { DoubleClickZoom, Select } from 'ol/interaction.js';
 import TileLayer from 'ol/layer/Tile.js';
-import ImageLayer from 'ol/layer/Image';
-import { Raster as RasterSource } from 'ol/source';
-import XYZ from 'ol/source/XYZ.js';
 import VectorLayer from 'ol/layer/Vector.js';
 import VectorSource from 'ol/source/Vector.js';
-import GeoJSON from 'ol/format/GeoJSON.js';
-import Point from "ol/geom/Point.js";
-import Feature from "ol/Feature.js";
-import Overlay from 'ol/Overlay';
-import { defaults as defaultInteractions, Select, DoubleClickZoom } from 'ol/interaction.js';
-import { getCenter, boundingExtent } from 'ol/extent.js';
-import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style.js';
+import XYZ from 'ol/source/XYZ.js';
+import { Fill, Icon, Stroke, Style, Text } from 'ol/style.js';
 
-import nextTick from 'dai-js/tools/nextTick'
-import { mapGetters } from "vuex";
+import { requestGet, requestPost } from "@/js/dai/request";
+import nextTick from 'dai-js/tools/nextTick';
 import { Loading } from 'element-ui'; //引入Loading服务
-import { requestPost, requestGet } from "@/js/dai/request";
+import { mapGetters } from "vuex";
 
 
-import cptTb from "@/views/modules/visual/cpts/tb";
 import cptCard from "@/views/modules/visual/cpts/card";
 import ScreenLoading from "@/views/modules/visual/cpts/loading";
+import cptTb from "@/views/modules/visual/cpts/tb";
 import People from "../../basicinfo/people";
 
 var centerPointGlobal = [120.664619, 36.504963]
@@ -417,1428 +416,1428 @@ let yoffset = 0
 //url图标
 
 let iconUrlArray = [
-  'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
-  'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
-  'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
+    'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
+    'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
+    'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
 ];
 let textColorArray = [
-  'rgba(236, 69, 4, 0.66)',
-  'rgba(0, 146, 238, 0.75)',
-  'rgba(238, 151, 0, 0.8)'
+    'rgba(236, 69, 4, 0.66)',
+    'rgba(0, 146, 238, 0.75)',
+    'rgba(238, 151, 0, 0.8)'
 ];
 let polygonColorArray = [
-  'rgba(210, 2, 2, 0.24)',
-  'rgba(43, 231, 253, 0.25)',
-  'rgba(183, 185, 0, 0.16)'
+    'rgba(210, 2, 2, 0.24)',
+    'rgba(43, 231, 253, 0.25)',
+    'rgba(183, 185, 0, 0.16)'
 ];
 //标注的文字样式
 var createTextStyle = function (feature) {
-  return new Text({
-    textAlign: undefined,
-    font: "18px Arial",
-    //fontFamily: "Courier New, monospace",
-    // fontWeight: "bold",
-    text: feature.values_.name,
-    backgroundFill: new Fill({
-      // color: 'rgba(0, 146, 238, 0.75)'
-      color: textColorArray[feature.values_.colorIndex]
-    }),
-    padding: [4, 10, 4, 10],
-    //text: "名称",
-    fill: new Fill({ color: "#ffffff" }),
-    // stroke: new Stroke({ color: "#ffffff", width: 3 }),
-    offsetY: -30,
-    offsetX: -50,
-    overflow: true,
-  });
+    return new Text({
+        textAlign: undefined,
+        font: "18px Arial",
+        //fontFamily: "Courier New, monospace",
+        // fontWeight: "bold",
+        text: feature.values_.name,
+        backgroundFill: new Fill({
+            // color: 'rgba(0, 146, 238, 0.75)'
+            color: textColorArray[feature.values_.colorIndex]
+        }),
+        padding: [4, 10, 4, 10],
+        //text: "名称",
+        fill: new Fill({ color: "#ffffff" }),
+        // stroke: new Stroke({ color: "#ffffff", width: 3 }),
+        offsetY: -30,
+        offsetX: -50,
+        overflow: true,
+    });
 };
 
 //上级组织标注样式
 var parentStyleFunction = (function () {
-  return function (feature) {
-    return new Style({
-      // fill: new Fill({
-      //   color: [255, 255, 255, 0.3]
-      // }),
-      stroke: new Stroke({
-        color: [0, 103, 182, 1],
-        width: 2
-      }),
-
-      // text: createTextStyle(feature)
-    });;
-  };
+    return function (feature) {
+        return new Style({
+            // fill: new Fill({
+            //   color: [255, 255, 255, 0.3]
+            // }),
+            stroke: new Stroke({
+                color: [0, 103, 182, 1],
+                width: 2
+            }),
+
+            // text: createTextStyle(feature)
+        });;
+    };
 })()
 
 
 //标注样式
 var polygonStyleFunction = (function () {
-  return function (feature) {
-    return new Style({
-      fill: new Fill({
-        // color: [255, 255, 255, 0.3]
-        color: polygonColorArray[feature.values_.colorIndex]
-      }),
-      stroke: new Stroke({
-        color: polygonColorArray[feature.values_.colorIndex],
-        width: 3
-      }),
-
-      text: createTextStyle(feature)
-    });;
-  };
+    return function (feature) {
+        return new Style({
+            fill: new Fill({
+                // color: [255, 255, 255, 0.3]
+                color: polygonColorArray[feature.values_.colorIndex]
+            }),
+            stroke: new Stroke({
+                color: polygonColorArray[feature.values_.colorIndex],
+                width: 3
+            }),
+
+            text: createTextStyle(feature)
+        });;
+    };
 })()
 
 //定义颜色转换方法
 let reverseFunc = function (pixelsTemp) {
-  //蓝色
-  for (var i = 0; i < pixelsTemp.length; i += 4) {
-    var r = pixelsTemp[i];
-    var g = pixelsTemp[i + 1];
-    var b = pixelsTemp[i + 2];
-    //运用图像学公式，设置灰度值
-    var grey = r * 0.3 + g * 0.59 + b * 0.11;
-    //将rgb的值替换为灰度值
-    pixelsTemp[i] = grey;
-    pixelsTemp[i + 1] = grey;
-    pixelsTemp[i + 2] = grey;
-
-    //基于灰色，设置为蓝色，这几个数值是我自己试出来的，可以根据需求调整
-    pixelsTemp[i] = 55 - pixelsTemp[i];
-    pixelsTemp[i + 1] = 255 - pixelsTemp[i + 1];
-    pixelsTemp[i + 2] = 305 - pixelsTemp[i + 2];
-  }
+    //蓝色
+    for (var i = 0; i < pixelsTemp.length; i += 4) {
+        var r = pixelsTemp[i];
+        var g = pixelsTemp[i + 1];
+        var b = pixelsTemp[i + 2];
+        //运用图像学公式，设置灰度值
+        var grey = r * 0.3 + g * 0.59 + b * 0.11;
+        //将rgb的值替换为灰度值
+        pixelsTemp[i] = grey;
+        pixelsTemp[i + 1] = grey;
+        pixelsTemp[i + 2] = grey;
+
+        //基于灰色，设置为蓝色，这几个数值是我自己试出来的，可以根据需求调整
+        pixelsTemp[i] = 55 - pixelsTemp[i];
+        pixelsTemp[i + 1] = 255 - pixelsTemp[i + 1];
+        pixelsTemp[i + 2] = 305 - pixelsTemp[i + 2];
+    }
 };
 
 
 const vueGis = {
-  name: 'HomeMap',
-  data () {
-    return {
-      centerPoint: [],//中心点位置
-      zoom: 14,//缩放范围：区14
-      minZoom: 1,//最小缩放
-
-      orgData: {},//当前组织对象
-      orgId: '',
-      orgLevel: '',
-
-      subAgencyArray: [],//下拉框数据
-      iconCoordinators: [],
-      currentCoordinate: null,
-      overlay: null,
-
-      //右侧搜索
-      searchName: "",
-
-      //右侧列表
-      infoLoading: true,
-      listData: [],//得到的数据
-      listDatashow: [],//处理成一行两列的数据
-
-      //下钻层级记录
-      runNum: 0,
-      routerArray: [],
-      center: [],
-      zoom: null,
-      parentPolygon: [],
-
-      centerFlag: 'point',//定义中心点的flag  point点 fit 自适应
-
-      coverageTypesList: [//图层类型。五大图层：zhzl：综合治理图层；yjcl：应急处置图层；aqsc：安全生产图层；csgl：城市管理图层；ggfw：公共服务图层
-        {
-          select: true,
-          label: '综合治理图层',
-          value: 'zhzl'
-        },
-        {
-          select: false,
-          label: '应急处置图层',
-          value: 'yjcl'
-        },
-        {
-          select: false,
-          label: '安全生产图层',
-          value: 'aqsc'
-        },
-        {
-          select: false,
-          label: '城市管理图层',
-          value: 'csgl'
-        },
-        {
-          select: false,
-          label: '公共服务图层',
-          value: 'ggfw'
-        },
-      ],
-      categoryList: [],//分类列表
-      categoryListshow: [],//处理成一行四列的数据
-
-      selImg: require('../../../../../assets/img/shuju/xuanzhong.png'),
-      noSelImg: require('../../../../../assets/img/shuju/weixuan.png'),
-
-      coverageTypes: ['zhzl'],
-      categoryKeys: [],
-      search: '',
-      pageNo: 1,
-      pageSize: 10,
-
-      demand: {
-        loading: false,
-        colList: [
-          {
-            align: "center",
-            width: "15%",
-          },
-          {
-            align: "center",
-            width: "25%",
-          },
-          {
-            align: "center",
-            width: "60%",
-          },
-
-        ],
-        header: ["图例", "分类", "名称"],
-        list: [],
-        pageSize: 50,
-        pageNo: 1,
-        total: 0,
-      },
-
-      iconUrlArray: {
-
-        'anzhibangjiao': require('../../../../../assets/img/shuju/fiveLayer/anzhibangjiao.png'),
-        'buliangqingshaonian': require('../../../../../assets/img/shuju/fiveLayer/buliangqingshaonian.png'),
-        'shequjiaozheng': require('../../../../../assets/img/shuju/fiveLayer/shequjiaozheng.png'),
-        'resi_xfry': require('../../../../../assets/img/shuju/fiveLayer/resi_xfry.png'),
-        'xidurenyuan': require('../../../../../assets/img/shuju/fiveLayer/xidurenyuan.png'),
-        'xiejiaorenyuan': require('../../../../../assets/img/shuju/fiveLayer/xiejiaorenyuan.png'),
-        'zhaoshizhaohuojingshenbing': require('../../../../../assets/img/shuju/fiveLayer/zhaoshizhaohuojingshenbing.png'),
-
-
-        'yjdw': require('../../../../../assets/img/shuju/fiveLayer/yjdw.png'),
-        'sr_gy': require('../../../../../assets/img/shuju/fiveLayer/sr_gy.png'),
-        'sr_gc': require('../../../../../assets/img/shuju/fiveLayer/sr_gc.png'),
-        'whdw': require('../../../../../assets/img/shuju/fiveLayer/whdw.png'),
-        'sr_ggld': require('../../../../../assets/img/shuju/fiveLayer/sr_ggld.png'),
-        'lwh': require('../../../../../assets/img/shuju/fiveLayer/lwh.png'),
-        'sr_tyc': require('../../../../../assets/img/shuju/fiveLayer/sr_tyc.png'),
-        'lyjlb': require('../../../../../assets/img/shuju/fiveLayer/lyjlb.png'),
-        'sr_yjy': require('../../../../../assets/img/shuju/fiveLayer/sr_yjy.png'),
-        'zaxld': require('../../../../../assets/img/shuju/fiveLayer/zaxld.png'),
-        'other': require('../../../../../assets/img/shuju/fiveLayer/other.png'),
-        'sr_jzz': require('../../../../../assets/img/shuju/fiveLayer/sr_jzz.png'),
-        'sr_djc': require('../../../../../assets/img/shuju/fiveLayer/sr_djc.png'),
-        'sr_rfqck': require('../../../../../assets/img/shuju/fiveLayer/sr_rfqck.png'),
-        'ep_lg': require('../../../../../assets/img/shuju/fiveLayer/ep_lg.png'),
-        'sr_xfz': require('../../../../../assets/img/shuju/fiveLayer/sr_xfz.png'),
-        'pu_jgzsbm': require('../../../../../assets/img/shuju/fiveLayer/pu_jgzsbm.png'),
-        'ep_qt': require('../../../../../assets/img/shuju/fiveLayer/ep_qt.png'),
-
-        'gr_czw': require('../../../../../assets/img/shuju/fiveLayer/gr_czw.png'),
-        'ep_cycs': require('../../../../../assets/img/shuju/fiveLayer/ep_cycs.png'),
-        'dc_jyz': require('../../../../../assets/img/shuju/fiveLayer/dc_jyz.png'),
-        'ep_gwylcs': require('../../../../../assets/img/shuju/fiveLayer/ep_gwylcs.png'),
-        'dc_jqz': require('../../../../../assets/img/shuju/fiveLayer/dc_jqz.png'),
-        'dc_whpdw': require('../../../../../assets/img/shuju/fiveLayer/dc_whpdw.png'),
-        'ep_wb': require('../../../../../assets/img/shuju/fiveLayer/ep_wb.png'),
-        'ep_mrxycs': require('../../../../../assets/img/shuju/fiveLayer/ep_mrxycs.png'),
-        'dc_yqhjz': require('../../../../../assets/img/shuju/fiveLayer/dc_yqhjz.png'),
-        'dc_jzgd': require('../../../../../assets/img/shuju/fiveLayer/dc_jzgd.png'),
-        'ep_scjgqy': require('../../../../../assets/img/shuju/fiveLayer/ep_scjgqy.png'),
-
-        'cm_nmsc': require('../../../../../assets/img/shuju/fiveLayer/cm_nmsc.png'),
-        'event_tdnd': require('../../../../../assets/img/shuju/fiveLayer/event_tdnd.png'),
-        'cm_bhsc': require('../../../../../assets/img/shuju/fiveLayer/cm_bhsc.png'),
-        'cm_cjsc': require('../../../../../assets/img/shuju/fiveLayer/cm_cjsc.png'),
-        'ep_lssd': require('../../../../../assets/img/shuju/fiveLayer/ep_lssd.png'),
-
-
-        'resi_szry': require('../../../../../assets/img/shuju/fiveLayer/resi_szry.png'),
-        'ps_lyy': require('../../../../../assets/img/shuju/fiveLayer/ps_lyy.png'),
-        'resi_snry': require('../../../../../assets/img/shuju/fiveLayer/resi_snry.png'),
-        'ps_mzb': require('../../../../../assets/img/shuju/fiveLayer/ps_mzb.png'),
-        'ps_zs': require('../../../../../assets/img/shuju/fiveLayer/ps_zs.png'),
-        'ps_wss': require('../../../../../assets/img/shuju/fiveLayer/ps_wss.png'),
-        'ps_jjz': require('../../../../../assets/img/shuju/fiveLayer/ps_jjz.png'),
-        'ep_xx': require('../../../../../assets/img/shuju/fiveLayer/ep_xx.png'),
-        'ep_yy': require('../../../../../assets/img/shuju/fiveLayer/ep_yy.png'),
-
-      },
-      iconArrays: [],
-      overlay: null,
-      showPopup: false,
-
-      selPlaceType: '',
-      selInfo: {},
-      selUserId: '',
-      showPeopleInfo: false
-
-    }
-  },
-  async mounted () {
+    name: 'HomeMap',
+    data() {
+        return {
+            centerPoint: [],//中心点位置
+            zoom: 14,//缩放范围：区14
+            minZoom: 1,//最小缩放
+
+            orgData: {},//当前组织对象
+            orgId: '',
+            orgLevel: '',
+
+            subAgencyArray: [],//下拉框数据
+            iconCoordinators: [],
+            currentCoordinate: null,
+            overlay: null,
+
+            //右侧搜索
+            searchName: "",
+
+            //右侧列表
+            infoLoading: true,
+            listData: [],//得到的数据
+            listDatashow: [],//处理成一行两列的数据
+
+            //下钻层级记录
+            runNum: 0,
+            routerArray: [],
+            center: [],
+            zoom: null,
+            parentPolygon: [],
+
+            centerFlag: 'point',//定义中心点的flag  point点 fit 自适应
+
+            coverageTypesList: [//图层类型。五大图层：zhzl：综合治理图层；yjcl：应急处置图层；aqsc：安全生产图层；csgl：城市管理图层；ggfw：公共服务图层
+                {
+                    select: true,
+                    label: '综合治理图层',
+                    value: 'zhzl'
+                },
+                {
+                    select: false,
+                    label: '应急处置图层',
+                    value: 'yjcl'
+                },
+                {
+                    select: false,
+                    label: '安全生产图层',
+                    value: 'aqsc'
+                },
+                {
+                    select: false,
+                    label: '城市管理图层',
+                    value: 'csgl'
+                },
+                {
+                    select: false,
+                    label: '公共服务图层',
+                    value: 'ggfw'
+                },
+            ],
+            categoryList: [],//分类列表
+            categoryListshow: [],//处理成一行四列的数据
+
+            selImg: require('../../../../../assets/img/shuju/xuanzhong.png'),
+            noSelImg: require('../../../../../assets/img/shuju/weixuan.png'),
+
+            coverageTypes: ['zhzl'],
+            categoryKeys: [],
+            search: '',
+            pageNo: 1,
+            pageSize: 10,
+
+            demand: {
+                loading: false,
+                colList: [
+                    {
+                        align: "center",
+                        width: "15%",
+                    },
+                    {
+                        align: "center",
+                        width: "25%",
+                    },
+                    {
+                        align: "center",
+                        width: "60%",
+                    },
+
+                ],
+                header: ["图例", "分类", "名称"],
+                list: [],
+                pageSize: 50,
+                pageNo: 1,
+                total: 0,
+            },
+
+            iconUrlArray: {
+
+                'anzhibangjiao': require('../../../../../assets/img/shuju/fiveLayer/anzhibangjiao.png'),
+                'buliangqingshaonian': require('../../../../../assets/img/shuju/fiveLayer/buliangqingshaonian.png'),
+                'shequjiaozheng': require('../../../../../assets/img/shuju/fiveLayer/shequjiaozheng.png'),
+                'resi_xfry': require('../../../../../assets/img/shuju/fiveLayer/resi_xfry.png'),
+                'xidurenyuan': require('../../../../../assets/img/shuju/fiveLayer/xidurenyuan.png'),
+                'xiejiaorenyuan': require('../../../../../assets/img/shuju/fiveLayer/xiejiaorenyuan.png'),
+                'zhaoshizhaohuojingshenbing': require('../../../../../assets/img/shuju/fiveLayer/zhaoshizhaohuojingshenbing.png'),
+
+
+                'yjdw': require('../../../../../assets/img/shuju/fiveLayer/yjdw.png'),
+                'sr_gy': require('../../../../../assets/img/shuju/fiveLayer/sr_gy.png'),
+                'sr_gc': require('../../../../../assets/img/shuju/fiveLayer/sr_gc.png'),
+                'whdw': require('../../../../../assets/img/shuju/fiveLayer/whdw.png'),
+                'sr_ggld': require('../../../../../assets/img/shuju/fiveLayer/sr_ggld.png'),
+                'lwh': require('../../../../../assets/img/shuju/fiveLayer/lwh.png'),
+                'sr_tyc': require('../../../../../assets/img/shuju/fiveLayer/sr_tyc.png'),
+                'lyjlb': require('../../../../../assets/img/shuju/fiveLayer/lyjlb.png'),
+                'sr_yjy': require('../../../../../assets/img/shuju/fiveLayer/sr_yjy.png'),
+                'zaxld': require('../../../../../assets/img/shuju/fiveLayer/zaxld.png'),
+                'other': require('../../../../../assets/img/shuju/fiveLayer/other.png'),
+                'sr_jzz': require('../../../../../assets/img/shuju/fiveLayer/sr_jzz.png'),
+                'sr_djc': require('../../../../../assets/img/shuju/fiveLayer/sr_djc.png'),
+                'sr_rfqck': require('../../../../../assets/img/shuju/fiveLayer/sr_rfqck.png'),
+                'ep_lg': require('../../../../../assets/img/shuju/fiveLayer/ep_lg.png'),
+                'sr_xfz': require('../../../../../assets/img/shuju/fiveLayer/sr_xfz.png'),
+                'pu_jgzsbm': require('../../../../../assets/img/shuju/fiveLayer/pu_jgzsbm.png'),
+                'ep_qt': require('../../../../../assets/img/shuju/fiveLayer/ep_qt.png'),
+
+                'gr_czw': require('../../../../../assets/img/shuju/fiveLayer/gr_czw.png'),
+                'ep_cycs': require('../../../../../assets/img/shuju/fiveLayer/ep_cycs.png'),
+                'dc_jyz': require('../../../../../assets/img/shuju/fiveLayer/dc_jyz.png'),
+                'ep_gwylcs': require('../../../../../assets/img/shuju/fiveLayer/ep_gwylcs.png'),
+                'dc_jqz': require('../../../../../assets/img/shuju/fiveLayer/dc_jqz.png'),
+                'dc_whpdw': require('../../../../../assets/img/shuju/fiveLayer/dc_whpdw.png'),
+                'ep_wb': require('../../../../../assets/img/shuju/fiveLayer/ep_wb.png'),
+                'ep_mrxycs': require('../../../../../assets/img/shuju/fiveLayer/ep_mrxycs.png'),
+                'dc_yqhjz': require('../../../../../assets/img/shuju/fiveLayer/dc_yqhjz.png'),
+                'dc_jzgd': require('../../../../../assets/img/shuju/fiveLayer/dc_jzgd.png'),
+                'ep_scjgqy': require('../../../../../assets/img/shuju/fiveLayer/ep_scjgqy.png'),
+
+                'cm_nmsc': require('../../../../../assets/img/shuju/fiveLayer/cm_nmsc.png'),
+                'event_tdnd': require('../../../../../assets/img/shuju/fiveLayer/event_tdnd.png'),
+                'cm_bhsc': require('../../../../../assets/img/shuju/fiveLayer/cm_bhsc.png'),
+                'cm_cjsc': require('../../../../../assets/img/shuju/fiveLayer/cm_cjsc.png'),
+                'ep_lssd': require('../../../../../assets/img/shuju/fiveLayer/ep_lssd.png'),
+
+
+                'resi_szry': require('../../../../../assets/img/shuju/fiveLayer/resi_szry.png'),
+                'ps_lyy': require('../../../../../assets/img/shuju/fiveLayer/ps_lyy.png'),
+                'resi_snry': require('../../../../../assets/img/shuju/fiveLayer/resi_snry.png'),
+                'ps_mzb': require('../../../../../assets/img/shuju/fiveLayer/ps_mzb.png'),
+                'ps_zs': require('../../../../../assets/img/shuju/fiveLayer/ps_zs.png'),
+                'ps_wss': require('../../../../../assets/img/shuju/fiveLayer/ps_wss.png'),
+                'ps_jjz': require('../../../../../assets/img/shuju/fiveLayer/ps_jjz.png'),
+                'ep_xx': require('../../../../../assets/img/shuju/fiveLayer/ep_xx.png'),
+                'ep_yy': require('../../../../../assets/img/shuju/fiveLayer/ep_yy.png'),
+
+            },
+            iconArrays: [],
+            overlay: null,
+            showPopup: false,
+
+            selPlaceType: '',
+            selInfo: {},
+            selUserId: '',
+            showPeopleInfo: false
 
-    //加载组织数据
-    await this.loadOrgData()
-
-    //初始化地图
-    this.initMap()
-
-    await nextTick(300)
-    this.addParentLayer()
-    this.loadParentPolygon()
-    //添加标注图层
-    this.addPolygonLayer()
-
-    //添加icontuceng
-    this.addIconLayer()
-
-    //加载当前园区的标注
-    this.loadPolygon(this.subAgencyArray)
-
-
-    this.setMapLocation()
-    await this.loadCategoryList()
-    this.getTable();
-    await this.getMapTable();
-
-
-    //初始化icon图层
-    this.addOverlay()
-
-    this.addMapClick()
-
-  },
-  methods: {
-
-    toPeople () {
-      this.showPeopleInfo = true
+        }
     },
+    async mounted() {
 
-    //添加覆盖层
-    addOverlay () {
-      // 使用变量存储弹窗所需的 DOM 对象
-      var container = document.getElementById("popup");
-      var closer = document.getElementById("popup-closer");
-      var content = document.getElementById("popup-content");
+        //加载组织数据
+        await this.loadOrgData()
 
+        //初始化地图
+        this.initMap()
 
-      // 创建一个弹窗 Overlay 对象
-      this.overlay = new Overlay({
-        element: container, //绑定 Overlay 对象和 DOM 对象的
-        autoPan: true, // 定义弹出窗口在边缘点击时候可能不完整 设置自动平移效果
-        autoPanAnimation: {
-          duration: 250 //自动平移效果的动画时间 9毫秒
-        },
-        zIndex: 100
-      });
-      // 将弹窗添加到 map 地图中
-      map.addOverlay(this.overlay);
-      let _that = this;
-
-      /**
-       * 为弹窗添加一个响应关闭的函数
-       */
-      closer.onclick = function () {
-        _that.overlay.setPosition(undefined);
-        closer.blur();
-        return false;
-      };
+        await nextTick(300)
+        this.addParentLayer()
+        this.loadParentPolygon()
+        //添加标注图层
+        this.addPolygonLayer()
 
-    },
+        //添加icontuceng
+        this.addIconLayer()
 
-    //注册地图点击事件
-    addMapClick () {
-      let _that = this
+        //加载当前园区的标注
+        this.loadPolygon(this.subAgencyArray)
 
-      map.on("click", function (evt) {
-        const feature = map.forEachFeatureAtPixel(evt.pixel, function (feature) {
-          return feature;
-        });
-        if (feature) {
-          // console.log(feature)
-          _that.clickMapVolunteer(feature.values_.properties.info)
 
-        }
+        this.setMapLocation()
+        await this.loadCategoryList()
+        this.getTable();
+        await this.getMapTable();
 
-      });
-    },
 
-    //点击项目
-    async clickMapVolunteer (info) {
-
-      if (!info.id) {
-        return false
-      }
-      if (!info.latitude || !info.longitude) {
-        this.$message.warning("请先完善坐标位置")
-        return false
-      }
-      this.selPlaceType = info.placeType
-      if (info.placeType === 'resi' || info.placeType === 'special_resi') {//综合治理图层和公共服务图层中的失能人员、失智人员
-        // info.id = "dd0bd55db0ca4b629c40bc914a08368e"
-        this.selUserId = info.id
-        this.loadResi(info)
-      }
-      if (info.placeType === 'public_service') {//公共服务图层
-        this.loadPublicService(info)
-      }
-      if (info.placeType === 'dangerous_chemicals') {//重点危化品企业
-        this.loadDangerousChemicals(info)
-      }
-      if (info.placeType === 'event') {//难点痛点
-        this.loadEvent(info)
-      }
-      if (info.placeType === 'city_management') {//城市管理图层
-        this.loadCityManagement(info)
-      }
-      if (info.placeType === 'community_org') {//社区自组织
-        this.loadCommunityOrg(info)
-      }
-      if (info.placeType === 'superior_resource') {//优势资源
-        this.loadSuperiorResource(info)
-      }
-      if (info.placeType === 'group_rent') {//群租房
-        this.loadGroupRent(info)
-      }
-
-
-      if (info.placeType === 'party_unit') {//来自联建单位的机关直属部门
-        this.loadPartyUnit(info)
-      }
-      if (info.placeType === 'enterprise_patrol') {//来自企事业查询的
-        this.loadEnterprisePartrol(info)
-      }
+        //初始化icon图层
+        this.addOverlay()
 
+        this.addMapClick()
 
     },
+    methods: {
 
-    async loadResi (info) {
-      const url = "/epmetuser/icresiuser/resi-brief/" + info.id
-      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution"
-
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        let coordinate = [info.longitude, info.latitude]
-        data.icUserName = data.icUserName ? data.icUserName : '--'
-        data.gridName = data.gridName ? data.gridName : '--'
-        data.villageName = data.villageName ? data.villageName : '--'
-        data.mobile = data.mobile ? data.mobile : '--'
-        data.idCard = data.idCard ? data.idCard : '--'
-        data.birthday = data.birthday ? data.birthday : '--'
-        data.contacts = data.contacts ? data.contacts : '--'
-        data.contactsMobile = data.contactsMobile ? data.contactsMobile : '--'
-
-        data.isBdhjShow = data.isBdhj ? data.isBdhj === '0' ? '否' : '是' : '--'
-        data.genderShow = data.gender ? data.gender === '0' ? '女' : '男' : '--'
-        if (data.rhzk === 'rhyz') {
-          data.rhzkShow = '人户一致'
-        } else if (data.rhzk === 'rzhbz') {
-          data.rhzkShow = '人在户不在'
-        } else if (data.rhzk === 'hzrbz') {
-          data.rhzkShow = '户在人不在'
-        } else {
-          data.rhzkShow = '--'
-        }
-
-        let categoriesArray = []
-
-        for (let key in data.volunteerCategories) {
-          categoriesArray.push(data.volunteerCategories[key])
-
-        }
-
-        if (categoriesArray.length > 0) {
-          data.categories = categoriesArray.join(',')
-        } else {
-          data.categories = '--'
-        }
-        this.selInfo = JSON.parse(JSON.stringify(data))
+        toPeople() {
+            this.showPeopleInfo = true
+        },
 
-        this.handleShowPopup(coordinate)
+        //添加覆盖层
+        addOverlay() {
+            // 使用变量存储弹窗所需的 DOM 对象
+            var container = document.getElementById("popup");
+            var closer = document.getElementById("popup-closer");
+            var content = document.getElementById("popup-content");
+
+
+            // 创建一个弹窗 Overlay 对象
+            this.overlay = new Overlay({
+                element: container, //绑定 Overlay 对象和 DOM 对象的
+                autoPan: true, // 定义弹出窗口在边缘点击时候可能不完整 设置自动平移效果
+                autoPanAnimation: {
+                    duration: 250 //自动平移效果的动画时间 9毫秒
+                },
+                zIndex: 100
+            });
+            // 将弹窗添加到 map 地图中
+            map.addOverlay(this.overlay);
+            let _that = this;
+
+            /**
+             * 为弹窗添加一个响应关闭的函数
+             */
+            closer.onclick = function () {
+                _that.overlay.setPosition(undefined);
+                closer.blur();
+                return false;
+            };
 
-      } else {
-        this.$message.error(msg)
-      }
-    },
+        },
 
-    async loadPublicService (info) {
-      const url = "/gov/org/icPublicService/detail"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail"
+        //注册地图点击事件
+        addMapClick() {
+            let _that = this
 
-      let params = {
-        icPublicServiceId: info.id
-      }
+            map.on("click", function (evt) {
+                const feature = map.forEachFeatureAtPixel(evt.pixel, function (feature) {
+                    return feature;
+                });
+                if (feature) {
+                    // console.log(feature)
+                    _that.clickMapVolunteer(feature.values_.properties.info)
 
-      const { data, code, msg } = await requestPost(url, params)
+                }
 
-      if (code === 0) {
-        let coordinate = [info.longitude, info.latitude]
-        data.name = data.name ? data.name : '--'
-        data.categoryName = data.categoryName ? data.categoryName : '--'
-        data.areaCovered = data.areaCovered ? data.areaCovered + '平方公里' : '--'
-        data.capacity = data.capacity ? data.capacity : '--'
-        data.address = data.address ? data.address : '--'
+            });
+        },
 
-        this.selInfo = JSON.parse(JSON.stringify(data))
+        //点击项目
+        async clickMapVolunteer(info) {
 
+            if (!info.id) {
+                return false
+            }
+            if (!info.latitude || !info.longitude) {
+                this.$message.warning("请先完善坐标位置")
+                return false
+            }
+            this.selPlaceType = info.placeType
+            if (info.placeType === 'resi' || info.placeType === 'special_resi') {//综合治理图层和公共服务图层中的失能人员、失智人员
+                // info.id = "dd0bd55db0ca4b629c40bc914a08368e"
+                this.selUserId = info.id
+                this.loadResi(info)
+            }
+            if (info.placeType === 'public_service') {//公共服务图层
+                this.loadPublicService(info)
+            }
+            if (info.placeType === 'dangerous_chemicals') {//重点危化品企业
+                this.loadDangerousChemicals(info)
+            }
+            if (info.placeType === 'event') {//难点痛点
+                this.loadEvent(info)
+            }
+            if (info.placeType === 'city_management') {//城市管理图层
+                this.loadCityManagement(info)
+            }
+            if (info.placeType === 'community_org') {//社区自组织
+                this.loadCommunityOrg(info)
+            }
+            if (info.placeType === 'superior_resource') {//优势资源
+                this.loadSuperiorResource(info)
+            }
+            if (info.placeType === 'group_rent') {//群租房
+                this.loadGroupRent(info)
+            }
 
-        this.handleShowPopup(coordinate)
 
-      } else {
-        this.$message.error(msg)
-      }
-    },
+            if (info.placeType === 'party_unit') {//来自联建单位的机关直属部门
+                this.loadPartyUnit(info)
+            }
+            if (info.placeType === 'enterprise_patrol') {//来自企事业查询的
+                this.loadEnterprisePartrol(info)
+            }
 
-    async loadEvent (info) {
-      const url = "/governance/icEvent/detail";
-      //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventDetail/" + this.eventId;
 
-      const { data, code, msg } = await requestPost(url, {
-        icEventId: info.id,
-      });
+        },
 
-      if (code === 0) {
-        let coordinate = [info.longitude, info.latitude]
-        this.selInfo = JSON.parse(JSON.stringify(data))
+        async loadResi(info) {
+            const url = "/epmetuser/icresiuser/resi-brief/" + info.id
+            // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution"
+
+            let params = {}
+
+            const { data, code, msg } = await requestPost(url, params)
+
+            if (code === 0) {
+                let coordinate = [info.longitude, info.latitude]
+                data.icUserName = data.icUserName ? data.icUserName : '--'
+                data.gridName = data.gridName ? data.gridName : '--'
+                data.villageName = data.villageName ? data.villageName : '--'
+                data.mobile = data.mobile ? data.mobile : '--'
+                data.idCard = data.idCard ? data.idCard : '--'
+                data.birthday = data.birthday ? data.birthday : '--'
+                data.contacts = data.contacts ? data.contacts : '--'
+                data.contactsMobile = data.contactsMobile ? data.contactsMobile : '--'
+
+                data.isBdhjShow = data.isBdhj ? data.isBdhj === '0' ? '否' : '是' : '--'
+                data.genderShow = data.gender ? data.gender === '0' ? '女' : '男' : '--'
+                if (data.rhzk === 'rhyz') {
+                    data.rhzkShow = '人户一致'
+                } else if (data.rhzk === 'rzhbz') {
+                    data.rhzkShow = '人在户不在'
+                } else if (data.rhzk === 'hzrbz') {
+                    data.rhzkShow = '户在人不在'
+                } else {
+                    data.rhzkShow = '--'
+                }
+
+                let categoriesArray = []
+
+                for (let key in data.volunteerCategories) {
+                    categoriesArray.push(data.volunteerCategories[key])
+
+                }
+
+                if (categoriesArray.length > 0) {
+                    data.categories = categoriesArray.join(',')
+                } else {
+                    data.categories = '--'
+                }
+                this.selInfo = JSON.parse(JSON.stringify(data))
+
+                this.handleShowPopup(coordinate)
+
+            } else {
+                this.$message.error(msg)
+            }
+        },
 
-        this.handleShowPopup(coordinate)
+        async loadPublicService(info) {
+            const url = "/gov/org/icPublicService/detail"
+            // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail"
 
+            let params = {
+                icPublicServiceId: info.id
+            }
 
+            const { data, code, msg } = await requestPost(url, params)
 
-      } else {
-        this.$message.error(msg)
-      }
-    },
+            if (code === 0) {
+                let coordinate = [info.longitude, info.latitude]
+                data.name = data.name ? data.name : '--'
+                data.categoryName = data.categoryName ? data.categoryName : '--'
+                data.areaCovered = data.areaCovered ? data.areaCovered + '平方公里' : '--'
+                data.capacity = data.capacity ? data.capacity : '--'
+                data.address = data.address ? data.address : '--'
 
-    async loadDangerousChemicals (info) {
-      const url = "/gov/org/icDangerousChemicals/detail"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail"
+                this.selInfo = JSON.parse(JSON.stringify(data))
 
-      let params = {
-        icDangerousChemicalsId: info.id
-      }
 
-      const { data, code, msg } = await requestPost(url, params)
+                this.handleShowPopup(coordinate)
 
-      if (code === 0) {
-        let coordinate = [info.longitude, info.latitude]
-        data.name = data.name ? data.name : '--'
-        data.categoryName = data.categoryName ? data.categoryName : '--'
-        data.safeDistance = data.safeDistance ? data.safeDistance : '--'
-        data.dangerTypeName = data.dangerTypeName ? data.dangerTypeName : '--'
-        data.principalName = data.principalName ? data.principalName : '--'
-        data.principalMobile = data.principalMobile ? data.principalMobile : '--'
-        data.address = data.address ? data.address : '--'
-        data.remark = data.remark ? data.remark : '--'
+            } else {
+                this.$message.error(msg)
+            }
+        },
 
-        this.selInfo = JSON.parse(JSON.stringify(data))
+        async loadEvent(info) {
+            const url = "/governance/icEvent/detail";
+            //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventDetail/" + this.eventId;
 
+            const { data, code, msg } = await requestPost(url, {
+                icEventId: info.id,
+            });
 
-        this.handleShowPopup(coordinate)
+            if (code === 0) {
+                let coordinate = [info.longitude, info.latitude]
+                this.selInfo = JSON.parse(JSON.stringify(data))
 
-      } else {
-        this.$message.error(msg)
-      }
-    },
+                this.handleShowPopup(coordinate)
 
-    async loadCityManagement (info) {
-      const url = "/gov/org/icCityManagement/detail"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/detail"
 
-      let params = {
-        icCityManagementId: info.id
-      }
 
-      const { data, code, msg } = await requestPost(url, params)
+            } else {
+                this.$message.error(msg)
+            }
+        },
 
-      if (code === 0) {
-        let coordinate = [info.longitude, info.latitude]
-        data.name = data.name ? data.name : '--'
-        data.categoryName = data.categoryName ? data.categoryName : '--'
-        data.areaCovered = data.areaCovered ? data.areaCovered + '平方公里' : '--'
-        data.capacity = data.capacity ? data.capacity : '--'
-        data.address = data.address ? data.address : '--'
+        async loadDangerousChemicals(info) {
+            const url = "/gov/org/icDangerousChemicals/detail"
+            // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail"
 
-        this.selInfo = JSON.parse(JSON.stringify(data))
+            let params = {
+                icDangerousChemicalsId: info.id
+            }
 
+            const { data, code, msg } = await requestPost(url, params)
 
-        this.handleShowPopup(coordinate)
+            if (code === 0) {
+                let coordinate = [info.longitude, info.latitude]
+                data.name = data.name ? data.name : '--'
+                data.categoryName = data.categoryName ? data.categoryName : '--'
+                data.safeDistance = data.safeDistance ? data.safeDistance : '--'
+                data.dangerTypeName = data.dangerTypeName ? data.dangerTypeName : '--'
+                data.principalName = data.principalName ? data.principalName : '--'
+                data.principalMobile = data.principalMobile ? data.principalMobile : '--'
+                data.address = data.address ? data.address : '--'
+                data.remark = data.remark ? data.remark : '--'
 
-      } else {
-        this.$message.error(msg)
-      }
-    },
+                this.selInfo = JSON.parse(JSON.stringify(data))
 
-    async loadCommunityOrg (info) {
-      // const url = "/gov/org/icCityManagement/detail"
-      const url = "/heart/iccommunityselforganization/community-self-org-detail/" + info.id
 
-      let params = {}
+                this.handleShowPopup(coordinate)
 
-      const { data, code, msg } = await requestPost(url, params)
+            } else {
+                this.$message.error(msg)
+            }
+        },
 
-      if (code === 0) {
-        let coordinate = [info.longitude, info.latitude]
-        data.orgPersonArray = []
-        data.organizationPersonnel.forEach(element => {
-          let orgPersonnel = element.personName + "(" + element.personPhone + ")"
-          data.orgPersonArray.push(orgPersonnel)
-        });
+        async loadCityManagement(info) {
+            const url = "/gov/org/icCityManagement/detail"
+            // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/detail"
 
-        data.organizationPersonnelShow = data.orgPersonArray.join(",")
+            let params = {
+                icCityManagementId: info.id
+            }
 
-        this.selInfo = JSON.parse(JSON.stringify(data))
+            const { data, code, msg } = await requestPost(url, params)
 
+            if (code === 0) {
+                let coordinate = [info.longitude, info.latitude]
+                data.name = data.name ? data.name : '--'
+                data.categoryName = data.categoryName ? data.categoryName : '--'
+                data.areaCovered = data.areaCovered ? data.areaCovered + '平方公里' : '--'
+                data.capacity = data.capacity ? data.capacity : '--'
+                data.address = data.address ? data.address : '--'
 
-        this.handleShowPopup(coordinate)
+                this.selInfo = JSON.parse(JSON.stringify(data))
 
-      } else {
-        this.$message.error(msg)
-      }
-    },
 
-    async loadSuperiorResource (info) {
-      const url = "/gov/org/icSuperiorResource/detail"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icSuperiorResource/detail"
+                this.handleShowPopup(coordinate)
 
-      let params = {
-        icSuperiorResourceId: info.id
-      }
+            } else {
+                this.$message.error(msg)
+            }
+        },
 
-      const { data, code, msg } = await requestPost(url, params)
+        async loadCommunityOrg(info) {
+            // const url = "/gov/org/icCityManagement/detail"
+            const url = "/heart/iccommunityselforganization/community-self-org-detail/" + info.id
 
-      if (code === 0) {
-        let coordinate = [info.longitude, info.latitude]
-        data.name = data.name ? data.name : '--'
-        data.categoryName = data.categoryName ? data.categoryName : '--'
-        data.areaCovered = data.areaCovered ? data.areaCovered + '平方公里' : '--'
-        data.capacity = data.capacity ? data.capacity : '--'
-        data.address = data.address ? data.address : '--'
+            let params = {}
 
-        this.selInfo = JSON.parse(JSON.stringify(data))
+            const { data, code, msg } = await requestPost(url, params)
 
+            if (code === 0) {
+                let coordinate = [info.longitude, info.latitude]
+                data.orgPersonArray = []
+                data.organizationPersonnel.forEach(element => {
+                    let orgPersonnel = element.personName + "(" + element.personPhone + ")"
+                    data.orgPersonArray.push(orgPersonnel)
+                });
 
-        this.handleShowPopup(coordinate)
+                data.organizationPersonnelShow = data.orgPersonArray.join(",")
 
-      } else {
-        this.$message.error(msg)
-      }
-    },
+                this.selInfo = JSON.parse(JSON.stringify(data))
 
-    async loadEnterprisePartrol (info) {
-      const url = "/gov/org/enterprise/detail/" + info.id
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail"
 
-      const { data, code, msg } = await requestPost(url)
+                this.handleShowPopup(coordinate)
 
-      if (code === 0) {
-        // debugger
-        let coordinate = [info.longitude, info.latitude]
+            } else {
+                this.$message.error(msg)
+            }
+        },
 
-        this.selInfo = JSON.parse(JSON.stringify(data))
-        this.handleShowPopup(coordinate)
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    async loadGroupRent (info) {
-      const url = "/gov/org/ichouse/" + info.id
+        async loadSuperiorResource(info) {
+            const url = "/gov/org/icSuperiorResource/detail"
+            // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icSuperiorResource/detail"
 
-      const { data, code, msg } = await requestGet(url)
+            let params = {
+                icSuperiorResourceId: info.id
+            }
 
-      if (code === 0) {
-        // debugger
-        let coordinate = [info.longitude, info.latitude]
+            const { data, code, msg } = await requestPost(url, params)
 
-        this.selInfo = JSON.parse(JSON.stringify(data))
-        this.handleShowPopup(coordinate)
+            if (code === 0) {
+                let coordinate = [info.longitude, info.latitude]
+                data.name = data.name ? data.name : '--'
+                data.categoryName = data.categoryName ? data.categoryName : '--'
+                data.areaCovered = data.areaCovered ? data.areaCovered + '平方公里' : '--'
+                data.capacity = data.capacity ? data.capacity : '--'
+                data.address = data.address ? data.address : '--'
 
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    async loadPartyUnit (info) {
-      const url = '/heart/icpartyunit/detail'
-      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
-      let params = {
-        id: info.id
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        let coordinate = [info.longitude, info.latitude]
-        if (!data.serviceMatterList || !Array.isArray(data.serviceMatterList)) {
-          data.serviceMatterList = []
-        } else {
-          data.serviceMatterListShow = data.serviceMatterNameList.join(',')
-        }
+                this.selInfo = JSON.parse(JSON.stringify(data))
 
-        this.selInfo = JSON.parse(JSON.stringify(data))
-        this.handleShowPopup(coordinate)
-      } else {
-        this.$message.error(msg)
-      }
-    },
 
+                this.handleShowPopup(coordinate)
 
-    handleShowPopup (coordinate) {
+            } else {
+                this.$message.error(msg)
+            }
+        },
 
-      // console.log(this.overlay.getElement())
-      let content = document.getElementById("popup-content");
-      this.overlay.getElement().style.display = 'block'
-      this.overlay.getElement().parentNode.style.display = 'block'
-      this.overlay.getElement().parentNode.parentNode.style.display = 'block'
-      // content.innerHTML = showData;
-      this.overlay.setPosition(coordinate);
-      //把 overlay 显示到指定的 x,y坐标
+        async loadEnterprisePartrol(info) {
+            const url = "/gov/org/enterprise/detail/" + info.id
+            // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail"
 
-    },
-    // 关闭弹窗
-    handleClosePopup () {
-      this.overlay.setPosition(undefined);
-      document.getElementById("popup-closer").blur();
-      return false;
-    },
+            const { data, code, msg } = await requestPost(url)
 
-    //点击图层
-    async handleClickCoverage (index) {
-      this.demand.pageNo = 1
-      this.coverageTypesList[index].select = !this.coverageTypesList[index].select
-      let item = this.coverageTypesList[index]
+            if (code === 0) {
+                // debugger
+                let coordinate = [info.longitude, info.latitude]
 
-      this.$set(this.coverageTypesList, index, item)
+                this.selInfo = JSON.parse(JSON.stringify(data))
+                this.handleShowPopup(coordinate)
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        async loadGroupRent(info) {
+            const url = "/gov/org/ichouse/" + info.id
 
-      this.coverageTypes = []
+            const { data, code, msg } = await requestGet(url)
 
-      this.coverageTypesList.forEach(element => {
-        if (element.select) {
-          this.coverageTypes.push(element.value)
-        }
-      });
+            if (code === 0) {
+                // debugger
+                let coordinate = [info.longitude, info.latitude]
 
-      await this.loadCategoryList()
-      this.getTable();
-      this.getMapTable();
-    },
+                this.selInfo = JSON.parse(JSON.stringify(data))
+                this.handleShowPopup(coordinate)
 
-    //点击类别
-    async handleClickCategory (index, colIndex) {
-      this.demand.pageNo = 1
-      this.categoryListshow[index][colIndex].sel = !this.categoryListshow[index][colIndex].sel
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        async loadPartyUnit(info) {
+            const url = '/heart/icpartyunit/detail'
+            // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
+            let params = {
+                id: info.id
+            }
 
-      // this.categoryList[index * 4 + colIndex].sel = !this.categoryList[index * 4 + colIndex].sel
+            const { data, code, msg } = await requestPost(url, params)
 
-      let array = this.categoryListshow[index]
-      let item = this.categoryListshow[index][colIndex]
+            if (code === 0) {
+                let coordinate = [info.longitude, info.latitude]
+                if (!data.serviceMatterList || !Array.isArray(data.serviceMatterList)) {
+                    data.serviceMatterList = []
+                } else {
+                    data.serviceMatterListShow = data.serviceMatterNameList.join(',')
+                }
 
+                this.selInfo = JSON.parse(JSON.stringify(data))
+                this.handleShowPopup(coordinate)
+            } else {
+                this.$message.error(msg)
+            }
+        },
 
-      this.$set(this.categoryListshow[index], colIndex, item)
-      this.$set(this.categoryListshow, index, array)
 
-      this.categoryKeys = []
+        handleShowPopup(coordinate) {
 
-      this.categoryList.forEach(element => {
-        if (element.sel) {
-          this.categoryKeys.push(element.categoryKey)
-        }
-      });
+            // console.log(this.overlay.getElement())
+            let content = document.getElementById("popup-content");
+            this.overlay.getElement().style.display = 'block'
+            this.overlay.getElement().parentNode.style.display = 'block'
+            this.overlay.getElement().parentNode.parentNode.style.display = 'block'
+            // content.innerHTML = showData;
+            this.overlay.setPosition(coordinate);
+            //把 overlay 显示到指定的 x,y坐标
 
-      this.getTable();
-      this.getMapTable();
-    },
-    handleSearch () {
-      this.demand.pageNo = 1
-      this.getTable();
-      this.getMapTable();
-    },
-    //
-    handleClickRow (index) {
-      let selData = this.tableList[index]
-      if (selData.longitude && selData.latitude) {
-        mapView.setCenter([selData.longitude, selData.latitude]);
-      }
+        },
+        // 关闭弹窗
+        handleClosePopup() {
+            this.overlay.setPosition(undefined);
+            document.getElementById("popup-closer").blur();
+            return false;
+        },
 
-      this.clickMapVolunteer(selData)
+        //点击图层
+        async handleClickCoverage(index) {
+            this.demand.pageNo = 1
+            this.coverageTypesList[index].select = !this.coverageTypesList[index].select
+            let item = this.coverageTypesList[index]
 
-      // alert(index)
-    },
+            this.$set(this.coverageTypesList, index, item)
 
-    handlePageNoChange_demand (val) {
-      this.demand.pageNo = val;
-      this.getTable();
-    },
+            this.coverageTypes = []
 
-    async loadCategoryList () {
-      const url = "/gov/org/coverage/categoryList"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/categoryList"
-      let params = {
-        coverageTypes: this.coverageTypes,
+            this.coverageTypesList.forEach(element => {
+                if (element.select) {
+                    this.coverageTypes.push(element.value)
+                }
+            });
 
-      }
+            await this.loadCategoryList()
+            this.getTable();
+            this.getMapTable();
+        },
 
-      const { data, code, msg } = await requestPost(url, params)
+        //点击类别
+        async handleClickCategory(index, colIndex) {
+            this.demand.pageNo = 1
+            this.categoryListshow[index][colIndex].sel = !this.categoryListshow[index][colIndex].sel
 
-      if (code === 0) {
-        this.categoryList = data
+            // this.categoryList[index * 4 + colIndex].sel = !this.categoryList[index * 4 + colIndex].sel
 
-        this.categoryKeys = []
+            let array = this.categoryListshow[index]
+            let item = this.categoryListshow[index][colIndex]
 
-        this.categoryListshow = []
-        let itemArray = []
 
-        this.categoryList.forEach((item, index) => {
+            this.$set(this.categoryListshow[index], colIndex, item)
+            this.$set(this.categoryListshow, index, array)
 
-          item.dataIcon = this.iconUrlArray[item.categoryKey]
+            this.categoryKeys = []
 
+            this.categoryList.forEach(element => {
+                if (element.sel) {
+                    this.categoryKeys.push(element.categoryKey)
+                }
+            });
 
-          item.sel = true
-          this.categoryKeys.push(item.categoryKey)
+            this.getTable();
+            this.getMapTable();
+        },
+        handleSearch() {
+            this.demand.pageNo = 1
+            this.getTable();
+            this.getMapTable();
+        },
+        //
+        handleClickRow(index) {
+            let selData = this.tableList[index]
+            if (selData.longitude && selData.latitude) {
+                mapView.setCenter([selData.longitude, selData.latitude]);
+            }
 
-        });
+            this.clickMapVolunteer(selData)
 
-        let chunk = 4
-        for (let i = 0, j = this.categoryList.length; i < j; i += chunk) {
-          this.categoryListshow.push(this.categoryList.slice(i, i + chunk))
-        }
+            // alert(index)
+        },
 
+        handlePageNoChange_demand(val) {
+            this.demand.pageNo = val;
+            this.getTable();
+        },
 
-        // console.log(this.categoryListshow)
-        // console.log(this.categoryList)
+        async loadCategoryList() {
+            const url = "/gov/org/coverage/categoryList"
+            // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/categoryList"
+            let params = {
+                coverageTypes: this.coverageTypes,
 
-      } else {
-        this.$message.error(msg)
-      }
-    },
+            }
 
-    //加载组织数据
-    async getTable () {
-      this.demand.loading = true
-      const url = "/data/aggregator/coverage/dataList";
-      // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList";
-      let params = {
-        coverageTypes: this.coverageTypes,
-        categoryKeys: this.categoryKeys,
-        search: this.search,
-        pageNo: this.demand.pageNo,
-        pageSize: this.demand.pageSize,
-        isPage: true
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-      this.demand.loading = false;
-
-      if (code === 0) {
-
-        this.demand.total = data.total;
-
-        this.tableList = data.list
-        this.demand.list = data.list
-        this.demand.list.forEach(item => {
-          item.imgObj = {
-            type: 'img',
-            src: this.iconUrlArray[item.categoryKey]
-          }
-        });
-
-
-        this.demand.list = this.demand.list.map((item) => {
-          return [
-            // item.categoryKey ? item.categoryKey : '--',
-
-            item.imgObj,
-            item.categoryName,
-            item.content ? item.content : '',
-
-          ];
-        });
-        console.log(this.demand.list)
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    //加载组织数据
-    async getMapTable () {
+            const { data, code, msg } = await requestPost(url, params)
 
-      const url = "/data/aggregator/coverage/dataList";
-      // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList";
-      let params = {
-        coverageTypes: this.coverageTypes,
-        categoryKeys: this.categoryKeys,
-        search: this.search,
-        // pageNo: 1,
-        // pageSize: 2000,
-        isPage: false
-      };
+            if (code === 0) {
+                this.categoryList = data
 
-      const { data, code, msg } = await requestPost(url, params);
+                this.categoryKeys = []
 
-      if (code === 0) {
+                this.categoryListshow = []
+                let itemArray = []
 
-        this.demand.total = data.total;
+                this.categoryList.forEach((item, index) => {
 
-        this.iconArrays = data.list
+                    item.dataIcon = this.iconUrlArray[item.categoryKey]
 
-        this.iconArrays.forEach((item, index) => {
-          item.url = this.iconUrlArray[item.categoryKey]
 
-        });
-        // console.log(this.iconArrays)
-        this.loadIcon()
-      } else {
-        this.$message.error(msg);
-      }
-    },
+                    item.sel = true
+                    this.categoryKeys.push(item.categoryKey)
 
-    //加载icon图标
-    loadIcon () {
+                });
 
-      iconSource.clear()//清空多边形标注
-      if (this.iconArrays && this.iconArrays.length > 0) {
+                let chunk = 4
+                for (let i = 0, j = this.categoryList.length; i < j; i += chunk) {
+                    this.categoryListshow.push(this.categoryList.slice(i, i + chunk))
+                }
 
-        let iconFeatures = [];
 
-        this.iconArrays.forEach((oneIcon, index) => {
-          //添加标注
+                // console.log(this.categoryListshow)
+                // console.log(this.categoryList)
 
-          let iconItem = new Feature({
-            geometry: new Point([oneIcon.longitude, oneIcon.latitude]),
-            id: oneIcon.id,
-            properties: {
-              type: "icon",
-              info: { ...oneIcon }
+            } else {
+                this.$message.error(msg)
             }
-          });
-          // console.log('oneIcon----', this.iconUrlArray[oneIcon.urlIndex])
-          let iconStyle = new Style({
-            image: new Icon({
-              // anchor: [0.5, 0.5],
-              // imgSize: [32, 32],
-              // scale: 0.5,
-              // src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0] || this.iconUrlArray[0]
-              src: oneIcon.url
-            }),
-            // text: createTextStyle(oneIcon)
-          });
-
-          iconItem.setStyle(iconStyle);
-
-          // if (this.distanceMax) {
-          //   if (this.computedDistance(oneIcon.longitude, oneIcon.latitude, this.distanceMax)) {
-          //     iconFeatures.push(iconItem);
-          //   }
-          // } else {
-          iconFeatures.push(iconItem);
-          // }
-
-
-        });
+        },
 
-        iconSource.addFeatures(iconFeatures);
-      }
-    },
+        //加载组织数据
+        async getTable() {
+            this.demand.loading = true
+            const url = "/data/aggregator/coverage/dataList";
+            // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList";
+            let params = {
+                coverageTypes: this.coverageTypes,
+                categoryKeys: this.categoryKeys,
+                search: this.search,
+                pageNo: this.demand.pageNo,
+                pageSize: this.demand.pageSize,
+                isPage: true
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+            this.demand.loading = false;
+
+            if (code === 0) {
+
+                this.demand.total = data.total;
+
+                this.tableList = data.list
+                this.demand.list = data.list
+                this.demand.list.forEach(item => {
+                    item.imgObj = {
+                        type: 'img',
+                        src: this.iconUrlArray[item.categoryKey]
+                    }
+                });
+
+
+                this.demand.list = this.demand.list.map((item) => {
+                    return [
+                        // item.categoryKey ? item.categoryKey : '--',
+
+                        item.imgObj,
+                        item.categoryName,
+                        item.content ? item.content : '',
+
+                    ];
+                });
+                console.log(this.demand.list)
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        //加载组织数据
+        async getMapTable() {
 
-    //刷新地图
-    async refreshMap (isRefreshView) {
+            const url = "/data/aggregator/coverage/dataList";
+            // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList";
+            let params = {
+                coverageTypes: this.coverageTypes,
+                categoryKeys: this.categoryKeys,
+                search: this.search,
+                // pageNo: 1,
+                // pageSize: 2000,
+                isPage: false
+            };
 
-      //加载组织数据
-      await this.loadOrgData()
+            const { data, code, msg } = await requestPost(url, params);
 
-      //绘制父级组织数据
-      this.loadParentPolygon()
-      //绘制本级组织数据
-      this.loadPolygon(this.subAgencyArray)
+            if (code === 0) {
 
-      //重置地图中心点
+                this.demand.total = data.total;
 
-      // if (isRefreshView) {
-      // this.setMapLocation()
+                this.iconArrays = data.list
 
-      // }
+                this.iconArrays.forEach((item, index) => {
+                    item.url = this.iconUrlArray[item.categoryKey]
 
-      await this.getTable(false);
+                });
+                // console.log(this.iconArrays)
+                this.loadIcon()
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    },
+        //加载icon图标
+        loadIcon() {
+
+            iconSource.clear()//清空多边形标注
+            if (this.iconArrays && this.iconArrays.length > 0) {
+
+                let iconFeatures = [];
+
+                this.iconArrays.forEach((oneIcon, index) => {
+                    //添加标注
+
+                    let iconItem = new Feature({
+                        geometry: new Point([oneIcon.longitude, oneIcon.latitude]),
+                        id: oneIcon.id,
+                        properties: {
+                            type: "icon",
+                            info: { ...oneIcon }
+                        }
+                    });
+                    // console.log('oneIcon----', this.iconUrlArray[oneIcon.urlIndex])
+                    let iconStyle = new Style({
+                        image: new Icon({
+                            // anchor: [0.5, 0.5],
+                            // imgSize: [32, 32],
+                            // scale: 0.5,
+                            // src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0] || this.iconUrlArray[0]
+                            src: oneIcon.url
+                        }),
+                        // text: createTextStyle(oneIcon)
+                    });
+
+                    iconItem.setStyle(iconStyle);
+
+                    // if (this.distanceMax) {
+                    //   if (this.computedDistance(oneIcon.longitude, oneIcon.latitude, this.distanceMax)) {
+                    //     iconFeatures.push(iconItem);
+                    //   }
+                    // } else {
+                    iconFeatures.push(iconItem);
+                    // }
+
+
+                });
+
+                iconSource.addFeatures(iconFeatures);
+            }
+        },
 
-    //设置地图定位的中心点和缩放级别
-    setMapLocation () {
-      if (!this.zoom) {
-        this.setZoom(this.orgData.agencyLevel)
-      }
-      this.centerPoint = []
+        //刷新地图
+        async refreshMap(isRefreshView) {
 
+            //加载组织数据
+            await this.loadOrgData()
 
-      //如果存在中心点（返回时赋值）
-      if (this.center && this.center.length > 0) {
-        this.centerPoint = this.center
-        this.centerFlag = 'point'
-        this.center = []
+            //绘制父级组织数据
+            this.loadParentPolygon()
+            //绘制本级组织数据
+            this.loadPolygon(this.subAgencyArray)
 
-      } else if (parentLayer.getSource().getFeatures()[0]) {//如果是初次进入，不存在下级组织，用父级组织
-        this.centerFlag = 'flag_parent'
+            //重置地图中心点
 
+            // if (isRefreshView) {
+            // this.setMapLocation()
 
-      } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织
-        this.centerFlag = 'flag_polygon'
+            // }
 
-      } else if (this.orgData.longitude && this.orgData.latitude) {
-        this.centerPoint.push(this.orgData.longitude)
-        this.centerPoint.push(this.orgData.latitude)
-        this.centerFlag = 'point'
+            await this.getTable(false);
 
-      } else {
-        this.centerPoint = centerPointGlobal
-        this.centerFlag = 'point'
-      }
-      // debugger
-      if (this.centerFlag === 'flag_parent') {
-        let parentFeatures = parentLayer.getSource().getFeatures()[0]
-        let polygon = parentFeatures.getGeometry();
-        map.getView().fit(polygon, map.getSize());
-        this.zoom = map.getView().getZoom() - 1
+        },
 
-      } else if (this.centerFlag === 'flag_polygon') {
-        let polygonFeatures = polygonLayer.getSource().getFeatures()[0]
-        let polygon = polygonFeatures.getGeometry();
-        map.getView().fit(polygon, map.getSize());
-        this.zoom = map.getView().getZoom() - 1
+        //设置地图定位的中心点和缩放级别
+        setMapLocation() {
+            if (!this.zoom) {
+                this.setZoom(this.orgData.agencyLevel)
+            }
+            this.centerPoint = []
 
-      } else {
-        mapView.setCenter(this.centerPoint);
 
-      }
-      mapView.setZoom(this.zoom);
+            //如果存在中心点（返回时赋值）
+            if (this.center && this.center.length > 0) {
+                this.centerPoint = this.center
+                this.centerFlag = 'point'
+                this.center = []
 
-    },
+            } else if (parentLayer.getSource().getFeatures()[0]) {//如果是初次进入，不存在下级组织，用父级组织
+                this.centerFlag = 'flag_parent'
 
-    //返回所选组织
-    handleClickRouter (index) {
 
-      this.showPeopleInfo = false
+            } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织
+                this.centerFlag = 'flag_polygon'
 
+            } else if (this.orgData.longitude && this.orgData.latitude) {
+                this.centerPoint.push(this.orgData.longitude)
+                this.centerPoint.push(this.orgData.latitude)
+                this.centerFlag = 'point'
 
+            } else {
+                this.centerPoint = centerPointGlobal
+                this.centerFlag = 'point'
+            }
+            // debugger
+            if (this.centerFlag === 'flag_parent') {
+                let parentFeatures = parentLayer.getSource().getFeatures()[0]
+                let polygon = parentFeatures.getGeometry();
+                map.getView().fit(polygon, map.getSize());
+                this.zoom = map.getView().getZoom() - 1
+
+            } else if (this.centerFlag === 'flag_polygon') {
+                let polygonFeatures = polygonLayer.getSource().getFeatures()[0]
+                let polygon = polygonFeatures.getGeometry();
+                map.getView().fit(polygon, map.getSize());
+                this.zoom = map.getView().getZoom() - 1
+
+            } else {
+                mapView.setCenter(this.centerPoint);
 
-    },
+            }
+            mapView.setZoom(this.zoom);
 
-    //加载组织数据
-    async loadOrgData () {
+        },
 
-      const url = "/gov/org/agency/maporg"
-      let params = {
-        orgId: this.orgId,
-        level: this.orgLevel
-      }
+        //返回所选组织
+        handleClickRouter(index) {
 
-      const { data, code, msg } = await requestPost(url, params)
+            this.showPeopleInfo = false
 
-      if (code === 0) {
 
-        this.orgData = data
-        this.orgId = this.orgData.id
-        this.orgLevel = this.orgData.level
-        this.parentPolygon = []
-        this.parentPolygon.push(data)
-        if (data.children && data.children.length > 0) {
-          this.subAgencyArray = data.children
-        } else {
-          this.subAgencyArray = []
-        }
 
-      } else {
-        this.$message.error(msg)
-      }
+        },
 
-    },
+        //加载组织数据
+        async loadOrgData() {
 
-    //加载父级组织多边形
-    loadParentPolygon () {
-      parentSource.clear()//清空标注
-
-      let featureData = []//标注数据
-      if (this.parentPolygon && this.parentPolygon.length > 0) {//判断是否存在下级标注
-        let oneData = {}
-
-        this.parentPolygon.forEach(agencyItem => {
-
-          if (agencyItem.coordinates && agencyItem.coordinates !== '') {//如果有坐标
-            oneData = {
-              type: 'Feature',
-              id: agencyItem.id,
-              properties: {
-                id: agencyItem.id,
-                level: agencyItem.level,
-                name: agencyItem.name
-              },
-              geometry: {
-                type: 'Polygon',
-                coordinates: [],
-              },
+            const url = "/gov/org/agency/maporg"
+            let params = {
+                orgId: this.orgId,
+                level: this.orgLevel
             }
-            let coorArray = agencyItem.coordinates.split(',')//坐标数组
 
-            let itemArray = []//单个点位的[lon,lat]，数组
-            let polygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+            const { data, code, msg } = await requestPost(url, params)
 
-            coorArray.forEach((item, index) => {
+            if (code === 0) {
 
-              if (index % 2 == 0) {//偶
-                item = (parseFloat(item) + parseFloat(xoffset)) + ''
-                itemArray.push(item)
-              } else {//奇
-                item = (parseFloat(item) + parseFloat(yoffset)) + ''
-                itemArray.push(item)
+                this.orgData = data
+                this.orgId = this.orgData.id
+                this.orgLevel = this.orgData.level
+                this.parentPolygon = []
+                this.parentPolygon.push(data)
+                if (data.children && data.children.length > 0) {
+                    this.subAgencyArray = data.children
+                } else {
+                    this.subAgencyArray = []
+                }
 
-                polygonArray.push(itemArray)
-                itemArray = []
-              }
-
-            });
-            oneData.geometry.coordinates.push(polygonArray)
-            featureData.push(oneData)
-          }
-        });
-      }
-
-      if (featureData && featureData.length > 0) {
-        var geojsonObject = {
-          'type': 'FeatureCollection',
-          'features': featureData
-        };
-        let feature = (new GeoJSON()).readFeatures(geojsonObject)
-        parentSource.addFeatures(feature)
-
-      }
-
-    },
-
-    //加载当前园区的标注
-    loadPolygon (subAgencyArray) {
-      polygonSource.clear()//清空多边形标注
-      iconSource.clear()//清空多边形标注
-
-      let featureData = []//标注数据
-      if (subAgencyArray && subAgencyArray.length > 0) {//判断是否存在下级标注
-        let oneData = {}
-
-        let count = 0
-        for (let i = 0; i < subAgencyArray.length; i++) {
-          const agencyItem = subAgencyArray[i]
-
-
-          if (agencyItem.coordinates && agencyItem.coordinates !== '') {//如果有坐标
-            let urlNum = count % 3
-            count++
-
-            oneData = {
-              type: 'Feature',
-              id: agencyItem.id,
-              properties: {
-                id: agencyItem.id,
-                level: agencyItem.level,
-                name: agencyItem.name,
-                colorIndex: urlNum//颜色随机的索引
-              },
-              geometry: {
-                type: 'Polygon',
-                coordinates: [],
-              },
+            } else {
+                this.$message.error(msg)
             }
-            let coorArray = agencyItem.coordinates.split(',')//坐标数组
-
-            let itemArray = []//单个点位的[lon,lat]，数组
-            let polygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
 
-            coorArray.forEach((item, index) => {
-              // itemArray.push(item)
-              if (index % 2 == 0) {//偶
-                item = (parseFloat(item) + parseFloat(xoffset)) + ''
-                itemArray.push(item)
+        },
 
-              } else {//奇
+        //加载父级组织多边形
+        loadParentPolygon() {
+            parentSource.clear()//清空标注
+
+            let featureData = []//标注数据
+            if (this.parentPolygon && this.parentPolygon.length > 0) {//判断是否存在下级标注
+                let oneData = {}
+
+                this.parentPolygon.forEach(agencyItem => {
+
+                    if (agencyItem.coordinates && agencyItem.coordinates !== '') {//如果有坐标
+                        oneData = {
+                            type: 'Feature',
+                            id: agencyItem.id,
+                            properties: {
+                                id: agencyItem.id,
+                                level: agencyItem.level,
+                                name: agencyItem.name
+                            },
+                            geometry: {
+                                type: 'Polygon',
+                                coordinates: [],
+                            },
+                        }
+                        let coorArray = agencyItem.coordinates.split(',')//坐标数组
+
+                        let itemArray = []//单个点位的[lon,lat]，数组
+                        let polygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+
+                        coorArray.forEach((item, index) => {
+
+                            if (index % 2 == 0) {//偶
+                                item = (parseFloat(item) + parseFloat(xoffset)) + ''
+                                itemArray.push(item)
+                            } else {//奇
+                                item = (parseFloat(item) + parseFloat(yoffset)) + ''
+                                itemArray.push(item)
+
+                                polygonArray.push(itemArray)
+                                itemArray = []
+                            }
+
+                        });
+                        oneData.geometry.coordinates.push(polygonArray)
+                        featureData.push(oneData)
+                    }
+                });
+            }
 
-                item = (parseFloat(item) + parseFloat(yoffset)) + ''
-                itemArray.push(item)
-                polygonArray.push(itemArray)
-                itemArray = []
-              }
+            if (featureData && featureData.length > 0) {
+                var geojsonObject = {
+                    'type': 'FeatureCollection',
+                    'features': featureData
+                };
+                let feature = (new GeoJSON()).readFeatures(geojsonObject)
+                parentSource.addFeatures(feature)
 
-            });
-            oneData.geometry.coordinates.push(polygonArray)
-            featureData.push(oneData)
-          }
-        }
-      }
-
-      if (featureData && featureData.length > 0) {
-        var geojsonObject = {
-          'type': 'FeatureCollection',
-          'features': featureData
-        };
-        let feature = (new GeoJSON()).readFeatures(geojsonObject)
-        // console.log(geojsonObject)
-
-        polygonSource.addFeatures(feature)
-
-        let iconFeatures = [];
-        feature.forEach(oneIcon => {
-          var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy]
-          // var center = getCenter(extent);   //获取边界区域的中心位置
-          //添加标注
-          let x = (parseFloat(extent[0]) + parseFloat(extent[2])) / 2
-          let y = (parseFloat(extent[1]) + parseFloat(extent[3])) / 2
-
-          let oneArray = [x, y]
-          this.iconCoordinators.push(oneArray)
-          // debugger
-          //地图icon样式
-          let oneCctv = new Feature({
-            geometry: new Point([x, y]),
-            id: oneIcon.id_,
-            properties: {
-              type: "icon",
-              id: oneIcon.id_
             }
-          });
-
-          let iconStyle = new Style({
-            image: new Icon({
-              // anchor: [0.5, 0.5],
-              // imgSize: [32, 32],
-              scale: 0.5,
-              // src: "/img/largeScreen/icon_camra.png"
-              // src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png"
-              src: iconUrlArray[oneIcon.values_.colorIndex]
-            })
-          });
 
-          oneCctv.setStyle(iconStyle);
-          iconFeatures.push(oneCctv);
+        },
 
-        });
+        //加载当前园区的标注
+        loadPolygon(subAgencyArray) {
+            polygonSource.clear()//清空多边形标注
+            iconSource.clear()//清空多边形标注
+
+            let featureData = []//标注数据
+            if (subAgencyArray && subAgencyArray.length > 0) {//判断是否存在下级标注
+                let oneData = {}
+
+                let count = 0
+                for (let i = 0; i < subAgencyArray.length; i++) {
+                    const agencyItem = subAgencyArray[i]
+
+
+                    if (agencyItem.coordinates && agencyItem.coordinates !== '') {//如果有坐标
+                        let urlNum = count % 3
+                        count++
+
+                        oneData = {
+                            type: 'Feature',
+                            id: agencyItem.id,
+                            properties: {
+                                id: agencyItem.id,
+                                level: agencyItem.level,
+                                name: agencyItem.name,
+                                colorIndex: urlNum//颜色随机的索引
+                            },
+                            geometry: {
+                                type: 'Polygon',
+                                coordinates: [],
+                            },
+                        }
+                        let coorArray = agencyItem.coordinates.split(',')//坐标数组
+
+                        let itemArray = []//单个点位的[lon,lat]，数组
+                        let polygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+
+                        coorArray.forEach((item, index) => {
+                            // itemArray.push(item)
+                            if (index % 2 == 0) {//偶
+                                item = (parseFloat(item) + parseFloat(xoffset)) + ''
+                                itemArray.push(item)
+
+                            } else {//奇
+
+                                item = (parseFloat(item) + parseFloat(yoffset)) + ''
+                                itemArray.push(item)
+                                polygonArray.push(itemArray)
+                                itemArray = []
+                            }
+
+                        });
+                        oneData.geometry.coordinates.push(polygonArray)
+                        featureData.push(oneData)
+                    }
+                }
+            }
 
-        iconSource.addFeatures(iconFeatures);
-      }
+            if (featureData && featureData.length > 0) {
+                var geojsonObject = {
+                    'type': 'FeatureCollection',
+                    'features': featureData
+                };
+                let feature = (new GeoJSON()).readFeatures(geojsonObject)
+                // console.log(geojsonObject)
+
+                polygonSource.addFeatures(feature)
+
+                let iconFeatures = [];
+                feature.forEach(oneIcon => {
+                    var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy]
+                    // var center = getCenter(extent);   //获取边界区域的中心位置
+                    //添加标注
+                    let x = (parseFloat(extent[0]) + parseFloat(extent[2])) / 2
+                    let y = (parseFloat(extent[1]) + parseFloat(extent[3])) / 2
+
+                    let oneArray = [x, y]
+                    this.iconCoordinators.push(oneArray)
+                    // debugger
+                    //地图icon样式
+                    let oneCctv = new Feature({
+                        geometry: new Point([x, y]),
+                        id: oneIcon.id_,
+                        properties: {
+                            type: "icon",
+                            id: oneIcon.id_
+                        }
+                    });
+
+                    let iconStyle = new Style({
+                        image: new Icon({
+                            // anchor: [0.5, 0.5],
+                            // imgSize: [32, 32],
+                            scale: 0.5,
+                            // src: "/img/largeScreen/icon_camra.png"
+                            // src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png"
+                            src: iconUrlArray[oneIcon.values_.colorIndex]
+                        })
+                    });
+
+                    oneCctv.setStyle(iconStyle);
+                    iconFeatures.push(oneCctv);
+
+                });
+
+                iconSource.addFeatures(iconFeatures);
+            }
 
-    },
+        },
 
-    //根据组织层级设置缩放级别
-    setZoom (agencyLevel) {
-      if (agencyLevel === 'district') {
-        this.zoom = 12
-      } else if (agencyLevel === 'street') {
-        this.zoom = 13
-      } else if (agencyLevel === 'community') {
-        this.zoom = 14
-      } else {
-        this.zoom = 11
-      }
+        //根据组织层级设置缩放级别
+        setZoom(agencyLevel) {
+            if (agencyLevel === 'district') {
+                this.zoom = 12
+            } else if (agencyLevel === 'street') {
+                this.zoom = 13
+            } else if (agencyLevel === 'community') {
+                this.zoom = 14
+            } else {
+                this.zoom = 11
+            }
 
-    },
+        },
 
-    firstCenterMap () {
-      this.centerPoint = []
-      if (this.orgData.longitude && this.orgData.latitude) {
-        this.centerPoint.push(this.orgData.longitude)
-        this.centerPoint.push(this.orgData.latitude)
+        firstCenterMap() {
+            this.centerPoint = []
+            if (this.orgData.longitude && this.orgData.latitude) {
+                this.centerPoint.push(this.orgData.longitude)
+                this.centerPoint.push(this.orgData.latitude)
 
-      } else {
-        this.centerPoint = centerPointGlobal
-      }
+            } else {
+                this.centerPoint = centerPointGlobal
+            }
 
-      if (!this.zoom) {
-        this.setZoom(this.orgData.agencyLevel)
-      }
-    },
+            if (!this.zoom) {
+                this.setZoom(this.orgData.agencyLevel)
+            }
+        },
 
-    initMap () {
-      this.firstCenterMap()
+        initMap() {
+            this.firstCenterMap()
+
+            gaodeMapLayer = new TileLayer({
+                title: "地图",
+                source: new XYZ({
+                    //指定url瓦片
+                    url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}',
+                    wrapX: true//x方向平铺，也可以选择false
+                }),
+                zIndex: 20,
+                crossOrigin: 'anonymous'
+            });
 
-      gaodeMapLayer = new TileLayer({
-        title: "地图",
-        source: new XYZ({
-          //指定url瓦片
-          url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}',
-          wrapX: true//x方向平铺，也可以选择false
-        }),
-        zIndex: 20,
-        crossOrigin: 'anonymous'
-      });
 
 
 
+            mapView = new View({
+                //中心点坐标
+                center: this.centerPoint,
+                // projection: 'EPSG:3857',
+                projection: 'EPSG:4326',
+                zoom: this.zoom,
+                minZoom: this.minZoom
+            })
 
-      mapView = new View({
-        //中心点坐标
-        center: this.centerPoint,
-        // projection: 'EPSG:3857',
-        projection: 'EPSG:4326',
-        zoom: this.zoom,
-        minZoom: this.minZoom
-      })
+            //初始化map和地图底图
+            //创建地图容器
+            map = new Map({
+                layers: [gaodeMapLayer],
+                //加载瓦片图层数据
+                view: mapView,
+                target: 'map'
+                //目标加载到map中
+            })
 
-      //初始化map和地图底图
-      //创建地图容器
-      map = new Map({
-        layers: [gaodeMapLayer],
-        //加载瓦片图层数据
-        view: mapView,
-        target: 'map'
-        //目标加载到map中
-      })
 
+            //去除双击放大效果
+            const dblClickInteraction = map
+                .getInteractions()
+                .getArray()
+                .find(interaction => {
+                    return interaction instanceof DoubleClickZoom;
+                });
+            map.removeInteraction(dblClickInteraction);
 
-      //去除双击放大效果
-      const dblClickInteraction = map
-        .getInteractions()
-        .getArray()
-        .find(interaction => {
-          return interaction instanceof DoubleClickZoom;
-        });
-      map.removeInteraction(dblClickInteraction);
 
 
+        },
+        //添加标注图层
+        addParentLayer() {
+            parentSource = new VectorSource({
+                //features: (new GeoJSON()).readFeatures(geojsonObject)
+            });
 
-    },
-    //添加标注图层
-    addParentLayer () {
-      parentSource = new VectorSource({
-        //features: (new GeoJSON()).readFeatures(geojsonObject)
-      });
+            parentLayer = new VectorLayer({
+                source: parentSource,
+                style: parentStyleFunction,
+                zIndex: 50
+            });
 
-      parentLayer = new VectorLayer({
-        source: parentSource,
-        style: parentStyleFunction,
-        zIndex: 50
-      });
 
+            map.addLayer(parentLayer)
 
-      map.addLayer(parentLayer)
 
+        },
 
-    },
+        //添加标注图层
+        addPolygonLayer() {
+            polygonSource = new VectorSource({
+                //features: (new GeoJSON()).readFeatures(geojsonObject)
+            });
 
-    //添加标注图层
-    addPolygonLayer () {
-      polygonSource = new VectorSource({
-        //features: (new GeoJSON()).readFeatures(geojsonObject)
-      });
-
-      polygonLayer = new VectorLayer({
-        source: polygonSource,
-        style: polygonStyleFunction,
-        zIndex: 50
-      });
-
-      //选中多边形后的样式
-      var overlayStyle = (function () {
-
-        return function (feature) {
-          var styles = {};
-          styles['Polygon'] = [
-            new Style({
-              stroke: new Stroke({
-                color: '#ec9000',
-                width: 2
-              })
-            }),
+            polygonLayer = new VectorLayer({
+                source: polygonSource,
+                style: polygonStyleFunction,
+                zIndex: 50
+            });
 
-            new Style({
-              fill: new Fill({
-                color: 'rgba(0, 0, 255, 0.1)'
-              })
-            }),
-            new Style({
-              text: createTextStyle(feature)
-            })
-          ];
-          styles['MultiPolygon'] = styles['Polygon'];
-          return styles[feature.getGeometry().getType()];
-        };
-      })();
+            //选中多边形后的样式
+            var overlayStyle = (function () {
+
+                return function (feature) {
+                    var styles = {};
+                    styles['Polygon'] = [
+                        new Style({
+                            stroke: new Stroke({
+                                color: '#ec9000',
+                                width: 2
+                            })
+                        }),
+
+                        new Style({
+                            fill: new Fill({
+                                color: 'rgba(0, 0, 255, 0.1)'
+                            })
+                        }),
+                        new Style({
+                            text: createTextStyle(feature)
+                        })
+                    ];
+                    styles['MultiPolygon'] = styles['Polygon'];
+                    return styles[feature.getGeometry().getType()];
+                };
+            })();
+
+            select = new Select({
+                style: overlayStyle
+            });
 
-      select = new Select({
-        style: overlayStyle
-      });
 
+            map.addLayer(polygonLayer)
+            // map.addInteraction(select);
 
-      map.addLayer(polygonLayer)
-      // map.addInteraction(select);
+            // select.on('select', e => {
 
-      // select.on('select', e => {
+            // });
 
-      // });
+        },
 
-    },
+        addIconLayer() {
+            iconSource = new VectorSource({
+                //features: (new GeoJSON()).readFeatures(geojsonObject)
+            });
 
-    addIconLayer () {
-      iconSource = new VectorSource({
-        //features: (new GeoJSON()).readFeatures(geojsonObject)
-      });
+            iconLayer = new VectorLayer({
+                source: iconSource,
+                zIndex: 70
+            });
 
-      iconLayer = new VectorLayer({
-        source: iconSource,
-        zIndex: 70
-      });
+            map.addLayer(iconLayer);
 
-      map.addLayer(iconLayer);
+        },
 
-    },
+        //开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, //是否锁定
+                text: '正在加载……', //加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' //背景颜色
+            });
 
-    //开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, //是否锁定
-        text: '正在加载……', //加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' //背景颜色
-      });
+        },
 
+        //结束加载动画
+        endLoading() {
+            //clearTimeout(timer);
+            if (loading) {
+                loading.close();
+            }
+        },
     },
+    props: {
 
-    //结束加载动画
-    endLoading () {
-      //clearTimeout(timer);
-      if (loading) {
-        loading.close();
-      }
+        // vueFlag: {
+        //   type: String,
+        //   default: "alarm"
+        // }
     },
-  },
-  props: {
+    computed: {
 
-    // vueFlag: {
-    //   type: String,
-    //   default: "alarm"
-    // }
-  },
-  computed: {
+        mapHeight() {
 
-    mapHeight () {
+            return this.clientHeight - 120;
 
-      return this.clientHeight - 120;
+        },
+        // zoom: {
+        //   get () {
+        //     //根据不同屏幕分辨率，控制zoom大小
+        //     if (this.clientHeight < 900) {
+        //       return 2.3
+        //     } else {
+        //       return 2.8
+        //     }
+        //   },
+        //   set (value) {
+        //   }
+        // },
+        ...mapGetters(["clientHeight"])
 
     },
-    // zoom: {
-    //   get () {
-    //     //根据不同屏幕分辨率，控制zoom大小
-    //     if (this.clientHeight < 900) {
-    //       return 2.3
-    //     } else {
-    //       return 2.8
-    //     }
-    //   },
-    //   set (value) {
-    //   }
-    // },
-    ...mapGetters(["clientHeight"])
-
-  },
-  components: { cptTb, cptCard, ScreenLoading, People },
+    components: { cptTb, cptCard, ScreenLoading, People },
 }
 export default vueGis;
 </script>
@@ -1851,138 +1850,138 @@ export default vueGis;
 
 <style lang="scss" >
 .div_content {
-  .ol-viewport {
-    border-radius: 5px;
-  }
+    .ol-viewport {
+        border-radius: 5px;
+    }
 }
 .ol-overlaycontainer-stopevent {
-  display: none;
+    display: none;
 }
 </style>
 
 <style lang="scss" scoped>
 .popTitle {
-  font-size: 16px;
-  color: #ffffff;
-  padding-bottom: 5px;
+    font-size: 16px;
+    color: #ffffff;
+    padding-bottom: 5px;
 }
 
 .m-info-prop {
-  position: relative;
-  margin: 10px 0;
-  display: flex;
-  padding-left: 15px;
-  font-size: 12px;
-
-  .m-info-pics {
-    display: flex;
+    position: relative;
     margin: 10px 0;
-    img {
-      display: block;
-      width: 32%;
-      height: 90px;
-      margin-right: 9px;
-      object-fit: cover;
+    display: flex;
+    padding-left: 15px;
+    font-size: 12px;
+
+    .m-info-pics {
+        display: flex;
+        margin: 10px 0;
+        img {
+            display: block;
+            width: 32%;
+            height: 90px;
+            margin-right: 9px;
+            object-fit: cover;
+        }
+    }
+    > span,
+    > div {
+        display: block;
+        max-width: 300px;
     }
-  }
-  > span,
-  > div {
-    display: block;
-    max-width: 300px;
-  }
 }
 
 .popContentTitle {
-  font-size: 12px;
-  color: #ffffff;
-  margin-top: 5px;
+    font-size: 12px;
+    color: #ffffff;
+    margin-top: 5px;
 }
 
 .div_resi_more {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
 }
 
 .span_resi_more {
-  font-size: 16px;
-  text-decoration: underline;
+    font-size: 16px;
+    text-decoration: underline;
 }
 .span_resi_more:hover {
-  cursor: pointer;
+    cursor: pointer;
 }
 </style>
 
 <style lang="scss" >
 .div_search_list {
-  .el-input__inner[WarningColor="warning"] {
-    border-radius: 8px 0 0 8px;
-    height: 48px;
-    background-color: #01106800;
-    border: 0px solid #0082fb;
-    padding: 0 0 0 70px;
-    font-size: 18px;
-    font-family: PingFang SC;
-    font-weight: 400;
-    color: #ffffff;
-  }
-  .el-input__inner {
-    &::placeholder {
-      padding: 0;
-      margin: 0;
+    .el-input__inner[WarningColor="warning"] {
+        border-radius: 8px 0 0 8px;
+        height: 48px;
+        background-color: #01106800;
+        border: 0px solid #0082fb;
+        padding: 0 0 0 70px;
+        font-size: 18px;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #ffffff;
+    }
+    .el-input__inner {
+        &::placeholder {
+            padding: 0;
+            margin: 0;
 
-      font-size: 18px;
+            font-size: 18px;
+        }
     }
-  }
 }
 
 .ol-popup {
-  position: absolute;
-  background-color: #1257c9;
-  -webkit-filter: drop-shadow(0 1px 4px rgba(0, 0, 0, 0.2));
-  filter: drop-shadow(0 1px 4px rgba(0, 0, 0, 0.2));
-  padding: 15px;
-  border-radius: 10px;
-  border: 1px solid #1257c9;
-  bottom: 12px;
-  left: -50px;
-  text-align: left;
+    position: absolute;
+    background-color: #1257c9;
+    -webkit-filter: drop-shadow(0 1px 4px rgba(0, 0, 0, 0.2));
+    filter: drop-shadow(0 1px 4px rgba(0, 0, 0, 0.2));
+    padding: 15px;
+    border-radius: 10px;
+    border: 1px solid #1257c9;
+    bottom: 12px;
+    left: -50px;
+    text-align: left;
 }
 .ol-popup:after,
 .ol-popup:before {
-  top: 100%;
-  border: solid transparent;
-  content: " ";
-  height: 0;
-  width: 0;
-  position: absolute;
-  pointer-events: none;
+    top: 100%;
+    border: solid transparent;
+    content: " ";
+    height: 0;
+    width: 0;
+    position: absolute;
+    pointer-events: none;
 }
 .ol-popup:after {
-  border-top-color: 1257c9;
-  border-width: 10px;
-  left: 48px;
-  margin-left: -10px;
+    border-top-color: 1257c9;
+    border-width: 10px;
+    left: 48px;
+    margin-left: -10px;
 }
 .ol-popup:before {
-  border-top-color: #1257c9;
-  border-width: 11px;
-  left: 48px;
-  margin-left: -11px;
+    border-top-color: #1257c9;
+    border-width: 11px;
+    left: 48px;
+    margin-left: -11px;
 }
 .ol-popup-closer {
-  text-decoration: none;
-  position: absolute;
-  top: 2px;
-  right: 8px;
+    text-decoration: none;
+    position: absolute;
+    top: 2px;
+    right: 8px;
 }
 .popup-content {
-  width: 300px;
+    width: 300px;
 }
 
 .ol-popup-closer:after {
-  content: "✖";
-  // color: rgba(1, 17, 104, 1);
-  color: #fff;
+    content: "✖";
+    // color: rgba(1, 17, 104, 1);
+    color: #fff;
 }
 </style>
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index bf76f89cc..207a17f4e 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -1,12 +1,12 @@
 <template>
-  <div class="div_content_map">
-    <!-- <div>
+    <div class="div_content_map">
+        <!-- <div>
       <el-input v-model="input_lat"></el-input>
       <el-input v-model="input_lon"></el-input>
       <el-button @click="showPosition"></el-button>
     </div> -->
 
-    <!-- <div id="mouse-position"
+        <!-- <div id="mouse-position"
          style="
         color: #fff;
         position: absolute;
@@ -20,49 +20,46 @@
 
   </div>-->
 
-    <div class="div_map"
-         :id="mapId"
-         :ref="mapId">
+        <div class="div_map"
+             :id="mapId"
+             :ref="mapId">
+        </div>
+        <div id="popup"
+             style="display: none;"
+             class="ol-popup">
+            <a href="#"
+               id="popup-closer"
+               class="ol-popup-closer"></a>
+            <div id="popup-content"
+                 class="popup-content"></div>
+            <a href="#"
+               id="popup-goMore"
+               class="popup-goMore">更多>>>></a>
+        </div>
     </div>
-    <div id="popup"
-         style="display: none;"
-         class="ol-popup">
-      <a href="#"
-         id="popup-closer"
-         class="ol-popup-closer"></a>
-      <div id="popup-content"
-           class="popup-content"></div>
-      <a href="#"
-         id="popup-goMore"
-         class="popup-goMore">更多>>>></a>
-    </div>
-  </div>
 </template>
 
 <script>
 // import 'ol/ol.css'
-import { Map, View } from 'ol'
+import { Map, View } from 'ol';
+import Feature from "ol/Feature.js";
+import Overlay from 'ol/Overlay';
+import { boundingExtent } from 'ol/extent.js';
+import GeoJSON from 'ol/format/GeoJSON.js';
+import Point from "ol/geom/Point.js";
+import { DoubleClickZoom, Select } from 'ol/interaction.js';
 import TileLayer from 'ol/layer/Tile.js';
-import XYZ from 'ol/source/XYZ.js';
 import VectorLayer from 'ol/layer/Vector.js';
 import VectorSource from 'ol/source/Vector.js';
-import GeoJSON from 'ol/format/GeoJSON.js';
-import Point from "ol/geom/Point.js";
-import Feature from "ol/Feature.js";
-import Overlay from 'ol/Overlay';
-import { Select, DoubleClickZoom } from 'ol/interaction.js';
-import { getCenter, boundingExtent } from 'ol/extent.js';
-import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style.js';
-import { altKeyOnly, click, pointerMove } from 'ol/events/condition';
+import XYZ from 'ol/source/XYZ.js';
 import { getDistance } from 'ol/sphere';
+import { Fill, Icon, Stroke, Style, Text } from 'ol/style.js';
 
+import { Loading } from 'element-ui'; //引入Loading服务
 import MousePosition from 'ol/control/MousePosition';
 import { createStringXY } from 'ol/coordinate';
-import { defaults as defaultControls } from 'ol/control';
 import { mapGetters } from "vuex";
-import { Loading } from 'element-ui'; //引入Loading服务
 
-import { requestPost } from "@/js/dai/request";
 var centerPointGlobal = [120.38945519, 36.0722275]
 
 
@@ -83,808 +80,808 @@ let iconSource; // icon
 let select;//选中标注
 
 let iconTextsStyle = {
-  textAlign: undefined,
-  font: "18px Arial",
-  //fontFamily: "Courier New, monospace",
-  // fontWeight: "bold",
-  text: '',
-  backgroundFill: new Fill({
-    color: 'rgba(0, 146, 238, 0.75)'
-    // color: textColorArray[feature.values_.colorIndex]
-  }),
-  padding: [4, 10, 4, 10],
-  //text: "变电站名称",
-  fill: new Fill({ color: "#ffffff" }),
-  // stroke: new Stroke({ color: "#ffffff", width: 3 }),
-  offsetY: -30,
-  offsetX: -50,
-  overflow: true,
+    textAlign: undefined,
+    font: "18px Arial",
+    //fontFamily: "Courier New, monospace",
+    // fontWeight: "bold",
+    text: '',
+    backgroundFill: new Fill({
+        color: 'rgba(0, 146, 238, 0.75)'
+        // color: textColorArray[feature.values_.colorIndex]
+    }),
+    padding: [4, 10, 4, 10],
+    //text: "变电站名称",
+    fill: new Fill({ color: "#ffffff" }),
+    // stroke: new Stroke({ color: "#ffffff", width: 3 }),
+    offsetY: -30,
+    offsetX: -50,
+    overflow: true,
 }
 
 let polygonColorArray = [
-  'rgba(210, 2, 2, 0.24)',
-  'rgba(43, 231, 253, 0.25)',
-  'rgba(183, 185, 0, 0.16)'
+    'rgba(210, 2, 2, 0.24)',
+    'rgba(43, 231, 253, 0.25)',
+    'rgba(183, 185, 0, 0.16)'
 ];
 
 //icon文字样式
 let createTextStyle = function (feature) {
 
-  if (iconTextsStyle) {
-    let iconTextsStyles = { ...iconTextsStyle }
-    iconTextsStyles.text = feature.values_ && feature.values_.name || feature.name
-    return new Text({ ...iconTextsStyles })
-  } else {
-    return null
-  }
+    if (iconTextsStyle) {
+        let iconTextsStyles = { ...iconTextsStyle }
+        iconTextsStyles.text = feature.values_ && feature.values_.name || feature.name
+        return new Text({ ...iconTextsStyles })
+    } else {
+        return null
+    }
 
 
 }
 //多边形标注样式
 var polygonStyleFunction = (function () {
-  return function (feature) {
-    return new Style({
-      fill: new Fill({
-        // color: [255, 255, 255, 0.3]
-        color: feature.values_.fillColor
-      }),
-      stroke: new Stroke({
-        color: feature.values_.color,
-        width: 2
-      }),
-
-      // text: createTextStyle(feature)
-    });;
-  };
+    return function (feature) {
+        return new Style({
+            fill: new Fill({
+                // color: [255, 255, 255, 0.3]
+                color: feature.values_.fillColor
+            }),
+            stroke: new Stroke({
+                color: feature.values_.color,
+                width: 2
+            }),
+
+            // text: createTextStyle(feature)
+        });;
+    };
 })()
 
 
 
 const vueGis = {
-  name: 'HomeMap',
-  data () {
-    return {
-      centerPoint: [],//中心点位置
-      zoom: 14,//缩放范围：区14
-      minZoom: 1,//最小缩放
-      overlay: null,
-      showPopup: false,
-      mapInfo: {
-
-      },
-
-      polygonArray: [
-        {
-          agencyLevel: "grid",
-          coordinates: "120.37421528296863,36.085017737014525,120.37551227771064,36.08181339174796,120.38108173804676,36.08303409283569,120.3852397566111,36.08318668276358,120.38539234391965,36.090816077003794,120.37410084117755,36.09096866431234,120.37421528296863,36.085017737014525",
-          id: "2a278c0ceb863359d263fda7aabf6752",
-          latitude: 36.072227,
-          level: "grid",
-          longitude: 120.389455,
-          name: "第三网格",
-        },
-        {
-          agencyLevel: "grid",
-          coordinates: "120.38577111171519,36.095762169637716,120.38544318588274,36.08317796726519,120.39339541546589,36.08080049372144,120.40122467708379,36.08026761565102,120.40188052874869,36.08276805856732,120.39929810296697,36.086990119140545,120.39757648953199,36.08981849070392,120.39901116927089,36.0943274884915,120.3977404524482,36.096418022709926,120.38577111171519,36.095762169637716",
-          id: "94227891bc4ad5f40cb95081761592d9",
-          latitude: 36.072227,
-          level: "grid",
-          longitude: 120.389455,
-          name: "南宁第二网格",
-        },
-        {
-          agencyLevel: "grid",
-          coordinates: "120.3736430792519,36.09505039184175,120.373948253869,36.09119754789451,120.38543049205646,36.09115940106737,120.38577381481036,36.0960803587938,120.3736430792519,36.09505039184175",
-          id: "a772a325e022484ef53e4a7d679726f1",
-          latitude: 36.072227,
-          level: "grid",
-          longitude: 120.389455,
-          name: "南宁第一网格",
+    name: 'HomeMap',
+    data() {
+        return {
+            centerPoint: [],//中心点位置
+            zoom: 14,//缩放范围：区14
+            minZoom: 1,//最小缩放
+            overlay: null,
+            showPopup: false,
+            mapInfo: {
+
+            },
+
+            polygonArray: [
+                {
+                    agencyLevel: "grid",
+                    coordinates: "120.37421528296863,36.085017737014525,120.37551227771064,36.08181339174796,120.38108173804676,36.08303409283569,120.3852397566111,36.08318668276358,120.38539234391965,36.090816077003794,120.37410084117755,36.09096866431234,120.37421528296863,36.085017737014525",
+                    id: "2a278c0ceb863359d263fda7aabf6752",
+                    latitude: 36.072227,
+                    level: "grid",
+                    longitude: 120.389455,
+                    name: "第三网格",
+                },
+                {
+                    agencyLevel: "grid",
+                    coordinates: "120.38577111171519,36.095762169637716,120.38544318588274,36.08317796726519,120.39339541546589,36.08080049372144,120.40122467708379,36.08026761565102,120.40188052874869,36.08276805856732,120.39929810296697,36.086990119140545,120.39757648953199,36.08981849070392,120.39901116927089,36.0943274884915,120.3977404524482,36.096418022709926,120.38577111171519,36.095762169637716",
+                    id: "94227891bc4ad5f40cb95081761592d9",
+                    latitude: 36.072227,
+                    level: "grid",
+                    longitude: 120.389455,
+                    name: "南宁第二网格",
+                },
+                {
+                    agencyLevel: "grid",
+                    coordinates: "120.3736430792519,36.09505039184175,120.373948253869,36.09119754789451,120.38543049205646,36.09115940106737,120.38577381481036,36.0960803587938,120.3736430792519,36.09505039184175",
+                    id: "a772a325e022484ef53e4a7d679726f1",
+                    latitude: 36.072227,
+                    level: "grid",
+                    longitude: 120.389455,
+                    name: "南宁第一网格",
+                },
+            ],
+
+            iconArrays: [
+
+            ],
+            // iconTextStyle: {},
+
+            //policon图标样式
+            polIconUrlArray: [
+                'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
+                'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
+                'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
+            ],
+            //icon图标样式
+            iconUrlArray: [],
+            iconTextColor: '#ffffff',
+            distanceMax: null,//显示的坐标距离中心点的范围
+
+            input_lat: null,
+            input_lon: null,
+
+            isChangeCenter: true,//是否根据多边形改变数组
+        }
+    },
+    async mounted() {
+
+    },
+    methods: {
+        showPosition() {
+            let array = [this.input_lat, this.input_lon]
+            map.getView().setCenter(array)
         },
-      ],
+        //加载地图:地图基本信息，多边形区域信息，多边形icon
+        loadMap(mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray, iconTextStyle, distanceMax) {
+            this.mapInfo = mapInfo
+            this.polygonArray = polygonArray
+            this.polIconUrlArray = polIconUrlArray || []
+            this.iconArrays = iconArrays
+            this.iconUrlArray = iconUrlArray
+            iconTextsStyle = iconTextStyle || iconTextsStyle
+            this.distanceMax = distanceMax
+
+            // iconArrays.forEach(item => {
+            //   console.log(item.type, item.urlIndex, item.latitude, item.longitude)
+            // });
+
+
+            //初始化地图
+            this.initMap()
+            if (this.showPolIconLayer) {
+                console.log('showPolIconLayer++++++++++++++++++++++', this.showPolIconLayer)
+                //初始化多边形标注图层
+                this.initPolIconLayer()
+                //加载当前园区的标注
+                // this.loadPolIcon()
+            }
+            if (this.showPolygonLayer) {
+                //初始化多边形标注图层
+                this.initPolygonLayer()
+                //加载当前园区的标注
+                this.loadPolygon()
+            }
 
-      iconArrays: [
 
-      ],
-      // iconTextStyle: {},
+            if (this.showIconLayer) {
+                //初始化icon图层
+                this.initIconLayer()
+                this.loadIcon()
+            }
 
-      //policon图标样式
-      polIconUrlArray: [
-        'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
-        'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
-        'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
-      ],
-      //icon图标样式
-      iconUrlArray: [],
-      iconTextColor: '#ffffff',
-      distanceMax: null,//显示的坐标距离中心点的范围
+            if (this.isAddOpenlay) {
+                //初始化icon图层
+                this.addOverlay()
+            }
 
-      input_lat: null,
-      input_lon: null,
+            this.addMapClick()
 
-      isChangeCenter: true,//是否根据多边形改变数组
-    }
-  },
-  async mounted () {
-
-  },
-  methods: {
-    showPosition () {
-      let array = [this.input_lat, this.input_lon]
-      map.getView().setCenter(array)
-    },
-    //加载地图:地图基本信息，多边形区域信息，多边形icon
-    loadMap (mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray, iconTextStyle, distanceMax) {
-      this.mapInfo = mapInfo
-      this.polygonArray = polygonArray
-      this.polIconUrlArray = polIconUrlArray || []
-      this.iconArrays = iconArrays
-      this.iconUrlArray = iconUrlArray
-      iconTextsStyle = iconTextStyle || iconTextsStyle
-      this.distanceMax = distanceMax
-
-      // iconArrays.forEach(item => {
-      //   console.log(item.type, item.urlIndex, item.latitude, item.longitude)
-      // });
-
-
-      //初始化地图
-      this.initMap()
-      if (this.showPolIconLayer) {
-        console.log('showPolIconLayer++++++++++++++++++++++', this.showPolIconLayer)
-        //初始化多边形标注图层
-        this.initPolIconLayer()
-        //加载当前园区的标注
-        // this.loadPolIcon()
-      }
-      if (this.showPolygonLayer) {
-        //初始化多边形标注图层
-        this.initPolygonLayer()
-        //加载当前园区的标注
-        this.loadPolygon()
-      }
+        },
 
+        //刷新地图:地图信息，多边形数组，标注数组，是否根据多边形改变中心点
+        async refreshMap(mapInfo, polygonArray, iconArrays, isChangeCenter) {
+            this.mapInfo = mapInfo
+            this.polygonArray = []
+            this.polygonArray = polygonArray
+            this.iconArrays = iconArrays
+            this.isChangeCenter = isChangeCenter
+            if (iconSource) {
+                iconSource.clear()
+            }
+            if (polygonSource) {
+                polygonSource.clear()
+            }
+            if (polIconSource) {
+                polIconSource.clear()
+            }
+            this.initPolIconLayer()
 
-      if (this.showIconLayer) {
-        //初始化icon图层
-        this.initIconLayer()
-        this.loadIcon()
-      }
+            if (this.showPolygonLayer) {
+                this.initPolygonLayer()
+                //加载当前园区的标注
+                this.loadPolygon()
+            }
+            if (this.showPolIconLayer) {
+                this.initIconLayer()
+                //加载当前园区的标注
+                // this.loadPolIcon()
+            }
 
-      if (this.isAddOpenlay) {
-        //初始化icon图层
-        this.addOverlay()
-      }
+            if (this.showIconLayer) {
 
-      this.addMapClick()
+                this.loadIcon()
+            }
+            this.setMapLocation()
+            // gaodeMapLayer.getSource().changed()
+        },
 
-    },
+        //加载区域多边形
+        loadPolygon() {
+            polygonSource.clear()//清空多边形标注
+            // iconSource.clear()
+            let featureData = []//多边形数据数据
 
-    //刷新地图:地图信息，多边形数组，标注数组，是否根据多边形改变中心点
-    async refreshMap (mapInfo, polygonArray, iconArrays, isChangeCenter) {
-      this.mapInfo = mapInfo
-      this.polygonArray = []
-      this.polygonArray = polygonArray
-      this.iconArrays = iconArrays
-      this.isChangeCenter = isChangeCenter
-      if (iconSource) {
-        iconSource.clear()
-      }
-      if (polygonSource) {
-        polygonSource.clear()
-      }
-      if (polIconSource) {
-        polIconSource.clear()
-      }
-      this.initPolIconLayer()
-
-      if (this.showPolygonLayer) {
-        this.initPolygonLayer()
-        //加载当前园区的标注
-        this.loadPolygon()
-      }
-      if (this.showPolIconLayer) {
-        this.initIconLayer()
-        //加载当前园区的标注
-        // this.loadPolIcon()
-      }
-
-      if (this.showIconLayer) {
-
-        this.loadIcon()
-      }
-      this.setMapLocation()
-      // gaodeMapLayer.getSource().changed()
-    },
+            if (this.polygonArray && this.polygonArray.length > 0) {//判断是否存在下级标注
+                let oneData = {}
 
-    //加载区域多边形
-    loadPolygon () {
-      polygonSource.clear()//清空多边形标注
-      // iconSource.clear()
-      let featureData = []//多边形数据数据
+                this.polygonArray.forEach(polygonItem => {
 
-      if (this.polygonArray && this.polygonArray.length > 0) {//判断是否存在下级标注
-        let oneData = {}
+                    if (polygonItem.coordinates && polygonItem.coordinates !== '') {//如果有坐标
 
-        this.polygonArray.forEach(polygonItem => {
+                        oneData = {
+                            type: 'Feature',
 
-          if (polygonItem.coordinates && polygonItem.coordinates !== '') {//如果有坐标
+                            properties: { ...polygonItem },
+                            geometry: {
+                                type: 'Polygon',
+                                coordinates: [],
+                            },
+                        }
+                        let coorArray = polygonItem.coordinates.split(',')//坐标数组
 
-            oneData = {
-              type: 'Feature',
+                        let itemArray = []//单个点位的[lon,lat]，数组
+                        let tempPolygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
 
-              properties: { ...polygonItem },
-              geometry: {
-                type: 'Polygon',
-                coordinates: [],
-              },
+                        coorArray.forEach((item, index) => {
+                            itemArray.push(item)
+                            if (index % 2 == 0) {//偶
+
+                            } else {//奇
+                                tempPolygonArray.push(itemArray)
+                                itemArray = []
+                            }
+
+                        });
+                        oneData.geometry.coordinates.push(tempPolygonArray)
+                        featureData.push(oneData)
+                    }
+                });
             }
-            let coorArray = polygonItem.coordinates.split(',')//坐标数组
 
-            let itemArray = []//单个点位的[lon,lat]，数组
-            let tempPolygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+            if (featureData && featureData.length > 0) {
+                var geojsonObject = {
+                    'type': 'FeatureCollection',
+                    'features': featureData
+                };
+                let feature = (new GeoJSON()).readFeatures(geojsonObject)
+
+                polygonSource.addFeatures(feature)
 
-            coorArray.forEach((item, index) => {
-              itemArray.push(item)
-              if (index % 2 == 0) {//偶
+                if (this.showPolIconLayer) {
+                    this.loadPolIcon(feature)
+                }
 
-              } else {//奇
-                tempPolygonArray.push(itemArray)
-                itemArray = []
-              }
+
+            }
+
+        },
+
+        //加载区域多边形的icon
+        loadPolIcon(feature) {
+            polIconSource.clear()
+            let polyIconFeatures = [];
+            // console.log('feature-----', feature)
+            feature.forEach(oneIcon => {
+
+                var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy]
+                // var center = getCenter(extent);   //获取边界区域的中心位置
+                //添加标注
+                let x = (parseFloat(extent[0]) + parseFloat(extent[2])) / 2
+                let y = (parseFloat(extent[1]) + parseFloat(extent[3])) / 2
+
+                let polyIcon = new Feature({
+                    geometry: new Point([x, y]),
+                    id: oneIcon.id_,
+                    properties: {
+                        type: "icon",
+                        id: oneIcon.id_
+                    }
+                });
+                // console.log('oneIcon----ddd', oneIcon)
+                let polyIconStyle = new Style({
+                    image: new Icon({
+                        // anchor: [0.5, 0.5],
+                        // imgSize: [32, 32],
+                        scale: this.areaScale,
+                        src: this.polIconUrlArray[0]
+                    }),
+                    text: createTextStyle(oneIcon)
+                });
+
+                polyIcon.setStyle(polyIconStyle);
+                polyIconFeatures.push(polyIcon);
 
             });
-            oneData.geometry.coordinates.push(tempPolygonArray)
-            featureData.push(oneData)
-          }
-        });
-      }
-
-      if (featureData && featureData.length > 0) {
-        var geojsonObject = {
-          'type': 'FeatureCollection',
-          'features': featureData
-        };
-        let feature = (new GeoJSON()).readFeatures(geojsonObject)
-
-        polygonSource.addFeatures(feature)
-
-        if (this.showPolIconLayer) {
-          this.loadPolIcon(feature)
-        }
+            polIconSource.addFeatures(polyIconFeatures);
+        },
 
+        //加载icon图标
+        loadIcon() {
+            iconSource.clear()//清空多边形标注
+            if (this.iconArrays && this.iconArrays.length > 0) {
 
-      }
+                let iconFeatures = [];
 
-    },
+                this.iconArrays.forEach((oneIcon, index) => {
+                    //添加标注
 
-    //加载区域多边形的icon
-    loadPolIcon (feature) {
-      polIconSource.clear()
-      let polyIconFeatures = [];
-      // console.log('feature-----', feature)
-      feature.forEach(oneIcon => {
-
-        var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy]
-        // var center = getCenter(extent);   //获取边界区域的中心位置
-        //添加标注
-        let x = (parseFloat(extent[0]) + parseFloat(extent[2])) / 2
-        let y = (parseFloat(extent[1]) + parseFloat(extent[3])) / 2
-
-        let polyIcon = new Feature({
-          geometry: new Point([x, y]),
-          id: oneIcon.id_,
-          properties: {
-            type: "icon",
-            id: oneIcon.id_
-          }
-        });
-        // console.log('oneIcon----ddd', oneIcon)
-        let polyIconStyle = new Style({
-          image: new Icon({
-            // anchor: [0.5, 0.5],
-            // imgSize: [32, 32],
-            scale: this.areaScale,
-            src: this.polIconUrlArray[0]
-          }),
-          text: createTextStyle(oneIcon)
-        });
-
-        polyIcon.setStyle(polyIconStyle);
-        polyIconFeatures.push(polyIcon);
-
-      });
-      polIconSource.addFeatures(polyIconFeatures);
-    },
+                    let iconItem = new Feature({
+                        geometry: new Point([oneIcon.longitude, oneIcon.latitude]),
+                        id: oneIcon.id,
+                        properties: {
+                            type: "icon",
+                            info: { ...oneIcon }
+                        }
+                    });
+                    // console.log('oneIcon----', this.iconUrlArray[oneIcon.urlIndex])
+                    let iconStyle = new Style({
+                        image: new Icon({
+                            // anchor: [0.5, 0.5],
+                            // imgSize: [32, 32],
+                            // scale: 0.5,
+                            // src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0] || this.iconUrlArray[0]
+                            src: (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) || (oneIcon.index && this.iconUrlArray[oneIcon.index]) || this.iconUrlArray[0]
+                        }),
+                        // text: createTextStyle(oneIcon)
+                    });
 
-    //加载icon图标
-    loadIcon () {
-      iconSource.clear()//清空多边形标注
-      if (this.iconArrays && this.iconArrays.length > 0) {
+                    iconItem.setStyle(iconStyle);
 
-        let iconFeatures = [];
+                    if (this.distanceMax) {
+                        if (this.computedDistance(oneIcon.longitude, oneIcon.latitude, this.distanceMax)) {
+                            iconFeatures.push(iconItem);
+                        }
+                    } else {
+                        iconFeatures.push(iconItem);
+                    }
 
-        this.iconArrays.forEach((oneIcon, index) => {
-          //添加标注
 
-          let iconItem = new Feature({
-            geometry: new Point([oneIcon.longitude, oneIcon.latitude]),
-            id: oneIcon.id,
-            properties: {
-              type: "icon",
-              info: { ...oneIcon }
-            }
-          });
-          // console.log('oneIcon----', this.iconUrlArray[oneIcon.urlIndex])
-          let iconStyle = new Style({
-            image: new Icon({
-              // anchor: [0.5, 0.5],
-              // imgSize: [32, 32],
-              // scale: 0.5,
-              // src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0] || this.iconUrlArray[0]
-              src: (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) || (oneIcon.index && this.iconUrlArray[oneIcon.index]) || this.iconUrlArray[0]
-            }),
-            // text: createTextStyle(oneIcon)
-          });
 
-          iconItem.setStyle(iconStyle);
 
-          if (this.distanceMax) {
-            if (this.computedDistance(oneIcon.longitude, oneIcon.latitude, this.distanceMax)) {
-              iconFeatures.push(iconItem);
+                });
+
+                iconSource.addFeatures(iconFeatures);
             }
-          } else {
-            iconFeatures.push(iconItem);
-          }
+        },
 
 
+        //计算和中心点距离
+        computedDistance(lon, lat, max) {
+            let c1 = [2]; c1[0] = lon; c1[1] = lat;
+            let distance = getDistance(this.centerPoint, c1);
+            // console.log(distance)
+            return (distance < max || distance === max)
 
+            // debugger
+            //   return
+            // var wgs84Sphere = new ol.Sphere(6378137);
+            // wgs84Sphere.haversineDistance([120.21592590991689, 30.210793016606],[120.21670777384473, 30.211168525868086]);
+        },
 
-        });
+        //初始化地图
+        initMap() {
+            this.firstCentermap()
+            gaodeMapLayer = new TileLayer({
+                title: "地图",
+                source: new XYZ({
+                    //指定url瓦片
+                    url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}',
+                    wrapX: true//x方向平铺，也可以选择false
+                }),
+                zIndex: 20
+            });
 
-        iconSource.addFeatures(iconFeatures);
-      }
-    },
+            mapView = new View({
+                //中心点坐标
+                center: this.centerPoint,
+                // projection: 'EPSG:3857',
+                projection: 'EPSG:4326',
+                zoom: this.zoom,
+                minZoom: this.minZoom
+            })
 
+            //初始化map和地图底图
+            //创建地图容器
+            map = new Map({
 
-    //计算和中心点距离
-    computedDistance (lon, lat, max) {
-      let c1 = [2]; c1[0] = lon; c1[1] = lat;
-      let distance = getDistance(this.centerPoint, c1);
-      // console.log(distance)
-      return (distance < max || distance === max)
+                layers: [gaodeMapLayer],
+                //加载瓦片图层数据
+                view: mapView,
+                target: this.mapId
+                //目标加载到map中
+            })
 
-      // debugger
-      //   return
-      // var wgs84Sphere = new ol.Sphere(6378137);
-      // wgs84Sphere.haversineDistance([120.21592590991689, 30.210793016606],[120.21670777384473, 30.211168525868086]);
-    },
+            var mousePositionControl = new MousePosition({
+                coordinateFormat: createStringXY(6),//获取位置
+                projection: 'EPSG:4326',
+                className: 'custom-mouse-position',
+                target: document.getElementById('mouse-position'), //将位置数据放到那里
+                undefinedHTML: '&nbsp'
+            });
+            map.addControl(mousePositionControl);
 
-    //初始化地图
-    initMap () {
-      this.firstCentermap()
-      gaodeMapLayer = new TileLayer({
-        title: "地图",
-        source: new XYZ({
-          //指定url瓦片
-          url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}',
-          wrapX: true//x方向平铺，也可以选择false
-        }),
-        zIndex: 20
-      });
-
-      mapView = new View({
-        //中心点坐标
-        center: this.centerPoint,
-        // projection: 'EPSG:3857',
-        projection: 'EPSG:4326',
-        zoom: this.zoom,
-        minZoom: this.minZoom
-      })
-
-      //初始化map和地图底图
-      //创建地图容器
-      map = new Map({
-
-        layers: [gaodeMapLayer],
-        //加载瓦片图层数据
-        view: mapView,
-        target: this.mapId
-        //目标加载到map中
-      })
-
-      var mousePositionControl = new MousePosition({
-        coordinateFormat: createStringXY(6),//获取位置
-        projection: 'EPSG:4326',
-        className: 'custom-mouse-position',
-        target: document.getElementById('mouse-position'), //将位置数据放到那里
-        undefinedHTML: '&nbsp'
-      });
-      map.addControl(mousePositionControl);
-
-
-      //去除双击放大效果
-      const dblClickInteraction = map
-        .getInteractions()
-        .getArray()
-        .find(interaction => {
-          return interaction instanceof DoubleClickZoom;
-        });
-      map.removeInteraction(dblClickInteraction);
 
-    },
-    //设置地图定位的中心点和缩放级别
-    setMapLocation () {
-      if (!this.zoom) {
-        this.setZoom(this.mapInfo.agencyLevel)
-      }
-      this.centerPoint = []
-
-
-      //如果存在中心点（返回时赋值）
-      if (this.center && this.center.length > 0) {
-        this.centerPoint = this.center
-        this.centerFlag = 'point'
-        this.center = []
-
-      } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织
-        this.centerFlag = 'flag_polygon'
-
-      } else if (this.mapInfo.longitude && this.mapInfo.latitude) {
-        this.centerPoint.push(this.mapInfo.longitude)
-        this.centerPoint.push(this.mapInfo.latitude)
-        this.centerFlag = 'point'
-
-      } else {
-        this.centerPoint = centerPointGlobal
-        this.centerFlag = 'point'
-      }
-      // debugger
-      if (this.centerFlag === 'flag_parent') {
-        let parentFeatures = parentLayer.getSource().getFeatures()[0]
-        let polygon = parentFeatures.getGeometry();
-        map.getView().fit(polygon, map.getSize());
-        this.zoom = map.getView().getZoom() - 1
-
-      } else if (this.centerFlag === 'flag_polygon') {
-        let polygonFeatures = polygonLayer.getSource().getFeatures()[0]
-        let polygon = polygonFeatures.getGeometry();
-        map.getView().fit(polygon, map.getSize());
-        this.zoom = map.getView().getZoom() - 1
-
-      } else {
-        mapView.setCenter(this.centerPoint);
-      }
-
-      if (!this.isChangeCenter) {
-        return false
-      }
-      // debugger
-      if (!this.zoom) {
-        this.setZoom(this.mapInfo.agencyLevel)
-      }
-      this.centerPoint = []
-
-      //如果存在中心点（返回时赋值）
-      if (this.center && this.center.length > 0) {
-        this.centerPoint = this.center
-        this.centerFlag = 'point'
-        this.center = []
-
-      } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织
-        this.centerFlag = 'flag_polygon'
-        this.centerPoint.push(this.mapInfo.longitude)
-        this.centerPoint.push(this.mapInfo.latitude)
-
-      } else if (this.mapInfo.longitude && this.mapInfo.latitude) {
-        this.centerPoint.push(this.mapInfo.longitude)
-        this.centerPoint.push(this.mapInfo.latitude)
-        this.centerFlag = 'point'
-
-      } else {
-        this.centerPoint = centerPointGlobal
-        this.centerFlag = 'point'
-      }
-
-      // debugger
-      if (this.centerFlag === 'flag_parent') {
-        let parentFeatures = parentLayer.getSource().getFeatures()[0]
-        let polygon = parentFeatures.getGeometry();
-        map.getView().fit(polygon, map.getSize());
-        this.zoom = map.getView().getZoom() - 1
-
-      } else if (this.centerFlag === 'flag_polygon') {
-        let polygonFeatures = polygonLayer.getSource().getFeatures()[0]
-        let polygon = polygonFeatures.getGeometry();
-        map.getView().fit(polygon, map.getSize());
-        this.zoom = map.getView().getZoom() - 1
-
-      } else {
-        mapView.setCenter(this.centerPoint);
-
-      }
-      mapView.setZoom(this.zoom);
+            //去除双击放大效果
+            const dblClickInteraction = map
+                .getInteractions()
+                .getArray()
+                .find(interaction => {
+                    return interaction instanceof DoubleClickZoom;
+                });
+            map.removeInteraction(dblClickInteraction);
 
-    },
-    firstCentermap () {
-      if (this.mapInfo.longitude && this.mapInfo.latitude) {
-        this.centerPoint = []
-        this.centerPoint.push(this.mapInfo.longitude)
-        this.centerPoint.push(this.mapInfo.latitude)
-      } else {
+        },
+        //设置地图定位的中心点和缩放级别
+        setMapLocation() {
+            if (!this.zoom) {
+                this.setZoom(this.mapInfo.agencyLevel)
+            }
+            this.centerPoint = []
 
-        this.centerPoint = centerPointGlobal
-      }
 
-      this.setZoom(this.mapInfo.agencyLevel)
-    },
+            //如果存在中心点（返回时赋值）
+            if (this.center && this.center.length > 0) {
+                this.centerPoint = this.center
+                this.centerFlag = 'point'
+                this.center = []
 
-    //根据组织层级设置缩放级别
-    setZoom (level) {
-      if (level === 'district') {
-        this.zoom = 12
-      } else if (level === 'street') {
-        this.zoom = 13
-      } else if (level === 'community') {
-        this.zoom = 14
-      } else {
-        this.zoom = 11
-      }
+            } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织
+                this.centerFlag = 'flag_polygon'
 
-    },
+            } else if (this.mapInfo.longitude && this.mapInfo.latitude) {
+                this.centerPoint.push(this.mapInfo.longitude)
+                this.centerPoint.push(this.mapInfo.latitude)
+                this.centerFlag = 'point'
 
-    //初始化多边形标注图层
-    initPolygonLayer () {
-      polygonSource = new VectorSource({
-        // features: (new GeoJSON()).readFeatures(geojsonObject)
-        wrapX: false
-      });
-
-      polygonLayer = new VectorLayer({
-        source: polygonSource,
-        style: polygonStyleFunction,
-        zIndex: 50
-      });
-      let that = this
-      //选中多边形后的样式
-      var overlayStyle = (function () {
-
-        return function (feature) {
-          var styles = {};
-          styles['Polygon'] = [
-            new Style({
-              stroke: new Stroke({
-                color: '#ec9000',
-                width: 2
-              })
-            }),
+            } else {
+                this.centerPoint = centerPointGlobal
+                this.centerFlag = 'point'
+            }
+            // debugger
+            if (this.centerFlag === 'flag_parent') {
+                let parentFeatures = parentLayer.getSource().getFeatures()[0]
+                let polygon = parentFeatures.getGeometry();
+                map.getView().fit(polygon, map.getSize());
+                this.zoom = map.getView().getZoom() - 1
+
+            } else if (this.centerFlag === 'flag_polygon') {
+                let polygonFeatures = polygonLayer.getSource().getFeatures()[0]
+                let polygon = polygonFeatures.getGeometry();
+                map.getView().fit(polygon, map.getSize());
+                this.zoom = map.getView().getZoom() - 1
+
+            } else {
+                mapView.setCenter(this.centerPoint);
+            }
 
-            new Style({
-              fill: new Fill({
-                color: 'rgba(0, 0, 255, 0.1)'
-              })
-            }),
-            new Style({
-              // text: createTextStyle(feature) // 报错 暂时注掉 zhaotongyao 2022.05.19
-            })
-          ];
-          styles['MultiPolygon'] = styles['Polygon'];
-          return styles[feature.getGeometry().getType()];
-        };
-      })();
+            if (!this.isChangeCenter) {
+                return false
+            }
+            // debugger
+            if (!this.zoom) {
+                this.setZoom(this.mapInfo.agencyLevel)
+            }
+            this.centerPoint = []
+
+            //如果存在中心点（返回时赋值）
+            if (this.center && this.center.length > 0) {
+                this.centerPoint = this.center
+                this.centerFlag = 'point'
+                this.center = []
+
+            } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织
+                this.centerFlag = 'flag_polygon'
+                this.centerPoint.push(this.mapInfo.longitude)
+                this.centerPoint.push(this.mapInfo.latitude)
+
+            } else if (this.mapInfo.longitude && this.mapInfo.latitude) {
+                this.centerPoint.push(this.mapInfo.longitude)
+                this.centerPoint.push(this.mapInfo.latitude)
+                this.centerFlag = 'point'
+
+            } else {
+                this.centerPoint = centerPointGlobal
+                this.centerFlag = 'point'
+            }
 
-      select = new Select({
-        style: overlayStyle
-      });
+            // debugger
+            if (this.centerFlag === 'flag_parent') {
+                let parentFeatures = parentLayer.getSource().getFeatures()[0]
+                let polygon = parentFeatures.getGeometry();
+                map.getView().fit(polygon, map.getSize());
+                this.zoom = map.getView().getZoom() - 1
 
+            } else if (this.centerFlag === 'flag_polygon') {
+                let polygonFeatures = polygonLayer.getSource().getFeatures()[0]
+                let polygon = polygonFeatures.getGeometry();
+                map.getView().fit(polygon, map.getSize());
+                this.zoom = map.getView().getZoom() - 1
 
+            } else {
+                mapView.setCenter(this.centerPoint);
 
-      map.addLayer(polygonLayer)
-      if (this.$route.path == '/main-shuju/visual-communityGovern-duoyuanfuwu-duoyuanfuwufenxi' || this.$route.path == '/main-shuju/visual-communityParty-gridParty' || this.$route.path == '/main-shuju/visual-communityParty-community') { // 2022.6.9 网格党建平面图 联建单位分析页面 点位点击以后会消失，屏蔽这段代码以后可以解决
-        console.log('去掉默认点击')
-      } else {
-        map.addInteraction(select);
-      }
-    },
+            }
+            mapView.setZoom(this.zoom);
 
-    //初始化多边形icon图层
-    initPolIconLayer () {
-      polIconSource = new VectorSource({
-        //features: (new GeoJSON()).readFeatures(geojsonObject)
-        wrapX: false
-      });
+        },
+        firstCentermap() {
+            if (this.mapInfo.longitude && this.mapInfo.latitude) {
+                this.centerPoint = []
+                this.centerPoint.push(this.mapInfo.longitude)
+                this.centerPoint.push(this.mapInfo.latitude)
+            } else {
+
+                this.centerPoint = centerPointGlobal
+            }
 
-      polIconLayer = new VectorLayer({
-        source: polIconSource,
-        zIndex: 70
-      });
+            this.setZoom(this.mapInfo.agencyLevel)
+        },
 
-      map.addLayer(polIconLayer);
+        //根据组织层级设置缩放级别
+        setZoom(level) {
+            if (level === 'district') {
+                this.zoom = 12
+            } else if (level === 'street') {
+                this.zoom = 13
+            } else if (level === 'community') {
+                this.zoom = 14
+            } else {
+                this.zoom = 11
+            }
 
-    },
+        },
 
-    //初始化icon图层
-    initIconLayer () {
-      iconSource = new VectorSource({
-        //features: (new GeoJSON()).readFeatures(geojsonObject)
-        wrapX: false
-      });
+        //初始化多边形标注图层
+        initPolygonLayer() {
+            polygonSource = new VectorSource({
+                // features: (new GeoJSON()).readFeatures(geojsonObject)
+                wrapX: false
+            });
 
-      iconLayer = new VectorLayer({
-        source: iconSource,
-        zIndex: 90
-      });
+            polygonLayer = new VectorLayer({
+                source: polygonSource,
+                style: polygonStyleFunction,
+                zIndex: 50
+            });
+            let that = this
+            //选中多边形后的样式
+            var overlayStyle = (function () {
+
+                return function (feature) {
+                    var styles = {};
+                    styles['Polygon'] = [
+                        new Style({
+                            stroke: new Stroke({
+                                color: '#ec9000',
+                                width: 2
+                            })
+                        }),
+
+                        new Style({
+                            fill: new Fill({
+                                color: 'rgba(0, 0, 255, 0.1)'
+                            })
+                        }),
+                        new Style({
+                            // text: createTextStyle(feature) // 报错 暂时注掉 zhaotongyao 2022.05.19
+                        })
+                    ];
+                    styles['MultiPolygon'] = styles['Polygon'];
+                    return styles[feature.getGeometry().getType()];
+                };
+            })();
+
+            select = new Select({
+                style: overlayStyle
+            });
 
-      map.addLayer(iconLayer);
-      // select = new Select({ condition: click, });
 
-      // map.addInteraction(select);
 
-      // select.on('select', e => {
-      //   this.$emit('clickFeature', e)
-      // });
-    },
+            map.addLayer(polygonLayer)
+            if (this.$route.path == '/main-shuju/visual-communityGovern-duoyuanfuwu-duoyuanfuwufenxi' || this.$route.path == '/main-shuju/visual-communityParty-gridParty' || this.$route.path == '/main-shuju/visual-communityParty-community') { // 2022.6.9 网格党建平面图 联建单位分析页面 点位点击以后会消失，屏蔽这段代码以后可以解决
+                console.log('去掉默认点击')
+            } else {
+                map.addInteraction(select);
+            }
+        },
+
+        //初始化多边形icon图层
+        initPolIconLayer() {
+            polIconSource = new VectorSource({
+                //features: (new GeoJSON()).readFeatures(geojsonObject)
+                wrapX: false
+            });
+
+            polIconLayer = new VectorLayer({
+                source: polIconSource,
+                zIndex: 70
+            });
+
+            map.addLayer(polIconLayer);
 
-    //添加覆盖层
-    addOverlay () {
-      // 使用变量存储弹窗所需的 DOM 对象
-      var container = document.getElementById("popup");
-      var closer = document.getElementById("popup-closer");
-      var content = document.getElementById("popup-content");
-      var goMore = document.getElementById("popup-goMore") ? document.getElementById("popup-goMore") : null
-
-      // 创建一个弹窗 Overlay 对象
-      this.overlay = new Overlay({
-        element: container, //绑定 Overlay 对象和 DOM 对象的
-        autoPan: true, // 定义弹出窗口在边缘点击时候可能不完整 设置自动平移效果
-        autoPanAnimation: {
-          duration: 250 //自动平移效果的动画时间 9毫秒
         },
-        zIndex: 100
-      });
-      // 将弹窗添加到 map 地图中
-      map.addOverlay(this.overlay);
-      let _that = this;
-
-      /**
-       * 为弹窗添加一个响应关闭的函数
-       */
-      closer.onclick = function () {
-        _that.overlay.setPosition(undefined);
-        closer.blur();
-        return false;
-      };
-      if (goMore) {
-        goMore.onclick = function () {
-          _that.$emit('lookMore')
-        };
-      }
-    },
 
-    //注册地图点击事件
-    addMapClick () {
-      let _that = this
+        //初始化icon图层
+        initIconLayer() {
+            iconSource = new VectorSource({
+                //features: (new GeoJSON()).readFeatures(geojsonObject)
+                wrapX: false
+            });
 
+            iconLayer = new VectorLayer({
+                source: iconSource,
+                zIndex: 90
+            });
 
-      map.on("click", function (evt) {
-        const feature = map.forEachFeatureAtPixel(evt.pixel, function (feature) {
-          return feature;
-        });
-        if (feature) {
+            map.addLayer(iconLayer);
+            // select = new Select({ condition: click, });
 
-          console.log('feature---', feature)
-          if (_that.clickType === 'back') {
+            // map.addInteraction(select);
 
-            _that.$emit('clickFeature', feature)
+            // select.on('select', e => {
+            //   this.$emit('clickFeature', e)
+            // });
+        },
 
+        //添加覆盖层
+        addOverlay() {
+            // 使用变量存储弹窗所需的 DOM 对象
+            var container = document.getElementById("popup");
+            var closer = document.getElementById("popup-closer");
+            var content = document.getElementById("popup-content");
+            var goMore = document.getElementById("popup-goMore") ? document.getElementById("popup-goMore") : null
+
+            // 创建一个弹窗 Overlay 对象
+            this.overlay = new Overlay({
+                element: container, //绑定 Overlay 对象和 DOM 对象的
+                autoPan: true, // 定义弹出窗口在边缘点击时候可能不完整 设置自动平移效果
+                autoPanAnimation: {
+                    duration: 250 //自动平移效果的动画时间 9毫秒
+                },
+                zIndex: 100
+            });
+            // 将弹窗添加到 map 地图中
+            map.addOverlay(this.overlay);
+            let _that = this;
+
+            /**
+             * 为弹窗添加一个响应关闭的函数
+             */
+            closer.onclick = function () {
+                _that.overlay.setPosition(undefined);
+                closer.blur();
+                return false;
+            };
+            if (goMore) {
+                goMore.onclick = function () {
+                    _that.$emit('lookMore')
+                };
+            }
+        },
 
-          } else if (_that.clickType === 'popup') {
-            _that.$emit('clickFeature', feature)
+        //注册地图点击事件
+        addMapClick() {
+            let _that = this
 
-          } else {
-            console.log('此处没有标注')
-          }
 
-        }
+            map.on("click", function (evt) {
+                const feature = map.forEachFeatureAtPixel(evt.pixel, function (feature) {
+                    return feature;
+                });
+                if (feature) {
 
-      });
-    },
+                    console.log('feature---', feature)
+                    if (_that.clickType === 'back') {
 
-    handleShowPopup (showData, coordinate, isShowMore) {
-      if (isShowMore) {
-        document.getElementById("popup-goMore").style.display = 'block'
-      } else {
-        document.getElementById("popup-goMore").style.display = 'none'
-      }
-      console.log(this.overlay.getElement())
-      let content = document.getElementById("popup-content");
-      this.overlay.getElement().style.display = 'block'
-      this.overlay.getElement().parentNode.style.display = 'block'
-      this.overlay.getElement().parentNode.parentNode.style.display = 'block'
-      content.innerHTML = showData;
-      this.overlay.setPosition(coordinate);
-      //把 overlay 显示到指定的 x,y坐标
+                        _that.$emit('clickFeature', feature)
 
-    },
-    // 关闭弹窗
-    handleClosePopup () {
-      this.overlay.setPosition(undefined);
-      document.getElementById("popup-closer").blur();
-      return false;
-    },
 
-    //取随机数
-    getRndBetween (lowerLimit, upperLimit) {
-      return Math.floor(Math.random() * (upperLimit - lowerLimit + 1)) + lowerLimit;
-    },
+                    } else if (_that.clickType === 'popup') {
+                        _that.$emit('clickFeature', feature)
 
-    //开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, //是否锁定
-        text: '正在加载……', //加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' //背景颜色
-      });
+                    } else {
+                        console.log('此处没有标注')
+                    }
 
-    },
+                }
 
-    //结束加载动画
-    endLoading () {
-      //clearTimeout(timer);
-      if (loading) {
-        loading.close();
-      }
-    },
-  },
-  props: {
-    mapId: {
-      type: String,
-      default: 'map'
-    },
-    //是否显示多边形图层
-    showPolygonLayer: {
-      type: Boolean,
-      default: false
-    },
-    //是否显示多边形icon图层
-    showPolIconLayer: {
-      type: Boolean,
-      default: false
-    },
+            });
+        },
 
-    //是否显示标注
-    showIconLayer: {
-      type: Boolean,
-      default: false
-    },
-    //是否添加弹出框图层
-    isAddOpenlay: {
-      type: Boolean,
-      default: false
-    },
+        handleShowPopup(showData, coordinate, isShowMore) {
+            if (isShowMore) {
+                document.getElementById("popup-goMore").style.display = 'block'
+            } else {
+                document.getElementById("popup-goMore").style.display = 'none'
+            }
+            console.log(this.overlay.getElement())
+            let content = document.getElementById("popup-content");
+            this.overlay.getElement().style.display = 'block'
+            this.overlay.getElement().parentNode.style.display = 'block'
+            this.overlay.getElement().parentNode.parentNode.style.display = 'block'
+            content.innerHTML = showData;
+            this.overlay.setPosition(coordinate);
+            //把 overlay 显示到指定的 x,y坐标
+
+        },
+        // 关闭弹窗
+        handleClosePopup() {
+            this.overlay.setPosition(undefined);
+            document.getElementById("popup-closer").blur();
+            return false;
+        },
+
+        //取随机数
+        getRndBetween(lowerLimit, upperLimit) {
+            return Math.floor(Math.random() * (upperLimit - lowerLimit + 1)) + lowerLimit;
+        },
+
+        //开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, //是否锁定
+                text: '正在加载……', //加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' //背景颜色
+            });
+
+        },
 
-    //点击地图事件类型,back:返回，popup:弹出层
-    clickType: {
-      type: String,
-      default: 'back'
+        //结束加载动画
+        endLoading() {
+            //clearTimeout(timer);
+            if (loading) {
+                loading.close();
+            }
+        },
     },
-    areaScale: {
-      type: Number,
-      default: 0.5
-    }
+    props: {
+        mapId: {
+            type: String,
+            default: 'map'
+        },
+        //是否显示多边形图层
+        showPolygonLayer: {
+            type: Boolean,
+            default: false
+        },
+        //是否显示多边形icon图层
+        showPolIconLayer: {
+            type: Boolean,
+            default: false
+        },
 
-  },
-  computed: {
+        //是否显示标注
+        showIconLayer: {
+            type: Boolean,
+            default: false
+        },
+        //是否添加弹出框图层
+        isAddOpenlay: {
+            type: Boolean,
+            default: false
+        },
 
-    mapHeight () {
-      return this.clientHeight - 120;
+        //点击地图事件类型,back:返回，popup:弹出层
+        clickType: {
+            type: String,
+            default: 'back'
+        },
+        areaScale: {
+            type: Number,
+            default: 0.5
+        }
 
     },
+    computed: {
 
-    ...mapGetters(["clientHeight"])
+        mapHeight() {
+            return this.clientHeight - 120;
 
-  },
-  components: {},
+        },
+
+        ...mapGetters(["clientHeight"])
+
+    },
+    components: {},
 }
 export default vueGis;
 </script>
@@ -897,70 +894,70 @@ export default vueGis;
 
 <style lang="scss" >
 .div_content_map {
-  .ol-viewport {
-    border-radius: 5px;
-  }
-  .div_map {
-    box-sizing: border-box;
-    width: 100%;
-    // padding: 10px 5px 13px;
-    // margin-top: 8px;
-    height: 100%;
-    color: #fff;
-  }
+    .ol-viewport {
+        border-radius: 5px;
+    }
+    .div_map {
+        box-sizing: border-box;
+        width: 100%;
+        // padding: 10px 5px 13px;
+        // margin-top: 8px;
+        height: 100%;
+        color: #fff;
+    }
 }
 .ol-overlaycontainer-stopevent {
-  display: none;
+    display: none;
 }
 .ol-popup {
-  position: absolute;
-  background-color: #1257c9;
-  -webkit-filter: drop-shadow(0 1px 4px rgba(0, 0, 0, 0.2));
-  filter: drop-shadow(0 1px 4px rgba(0, 0, 0, 0.2));
-  padding: 15px;
-  border-radius: 10px;
-  border: 1px solid #1257c9;
-  bottom: 12px;
-  left: -50px;
-  text-align: left;
+    position: absolute;
+    background-color: #1257c9;
+    -webkit-filter: drop-shadow(0 1px 4px rgba(0, 0, 0, 0.2));
+    filter: drop-shadow(0 1px 4px rgba(0, 0, 0, 0.2));
+    padding: 15px;
+    border-radius: 10px;
+    border: 1px solid #1257c9;
+    bottom: 12px;
+    left: -50px;
+    text-align: left;
 }
 .ol-popup:after,
 .ol-popup:before {
-  top: 100%;
-  border: solid transparent;
-  content: " ";
-  height: 0;
-  width: 0;
-  position: absolute;
-  pointer-events: none;
+    top: 100%;
+    border: solid transparent;
+    content: " ";
+    height: 0;
+    width: 0;
+    position: absolute;
+    pointer-events: none;
 }
 .ol-popup:after {
-  border-top-color: 1257c9;
-  border-width: 10px;
-  left: 48px;
-  margin-left: -10px;
+    border-top-color: 1257c9;
+    border-width: 10px;
+    left: 48px;
+    margin-left: -10px;
 }
 .ol-popup:before {
-  border-top-color: #1257c9;
-  border-width: 11px;
-  left: 48px;
-  margin-left: -11px;
+    border-top-color: #1257c9;
+    border-width: 11px;
+    left: 48px;
+    margin-left: -11px;
 }
 .ol-popup-closer {
-  text-decoration: none;
-  position: absolute;
-  top: 2px;
-  right: 8px;
+    text-decoration: none;
+    position: absolute;
+    top: 2px;
+    right: 8px;
 }
 .popup-content {
-  width: 300px;
+    width: 300px;
 }
 .popup-goMore {
-  margin: 20px 0;
+    margin: 20px 0;
 }
 .ol-popup-closer:after {
-  content: "✖";
-  // color: rgba(1, 17, 104, 1);
-  color: #fff;
+    content: "✖";
+    // color: rgba(1, 17, 104, 1);
+    color: #fff;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/modules/visual/plugin/power/components/screen-org-map.vue b/src/views/modules/visual/plugin/power/components/screen-org-map.vue
index cdb343bf1..3b4715b65 100644
--- a/src/views/modules/visual/plugin/power/components/screen-org-map.vue
+++ b/src/views/modules/visual/plugin/power/components/screen-org-map.vue
@@ -1,29 +1,23 @@
 <template>
-    <div class="div_map" id="map" ref="map"></div>
+    <div class="div_map"
+         id="map"
+         ref="map"></div>
 </template>
 
 <script>
 // import 'ol/ol.css'
+import { requestPost } from "@/js/dai/request"
 import { Map, View } from 'ol'
+import Feature from "ol/Feature.js"
+import { boundingExtent } from 'ol/extent.js'
+import GeoJSON from 'ol/format/GeoJSON.js'
+import Point from "ol/geom/Point.js"
+import { Select } from 'ol/interaction.js'
 import TileLayer from 'ol/layer/Tile.js'
-import XYZ from 'ol/source/XYZ.js'
 import VectorLayer from 'ol/layer/Vector.js'
 import VectorSource from 'ol/source/Vector.js'
-import GeoJSON from 'ol/format/GeoJSON.js'
-import Point from "ol/geom/Point.js"
-import Feature from "ol/Feature.js"
-import Overlay from 'ol/Overlay'
-import { Select, DoubleClickZoom } from 'ol/interaction.js'
-import { getCenter, boundingExtent } from 'ol/extent.js'
-import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style.js'
-import { altKeyOnly, click, pointerMove } from 'ol/events/condition'
-import { getDistance } from 'ol/sphere'
-import MousePosition from 'ol/control/MousePosition'
-import { createStringXY } from 'ol/coordinate'
-import { defaults as defaultControls } from 'ol/control'
-import { mapGetters } from "vuex"
-import { Loading } from 'element-ui'
-import { requestPost } from "@/js/dai/request"
+import XYZ from 'ol/source/XYZ.js'
+import { Fill, Icon, Stroke, Style, Text } from 'ol/style.js'
 
 let map
 let mapView
@@ -56,571 +50,571 @@ const iconArray = [
     'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
 ]
 const textColorArray = [
-  'rgba(236, 69, 4, 0.66)',
-  'rgba(0, 146, 238, 0.75)',
-  'rgba(238, 151, 0, 0.8)'
+    'rgba(236, 69, 4, 0.66)',
+    'rgba(0, 146, 238, 0.75)',
+    'rgba(238, 151, 0, 0.8)'
 ]
 let polygonColorArray = [
-  'rgba(210, 2, 2, 0.24)',
-  'rgba(43, 231, 253, 0.25)',
-  'rgba(183, 185, 0, 0.16)'
+    'rgba(210, 2, 2, 0.24)',
+    'rgba(43, 231, 253, 0.25)',
+    'rgba(183, 185, 0, 0.16)'
 ];
 let iconUrlArray = [
-  'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
-  'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
-  'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
+    'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
+    'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
+    'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
 ];
 //变电站标注的文字样式
 var createTextStyle = function (feature) {
-  return new Text({
-    textAlign: undefined,
-    font: "18px Arial",
-    //fontFamily: "Courier New, monospace",
-    // fontWeight: "bold",
-    text: feature.values_.name,
-    backgroundFill: new Fill({
-      // color: 'rgba(0, 146, 238, 0.75)'
-      color: textColorArray[feature.values_.colorIndex]
-    }),
-    padding: [4, 10, 4, 10],
-    //text: "变电站名称",
-    fill: new Fill({ color: "#ffffff" }),
-    // stroke: new Stroke({ color: "#ffffff", width: 3 }),
-    offsetY: -30,
-    offsetX: -50,
-    overflow: true,
-  });
+    return new Text({
+        textAlign: undefined,
+        font: "18px Arial",
+        //fontFamily: "Courier New, monospace",
+        // fontWeight: "bold",
+        text: feature.values_.name,
+        backgroundFill: new Fill({
+            // color: 'rgba(0, 146, 238, 0.75)'
+            color: textColorArray[feature.values_.colorIndex]
+        }),
+        padding: [4, 10, 4, 10],
+        //text: "变电站名称",
+        fill: new Fill({ color: "#ffffff" }),
+        // stroke: new Stroke({ color: "#ffffff", width: 3 }),
+        offsetY: -30,
+        offsetX: -50,
+        overflow: true,
+    });
 };
 //上级组织标注样式
 var parentStyleFunction = (function () {
-  return function (feature) {
-    return new Style({
-      // fill: new Fill({
-      //   color: [255, 255, 255, 0.3]
-      // }),
-      stroke: new Stroke({
-        color: [0, 103, 182, 1],
-        width: 2
-      }),
-
-      // text: createTextStyle(feature)
-    });;
-  };
+    return function (feature) {
+        return new Style({
+            // fill: new Fill({
+            //   color: [255, 255, 255, 0.3]
+            // }),
+            stroke: new Stroke({
+                color: [0, 103, 182, 1],
+                width: 2
+            }),
+
+            // text: createTextStyle(feature)
+        });;
+    };
 })()
 
 
 //变电站标注样式
 var polygonStyleFunction = (function () {
-  return function (feature) {
-    return new Style({
-      fill: new Fill({
-        // color: [255, 255, 255, 0.3]
-        color: polygonColorArray[feature.values_.colorIndex]
-      }),
-      stroke: new Stroke({
-        color: polygonColorArray[feature.values_.colorIndex],
-        width: 3
-      }),
-
-      text: createTextStyle(feature)
-    });;
-  };
+    return function (feature) {
+        return new Style({
+            fill: new Fill({
+                // color: [255, 255, 255, 0.3]
+                color: polygonColorArray[feature.values_.colorIndex]
+            }),
+            stroke: new Stroke({
+                color: polygonColorArray[feature.values_.colorIndex],
+                width: 3
+            }),
+
+            text: createTextStyle(feature)
+        });;
+    };
 })()
 export default {
-  name: "screen-org-map",
-  data() {
-    return {
-      centerPoint: [], // 中心点位置
-      zoom: 14, // 缩放范围：区14
-      minZoom: 1, // 最小缩放
-      orgData: {},//当前组织对象
-      iconCoordinators: [],
-      parentPolygon: [],
-      subAgencyArray: [],
-      centerFlag: 'point',//定义中心点的flag  point点 fit 自适应
-    }
-  },
-  async mounted() {
-
-    //加载组织数据
-    await this.loadOrgData()
-    this.initMap()
-    this.addParentLayer()
-    this.loadParentPolygon()
-    //添加标注图层
-    this.addPolygonLayer()
-
-    //添加icontuceng
-    this.addIconLayer()
-
-    //加载当前园区的标注
-    this.loadPolygon()
-
-    this.setMapLocation()
-  },
-  methods: {
-    initMap () {
-      this.firstCenterMap()
-
-      gaodeMapLayer = new TileLayer({
-        title: "地图",
-        source: new XYZ({
-          url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}',
-          wrapX: true // x方向平铺，也可以选择false
-        }),
-        zIndex: 20
-      })
-
-      mapView = new View({
-        center: this.centerPoint,
-        projection: 'EPSG:4326',
-        zoom: this.zoom,
-        minZoom: this.minZoom
-      })
-      map = new Map({
-        layers: [gaodeMapLayer],
-        view: mapView,
-        target: 'map'
-      })
-
-      map.on('singleclick', function (e) {
-        // console.log(e.coordinate)
-        // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
-      })
-    },
-    //设置地图定位的中心点和缩放级别
-    setMapLocation () {
-      if (!this.zoom) {
-        this.setZoom(this.orgData.agencyLevel)
-      }
-      this.centerPoint = []
-
-
-      //如果存在中心点（返回时赋值）
-      if (parentLayer.getSource().getFeatures()[0]) {//如果是初次进入，不存在下级组织，用父级组织
-        this.centerFlag = 'flag_parent'
-      } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织
-        this.centerFlag = 'flag_polygon'
-      } else if (this.orgData.longitude && this.orgData.latitude) {
-        this.centerPoint.push(this.orgData.longitude)
-        this.centerPoint.push(this.orgData.latitude)
-        this.centerFlag = 'point'
-      } else {
-        this.centerPoint = centerPointGlobal
-        this.centerFlag = 'point'
-      }
-      // debugger
-      if (this.centerFlag === 'flag_parent') {
-        let parentFeatures = parentLayer.getSource().getFeatures()[0]
-        let polygon = parentFeatures.getGeometry();
-        map.getView().fit(polygon, map.getSize());
-        this.zoom = map.getView().getZoom() - 1
-
-      } else if (this.centerFlag === 'flag_polygon') {
-        let polygonFeatures = polygonLayer.getSource().getFeatures()[0]
-        let polygon = polygonFeatures.getGeometry();
-        map.getView().fit(polygon, map.getSize());
-        this.zoom = map.getView().getZoom() - 1
-      } else {
-        mapView.setCenter(this.centerPoint);
-      }
-      mapView.setZoom(this.zoom);
+    name: "screen-org-map",
+    data() {
+        return {
+            centerPoint: [], // 中心点位置
+            zoom: 14, // 缩放范围：区14
+            minZoom: 1, // 最小缩放
+            orgData: {},//当前组织对象
+            iconCoordinators: [],
+            parentPolygon: [],
+            subAgencyArray: [],
+            centerFlag: 'point',//定义中心点的flag  point点 fit 自适应
+        }
     },
+    async mounted() {
 
-    firstCenterMap () {
-      this.centerPoint = []
-      if (this.orgData.longitude && this.orgData.latitude) {
-        this.centerPoint.push(this.orgData.longitude)
-        this.centerPoint.push(this.orgData.latitude)
+        //加载组织数据
+        await this.loadOrgData()
+        this.initMap()
+        this.addParentLayer()
+        this.loadParentPolygon()
+        //添加标注图层
+        this.addPolygonLayer()
 
-      } else {
-        this.centerPoint = centerPointGlobal
-      }
-    },
-    addMarker (list, icon=iconArray[0], scale=1) {
-      if (markerSource) {
-        markerSource.clear()
-      }
-      markerSource = new VectorSource({
-        // features: new GeoJSON().readFeatures(geojsonObject)
-      })
-      markerLayer = new VectorLayer({
-        source: markerSource,
-        zIndex: 50
-      })
-      let features = []
-      list.forEach((item, index) => {
-        const point = [parseFloat(item.longitude), parseFloat(item.latitude)]
-        let marker = new Feature({
-          geometry: new Point(point),
-          properties: {
-            ...item
-          }
-        })
-        let iconStyle = new Style({
-          image: new Icon({
-            scale: scale,
-            src: icon
-          })
-        })
-        marker.setStyle(iconStyle)
-        features.push(marker)
-      })
-      // // 点击图标
-      // var overlayStyle = (function () {
-      //   return function (feature) {
-      //     var styles = {}
-      //     styles['Point'] = [
-      //       new Style({
-      //         image: new Icon({
-      //           scale: scale,
-      //           src: iconArray[0] // feature.values_.properties.index
-      //         })
-      //       }),
-      //       new Style({
-      //         text: createTextStyle(feature)
-      //       })
-      //     ]
-      //     return styles[feature.getGeometry().getType()]
-      //   }
-      // })()
-      // let select = new Select({
-      //   style: overlayStyle
-      // })
-      // map.addInteraction(select)
-      // select.on('select', e => {
-      //   if (e.selected.length > 0) {
-      //     console.log('------', e.selected[0].values_.properties.id)
-      //   }
-      // })
-      markerSource.addFeatures(features)
-      map.addLayer(markerLayer)
-    },
-    addMarker_1 (list, icon=iconArray[0], scale=1) {
-      if (markerSource_1) {
-        markerSource_1.clear()
-      }
-      markerSource_1 = new VectorSource({
-        // features: new GeoJSON().readFeatures(geojsonObject)
-      })
-      markerLayer_1 = new VectorLayer({
-        source: markerSource_1,
-        zIndex: 50
-      })
-      let features = []
-      list.forEach((item, index) => {
-        const point = [parseFloat(item.longitude), parseFloat(item.latitude)]
-        let marker = new Feature({
-          geometry: new Point(point),
-          properties: {
-            ...item
-          }
-        })
-        let iconStyle = new Style({
-          image: new Icon({
-            scale: scale,
-            src: icon
-          })
-        })
-        marker.setStyle(iconStyle)
-        features.push(marker)
-      })
-      markerSource_1.addFeatures(features)
-      map.addLayer(markerLayer_1)
-    },
-    addMarker_2 (list, icon=iconArray[0], scale=1) {
-      if (markerSource_2) {
-        markerSource_2.clear()
-      }
-      markerSource_2 = new VectorSource({
-        // features: new GeoJSON().readFeatures(geojsonObject)
-      })
-      markerLayer_2 = new VectorLayer({
-        source: markerSource_2,
-        zIndex: 50
-      })
-      let features = []
-      list.forEach((item, index) => {
-        const point = [parseFloat(item.longitude), parseFloat(item.latitude)]
-        let marker = new Feature({
-          geometry: new Point(point),
-          properties: {
-            ...item
-          }
-        })
-        let iconStyle = new Style({
-          image: new Icon({
-            scale: scale,
-            src: icon
-          })
-        })
-        marker.setStyle(iconStyle)
-        features.push(marker)
-      })
-      markerSource_2.addFeatures(features)
-      map.addLayer(markerLayer_2)
-    },
-    //加载组织数据
-    async loadOrgData () {
-
-      const url = "/gov/org/agency/maporg"
-      let params = {
-        orgId: '',
-        level: ''
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-
-        this.orgData = data
-        // this.orgId = this.orgData.id
-        // this.orgLevel = this.orgData.level
-        this.parentPolygon = []
-        this.parentPolygon.push(data)
-        if (data.children && data.children.length > 0) {
-          this.subAgencyArray = data.children
-        } else {
-          this.subAgencyArray = []
-        }
+        //添加icontuceng
+        this.addIconLayer()
 
-      } else {
-        this.$message.error(msg)
-      }
+        //加载当前园区的标注
+        this.loadPolygon()
 
+        this.setMapLocation()
     },
-    //加载父级组织多边形
-    loadParentPolygon () {
-      let featureData = []//标注数据
-      if (this.parentPolygon && this.parentPolygon.length > 0) {//判断是否存在下级标注
-        let oneData = {}
-
-        this.parentPolygon.forEach(agencyItem => {
-
-          if (agencyItem.coordinates && agencyItem.coordinates !== '') {//如果有坐标
-            oneData = {
-              type: 'Feature',
-              id: agencyItem.id,
-              properties: {
-                id: agencyItem.id,
-                level: agencyItem.level,
-                name: agencyItem.name
-              },
-              geometry: {
-                type: 'Polygon',
-                coordinates: [],
-              },
+    methods: {
+        initMap() {
+            this.firstCenterMap()
+
+            gaodeMapLayer = new TileLayer({
+                title: "地图",
+                source: new XYZ({
+                    url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}',
+                    wrapX: true // x方向平铺，也可以选择false
+                }),
+                zIndex: 20
+            })
+
+            mapView = new View({
+                center: this.centerPoint,
+                projection: 'EPSG:4326',
+                zoom: this.zoom,
+                minZoom: this.minZoom
+            })
+            map = new Map({
+                layers: [gaodeMapLayer],
+                view: mapView,
+                target: 'map'
+            })
+
+            map.on('singleclick', function (e) {
+                // console.log(e.coordinate)
+                // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
+            })
+        },
+        //设置地图定位的中心点和缩放级别
+        setMapLocation() {
+            if (!this.zoom) {
+                this.setZoom(this.orgData.agencyLevel)
             }
-            let coorArray = agencyItem.coordinates.split(',')//坐标数组
+            this.centerPoint = []
+
+
+            //如果存在中心点（返回时赋值）
+            if (parentLayer.getSource().getFeatures()[0]) {//如果是初次进入，不存在下级组织，用父级组织
+                this.centerFlag = 'flag_parent'
+            } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织
+                this.centerFlag = 'flag_polygon'
+            } else if (this.orgData.longitude && this.orgData.latitude) {
+                this.centerPoint.push(this.orgData.longitude)
+                this.centerPoint.push(this.orgData.latitude)
+                this.centerFlag = 'point'
+            } else {
+                this.centerPoint = centerPointGlobal
+                this.centerFlag = 'point'
+            }
+            // debugger
+            if (this.centerFlag === 'flag_parent') {
+                let parentFeatures = parentLayer.getSource().getFeatures()[0]
+                let polygon = parentFeatures.getGeometry();
+                map.getView().fit(polygon, map.getSize());
+                this.zoom = map.getView().getZoom() - 1
+
+            } else if (this.centerFlag === 'flag_polygon') {
+                let polygonFeatures = polygonLayer.getSource().getFeatures()[0]
+                let polygon = polygonFeatures.getGeometry();
+                map.getView().fit(polygon, map.getSize());
+                this.zoom = map.getView().getZoom() - 1
+            } else {
+                mapView.setCenter(this.centerPoint);
+            }
+            mapView.setZoom(this.zoom);
+        },
 
-            let itemArray = []//单个点位的[lon,lat]，数组
-            let polygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+        firstCenterMap() {
+            this.centerPoint = []
+            if (this.orgData.longitude && this.orgData.latitude) {
+                this.centerPoint.push(this.orgData.longitude)
+                this.centerPoint.push(this.orgData.latitude)
 
-            coorArray.forEach((item, index) => {
-              itemArray.push(item)
-              if (index % 2 == 0) {//偶
+            } else {
+                this.centerPoint = centerPointGlobal
+            }
+        },
+        addMarker(list, icon = iconArray[0], scale = 1) {
+            if (markerSource) {
+                markerSource.clear()
+            }
+            markerSource = new VectorSource({
+                // features: new GeoJSON().readFeatures(geojsonObject)
+            })
+            markerLayer = new VectorLayer({
+                source: markerSource,
+                zIndex: 50
+            })
+            let features = []
+            list.forEach((item, index) => {
+                const point = [parseFloat(item.longitude), parseFloat(item.latitude)]
+                let marker = new Feature({
+                    geometry: new Point(point),
+                    properties: {
+                        ...item
+                    }
+                })
+                let iconStyle = new Style({
+                    image: new Icon({
+                        scale: scale,
+                        src: icon
+                    })
+                })
+                marker.setStyle(iconStyle)
+                features.push(marker)
+            })
+            // // 点击图标
+            // var overlayStyle = (function () {
+            //   return function (feature) {
+            //     var styles = {}
+            //     styles['Point'] = [
+            //       new Style({
+            //         image: new Icon({
+            //           scale: scale,
+            //           src: iconArray[0] // feature.values_.properties.index
+            //         })
+            //       }),
+            //       new Style({
+            //         text: createTextStyle(feature)
+            //       })
+            //     ]
+            //     return styles[feature.getGeometry().getType()]
+            //   }
+            // })()
+            // let select = new Select({
+            //   style: overlayStyle
+            // })
+            // map.addInteraction(select)
+            // select.on('select', e => {
+            //   if (e.selected.length > 0) {
+            //     console.log('------', e.selected[0].values_.properties.id)
+            //   }
+            // })
+            markerSource.addFeatures(features)
+            map.addLayer(markerLayer)
+        },
+        addMarker_1(list, icon = iconArray[0], scale = 1) {
+            if (markerSource_1) {
+                markerSource_1.clear()
+            }
+            markerSource_1 = new VectorSource({
+                // features: new GeoJSON().readFeatures(geojsonObject)
+            })
+            markerLayer_1 = new VectorLayer({
+                source: markerSource_1,
+                zIndex: 50
+            })
+            let features = []
+            list.forEach((item, index) => {
+                const point = [parseFloat(item.longitude), parseFloat(item.latitude)]
+                let marker = new Feature({
+                    geometry: new Point(point),
+                    properties: {
+                        ...item
+                    }
+                })
+                let iconStyle = new Style({
+                    image: new Icon({
+                        scale: scale,
+                        src: icon
+                    })
+                })
+                marker.setStyle(iconStyle)
+                features.push(marker)
+            })
+            markerSource_1.addFeatures(features)
+            map.addLayer(markerLayer_1)
+        },
+        addMarker_2(list, icon = iconArray[0], scale = 1) {
+            if (markerSource_2) {
+                markerSource_2.clear()
+            }
+            markerSource_2 = new VectorSource({
+                // features: new GeoJSON().readFeatures(geojsonObject)
+            })
+            markerLayer_2 = new VectorLayer({
+                source: markerSource_2,
+                zIndex: 50
+            })
+            let features = []
+            list.forEach((item, index) => {
+                const point = [parseFloat(item.longitude), parseFloat(item.latitude)]
+                let marker = new Feature({
+                    geometry: new Point(point),
+                    properties: {
+                        ...item
+                    }
+                })
+                let iconStyle = new Style({
+                    image: new Icon({
+                        scale: scale,
+                        src: icon
+                    })
+                })
+                marker.setStyle(iconStyle)
+                features.push(marker)
+            })
+            markerSource_2.addFeatures(features)
+            map.addLayer(markerLayer_2)
+        },
+        //加载组织数据
+        async loadOrgData() {
+
+            const url = "/gov/org/agency/maporg"
+            let params = {
+                orgId: '',
+                level: ''
+            }
 
-              } else {//奇
-                polygonArray.push(itemArray)
-                itemArray = []
-              }
+            const { data, code, msg } = await requestPost(url, params)
 
-            });
-            oneData.geometry.coordinates.push(polygonArray)
-            featureData.push(oneData)
-          }
-        });
-      }
-
-      if (featureData && featureData.length > 0) {
-        var geojsonObject = {
-          'type': 'FeatureCollection',
-          'features': featureData
-        };
-        let feature = (new GeoJSON()).readFeatures(geojsonObject)
-        parentSource.addFeatures(feature)
-
-      }
+            if (code === 0) {
 
-    },
-    //加载当前园区的标注
-    loadPolygon () {
-      let featureData = []//标注数据
-
-      if (this.subAgencyArray && this.subAgencyArray.length > 0) {//判断是否存在下级标注
-        let oneData = {}
-
-        let count = 0
-        for (let i = 0; i < this.subAgencyArray.length; i++) {
-          const agencyItem = this.subAgencyArray[i]
-          
-
-          if (agencyItem.coordinates && agencyItem.coordinates !== '') {//如果有坐标
-            let urlNum = count % 3
-            count++
-
-            oneData = {
-              type: 'Feature',
-              id: agencyItem.id,
-              properties: {
-                id: agencyItem.id,
-                level: agencyItem.level,
-                name: agencyItem.name,
-                colorIndex: urlNum//颜色随机的索引
-              },
-              geometry: {
-                type: 'Polygon',
-                coordinates: [],
-              },
-            }
-            let coorArray = agencyItem.coordinates.split(',')//坐标数组
+                this.orgData = data
+                // this.orgId = this.orgData.id
+                // this.orgLevel = this.orgData.level
+                this.parentPolygon = []
+                this.parentPolygon.push(data)
+                if (data.children && data.children.length > 0) {
+                    this.subAgencyArray = data.children
+                } else {
+                    this.subAgencyArray = []
+                }
 
-            let itemArray = []//单个点位的[lon,lat]，数组
-            let polygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+            } else {
+                this.$message.error(msg)
+            }
 
-            coorArray.forEach((item, index) => {
-              itemArray.push(item)
-              if (index % 2 == 0) {//偶
+        },
+        //加载父级组织多边形
+        loadParentPolygon() {
+            let featureData = []//标注数据
+            if (this.parentPolygon && this.parentPolygon.length > 0) {//判断是否存在下级标注
+                let oneData = {}
+
+                this.parentPolygon.forEach(agencyItem => {
+
+                    if (agencyItem.coordinates && agencyItem.coordinates !== '') {//如果有坐标
+                        oneData = {
+                            type: 'Feature',
+                            id: agencyItem.id,
+                            properties: {
+                                id: agencyItem.id,
+                                level: agencyItem.level,
+                                name: agencyItem.name
+                            },
+                            geometry: {
+                                type: 'Polygon',
+                                coordinates: [],
+                            },
+                        }
+                        let coorArray = agencyItem.coordinates.split(',')//坐标数组
+
+                        let itemArray = []//单个点位的[lon,lat]，数组
+                        let polygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+
+                        coorArray.forEach((item, index) => {
+                            itemArray.push(item)
+                            if (index % 2 == 0) {//偶
+
+                            } else {//奇
+                                polygonArray.push(itemArray)
+                                itemArray = []
+                            }
+
+                        });
+                        oneData.geometry.coordinates.push(polygonArray)
+                        featureData.push(oneData)
+                    }
+                });
+            }
 
-              } else {//奇
-                polygonArray.push(itemArray)
-                itemArray = []
-              }
+            if (featureData && featureData.length > 0) {
+                var geojsonObject = {
+                    'type': 'FeatureCollection',
+                    'features': featureData
+                };
+                let feature = (new GeoJSON()).readFeatures(geojsonObject)
+                parentSource.addFeatures(feature)
 
-            });
-            oneData.geometry.coordinates.push(polygonArray)
-            featureData.push(oneData)
-          }
-        }
-      }
-
-      if (featureData && featureData.length > 0) {
-        var geojsonObject = {
-          'type': 'FeatureCollection',
-          'features': featureData
-        };
-        let feature = (new GeoJSON()).readFeatures(geojsonObject)
-        polygonSource.addFeatures(feature)
-
-        let iconFeatures = [];
-        feature.forEach(oneIcon => {
-          var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy]
-          // var center = getCenter(extent);   //获取边界区域的中心位置
-          //添加标注
-          let x = (parseFloat(extent[0]) + parseFloat(extent[2])) / 2
-          let y = (parseFloat(extent[1]) + parseFloat(extent[3])) / 2
-
-          let oneArray = [x, y]
-          this.iconCoordinators.push(oneArray)
-          // debugger
-          //地图icon样式
-          let oneCctv = new Feature({
-            geometry: new Point([x, y]),
-            id: oneIcon.id_,
-            properties: {
-              type: "icon",
-              id: oneIcon.id_
             }
-          });
-
-          let iconStyle = new Style({
-            image: new Icon({
-              // anchor: [0.5, 0.5],
-              // imgSize: [32, 32],
-              scale: 0.5,
-              // src: "/img/largeScreen/icon_camra.png"
-              // src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png"
-              src: iconUrlArray[oneIcon.values_.colorIndex]
-            })
-          });
 
-          oneCctv.setStyle(iconStyle);
-          iconFeatures.push(oneCctv);
+        },
+        //加载当前园区的标注
+        loadPolygon() {
+            let featureData = []//标注数据
+
+            if (this.subAgencyArray && this.subAgencyArray.length > 0) {//判断是否存在下级标注
+                let oneData = {}
+
+                let count = 0
+                for (let i = 0; i < this.subAgencyArray.length; i++) {
+                    const agencyItem = this.subAgencyArray[i]
+
+
+                    if (agencyItem.coordinates && agencyItem.coordinates !== '') {//如果有坐标
+                        let urlNum = count % 3
+                        count++
+
+                        oneData = {
+                            type: 'Feature',
+                            id: agencyItem.id,
+                            properties: {
+                                id: agencyItem.id,
+                                level: agencyItem.level,
+                                name: agencyItem.name,
+                                colorIndex: urlNum//颜色随机的索引
+                            },
+                            geometry: {
+                                type: 'Polygon',
+                                coordinates: [],
+                            },
+                        }
+                        let coorArray = agencyItem.coordinates.split(',')//坐标数组
+
+                        let itemArray = []//单个点位的[lon,lat]，数组
+                        let polygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+
+                        coorArray.forEach((item, index) => {
+                            itemArray.push(item)
+                            if (index % 2 == 0) {//偶
+
+                            } else {//奇
+                                polygonArray.push(itemArray)
+                                itemArray = []
+                            }
+
+                        });
+                        oneData.geometry.coordinates.push(polygonArray)
+                        featureData.push(oneData)
+                    }
+                }
+            }
 
-        });
+            if (featureData && featureData.length > 0) {
+                var geojsonObject = {
+                    'type': 'FeatureCollection',
+                    'features': featureData
+                };
+                let feature = (new GeoJSON()).readFeatures(geojsonObject)
+                polygonSource.addFeatures(feature)
+
+                let iconFeatures = [];
+                feature.forEach(oneIcon => {
+                    var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy]
+                    // var center = getCenter(extent);   //获取边界区域的中心位置
+                    //添加标注
+                    let x = (parseFloat(extent[0]) + parseFloat(extent[2])) / 2
+                    let y = (parseFloat(extent[1]) + parseFloat(extent[3])) / 2
+
+                    let oneArray = [x, y]
+                    this.iconCoordinators.push(oneArray)
+                    // debugger
+                    //地图icon样式
+                    let oneCctv = new Feature({
+                        geometry: new Point([x, y]),
+                        id: oneIcon.id_,
+                        properties: {
+                            type: "icon",
+                            id: oneIcon.id_
+                        }
+                    });
+
+                    let iconStyle = new Style({
+                        image: new Icon({
+                            // anchor: [0.5, 0.5],
+                            // imgSize: [32, 32],
+                            scale: 0.5,
+                            // src: "/img/largeScreen/icon_camra.png"
+                            // src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png"
+                            src: iconUrlArray[oneIcon.values_.colorIndex]
+                        })
+                    });
+
+                    oneCctv.setStyle(iconStyle);
+                    iconFeatures.push(oneCctv);
+
+                });
+
+                iconSource.addFeatures(iconFeatures);
+            }
 
-        iconSource.addFeatures(iconFeatures);
-      }
+        },
+        //添加变电站标注图层
+        addParentLayer() {
+            parentSource = new VectorSource({
+                //features: (new GeoJSON()).readFeatures(geojsonObject)
+            });
+            parentLayer = new VectorLayer({
+                source: parentSource,
+                style: parentStyleFunction,
+                zIndex: 50
+            });
+            map.addLayer(parentLayer)
+        },
+        //添加变电站标注图层
+        addPolygonLayer() {
+            polygonSource = new VectorSource({
+                //features: (new GeoJSON()).readFeatures(geojsonObject)
+            });
 
-    },
-    //添加变电站标注图层
-    addParentLayer () {
-      parentSource = new VectorSource({
-        //features: (new GeoJSON()).readFeatures(geojsonObject)
-      });
-      parentLayer = new VectorLayer({
-        source: parentSource,
-        style: parentStyleFunction,
-        zIndex: 50
-      });
-      map.addLayer(parentLayer)
-    },
-    //添加变电站标注图层
-    addPolygonLayer () {
-      polygonSource = new VectorSource({
-        //features: (new GeoJSON()).readFeatures(geojsonObject)
-      });
-
-      polygonLayer = new VectorLayer({
-        source: polygonSource,
-        style: polygonStyleFunction,
-        zIndex: 50
-      });
-
-      //选中多边形后的样式
-      var overlayStyle = (function () {
-
-        return function (feature) {
-          var styles = {};
-          styles['Polygon'] = [
-            new Style({
-              stroke: new Stroke({
-                color: '#ec9000',
-                width: 2
-              })
-            }),
+            polygonLayer = new VectorLayer({
+                source: polygonSource,
+                style: polygonStyleFunction,
+                zIndex: 50
+            });
 
-            new Style({
-              fill: new Fill({
-                color: 'rgba(0, 0, 255, 0.1)'
-              })
-            }),
-            new Style({
-              text: createTextStyle(feature)
-            })
-          ];
-          styles['MultiPolygon'] = styles['Polygon'];
-          return styles[feature.getGeometry().getType()];
-        };
-      })();
+            //选中多边形后的样式
+            var overlayStyle = (function () {
+
+                return function (feature) {
+                    var styles = {};
+                    styles['Polygon'] = [
+                        new Style({
+                            stroke: new Stroke({
+                                color: '#ec9000',
+                                width: 2
+                            })
+                        }),
+
+                        new Style({
+                            fill: new Fill({
+                                color: 'rgba(0, 0, 255, 0.1)'
+                            })
+                        }),
+                        new Style({
+                            text: createTextStyle(feature)
+                        })
+                    ];
+                    styles['MultiPolygon'] = styles['Polygon'];
+                    return styles[feature.getGeometry().getType()];
+                };
+            })();
+
+            select = new Select({
+                style: overlayStyle
+            });
 
-      select = new Select({
-        style: overlayStyle
-      });
 
+            map.addLayer(polygonLayer)
+            map.addInteraction(select);
 
-      map.addLayer(polygonLayer)
-      map.addInteraction(select);
+            // select.on('select', e => {
+            //   this.toSubAgency('polygon', e)
+            // });
 
-      // select.on('select', e => {
-      //   this.toSubAgency('polygon', e)
-      // });
+        },
 
-    },
+        addIconLayer() {
+            iconSource = new VectorSource({
+                //features: (new GeoJSON()).readFeatures(geojsonObject)
+            });
 
-    addIconLayer () {
-      iconSource = new VectorSource({
-        //features: (new GeoJSON()).readFeatures(geojsonObject)
-      });
+            iconLayer = new VectorLayer({
+                source: iconSource,
+                zIndex: 70
+            });
+            map.addLayer(iconLayer);
+        },
 
-      iconLayer = new VectorLayer({
-        source: iconSource,
-        zIndex: 70
-      });
-      map.addLayer(iconLayer);
     },
-
-  },
 }
 </script>
 
diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue
index 375415bc6..b4d8e1fa9 100644
--- a/src/views/modules/workSys/mapConfig.vue
+++ b/src/views/modules/workSys/mapConfig.vue
@@ -1,183 +1,180 @@
 <template>
-  <div>
-    <div style="position: relative">
-      <div class="m-search">
-        <el-select v-model="selAgencyId"
-                   size="small"
-                   placeholder="请选择或点击区域选择">
-          <el-option @click.native="orgChange(index)"
-                     v-for="(item, index) in subAgencyArray"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-        <div v-if="selAgencyId && subAgencyArray.length > 0">
-          <el-button v-if="showBtn && !hasPolygon"
-                     size="small"
-                     style="margin-left: 10px"
-                     type="primary"
-                     icon="el-icon-plus"
-                     @click="handleAddPolygon">{{ method === "mAddPolygon" ? "取消绘制" : "绘制区域" }}</el-button>
-          <el-button v-if="showBtn && hasPolygon"
-                     size="small"
-                     style="margin-left: 10px"
-                     type="primary"
-                     icon="el-icon-edit"
-                     @click="handleEditPolygon">{{
+    <div>
+        <div style="position: relative">
+            <div class="m-search">
+                <el-select v-model="selAgencyId"
+                           size="small"
+                           placeholder="请选择或点击区域选择">
+                    <el-option @click.native="orgChange(index)"
+                               v-for="(item, index) in subAgencyArray"
+                               :key="item.id"
+                               :label="item.name"
+                               :value="item.id">
+                    </el-option>
+                </el-select>
+                <div v-if="selAgencyId && subAgencyArray.length > 0">
+                    <el-button v-if="showBtn && !hasPolygon"
+                               size="small"
+                               style="margin-left: 10px"
+                               type="primary"
+                               icon="el-icon-plus"
+                               @click="handleAddPolygon">{{ method === "mAddPolygon" ? "取消绘制" : "绘制区域" }}</el-button>
+                    <el-button v-if="showBtn && hasPolygon"
+                               size="small"
+                               style="margin-left: 10px"
+                               type="primary"
+                               icon="el-icon-edit"
+                               @click="handleEditPolygon">{{
               method === "mEditPolygon" ? "取消绘制" : "重新绘制"
             }}</el-button>
-          <!-- <el-button v-if="showBtn&&hasPolygon"
+                    <!-- <el-button v-if="showBtn&&hasPolygon"
                      size="small"
                      style="margin-left:10px"
                      type="primary"
                      icon="el-icon-delete"
                      @click="handleDelPolygon">删除区域</el-button> -->
-          <el-button v-if="showBtn"
-                     size="small"
-                     style="margin-left: 10px"
-                     type="primary"
-                     icon="el-icon-upload2"
-                     @click="handleManually">手动录入</el-button>
-          <!-- <el-button v-if="showBtn"
+                    <el-button v-if="showBtn"
+                               size="small"
+                               style="margin-left: 10px"
+                               type="primary"
+                               icon="el-icon-upload2"
+                               @click="handleManually">手动录入</el-button>
+                    <!-- <el-button v-if="showBtn"
                      style="margin-left:10px"
                      type="primary"
                      icon="el-icon-delete"
                      @click="handleSetOffset">设置偏差</el-button> -->
-          <span v-if="showBtn && hasPolygon"> 经度偏差：</span>
-          <el-input-number v-if="showBtn && hasPolygon"
-                           resize="none"
-                           size="small"
-                           style="width: 200px"
-                           :precision="5"
-                           :step="0.0001"
-                           placeholder="请输入经度偏差"
-                           v-model="xOffset">
-          </el-input-number>
-          <span v-if="showBtn && hasPolygon"> 纬度偏差：</span>
-          <el-input-number v-if="showBtn && hasPolygon"
-                           resize="none"
-                           size="small"
-                           :precision="5"
-                           :step="0.0001"
-                           style="width: 200px"
-                           placeholder="请输入维度偏差"
-                           v-model="yOffset">
-          </el-input-number>
-
-          <el-button v-if="showBtn && hasPolygon"
-                     style="margin-left: 10px"
-                     type="primary"
-                     size="small"
-                     icon="el-icon-folder-add"
-                     @click="handleOffsetOk">保存</el-button>
-          <!-- <el-button v-if="showBtn"
+                    <span v-if="showBtn && hasPolygon"> 经度偏差：</span>
+                    <el-input-number v-if="showBtn && hasPolygon"
+                                     resize="none"
+                                     size="small"
+                                     style="width: 200px"
+                                     :precision="5"
+                                     :step="0.0001"
+                                     placeholder="请输入经度偏差"
+                                     v-model="xOffset">
+                    </el-input-number>
+                    <span v-if="showBtn && hasPolygon"> 纬度偏差：</span>
+                    <el-input-number v-if="showBtn && hasPolygon"
+                                     resize="none"
+                                     size="small"
+                                     :precision="5"
+                                     :step="0.0001"
+                                     style="width: 200px"
+                                     placeholder="请输入维度偏差"
+                                     v-model="yOffset">
+                    </el-input-number>
+
+                    <el-button v-if="showBtn && hasPolygon"
+                               style="margin-left: 10px"
+                               type="primary"
+                               size="small"
+                               icon="el-icon-folder-add"
+                               @click="handleOffsetOk">保存</el-button>
+                    <!-- <el-button v-if="showBtn"
                      style="margin-left:10px"
                      type="primary"
                      size="mini"
                      icon="el-icon-delete"
                      @click="handleOffsetCancel">预览</el-button> -->
+                </div>
+            </div>
+            <div class="div_back">
+                <el-button v-if="runNum > 0"
+                           style="margin-left: 10px"
+                           type="primary"
+                           icon="el-icon-back"
+                           @click="handleBack">返回上一级</el-button>
+            </div>
+            <div class="div_tip">
+                <span>按住alt键单击标注，可以进入下一级地图</span>
+            </div>
+            <div id="map"
+                 class="div_map"
+                 :style="{ height: mapHeight + 'px' }"></div>
         </div>
-      </div>
-      <div class="div_back">
-        <el-button v-if="runNum > 0"
-                   style="margin-left: 10px"
-                   type="primary"
-                   icon="el-icon-back"
-                   @click="handleBack">返回上一级</el-button>
-      </div>
-      <div class="div_tip">
-        <span>按住alt键单击标注，可以进入下一级地图</span>
-      </div>
-      <div id="map"
-           class="div_map"
-           :style="{ height: mapHeight + 'px' }"></div>
+        <el-dialog title="手动录入"
+                   :visible.sync="dialogVisible"
+                   width="50%"
+                   :before-close="handleClose">
+            <div class="div_textarea">
+                <div style="margin-top: 10px">
+                    <span> 中心点经度：</span>
+                    <el-input-number size="small"
+                                     style="width: 250px"
+                                     v-model="longitude">
+                    </el-input-number>
+                    <span style="margin-left: 15px"> 中心点纬度：</span>
+                    <el-input-number size="small"
+                                     style="width: 250px"
+                                     v-model="latitude">
+                    </el-input-number>
+                </div>
+                <div style="margin-top: 20px">
+                    <el-input type="textarea"
+                              :rows="15"
+                              style="width: 600px; max-height: 500px"
+                              placeholder="请复制坐标数据"
+                              v-model="polygonManullyString">
+                    </el-input>
+                </div>
+                <div style="margin-top: 20px">
+                    <span> 经度偏差：</span>
+                    <el-input-number resize="none"
+                                     size="small"
+                                     style="width: 200px"
+                                     :precision="5"
+                                     :step="0.0001"
+                                     placeholder="请输入经度偏差"
+                                     v-model="xOffset_customize">
+                    </el-input-number>
+                    <span style="margin-left: 15px"> 纬度偏差：</span>
+                    <el-input-number resize="none"
+                                     size="small"
+                                     :precision="5"
+                                     :step="0.0001"
+                                     style="width: 200px"
+                                     placeholder="请输入维度偏差"
+                                     v-model="yOffset_customize">
+                    </el-input-number>
+                </div>
+            </div>
+
+            <span slot="footer"
+                  class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary"
+                           @click="handleManuallyOk">确 定</el-button>
+            </span>
+        </el-dialog>
     </div>
-    <el-dialog title="手动录入"
-               :visible.sync="dialogVisible"
-               width="50%"
-               :before-close="handleClose">
-      <div class="div_textarea">
-        <div style="margin-top: 10px">
-          <span> 中心点经度：</span>
-          <el-input-number size="small"
-                           style="width: 250px"
-                           v-model="longitude">
-          </el-input-number>
-          <span style="margin-left: 15px"> 中心点纬度：</span>
-          <el-input-number size="small"
-                           style="width: 250px"
-                           v-model="latitude">
-          </el-input-number>
-        </div>
-        <div style="margin-top: 20px">
-          <el-input type="textarea"
-                    :rows="15"
-                    style="width: 600px; max-height: 500px"
-                    placeholder="请复制坐标数据"
-                    v-model="polygonManullyString">
-          </el-input>
-        </div>
-        <div style="margin-top: 20px">
-          <span> 经度偏差：</span>
-          <el-input-number resize="none"
-                           size="small"
-                           style="width: 200px"
-                           :precision="5"
-                           :step="0.0001"
-                           placeholder="请输入经度偏差"
-                           v-model="xOffset_customize">
-          </el-input-number>
-          <span style="margin-left: 15px"> 纬度偏差：</span>
-          <el-input-number resize="none"
-                           size="small"
-                           :precision="5"
-                           :step="0.0001"
-                           style="width: 200px"
-                           placeholder="请输入维度偏差"
-                           v-model="yOffset_customize">
-          </el-input-number>
-        </div>
-      </div>
-
-      <span slot="footer"
-            class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary"
-                   @click="handleManuallyOk">确 定</el-button>
-      </span>
-    </el-dialog>
-  </div>
 </template>
 
 <script>
-import "ol/ol.css";
+// import "ol/ol.css";
+import { requestPost } from "@/js/dai/request";
+import { mapType } from "@/utils/dai-map";
+import { Loading } from "element-ui"; //引入Loading服务
 import { Map, View } from "ol";
-import TileLayer from "ol/layer/Tile.js";
-import XYZ from "ol/source/XYZ.js";
-import VectorLayer from "ol/layer/Vector.js";
-import VectorSource from "ol/source/Vector.js";
+import { altKeyOnly, click } from "ol/events/condition";
+import { getWidth } from "ol/extent.js";
 import GeoJSON from "ol/format/GeoJSON.js";
-import { defaults as defaultControls, ZoomToExtent } from "ol/control.js";
 import {
-  defaults as defaultInteractions,
-  Modify,
-  Select,
-  DoubleClickZoom,
+    DoubleClickZoom,
+    Select
 } from "ol/interaction.js";
-import { getCenter, getWidth } from "ol/extent.js";
-import { Circle as CircleStyle, Fill, Stroke, Style, Text } from "ol/style.js";
 import Draw from "ol/interaction/Draw.js";
-import { mapGetters } from "vuex";
-import { Loading } from "element-ui"; //引入Loading服务
-import { requestPost } from "@/js/dai/request";
-import { altKeyOnly, click, pointerMove } from "ol/events/condition";
+import TileLayer from "ol/layer/Tile.js";
+import VectorLayer from "ol/layer/Vector.js";
+import { Projection, addProjection, get as getProjection } from "ol/proj.js";
+import { register as registerProj4 } from "ol/proj/proj4";
+import VectorSource from "ol/source/Vector.js";
 import WMTS from "ol/source/WMTS.js";
+import XYZ from "ol/source/XYZ.js";
+import { Fill, Stroke, Style, Text } from "ol/style.js";
 import WMTSTileGrid from "ol/tilegrid/WMTS.js";
-import { mapType } from "@/utils/dai-map";
-import { get as getProjection, Projection, addProjection } from "ol/proj.js";
 import proj4 from "proj4";
-import { register as registerProj4 } from "ol/proj/proj4";
+import { mapGetters } from "vuex";
 
 var centerPointGlobal = [120.664619, 36.504963];
 let loading; //加载动画
@@ -187,9 +184,9 @@ let y = 700;
 let size = [x, y];
 let extent = [-x, -y, x, y];
 let projection = new Projection({
-  code: "xkcd-image",
-  units: "pixels",
-  extent: extent,
+    code: "xkcd-image",
+    units: "pixels",
+    extent: extent,
 });
 
 let map;
@@ -207,1045 +204,1045 @@ let selectedFeatures;
 
 //标注的文字样式
 var createTextStyle = function (feature) {
-  return new Text({
-    textAlign: undefined,
-    font: "bold 18px Arial",
-    //fontFamily: "Courier New, monospace",
-    fontWeight: "bold",
-    text: feature.values_.name,
-    //text: "名称",
-    fill: new Fill({ color: "#007ab9" }),
-    stroke: new Stroke({ color: "#ffffff", width: 3 }),
-    offsetY: 0,
-    overflow: true,
-  });
+    return new Text({
+        textAlign: undefined,
+        font: "bold 18px Arial",
+        //fontFamily: "Courier New, monospace",
+        fontWeight: "bold",
+        text: feature.values_.name,
+        //text: "名称",
+        fill: new Fill({ color: "#007ab9" }),
+        stroke: new Stroke({ color: "#ffffff", width: 3 }),
+        offsetY: 0,
+        overflow: true,
+    });
 };
 //上级组织标注样式
 var parentStyleFunction = (function () {
-  return function (feature) {
-    return new Style({
-      // fill: new Fill({
-      //   color: [255, 255, 255, 0.3]
-      // }),
-      stroke: new Stroke({
-        color: [0, 103, 182, 1],
-        width: 2,
-      }),
-
-      // text: createTextStyle(feature)
-    });
-  };
+    return function (feature) {
+        return new Style({
+            // fill: new Fill({
+            //   color: [255, 255, 255, 0.3]
+            // }),
+            stroke: new Stroke({
+                color: [0, 103, 182, 1],
+                width: 2,
+            }),
+
+            // text: createTextStyle(feature)
+        });
+    };
 })();
 
 var polygonStyleFunction = (function () {
-  return function (feature) {
-    return new Style({
-      fill: new Fill({
-        color: [255, 255, 255, 0.3],
-      }),
-      stroke: new Stroke({
-        color: [0, 153, 255, 1],
-        width: 3,
-      }),
-
-      text: createTextStyle(feature),
-    });
-  };
+    return function (feature) {
+        return new Style({
+            fill: new Fill({
+                color: [255, 255, 255, 0.3],
+            }),
+            stroke: new Stroke({
+                color: [0, 153, 255, 1],
+                width: 3,
+            }),
+
+            text: createTextStyle(feature),
+        });
+    };
 })();
 
 const vueGis = {
-  name: "HomeMap",
-  data () {
-    return {
-      method: "", //绘制方法
-      centerPoint: [], //中心点位置
-      zoom: 14, //缩放范围：区14
-      minZoom: 1, //最小缩放
-      isMapLoaded: false, //地图是否加载完毕
-
-      orgData: {}, //当前组织对象
-      orgId: "",
-      orgLevel: "",
-
-      subAgencyArray: [], //下拉框数据
-      selAgencyIndex: 0,
-      selAgencyId: "", //下拉框选中的组织id
-      selAgency: {}, //下拉框选中的组织对象
-      hasPolygon: false, //下拉框选中的组织是否有标注
-      showBtn: false,
-
-      selPolygonId: "", //选择的多边形id
-      selPolygon: {},
-
-      //下钻层级记录
-      runNum: 0,
-      runAgency: [],
-      center: [],
-      zoom: null,
-      parentPolygon: [],
-
-      //手动录入弹出框
-      dialogVisible: false,
-      showOffset: false,
-      // polygonManullyString: "POLYGON (( 120.33902844 36.10290786, 120.33928218 36.10292997, 120.33956336 36.10316381, 120.34016675 36.10367715, 120.34044913 36.10391476, 120.34045707 36.10392145, 120.34068696 36.10411489, 120.34103181 36.10436285, 120.34117309 36.10441824, 120.34134613 36.10447927, 120.34164715 36.10465122, 120.34124679 36.10507284, 120.34088128 36.10538902, 120.34076198 36.10549222, 120.34053890 36.10520966, 120.34044967 36.10507284, 120.34030632 36.10494761, 120.34019091 36.10484679, 120.33976558 36.10448095, 120.33966658 36.10439980, 120.33947147 36.10425822, 120.33932037 36.10417613, 120.33913002 36.10411307, 120.33895751 36.10406073, 120.33879451 36.10403693, 120.33864104 36.10403158, 120.33864031 36.10395235, 120.33863211 36.10305897, 120.33902175 36.10290728, 120.33902844 36.10290786))",
-      polygonManullyString: "",
-
-      xOffset: 0,
-      yOffset: 0,
-      xOffset_customize: 0,
-      yOffset_customize: 0,
-      // xOffset_customize: 0.0051,//市北默认偏移
-      // yOffset_customize: 0.0002,//市北默认偏移
-
-      longitude: undefined,
-      latitude: undefined,
-    };
-  },
-  async mounted () {
-    //加载组织数据
-    await this.loadOrgData();
-    // this.runAgency.push(this.orgData)
-
-    //
-    if (mapType == "tdzw") {
-      this.initMap2();
-    } else {
-      this.initMap();
-    }
-
-    //上级组织多边形图层
-    this.addParentLayer();
-    this.loadParentPolygon();
-
-    //添加标注图层
-    this.addPolygonLayer();
-
-    //加载当前园区的标注
-    this.loadPolygon(this.subAgencyArray);
-  },
-  methods: {
-    //切换下级组织
-    orgChange (index) {
-      this.selAgencyIndex = index;
-
-      selectedFeatures.clear();
-
-      if (this.subAgencyArray.length > 0 && (index || index === 0)) {
-        this.showBtn = true;
-        this.selAgency = this.subAgencyArray[index];
-        if (this.selAgency.coordinates) {
-          this.hasPolygon = true;
-          this.highlightPolygon();
+    name: "HomeMap",
+    data() {
+        return {
+            method: "", //绘制方法
+            centerPoint: [], //中心点位置
+            zoom: 14, //缩放范围：区14
+            minZoom: 1, //最小缩放
+            isMapLoaded: false, //地图是否加载完毕
+
+            orgData: {}, //当前组织对象
+            orgId: "",
+            orgLevel: "",
+
+            subAgencyArray: [], //下拉框数据
+            selAgencyIndex: 0,
+            selAgencyId: "", //下拉框选中的组织id
+            selAgency: {}, //下拉框选中的组织对象
+            hasPolygon: false, //下拉框选中的组织是否有标注
+            showBtn: false,
+
+            selPolygonId: "", //选择的多边形id
+            selPolygon: {},
+
+            //下钻层级记录
+            runNum: 0,
+            runAgency: [],
+            center: [],
+            zoom: null,
+            parentPolygon: [],
+
+            //手动录入弹出框
+            dialogVisible: false,
+            showOffset: false,
+            // polygonManullyString: "POLYGON (( 120.33902844 36.10290786, 120.33928218 36.10292997, 120.33956336 36.10316381, 120.34016675 36.10367715, 120.34044913 36.10391476, 120.34045707 36.10392145, 120.34068696 36.10411489, 120.34103181 36.10436285, 120.34117309 36.10441824, 120.34134613 36.10447927, 120.34164715 36.10465122, 120.34124679 36.10507284, 120.34088128 36.10538902, 120.34076198 36.10549222, 120.34053890 36.10520966, 120.34044967 36.10507284, 120.34030632 36.10494761, 120.34019091 36.10484679, 120.33976558 36.10448095, 120.33966658 36.10439980, 120.33947147 36.10425822, 120.33932037 36.10417613, 120.33913002 36.10411307, 120.33895751 36.10406073, 120.33879451 36.10403693, 120.33864104 36.10403158, 120.33864031 36.10395235, 120.33863211 36.10305897, 120.33902175 36.10290728, 120.33902844 36.10290786))",
+            polygonManullyString: "",
+
+            xOffset: 0,
+            yOffset: 0,
+            xOffset_customize: 0,
+            yOffset_customize: 0,
+            // xOffset_customize: 0.0051,//市北默认偏移
+            // yOffset_customize: 0.0002,//市北默认偏移
+
+            longitude: undefined,
+            latitude: undefined,
+        };
+    },
+    async mounted() {
+        //加载组织数据
+        await this.loadOrgData();
+        // this.runAgency.push(this.orgData)
+
+        //
+        if (mapType == "tdzw") {
+            this.initMap2();
         } else {
-          this.hasPolygon = false;
+            this.initMap();
         }
-      } else {
-        this.showBtn = false;
-      }
-    },
 
-    //刷新地图  isRefreshView:是否需要重置中心点，如果是绘制、删除区域，不需要，如果是下钻或返回需要
-    async refreshMap (isRefreshView) {
-      //加载组织数据
-      await this.loadOrgData();
-      this.loadParentPolygon();
-      //加载当前园区的标注
-      this.loadPolygon(this.subAgencyArray);
-
-      //重置地图中心点
-      // if (isRefreshView) {
-      //   this.setMapLocation()
-      //   mapView.setCenter(this.centerPoint);
-      //   mapView.setZoom(this.zoom);
-      // }
-    },
+        //上级组织多边形图层
+        this.addParentLayer();
+        this.loadParentPolygon();
 
-    //返回上一级组织
-    handleBack () {
-      this.center = this.runAgency[this.runNum - 1].center;
-      this.zoom = this.runAgency[this.runNum - 1].zoom;
-      this.selAgencyId = "";
-      this.runNum--;
-      this.runAgency.pop();
-
-      if (this.runNum === 0) {
-        this.orgId = "";
-        this.orgLevel = "";
-      } else {
-        this.orgId = this.runAgency[this.runAgency.length - 1].id;
-        this.orgLevel = this.runAgency[this.runAgency.length - 1].level;
-      }
-
-      this.refreshMap(true);
-    },
+        //添加标注图层
+        this.addPolygonLayer();
 
-    //加载组织数据
-    async loadOrgData () {
-      const url = "/gov/org/agency/maporg";
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
-      let params = {
-        orgId: this.orgId,
-        level: this.orgLevel,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.orgData = data;
-        this.subAgencyArray = [];
-        if (this.runNum === 0) {
-          //第一次进入，绘制本级
-          this.subAgencyArray.push(data);
-          // this.selAgencyId = data.id
-        } else {
-          this.parentPolygon = [];
-          this.parentPolygon.push(data);
-
-          if (data.children && data.children.length > 0) {
-            this.subAgencyArray = data.children;
-            // this.selAgencyId = this.subAgencyArray[0].id
-          } else {
-            this.subAgencyArray = [];
-            // this.selAgencyId = ''
-          }
-        }
-      } else {
-        this.$message.error(msg);
-      }
+        //加载当前园区的标注
+        this.loadPolygon(this.subAgencyArray);
     },
+    methods: {
+        //切换下级组织
+        orgChange(index) {
+            this.selAgencyIndex = index;
+
+            selectedFeatures.clear();
+
+            if (this.subAgencyArray.length > 0 && (index || index === 0)) {
+                this.showBtn = true;
+                this.selAgency = this.subAgencyArray[index];
+                if (this.selAgency.coordinates) {
+                    this.hasPolygon = true;
+                    this.highlightPolygon();
+                } else {
+                    this.hasPolygon = false;
+                }
+            } else {
+                this.showBtn = false;
+            }
+        },
 
-    //加载父级组织多边形
-    loadParentPolygon () {
-      parentSource.clear(); //清空标注
-
-      let featureData = []; //标注数据
-      if (this.parentPolygon && this.parentPolygon.length > 0) {
-        //判断是否存在下级标注
-        let oneData = {};
-
-        this.parentPolygon.forEach((agencyItem) => {
-          if (agencyItem.coordinates && agencyItem.coordinates !== "") {
-            //如果有坐标
-            oneData = {
-              type: "Feature",
-              id: agencyItem.id,
-              properties: {
-                id: agencyItem.id,
-                level: agencyItem.level,
-                name: agencyItem.name,
-              },
-              geometry: {
-                type: "Polygon",
-                coordinates: [],
-              },
-            };
-            let coorArray = agencyItem.coordinates.split(","); //坐标数组
-
-            let itemArray = []; //单个点位的[lon,lat]，数组
-            let polygonArray = []; //整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
-
-            coorArray.forEach((item, index) => {
-              itemArray.push(item);
-              if (index % 2 == 0) {
-                //偶
-              } else {
-                //奇
-                polygonArray.push(itemArray);
-                itemArray = [];
-              }
-            });
-            oneData.geometry.coordinates.push(polygonArray);
-            featureData.push(oneData);
-          }
-        });
-      }
+        //刷新地图  isRefreshView:是否需要重置中心点，如果是绘制、删除区域，不需要，如果是下钻或返回需要
+        async refreshMap(isRefreshView) {
+            //加载组织数据
+            await this.loadOrgData();
+            this.loadParentPolygon();
+            //加载当前园区的标注
+            this.loadPolygon(this.subAgencyArray);
+
+            //重置地图中心点
+            // if (isRefreshView) {
+            //   this.setMapLocation()
+            //   mapView.setCenter(this.centerPoint);
+            //   mapView.setZoom(this.zoom);
+            // }
+        },
 
-      if (featureData && featureData.length > 0) {
-        var geojsonObject = {
-          type: "FeatureCollection",
-          features: featureData,
-        };
-        let feature = new GeoJSON().readFeatures(geojsonObject);
-        parentSource.addFeatures(feature);
-      }
-    },
-    //加载当前园区的标注
-    loadPolygon (subAgencyArray) {
-      polygonSource.clear(); //清空标注
-
-      let featureData = []; //标注数据
-      if (subAgencyArray && subAgencyArray.length > 0) {
-        //判断是否存在下级标注
-        let oneData = {};
-
-        subAgencyArray.forEach((agencyItem) => {
-          if (agencyItem.coordinates && agencyItem.coordinates !== "") {
-            //如果有坐标
-            oneData = {
-              type: "Feature",
-              id: agencyItem.id,
-              properties: {
-                id: agencyItem.id,
-                level: agencyItem.level,
-                name: agencyItem.name,
-              },
-              geometry: {
-                type: "Polygon",
-                coordinates: [],
-              },
+        //返回上一级组织
+        handleBack() {
+            this.center = this.runAgency[this.runNum - 1].center;
+            this.zoom = this.runAgency[this.runNum - 1].zoom;
+            this.selAgencyId = "";
+            this.runNum--;
+            this.runAgency.pop();
+
+            if (this.runNum === 0) {
+                this.orgId = "";
+                this.orgLevel = "";
+            } else {
+                this.orgId = this.runAgency[this.runAgency.length - 1].id;
+                this.orgLevel = this.runAgency[this.runAgency.length - 1].level;
+            }
+
+            this.refreshMap(true);
+        },
+
+        //加载组织数据
+        async loadOrgData() {
+            const url = "/gov/org/agency/maporg";
+            // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
+            let params = {
+                orgId: this.orgId,
+                level: this.orgLevel,
             };
-            let coorArray = agencyItem.coordinates.split(","); //坐标数组
-
-            let itemArray = []; //单个点位的[lon,lat]，数组
-            let polygonArray = []; //整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
-
-            coorArray.forEach((item, index) => {
-              itemArray.push(item);
-              if (index % 2 == 0) {
-                //偶
-              } else {
-                //奇
-                polygonArray.push(itemArray);
-                itemArray = [];
-              }
-            });
-            oneData.geometry.coordinates.push(polygonArray);
-            featureData.push(oneData);
-          }
-        });
-      }
 
-      if (featureData && featureData.length > 0) {
-        var geojsonObject = {
-          type: "FeatureCollection",
-          features: featureData,
-        };
-        let feature = new GeoJSON().readFeatures(geojsonObject);
-        polygonSource.addFeatures(feature);
-      }
-      this.orgChange(this.selAgencyIndex);
-    },
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.orgData = data;
+                this.subAgencyArray = [];
+                if (this.runNum === 0) {
+                    //第一次进入，绘制本级
+                    this.subAgencyArray.push(data);
+                    // this.selAgencyId = data.id
+                } else {
+                    this.parentPolygon = [];
+                    this.parentPolygon.push(data);
+
+                    if (data.children && data.children.length > 0) {
+                        this.subAgencyArray = data.children;
+                        // this.selAgencyId = this.subAgencyArray[0].id
+                    } else {
+                        this.subAgencyArray = [];
+                        // this.selAgencyId = ''
+                    }
+                }
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    //选择feature
-    selectFeature (e) {
-      if (e.selected.length > 0) {
-        console.log("selectFeature22222222222222222222222");
-        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);
+        //加载父级组织多边形
+        loadParentPolygon() {
+            parentSource.clear(); //清空标注
+
+            let featureData = []; //标注数据
+            if (this.parentPolygon && this.parentPolygon.length > 0) {
+                //判断是否存在下级标注
+                let oneData = {};
+
+                this.parentPolygon.forEach((agencyItem) => {
+                    if (agencyItem.coordinates && agencyItem.coordinates !== "") {
+                        //如果有坐标
+                        oneData = {
+                            type: "Feature",
+                            id: agencyItem.id,
+                            properties: {
+                                id: agencyItem.id,
+                                level: agencyItem.level,
+                                name: agencyItem.name,
+                            },
+                            geometry: {
+                                type: "Polygon",
+                                coordinates: [],
+                            },
+                        };
+                        let coorArray = agencyItem.coordinates.split(","); //坐标数组
+
+                        let itemArray = []; //单个点位的[lon,lat]，数组
+                        let polygonArray = []; //整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+
+                        coorArray.forEach((item, index) => {
+                            itemArray.push(item);
+                            if (index % 2 == 0) {
+                                //偶
+                            } else {
+                                //奇
+                                polygonArray.push(itemArray);
+                                itemArray = [];
+                            }
+                        });
+                        oneData.geometry.coordinates.push(polygonArray);
+                        featureData.push(oneData);
+                    }
+                });
             }
-          });
-        }
-      }
-    },
-    //下钻到下一级
-    toSubAgency (e) {
-      if (!e.selected[0]) {
-        return false;
-      }
-
-      if (this.method != "mAddPolygon" && this.level != "neighborHood") {
-        this.selAgencyId = "";
+
+            if (featureData && featureData.length > 0) {
+                var geojsonObject = {
+                    type: "FeatureCollection",
+                    features: featureData,
+                };
+                let feature = new GeoJSON().readFeatures(geojsonObject);
+                parentSource.addFeatures(feature);
+            }
+        },
+        //加载当前园区的标注
+        loadPolygon(subAgencyArray) {
+            polygonSource.clear(); //清空标注
+
+            let featureData = []; //标注数据
+            if (subAgencyArray && subAgencyArray.length > 0) {
+                //判断是否存在下级标注
+                let oneData = {};
+
+                subAgencyArray.forEach((agencyItem) => {
+                    if (agencyItem.coordinates && agencyItem.coordinates !== "") {
+                        //如果有坐标
+                        oneData = {
+                            type: "Feature",
+                            id: agencyItem.id,
+                            properties: {
+                                id: agencyItem.id,
+                                level: agencyItem.level,
+                                name: agencyItem.name,
+                            },
+                            geometry: {
+                                type: "Polygon",
+                                coordinates: [],
+                            },
+                        };
+                        let coorArray = agencyItem.coordinates.split(","); //坐标数组
+
+                        let itemArray = []; //单个点位的[lon,lat]，数组
+                        let polygonArray = []; //整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+
+                        coorArray.forEach((item, index) => {
+                            itemArray.push(item);
+                            if (index % 2 == 0) {
+                                //偶
+                            } else {
+                                //奇
+                                polygonArray.push(itemArray);
+                                itemArray = [];
+                            }
+                        });
+                        oneData.geometry.coordinates.push(polygonArray);
+                        featureData.push(oneData);
+                    }
+                });
+            }
+
+            if (featureData && featureData.length > 0) {
+                var geojsonObject = {
+                    type: "FeatureCollection",
+                    features: featureData,
+                };
+                let feature = new GeoJSON().readFeatures(geojsonObject);
+                polygonSource.addFeatures(feature);
+            }
+            this.orgChange(this.selAgencyIndex);
+        },
+
+        //选择feature
+        selectFeature(e) {
+            if (e.selected.length > 0) {
+                console.log("selectFeature22222222222222222222222");
+                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);
+                        }
+                    });
+                }
+            }
+        },
         //下钻到下一级
-        this.subAgencyArray.forEach((item) => {
-          if (item.id === e.selected[0].id_) {
-            this.selPolygonId = item.id;
-            this.selPolygon = item;
-            this.orgId = item.id;
-            this.orgLevel = item.level;
-          }
-        });
+        toSubAgency(e) {
+            if (!e.selected[0]) {
+                return false;
+            }
 
-        this.runNum++;
-        this.selPolygon.center = map.getView().getCenter();
-        this.selPolygon.zoom = map.getView().getZoom();
-        console.log("center", map.getView().getCenter());
-        console.log("zoom", map.getView().getZoom());
+            if (this.method != "mAddPolygon" && this.level != "neighborHood") {
+                this.selAgencyId = "";
+                //下钻到下一级
+                this.subAgencyArray.forEach((item) => {
+                    if (item.id === e.selected[0].id_) {
+                        this.selPolygonId = item.id;
+                        this.selPolygon = item;
+                        this.orgId = item.id;
+                        this.orgLevel = item.level;
+                    }
+                });
+
+                this.runNum++;
+                this.selPolygon.center = map.getView().getCenter();
+                this.selPolygon.zoom = map.getView().getZoom();
+                console.log("center", map.getView().getCenter());
+                console.log("zoom", map.getView().getZoom());
+
+                this.runAgency.push(this.selPolygon);
+                this.selAgencyIndex = 0;
+                this.refreshMap(true);
+            }
+        },
 
-        this.runAgency.push(this.selPolygon);
-        this.selAgencyIndex = 0;
-        this.refreshMap(true);
-      }
-    },
+        //高亮某个标注
+        highlightPolygon() {
+            let features = polygonSource.getFeatures();
+            features.forEach((element) => {
+                if (element.id_ === this.selAgencyId) {
+                    selectedFeatures.push(element);
+                    let polygon = element.getGeometry();
+                    map.getView().fit(polygon, map.getSize());
+                    this.zoom = map.getView().getZoom() - 2;
+                    mapView.setZoom(this.zoom);
+                }
+            });
+        },
+        //设置地图定位的中心点和缩放级别
+        setMapLocation() {
+            this.centerPoint = [];
+
+            if (this.center && this.center.length > 0) {
+                this.centerPoint = this.center;
+            } else if (this.orgData.longitude && this.orgData.latitude) {
+                this.centerPoint.push(this.orgData.longitude);
+                this.centerPoint.push(this.orgData.latitude);
+            } else {
+                this.centerPoint = centerPointGlobal;
+            }
 
-    //高亮某个标注
-    highlightPolygon () {
-      let features = polygonSource.getFeatures();
-      features.forEach((element) => {
-        if (element.id_ === this.selAgencyId) {
-          selectedFeatures.push(element);
-          let polygon = element.getGeometry();
-          map.getView().fit(polygon, map.getSize());
-          this.zoom = map.getView().getZoom() - 2;
-          mapView.setZoom(this.zoom);
-        }
-      });
-    },
-    //设置地图定位的中心点和缩放级别
-    setMapLocation () {
-      this.centerPoint = [];
-
-      if (this.center && this.center.length > 0) {
-        this.centerPoint = this.center;
-      } else if (this.orgData.longitude && this.orgData.latitude) {
-        this.centerPoint.push(this.orgData.longitude);
-        this.centerPoint.push(this.orgData.latitude);
-      } else {
-        this.centerPoint = centerPointGlobal;
-      }
-
-      if (!this.zoom) {
-        this.setZoom(this.orgData.agencyLevel);
-      }
-    },
+            if (!this.zoom) {
+                this.setZoom(this.orgData.agencyLevel);
+            }
+        },
 
-    //根据组织层级设置缩放级别
-    setZoom (agencyLevel) {
-      if (agencyLevel === "district") {
-        this.zoom = 12;
-      } else if (agencyLevel === "street") {
-        this.zoom = 13;
-      } else if (agencyLevel === "community") {
-        this.zoom = 14;
-      } else {
-        this.zoom = 11;
-      }
-    },
+        //根据组织层级设置缩放级别
+        setZoom(agencyLevel) {
+            if (agencyLevel === "district") {
+                this.zoom = 12;
+            } else if (agencyLevel === "street") {
+                this.zoom = 13;
+            } else if (agencyLevel === "community") {
+                this.zoom = 14;
+            } else {
+                this.zoom = 11;
+            }
+        },
 
-    initMap () {
-      this.setMapLocation();
-
-      gaodeMapLayer = new TileLayer({
-        title: "地图",
-        // source: new XYZ({
-        //   url: "http://t4.tianditu.com/DataServer?T=vec_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
-        // }),
-        // source: new XYZ({
-        //   url: "http://api.tianditu.gov.cn/api?v=4.0&tk=c4dc987b442bd141a887d8d4a5d07926&x={x}&y={y}&l={z}"
-        // }),
-        source: new XYZ({
-          //指定url瓦片
-          url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&style=7&ltype=7&scl=0&size=0&x={x}&y={y}&z={z}",
-          wrapX: true, //x方向平铺，也可以选择false
-        }),
-        // zIndex: 20
-      });
-      // var sourceMark = new XYZ({
-      //   url: "http://t4.tianditu.com/DataServer?T=cva_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
-      //   // zIndex: 22
-      // });
-      // var tileMark = new TileLayer({
-      //   title: "标注图层",
-      //   source: sourceMark,
-      // });
-
-      (mapView = new View({
-        //中心点坐标
-        center: this.centerPoint,
-        // projection: 'EPSG:3857',
-        projection: "EPSG:4326",
-        zoom: this.zoom,
-        minZoom: this.minZoom,
-      })),
-        //初始化map和地图底图
-        //创建地图容器
-        (map = new Map({
-          layers: [gaodeMapLayer],
-          // layers: [gaodeMapLayer, tileMark],
-          //加载瓦片图层数据
-          view: mapView,
-          target: "map",
-          //目标加载到map中
-        }));
-
-      map.on("singleclick", function (e) {
-        // console.log(e.coordinate)
-        // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
-      });
-
-      //去除双击放大效果
-      const dblClickInteraction = map
-        .getInteractions()
-        .getArray()
-        .find((interaction) => {
-          return interaction instanceof DoubleClickZoom;
-        });
-      map.removeInteraction(dblClickInteraction);
-    },
+        initMap() {
+            this.setMapLocation();
+
+            gaodeMapLayer = new TileLayer({
+                title: "地图",
+                // source: new XYZ({
+                //   url: "http://t4.tianditu.com/DataServer?T=vec_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
+                // }),
+                // source: new XYZ({
+                //   url: "http://api.tianditu.gov.cn/api?v=4.0&tk=c4dc987b442bd141a887d8d4a5d07926&x={x}&y={y}&l={z}"
+                // }),
+                source: new XYZ({
+                    //指定url瓦片
+                    url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&style=7&ltype=7&scl=0&size=0&x={x}&y={y}&z={z}",
+                    wrapX: true, //x方向平铺，也可以选择false
+                }),
+                // zIndex: 20
+            });
+            // var sourceMark = new XYZ({
+            //   url: "http://t4.tianditu.com/DataServer?T=cva_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
+            //   // zIndex: 22
+            // });
+            // var tileMark = new TileLayer({
+            //   title: "标注图层",
+            //   source: sourceMark,
+            // });
 
-    // 烟台专用
-    initMap2 () {
-      this.setMapLocation();
-
-      proj4.defs(
-        "EPSG:4490",
-        'GEOGCS["China Geodetic Coordinate System 2000",DATUM["China_2000",SPHEROID["CGCS2000",6378137,298.257222101,AUTHORITY["EPSG","1024"]],AUTHORITY["EPSG","1043"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4490"]]'
-      );
-      registerProj4(proj4);
-      //重写projection4490，
-      var projection = new Projection({
-        code: "EPSG:4490",
-        units: "degrees",
-        axisOrientation: "neu",
-      });
-      projection.setExtent([-180, -90, 180, 90]);
-      projection.setWorldExtent([-180, -90, 180, 90]);
-      addProjection(projection);
-
-      let projectionExtent = projection.getExtent();
-      let size = getWidth(projectionExtent) / 256; //size就是一个像素代表的经纬度
-      let matrixIds = [];
-
-      function getResolutions () {
-        let resolutions = [];
-        for (let z = 7; z < 19; ++z) {
-          resolutions[z] = size / Math.pow(2, z);
-          matrixIds[z] = z;
-        }
-        return resolutions;
-      }
-
-      const resolutions = getResolutions();
-
-      console.log("========= getProjection", getProjection("EPSG:4490"));
-
-      let url = "http://59.206.203.34/tileservice/SDPubMap";
-      if (window.SITE_CONFIG["nodeEnv"] == "dev_sdtdt") {
-        url =
-          "http://service.sdmap.gov.cn/tileservice/sdpubmap?tk=e758167d5b90c351b70a979c0820840c";
-      }
-
-      gaodeMapLayer = new TileLayer({
-        title: "地图",
-        source: new WMTS({
-          url,
-          layer: "sdvec",
-          matrixSet: "c",
-          format: "image/png",
-          projection: getProjection("EPSG:4490"),
-          tileGrid: new WMTSTileGrid({
-            origin: [-180, 90],
-            resolutions,
-            matrixIds,
-          }),
-          style: "default",
-          tilematrixset: "c",
-          // wrapX: true,
-          tileLoadFunction (imageTile, src) {
-            // 使用滤镜 将白色修改为深色
-            let img = new Image();
-            // img.crossOrigin = ''
-            // 设置图片不从缓存取，从缓存取可能会出现跨域，导致加载失败
-            img.setAttribute("crossOrigin", "anonymous");
-            img.onload = function () {
-              let canvas = document.createElement("canvas");
-              let w = img.width;
-              let h = img.height;
-              canvas.width = w;
-              canvas.height = h;
-              let context = canvas.getContext("2d");
-              context.filter =
-                "grayscale(92%) invert(100%) sepia(20%) hue-rotate(140deg) saturate(2000%) brightness(70%) contrast(80%)";
-              context.drawImage(img, 0, 0, w, h, 0, 0, w, h);
-              imageTile.getImage().src = canvas.toDataURL("image/png");
-            };
-            img.src = src;
-          },
-        }),
-      });
-
-      (mapView = new View({
-        //中心点坐标
-        center: this.centerPoint,
-        projection: getProjection("EPSG:4490"),
-        zoom: this.zoom,
-        minZoom: this.minZoom,
-      })),
-        //初始化map和地图底图
-        //创建地图容器
-        (map = new Map({
-          layers: [gaodeMapLayer],
-          //加载瓦片图层数据
-          view: mapView,
-          target: "map",
-          //目标加载到map中
-        }));
-
-      map.on("singleclick", function (e) {
-        // console.log(e.coordinate)
-        // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
-      });
-
-      //去除双击放大效果
-      const dblClickInteraction = map
-        .getInteractions()
-        .getArray()
-        .find((interaction) => {
-          return interaction instanceof DoubleClickZoom;
-        });
-      map.removeInteraction(dblClickInteraction);
-    },
+            (mapView = new View({
+                //中心点坐标
+                center: this.centerPoint,
+                // projection: 'EPSG:3857',
+                projection: "EPSG:4326",
+                zoom: this.zoom,
+                minZoom: this.minZoom,
+            })),
+                //初始化map和地图底图
+                //创建地图容器
+                (map = new Map({
+                    layers: [gaodeMapLayer],
+                    // layers: [gaodeMapLayer, tileMark],
+                    //加载瓦片图层数据
+                    view: mapView,
+                    target: "map",
+                    //目标加载到map中
+                }));
+
+            map.on("singleclick", function (e) {
+                // console.log(e.coordinate)
+                // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
+            });
 
-    //添加标注图层
-    addParentLayer () {
-      parentSource = new VectorSource({
-        //features: (new GeoJSON()).readFeatures(geojsonObject)
-      });
+            //去除双击放大效果
+            const dblClickInteraction = map
+                .getInteractions()
+                .getArray()
+                .find((interaction) => {
+                    return interaction instanceof DoubleClickZoom;
+                });
+            map.removeInteraction(dblClickInteraction);
+        },
 
-      parentLayer = new VectorLayer({
-        source: parentSource,
-        style: parentStyleFunction,
-        zIndex: 50,
-      });
+        // 烟台专用
+        initMap2() {
+            this.setMapLocation();
+
+            proj4.defs(
+                "EPSG:4490",
+                'GEOGCS["China Geodetic Coordinate System 2000",DATUM["China_2000",SPHEROID["CGCS2000",6378137,298.257222101,AUTHORITY["EPSG","1024"]],AUTHORITY["EPSG","1043"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4490"]]'
+            );
+            registerProj4(proj4);
+            //重写projection4490，
+            var projection = new Projection({
+                code: "EPSG:4490",
+                units: "degrees",
+                axisOrientation: "neu",
+            });
+            projection.setExtent([-180, -90, 180, 90]);
+            projection.setWorldExtent([-180, -90, 180, 90]);
+            addProjection(projection);
+
+            let projectionExtent = projection.getExtent();
+            let size = getWidth(projectionExtent) / 256; //size就是一个像素代表的经纬度
+            let matrixIds = [];
+
+            function getResolutions() {
+                let resolutions = [];
+                for (let z = 7; z < 19; ++z) {
+                    resolutions[z] = size / Math.pow(2, z);
+                    matrixIds[z] = z;
+                }
+                return resolutions;
+            }
 
-      map.addLayer(parentLayer);
-    },
-    //添加标注图层
-    addPolygonLayer () {
-      polygonSource = new VectorSource({
-        //features: (new GeoJSON()).readFeatures(geojsonObject)
-      });
-
-      polygonLayer = new VectorLayer({
-        source: polygonSource,
-        style: polygonStyleFunction,
-        zIndex: 50,
-      });
-
-      //选中多边形后的样式
-      var overlayStyle = (function () {
-        return function (feature) {
-          var styles = {};
-          styles["Polygon"] = [
-            new Style({
-              stroke: new Stroke({
-                color: "#ec9000",
-                width: 2,
-              }),
-            }),
+            const resolutions = getResolutions();
 
-            new Style({
-              fill: new Fill({
-                color: "rgba(0, 0, 255, 0.1)",
-              }),
-            }),
-            new Style({
-              text: createTextStyle(feature),
-            }),
-          ];
-          styles["MultiPolygon"] = styles["Polygon"];
-          return styles[feature.getGeometry().getType()];
-        };
-      })();
+            console.log("========= getProjection", getProjection("EPSG:4490"));
 
-      select = new Select({
-        style: overlayStyle,
-      });
+            let url = "http://59.206.203.34/tileservice/SDPubMap";
+            if (window.SITE_CONFIG["nodeEnv"] == "dev_sdtdt") {
+                url =
+                    "http://service.sdmap.gov.cn/tileservice/sdpubmap?tk=e758167d5b90c351b70a979c0820840c";
+            }
 
-      selectAltClick = new Select({
-        condition: function (mapBrowserEvent) {
-          return click(mapBrowserEvent) && altKeyOnly(mapBrowserEvent);
-        },
-      });
+            gaodeMapLayer = new TileLayer({
+                title: "地图",
+                source: new WMTS({
+                    url,
+                    layer: "sdvec",
+                    matrixSet: "c",
+                    format: "image/png",
+                    projection: getProjection("EPSG:4490"),
+                    tileGrid: new WMTSTileGrid({
+                        origin: [-180, 90],
+                        resolutions,
+                        matrixIds,
+                    }),
+                    style: "default",
+                    tilematrixset: "c",
+                    // wrapX: true,
+                    tileLoadFunction(imageTile, src) {
+                        // 使用滤镜 将白色修改为深色
+                        let img = new Image();
+                        // img.crossOrigin = ''
+                        // 设置图片不从缓存取，从缓存取可能会出现跨域，导致加载失败
+                        img.setAttribute("crossOrigin", "anonymous");
+                        img.onload = function () {
+                            let canvas = document.createElement("canvas");
+                            let w = img.width;
+                            let h = img.height;
+                            canvas.width = w;
+                            canvas.height = h;
+                            let context = canvas.getContext("2d");
+                            context.filter =
+                                "grayscale(92%) invert(100%) sepia(20%) hue-rotate(140deg) saturate(2000%) brightness(70%) contrast(80%)";
+                            context.drawImage(img, 0, 0, w, h, 0, 0, w, h);
+                            imageTile.getImage().src = canvas.toDataURL("image/png");
+                        };
+                        img.src = src;
+                    },
+                }),
+            });
 
-      selectedFeatures = select.getFeatures();
+            (mapView = new View({
+                //中心点坐标
+                center: this.centerPoint,
+                projection: getProjection("EPSG:4490"),
+                zoom: this.zoom,
+                minZoom: this.minZoom,
+            })),
+                //初始化map和地图底图
+                //创建地图容器
+                (map = new Map({
+                    layers: [gaodeMapLayer],
+                    //加载瓦片图层数据
+                    view: mapView,
+                    target: "map",
+                    //目标加载到map中
+                }));
+
+            map.on("singleclick", function (e) {
+                // console.log(e.coordinate)
+                // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
+            });
 
-      map.addLayer(polygonLayer);
-      map.addInteraction(select);
-      map.addInteraction(selectAltClick);
+            //去除双击放大效果
+            const dblClickInteraction = map
+                .getInteractions()
+                .getArray()
+                .find((interaction) => {
+                    return interaction instanceof DoubleClickZoom;
+                });
+            map.removeInteraction(dblClickInteraction);
+        },
 
-      select.on("select", (e) => {
-        this.selectFeature(e);
-      });
-      selectAltClick.on("select", (e) => {
-        this.toSubAgency(e);
-      });
-    },
-    //点击【手动录入】
-    handleManually () {
-      this.dialogVisible = true;
-      this.polygonManullyString = "";
-      this.longitude = undefined;
-      this.latitude = undefined;
-      if (this.selAgency) {
-        if (this.selAgency.longitude) {
-          this.longitude = this.selAgency.longitude;
-        }
-        if (this.selAgency.latitude) {
-          this.latitude = this.selAgency.latitude;
-        }
-      }
-    },
+        //添加标注图层
+        addParentLayer() {
+            parentSource = new VectorSource({
+                //features: (new GeoJSON()).readFeatures(geojsonObject)
+            });
 
-    //点击【手动录入】
-    handleClose () {
-      this.dialogVisible = false;
-    },
+            parentLayer = new VectorLayer({
+                source: parentSource,
+                style: parentStyleFunction,
+                zIndex: 50,
+            });
 
-    handleManuallyOk () {
-      if (this.longitude || this.latitude) {
-        if (!(this.longitude && this.latitude)) {
-          this.$message({
-            type: "warning",
-            message: "请同时填写中心点经纬度，或不填写",
-          });
-          return false;
-        }
-      }
-      //转化成需要的格式
-      //120.54033616308595,36.53603370922851,120.69620469335939,36.5408402277832,120.63166001562502,36.46771248120117,120.52728989843752,36.458786089599606,120.54033616308595,36.53603370922851
-      //中国经纬度范围
-      // 经度范围：73°33′E至135°05′E 东经
-      // 纬度范围：3°51′N至53°33′N 北纬
-      let aaa = this.polygonManullyString.replace(/\[/g, ",");
-      aaa = aaa.replace(/\]/g, ",");
-
-      let array = aaa.split(/[, ()]/);
-      // const arrayString = this.polygonManullyString
-      // let array = arrayString.split(",|(|)|[|]")
-      console.log(array);
-      let polygonStringResult = "";
-
-      // const arrayString = this.polygonManullyString
-      // let array = arrayString.split(/[, ()]/)
-      // console.log(array)
-      // let polygonStringResult = ''
-
-      array.forEach((element) => {
-        let num = Number(element);
-        if (num) {
-          polygonStringResult = polygonStringResult + element + ",";
-        }
-      });
-
-      polygonStringResult = polygonStringResult.substring(
-        0,
-        polygonStringResult.length - 1
-      );
-
-      if (this.xOffset_customize !== 0 || this.yOffset_customize !== 0) {
-        this.saveOffset(
-          this.xOffset_customize,
-          this.yOffset_customize,
-          polygonStringResult
-        );
-      } else {
-        this.addPolygon(polygonStringResult);
-      }
-    },
+            map.addLayer(parentLayer);
+        },
+        //添加标注图层
+        addPolygonLayer() {
+            polygonSource = new VectorSource({
+                //features: (new GeoJSON()).readFeatures(geojsonObject)
+            });
 
-    handleSetOffset () {
-      this.showOffset = true;
-    },
-    handleOffsetOk () {
-      let selPolygonString = "";
-
-      this.subAgencyArray.forEach((element) => {
-        if (
-          element.id === this.selAgencyId &&
-          element.coordinates &&
-          element.coordinates.length > 0
-        ) {
-          selPolygonString = element.coordinates;
-        }
-      });
+            polygonLayer = new VectorLayer({
+                source: polygonSource,
+                style: polygonStyleFunction,
+                zIndex: 50,
+            });
 
-      if (selPolygonString) {
-        this.saveOffset(this.xOffset, this.yOffset, selPolygonString);
-      }
-    },
-    saveOffset (xOffset, yOffset, selPolygonString) {
-      let offsetPolygonString = ""; //偏移后的坐标字符串
-      let tempArray = selPolygonString.split(",");
+            //选中多边形后的样式
+            var overlayStyle = (function () {
+                return function (feature) {
+                    var styles = {};
+                    styles["Polygon"] = [
+                        new Style({
+                            stroke: new Stroke({
+                                color: "#ec9000",
+                                width: 2,
+                            }),
+                        }),
+
+                        new Style({
+                            fill: new Fill({
+                                color: "rgba(0, 0, 255, 0.1)",
+                            }),
+                        }),
+                        new Style({
+                            text: createTextStyle(feature),
+                        }),
+                    ];
+                    styles["MultiPolygon"] = styles["Polygon"];
+                    return styles[feature.getGeometry().getType()];
+                };
+            })();
+
+            select = new Select({
+                style: overlayStyle,
+            });
 
-      tempArray.forEach((element, index) => {
-        let aaa = 0;
+            selectAltClick = new Select({
+                condition: function (mapBrowserEvent) {
+                    return click(mapBrowserEvent) && altKeyOnly(mapBrowserEvent);
+                },
+            });
 
-        if (index % 2 === 0) {
-          //偶数
-          aaa = parseFloat(element) + parseFloat(xOffset);
-        } else {
-          aaa = parseFloat(element) + parseFloat(yOffset);
-        }
+            selectedFeatures = select.getFeatures();
 
-        if (index % 2 !== 0) {
-          //奇数
-        }
-        offsetPolygonString = offsetPolygonString + aaa + ",";
-      });
-
-      offsetPolygonString = offsetPolygonString.substring(
-        0,
-        offsetPolygonString.length - 1
-      );
-      this.addPolygon(offsetPolygonString);
-    },
-    handleSetOffset () {
-      this.handleOffsetCancel = false;
-    },
+            map.addLayer(polygonLayer);
+            map.addInteraction(select);
+            map.addInteraction(selectAltClick);
 
-    //点击【绘制区域】
-    handleAddPolygon () {
-      if (this.method === "mAddPolygon") {
-        this.method = "";
-        map.removeInteraction(draw);
-      } else if (this.selAgency) {
-        this.method = "mAddPolygon";
-        //绘制
-        this.drawPolygon();
-      } else {
-        this.$message({
-          type: "warning",
-          message: "请先选择组织",
-        });
-      }
-    },
+            select.on("select", (e) => {
+                this.selectFeature(e);
+            });
+            selectAltClick.on("select", (e) => {
+                this.toSubAgency(e);
+            });
+        },
+        //点击【手动录入】
+        handleManually() {
+            this.dialogVisible = true;
+            this.polygonManullyString = "";
+            this.longitude = undefined;
+            this.latitude = undefined;
+            if (this.selAgency) {
+                if (this.selAgency.longitude) {
+                    this.longitude = this.selAgency.longitude;
+                }
+                if (this.selAgency.latitude) {
+                    this.latitude = this.selAgency.latitude;
+                }
+            }
+        },
 
-    //点击【重新绘制】
-    handleEditPolygon () {
-      if (this.method === "mEditPolygon") {
-        this.method = "";
-        map.removeInteraction(draw);
-        this.loadPolygon(this.subAgencyArray);
-      } else {
-        this.method = "mEditPolygon";
-        //暂时隐藏要重新绘制的标注
-        this.hidePolygon();
-
-        //绘制
-        this.drawPolygon();
-      }
-    },
+        //点击【手动录入】
+        handleClose() {
+            this.dialogVisible = false;
+        },
 
-    //点击【删除标注】
-    handleDelPolygon () {
-      map.removeInteraction(draw);
-      this.$confirm("确认删除" + this.selAgency.name + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.method = "delPolygon";
-          this.delPolygon();
-        })
-        .catch((err) => {
-          if (err == "cancel") {
-            // this.$message({
-            //   type: "info",
-            //   message: "已取消删除"
-            // });
-          }
-          this.method = "";
-        });
-    },
+        handleManuallyOk() {
+            if (this.longitude || this.latitude) {
+                if (!(this.longitude && this.latitude)) {
+                    this.$message({
+                        type: "warning",
+                        message: "请同时填写中心点经纬度，或不填写",
+                    });
+                    return false;
+                }
+            }
+            //转化成需要的格式
+            //120.54033616308595,36.53603370922851,120.69620469335939,36.5408402277832,120.63166001562502,36.46771248120117,120.52728989843752,36.458786089599606,120.54033616308595,36.53603370922851
+            //中国经纬度范围
+            // 经度范围：73°33′E至135°05′E 东经
+            // 纬度范围：3°51′N至53°33′N 北纬
+            let aaa = this.polygonManullyString.replace(/\[/g, ",");
+            aaa = aaa.replace(/\]/g, ",");
+
+            let array = aaa.split(/[, ()]/);
+            // const arrayString = this.polygonManullyString
+            // let array = arrayString.split(",|(|)|[|]")
+            console.log(array);
+            let polygonStringResult = "";
+
+            // const arrayString = this.polygonManullyString
+            // let array = arrayString.split(/[, ()]/)
+            // console.log(array)
+            // let polygonStringResult = ''
+
+            array.forEach((element) => {
+                let num = Number(element);
+                if (num) {
+                    polygonStringResult = polygonStringResult + element + ",";
+                }
+            });
 
-    //隐藏Polygon（前端隐藏，非删除）
-    hidePolygon () {
-      let polygonTempArray = [];
+            polygonStringResult = polygonStringResult.substring(
+                0,
+                polygonStringResult.length - 1
+            );
+
+            if (this.xOffset_customize !== 0 || this.yOffset_customize !== 0) {
+                this.saveOffset(
+                    this.xOffset_customize,
+                    this.yOffset_customize,
+                    polygonStringResult
+                );
+            } else {
+                this.addPolygon(polygonStringResult);
+            }
+        },
 
-      this.subAgencyArray.forEach((element) => {
-        if (element.id !== this.selAgencyId) {
-          polygonTempArray.push(element);
-        }
-      });
+        handleSetOffset() {
+            this.showOffset = true;
+        },
+        handleOffsetOk() {
+            let selPolygonString = "";
+
+            this.subAgencyArray.forEach((element) => {
+                if (
+                    element.id === this.selAgencyId &&
+                    element.coordinates &&
+                    element.coordinates.length > 0
+                ) {
+                    selPolygonString = element.coordinates;
+                }
+            });
 
-      this.loadPolygon(polygonTempArray);
-    },
+            if (selPolygonString) {
+                this.saveOffset(this.xOffset, this.yOffset, selPolygonString);
+            }
+        },
+        saveOffset(xOffset, yOffset, selPolygonString) {
+            let offsetPolygonString = ""; //偏移后的坐标字符串
+            let tempArray = selPolygonString.split(",");
+
+            tempArray.forEach((element, index) => {
+                let aaa = 0;
+
+                if (index % 2 === 0) {
+                    //偶数
+                    aaa = parseFloat(element) + parseFloat(xOffset);
+                } else {
+                    aaa = parseFloat(element) + parseFloat(yOffset);
+                }
+
+                if (index % 2 !== 0) {
+                    //奇数
+                }
+                offsetPolygonString = offsetPolygonString + aaa + ",";
+            });
 
-    //绘制Polygon
-    drawPolygon () {
-      draw = new Draw({
-        source: polygonSource,
-        type: "Polygon",
-      });
-      map.addInteraction(draw);
+            offsetPolygonString = offsetPolygonString.substring(
+                0,
+                offsetPolygonString.length - 1
+            );
+            this.addPolygon(offsetPolygonString);
+        },
+        handleSetOffset() {
+            this.handleOffsetCancel = false;
+        },
 
-      draw.on("drawend", (feature) => {
-        this.polygonCoor = feature.feature.values_.geometry.flatCoordinates;
+        //点击【绘制区域】
+        handleAddPolygon() {
+            if (this.method === "mAddPolygon") {
+                this.method = "";
+                map.removeInteraction(draw);
+            } else if (this.selAgency) {
+                this.method = "mAddPolygon";
+                //绘制
+                this.drawPolygon();
+            } else {
+                this.$message({
+                    type: "warning",
+                    message: "请先选择组织",
+                });
+            }
+        },
 
-        let coorString = "";
-        for (let i = 0; i < this.polygonCoor.length; i++) {
-          coorString = coorString + this.polygonCoor[i] + ",";
-        }
-        if (this.polygonCoor.length > 0) {
-          coorString = coorString.substring(0, coorString.length - 1);
-        }
+        //点击【重新绘制】
+        handleEditPolygon() {
+            if (this.method === "mEditPolygon") {
+                this.method = "";
+                map.removeInteraction(draw);
+                this.loadPolygon(this.subAgencyArray);
+            } else {
+                this.method = "mEditPolygon";
+                //暂时隐藏要重新绘制的标注
+                this.hidePolygon();
+
+                //绘制
+                this.drawPolygon();
+            }
+        },
 
-        if (this.method === "mEditPolygon") {
-          this.$confirm("是否确认覆盖原有区域?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-            .then(() => {
-              this.addPolygon(coorString);
+        //点击【删除标注】
+        handleDelPolygon() {
+            map.removeInteraction(draw);
+            this.$confirm("确认删除" + this.selAgency.name + "?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
             })
-            .catch((err) => {
-              this.loadPolygon(this.subAgencyArray);
+                .then(() => {
+                    this.method = "delPolygon";
+                    this.delPolygon();
+                })
+                .catch((err) => {
+                    if (err == "cancel") {
+                        // this.$message({
+                        //   type: "info",
+                        //   message: "已取消删除"
+                        // });
+                    }
+                    this.method = "";
+                });
+        },
+
+        //隐藏Polygon（前端隐藏，非删除）
+        hidePolygon() {
+            let polygonTempArray = [];
+
+            this.subAgencyArray.forEach((element) => {
+                if (element.id !== this.selAgencyId) {
+                    polygonTempArray.push(element);
+                }
             });
-        } else {
-          this.addPolygon(coorString);
-        }
 
-        this.method = "";
-        map.removeInteraction(draw);
-      });
-    },
+            this.loadPolygon(polygonTempArray);
+        },
 
-    //新增标注
-    async addPolygon (coorString) {
-      console.log(coorString);
-      const url = "/gov/org/agency/mapaddarea";
-
-      let params = {
-        orgId: this.selAgency.id,
-        level: this.selAgency.level,
-        coordinates: coorString,
-        longitude: this.longitude,
-        latitude: this.latitude,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "绘制成功",
-        });
-        if (this.dialogVisible) {
-          this.polygonManullyString = "";
-          this.dialogVisible = false;
-        }
-        this.refreshMap(false);
-      } else {
-        this.$message({
-          type: "error",
-          message: "绘制失败，请重试",
-        });
-      }
-    },
+        //绘制Polygon
+        drawPolygon() {
+            draw = new Draw({
+                source: polygonSource,
+                type: "Polygon",
+            });
+            map.addInteraction(draw);
+
+            draw.on("drawend", (feature) => {
+                this.polygonCoor = feature.feature.values_.geometry.flatCoordinates;
+
+                let coorString = "";
+                for (let i = 0; i < this.polygonCoor.length; i++) {
+                    coorString = coorString + this.polygonCoor[i] + ",";
+                }
+                if (this.polygonCoor.length > 0) {
+                    coorString = coorString.substring(0, coorString.length - 1);
+                }
+
+                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);
+            });
+        },
 
-    //删除标注
-    async delPolygon () {
-      const url = "/gov/org/agency/mapdelarea";
+        //新增标注
+        async addPolygon(coorString) {
+            console.log(coorString);
+            const url = "/gov/org/agency/mapaddarea";
+
+            let params = {
+                orgId: this.selAgency.id,
+                level: this.selAgency.level,
+                coordinates: coorString,
+                longitude: this.longitude,
+                latitude: this.latitude,
+            };
 
-      let params = {
-        orgId: this.selAgency.id,
-        level: this.selAgency.level,
-      };
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.$message({
+                    type: "success",
+                    message: "绘制成功",
+                });
+                if (this.dialogVisible) {
+                    this.polygonManullyString = "";
+                    this.dialogVisible = false;
+                }
+                this.refreshMap(false);
+            } else {
+                this.$message({
+                    type: "error",
+                    message: "绘制失败，请重试",
+                });
+            }
+        },
 
-      const { data, code, msg } = await requestPost(url, params);
+        //删除标注
+        async delPolygon() {
+            const url = "/gov/org/agency/mapdelarea";
 
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "删除成功",
-        });
-        this.method = "";
-        this.selAgencyIndex = 0;
-        this.refreshMap(false);
-      }
-    },
-    //开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, //是否锁定
-        text: "正在加载……", //加载中需要显示的文字
-        background: "rgba(0,0,0,.7)", //背景颜色
-      });
-    },
+            let params = {
+                orgId: this.selAgency.id,
+                level: this.selAgency.level,
+            };
 
-    //结束加载动画
-    endLoading () {
-      //clearTimeout(timer);
-      if (loading) {
-        loading.close();
-      }
-    },
-  },
-  props: {
-    vueFlag: {
-      type: String,
-      default: "alarm",
-    },
-  },
-  computed: {
-    extentXOffset () {
-      if (this.clientHeight < 900) {
-        return 0.88;
-      } else {
-        return 0.95;
-      }
-    },
-    extentYOffset () {
-      return 0.95;
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.$message({
+                    type: "success",
+                    message: "删除成功",
+                });
+                this.method = "";
+                this.selAgencyIndex = 0;
+                this.refreshMap(false);
+            }
+        },
+        //开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, //是否锁定
+                text: "正在加载……", //加载中需要显示的文字
+                background: "rgba(0,0,0,.7)", //背景颜色
+            });
+        },
+
+        //结束加载动画
+        endLoading() {
+            //clearTimeout(timer);
+            if (loading) {
+                loading.close();
+            }
+        },
     },
-    imgExtent () {
-      return [
-        -x * this.extentXOffset,
-        -y * this.extentYOffset,
-        x * this.extentXOffset,
-        y * this.extentYOffset,
-      ];
+    props: {
+        vueFlag: {
+            type: String,
+            default: "alarm",
+        },
     },
-    mapHeight () {
-      return this.clientHeight - 170;
+    computed: {
+        extentXOffset() {
+            if (this.clientHeight < 900) {
+                return 0.88;
+            } else {
+                return 0.95;
+            }
+        },
+        extentYOffset() {
+            return 0.95;
+        },
+        imgExtent() {
+            return [
+                -x * this.extentXOffset,
+                -y * this.extentYOffset,
+                x * this.extentXOffset,
+                y * this.extentYOffset,
+            ];
+        },
+        mapHeight() {
+            return this.clientHeight - 170;
+        },
+        // zoom: {
+        //   get () {
+        //     //根据不同屏幕分辨率，控制zoom大小
+        //     if (this.clientHeight < 900) {
+        //       return 2.3
+        //     } else {
+        //       return 2.8
+        //     }
+        //   },
+        //   set (value) {
+        //   }
+        // },
+        ...mapGetters(["clientHeight"]),
     },
-    // zoom: {
-    //   get () {
-    //     //根据不同屏幕分辨率，控制zoom大小
-    //     if (this.clientHeight < 900) {
-    //       return 2.3
-    //     } else {
-    //       return 2.8
-    //     }
-    //   },
-    //   set (value) {
-    //   }
-    // },
-    ...mapGetters(["clientHeight"]),
-  },
-  components: {},
+    components: {},
 };
 export default vueGis;
 </script>
 
 <style scoped>
 .m-search {
-  z-index: 10;
+    z-index: 10;
 
-  display: flex;
+    display: flex;
 }
 .div_back {
-  z-index: 10;
-  right: 10px;
-  top: 1px;
-  position: absolute;
-  display: flex;
+    z-index: 10;
+    right: 10px;
+    top: 1px;
+    position: absolute;
+    display: flex;
 }
 .div_tip {
-  z-index: 10;
-  position: absolute;
-  bottom: 1px;
-  right: 2px;
-  background: rgba(255, 255, 255, 0.6);
-  padding: 3px 10px;
-  font-size: 15px;
+    z-index: 10;
+    position: absolute;
+    bottom: 1px;
+    right: 2px;
+    background: rgba(255, 255, 255, 0.6);
+    padding: 3px 10px;
+    font-size: 15px;
 }
 .div_map {
-  margin-top: 15px;
-  width: 100%;
+    margin-top: 15px;
+    width: 100%;
 }
 .div_textarea {
-  text-align: center;
+    text-align: center;
 }
 </style>
 <style>
 .ol-overlaycontainer-stopevent {
-  display: none;
+    display: none;
 }
 </style>