diff --git a/src/components/device/TrajectoryDialog.vue b/src/components/device/TrajectoryDialog.vue index 49651a6..b35aaed 100644 --- a/src/components/device/TrajectoryDialog.vue +++ b/src/components/device/TrajectoryDialog.vue @@ -59,7 +59,7 @@
{{ $t("device.trajectory.provider.label") }} - + {{ $t("device.trajectory.provider.google") }} @@ -174,7 +174,7 @@ export default { data() { return { activePanel: "map", - mapProvider: "amap", + mapProvider: "google", loading: false, mapLoading: false, loadError: "", @@ -261,7 +261,7 @@ export default { this.unbindDialogWrapper(); this.destroyMap(true); this.activePanel = "map"; - this.mapProvider = "amap"; + this.mapProvider = "google"; this.loadError = ""; this.trajectoryPoints = []; this.totalTrajectoryCount = 0; @@ -350,15 +350,16 @@ export default { await this.renderCurrentProviderMap(); }, resolveDefaultProvider() { + if (this.hasGoogleKey) { + return "google"; + } if (this.hasAmapKey) { return "amap"; } if (this.hasMaptilerKey) { return "maptiler"; } - if (this.hasGoogleKey) { - return "google"; - } + return "amap"; }, initDefaultLocationTimeRange() { diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 5ca65af..8e2db60 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -64,7 +64,7 @@
{{ $t("dashboard.overview.map.serviceLabel") }} - + {{ $t("dashboard.overview.provider.google") }} @@ -148,7 +148,7 @@ export default { statTimers: [], statDelayStep: 140, devicePoints: [], - mapProvider: "amap", + mapProvider: "google", mapConfig: null, map: null, mapsApi: null, @@ -165,7 +165,7 @@ export default { return !!(this.mapConfig && this.mapConfig.gaodeKey); }, hasGoogleKey() { - return !!(this.mapConfig && this.mapConfig.googleKey); + return true; }, hasMaptilerKey() { return !!(this.mapConfig && this.mapConfig.maptilerKey);