Merge remote-tracking branch 'origin/master'
# Conflicts: # src/views/Home.vue
Showing
2 changed files
with
5 additions
and
2 deletions
... | @@ -17,7 +17,7 @@ | ... | @@ -17,7 +17,7 @@ |
17 | mounted() { | 17 | mounted() { |
18 | Cesium.Ion.defaultAccessToken = this.config.mapToken; | 18 | Cesium.Ion.defaultAccessToken = this.config.mapToken; |
19 | var viewer = new Cesium.Viewer('cesiumContainer', { | 19 | var viewer = new Cesium.Viewer('cesiumContainer', { |
20 | fullscreenButton: true, | 20 | fullscreenButton: true, |
21 | }); | 21 | }); |
22 | }, | 22 | }, |
23 | methods: { | 23 | methods: { | ... | ... |
-
Please register or sign in to post a comment