Merge branch 'master' of http://192.168.0.105:10010/r/school-web

shuishen

2022-01-12 acb45c731c3ccd0a67061efb4e7bdf4f56005672

 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)
        }
    }