From ded6d48f9c70bbd2ebbc1f19befcb25268b388c3 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Wed, 8 Jun 2022 14:51:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../duoyuanfuwu/duoyuanDialog.vue             |  9 +++++++-
 .../duoyuanfuwu/duoyuanfuwufenxi.vue          | 21 ++++++++++++-------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue
index eef1de18..dfb584ae 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue
@@ -21,6 +21,7 @@
             </template>
             <screen-nodata class="nodata" v-else></screen-nodata>
           </div>
+          <div class="dashed-line"></div>
           <div class="list right-list">
             <template v-if="info.content">
               <!-- <div class="item-title">需求内容</div> -->
@@ -290,6 +291,12 @@ export default {
 .list-wr {
   display: flex;
   padding: 0 20px;
+  .dashed-line {
+    width: 1px;
+    height: 600px;
+    margin: 0 15px;
+    border: 1px dashed #1257c9;
+  }
   .left-list {
     width: 280px !important;
     height: 600px;
@@ -322,7 +329,7 @@ export default {
     }
   }
   .right-list {
-    padding: 0 25px !important;
+    padding: 0 15px !important;
   }
 }
 </style>
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 35de4c92..28595697 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -62,6 +62,8 @@
                         @clickFeature="clickMap"
                         :showIconLayer="true"
                         :showPolygonLayer="true"
+                        :showPolIconLayer="true"
+                        :areaScale="0.1"
                         :clickType="'popup'"
                         :isAddOpenlay="true"></screen-map>
           </div>
@@ -369,8 +371,9 @@ export default {
           if (item.coordinates && item.coordinates.length > 0) {
             if (!this.isRepeatItem(item.name)) {
               let colorIndex = index < polygonColorArray.length ? index : 0
-              item.fillColor = transparent,
-                item.color = polygonColorArray[colorIndex]
+              item.fillColor = 'rgba(0, 229, 237, 0.16)'
+              item.color = '#00E5ED'
+                // item.color = polygonColorArray[colorIndex]
               subPolygonList.push(item)
             }
           }
@@ -456,7 +459,10 @@ export default {
       if (this.isfirstInit) {
         // this.agencyInfo.level = 'agency'
         //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
-        this.$refs.map.loadMap(this.agencyInfo, this.polygonList, null, this.distributionsList, this.iconUrlArray, null)
+        const polygonIconArray = [
+          'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
+        ]
+        this.$refs.map.loadMap(this.agencyInfo, this.polygonList, polygonIconArray, this.distributionsList, this.iconUrlArray, null)
       } else {
         this.$refs.map.refreshMap(this.agencyInfo, this.polygonList, this.distributionsList, false)
       }
@@ -464,10 +470,11 @@ export default {
 
     // 点击项目
     async clickMap (feature) {
-      if (feature.values_.coordinates && feature.values_.coordinates.length > 0) {
-        await this.loadOrgData(feature.values_.level, feature.values_.id)
-        this.loadMap()
-      }
+      // 点击显示下级区域
+      // if (feature.values_.coordinates && feature.values_.coordinates.length > 0) {
+      //   await this.loadOrgData(feature.values_.level, feature.values_.id)
+      //   this.loadMap()
+      // }
       console.log('标注信息', feature.values_.properties)
       if (!feature.values_.properties) {
         return