From 117dc4cec546f830bc941ea314dcbdb9b370b211 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 25 Jan 2022 14:43:11 +0800
Subject: [PATCH] 冲突

---
 src/components/map/index.vue |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 003d3a2..80ce431 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -20,7 +20,7 @@
             智慧社区
         </div>
 
-        <dimension />
+        <dimension :areaLayer='areaLayer' />
 
         <left-nav ref="leftNav"></left-nav>
 
@@ -31,6 +31,7 @@
         <campusNav ref="campusNavRoute"
                    v-show="campusNavFlag" />
 
+        <search-details v-if="searchPopupFlag"></search-details>
         <org-nav-bar v-if="orgNavBarFlag"></org-nav-bar>
         <arc-nav-bar v-if="arcNavBarFlag"></arc-nav-bar>
     </div>
@@ -52,7 +53,8 @@
     },
     data () {
         return {
-            DC: null
+            DC: null,
+            areaLayer: null
         }
     },
     computed: {
@@ -81,7 +83,8 @@
             // 社区内导航的显示关闭
             'campusNavFlag',
             'orgNavBarFlag',
-            'arcNavBarFlag'
+            'arcNavBarFlag',
+            'searchPopupFlag'
         ])
     },
     mounted () {
@@ -154,6 +157,8 @@
                     }
                 }
             })
+
+            that.createdLayers(viewer)
 
             that.$store.commit('SET_VIEWER', viewer)
 
@@ -305,6 +310,14 @@
         mapClick (e) {
             this.$refs.campusNavRoute.shortcutShow(e)
             this.$refs.campusBuildingSearch.shortcutShow(e)
+        },
+
+        createdLayers (viewer) {
+            const layerGroup = new this.DC.LayerGroup('modelBox')
+            viewer.addLayerGroup(layerGroup)
+
+            this.areaLayer = new this.DC.VectorLayer('areaLayer')
+            layerGroup.addLayer(this.areaLayer)
         }
     }
 }

--
Gitblit v1.9.3