Browse Source

默认谷歌

master
hx 7 days ago
parent
commit
e5bb8872ef
  1. 13
      src/components/device/TrajectoryDialog.vue
  2. 6
      src/views/dashboard/index.vue

13
src/components/device/TrajectoryDialog.vue

@ -59,7 +59,7 @@
<div class="trajectory-toolbar"> <div class="trajectory-toolbar">
<span class="page-inline-filter__label">{{ $t("device.trajectory.provider.label") }}</span> <span class="page-inline-filter__label">{{ $t("device.trajectory.provider.label") }}</span>
<el-radio-group v-model="mapProvider" size="small" @change="handleProviderChange"> <el-radio-group v-model="mapProvider" size="small" @change="handleProviderChange">
<el-radio-button label="google" :disabled="!hasGoogleKey"> <el-radio-button label="google" >
{{ $t("device.trajectory.provider.google") }} {{ $t("device.trajectory.provider.google") }}
</el-radio-button> </el-radio-button>
<el-radio-button label="amap" :disabled="!hasAmapKey"> <el-radio-button label="amap" :disabled="!hasAmapKey">
@ -174,7 +174,7 @@ export default {
data() { data() {
return { return {
activePanel: "map", activePanel: "map",
mapProvider: "amap", mapProvider: "google",
loading: false, loading: false,
mapLoading: false, mapLoading: false,
loadError: "", loadError: "",
@ -261,7 +261,7 @@ export default {
this.unbindDialogWrapper(); this.unbindDialogWrapper();
this.destroyMap(true); this.destroyMap(true);
this.activePanel = "map"; this.activePanel = "map";
this.mapProvider = "amap"; this.mapProvider = "google";
this.loadError = ""; this.loadError = "";
this.trajectoryPoints = []; this.trajectoryPoints = [];
this.totalTrajectoryCount = 0; this.totalTrajectoryCount = 0;
@ -350,15 +350,16 @@ export default {
await this.renderCurrentProviderMap(); await this.renderCurrentProviderMap();
}, },
resolveDefaultProvider() { resolveDefaultProvider() {
if (this.hasGoogleKey) {
return "google";
}
if (this.hasAmapKey) { if (this.hasAmapKey) {
return "amap"; return "amap";
} }
if (this.hasMaptilerKey) { if (this.hasMaptilerKey) {
return "maptiler"; return "maptiler";
} }
if (this.hasGoogleKey) {
return "google";
}
return "amap"; return "amap";
}, },
initDefaultLocationTimeRange() { initDefaultLocationTimeRange() {

6
src/views/dashboard/index.vue

@ -64,7 +64,7 @@
<div class="dashboard-map-panel__toolbar"> <div class="dashboard-map-panel__toolbar">
<span class="dashboard-map-panel__toolbar-label">{{ $t("dashboard.overview.map.serviceLabel") }}</span> <span class="dashboard-map-panel__toolbar-label">{{ $t("dashboard.overview.map.serviceLabel") }}</span>
<el-radio-group v-model="mapProvider" size="small" @change="handleProviderChange"> <el-radio-group v-model="mapProvider" size="small" @change="handleProviderChange">
<el-radio-button label="google" :disabled="!hasGoogleKey"> <el-radio-button label="google">
{{ $t("dashboard.overview.provider.google") }} {{ $t("dashboard.overview.provider.google") }}
</el-radio-button> </el-radio-button>
<el-radio-button label="amap" :disabled="!hasAmapKey"> <el-radio-button label="amap" :disabled="!hasAmapKey">
@ -148,7 +148,7 @@ export default {
statTimers: [], statTimers: [],
statDelayStep: 140, statDelayStep: 140,
devicePoints: [], devicePoints: [],
mapProvider: "amap", mapProvider: "google",
mapConfig: null, mapConfig: null,
map: null, map: null,
mapsApi: null, mapsApi: null,
@ -165,7 +165,7 @@ export default {
return !!(this.mapConfig && this.mapConfig.gaodeKey); return !!(this.mapConfig && this.mapConfig.gaodeKey);
}, },
hasGoogleKey() { hasGoogleKey() {
return !!(this.mapConfig && this.mapConfig.googleKey); return true;
}, },
hasMaptilerKey() { hasMaptilerKey() {
return !!(this.mapConfig && this.mapConfig.maptilerKey); return !!(this.mapConfig && this.mapConfig.maptilerKey);

Loading…
Cancel
Save