From acb45c731c3ccd0a67061efb4e7bdf4f56005672 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 12 Jan 2022 08:52:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web

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

diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index a4b4b5b..003d3a2 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -287,15 +287,15 @@
 
             viewer.compass.enable = true
             viewer.zoomController.enable = true
-            // viewer.locationBar.enable = true
-            // viewer.hawkeyeMap.enable = true
-            // viewer.hawkeyeMap.addBaseLayer(
-            //     that.DC.ImageryLayerFactory.createAmapImageryLayer(
-            //         {
-            //             crs: 'WGS84'
-            //         }
-            //     )
-            // )
+            viewer.locationBar.enable = true
+            viewer.hawkeyeMap.enable = true
+            viewer.hawkeyeMap.addBaseLayer(
+                that.DC.ImageryLayerFactory.createAmapImageryLayer(
+                    {
+                        crs: 'WGS84'
+                    }
+                )
+            )
             // viewer.distanceLegend.enable = true
         }
 
@@ -303,6 +303,7 @@
     },
     methods: {
         mapClick (e) {
+            this.$refs.campusNavRoute.shortcutShow(e)
             this.$refs.campusBuildingSearch.shortcutShow(e)
         }
     }

--
Gitblit v1.9.3