@@ -107,8 +107,20 @@ export default {
},
methods: {
...mapMethods,
+ handleDialogOpen() {
+ this.$nextTick(() => {
+ this.initMap();
+ });
+ },
async initMap() {
try {
+ // 确保容器存在
+ const container = document.getElementById('mapContainer');
+ if (!container) {
+ console.error('地图容器不存在');
+ return;
+ }
+
if (!this.map) {
this.AMap = await AMapLoader.load({
key: globalConfig.aMap.key,
@@ -120,73 +132,74 @@ export default {
zoom: 13,
viewMode: '2D',
touchZoom: false,
- dragEnable: true
+ dragEnable: true,
+ center: [120.35218, 26.944335] // 默认中心点
});
this.map.addControl(new this.AMap.ToolBar());
this.map.addControl(new this.AMap.Scale());
- console.log("area", this.area);
if (this.area) {
this.renderAreaBoundary();
}
- console.log("areaSubList", this.areaSubList);
- if (this.areaSubList) {
+ if (this.areaSubList && this.areaSubList.length > 0) {
this.renderSubAreas();
}
-
}
// 清除已有标记
this.clearMarkers();
- let hasValidLocation = false;
-
- console.log(this.deviceLocation, this.phoneLocation);
+ let validMarkers = [];
// 添加设备位置标记
- const deviceLon = parseFloat(this.deviceLocation.lon);
- const deviceLat = parseFloat(this.deviceLocation.lat);
- if (!isNaN(deviceLon) && !isNaN(deviceLat)) {
- this.deviceMarker = new this.AMap.Marker({
- position: [deviceLon, deviceLat],
- content: `
`,
- offset: new this.AMap.Pixel(-12, -12),
- title: '设备位置'
- });
- this.markers.push(this.deviceMarker);
- if (this.showDevice) {
- this.map.add(this.deviceMarker);
+ if (this.deviceLocation && this.deviceLocation.lon && this.deviceLocation.lat) {
+ const deviceLon = parseFloat(this.deviceLocation.lon);
+ const deviceLat = parseFloat(this.deviceLocation.lat);
+ if (!isNaN(deviceLon) && !isNaN(deviceLat)) {
+ this.deviceMarker = new this.AMap.Marker({
+ position: [deviceLon, deviceLat],
+ content: `
`,
+ offset: new this.AMap.Pixel(-12, -12),
+ title: '设备位置'
+ });
+ this.markers.push(this.deviceMarker);
+ if (this.showDevice) {
+ this.map.add(this.deviceMarker);
+ validMarkers.push(this.deviceMarker);
+ }
}
- hasValidLocation = true;
}
// 添加手机位置标记
- const phoneLon = parseFloat(this.phoneLocation.lon);
- const phoneLat = parseFloat(this.phoneLocation.lat);
- if (!isNaN(phoneLon) && !isNaN(phoneLat)) {
- this.phoneMarker = new this.AMap.Marker({
- position: [phoneLon, phoneLat],
- content: `
`,
- offset: new this.AMap.Pixel(-12, -12),
- title: '手机位置'
- });
- this.markers.push(this.phoneMarker);
- if (this.showPhone) {
- this.map.add(this.phoneMarker);
+ if (this.phoneLocation && this.phoneLocation.lon && this.phoneLocation.lat) {
+ const phoneLon = parseFloat(this.phoneLocation.lon);
+ const phoneLat = parseFloat(this.phoneLocation.lat);
+ if (!isNaN(phoneLon) && !isNaN(phoneLat)) {
+ this.phoneMarker = new this.AMap.Marker({
+ position: [phoneLon, phoneLat],
+ content: `
`,
+ offset: new this.AMap.Pixel(-12, -12),
+ title: '手机位置'
+ });
+ this.markers.push(this.phoneMarker);
+ if (this.showPhone) {
+ this.map.add(this.phoneMarker);
+ validMarkers.push(this.phoneMarker);
+ }
}
- hasValidLocation = true;
}
- if (hasValidLocation) {
- // 设置地图视野，让所有标记点都在视野范围内
- this.map.setFitView(this.markers, {
- padding: [50, 50, 50, 50]
+ // 根据有效标记调整视图
+ if (validMarkers.length > 0) {
+ this.$nextTick(() => {
+ this.map.setFitView(validMarkers, {
+ padding: [50, 50, 50, 50]
+ });
});
} else {
- // 如果没有有效位置，设置默认中心点（可以设置为城市中心）
- this.map.setCenter([120.35218, 26.944335]);
- this.$message.warning('没有有效的位置信息');
+ // 如果没有有效位置，保持默认中心点
+ this.$message.warning('没有可用的位置信息');
}
} catch (error) {
console.error('地图初始化失败:', error);
diff --git a/src/views/bst/order/view/view.vue b/src/views/bst/order/view/view.vue
index be77d12..9fdc34f 100644
--- a/src/views/bst/order/view/view.vue
+++ b/src/views/bst/order/view/view.vue
@@ -223,7 +223,7 @@