From 243c86764ca8abe22cdb933fab55fb31a429a31a Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 28 Mar 2024 14:21:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 4 ++--
.../digitalConstruction/carPosition/index.vue | 1 +
.../digitalConstruction/equipmentPosition/index.vue | 1 +
.../digitalConstruction/smartSafeHat/index.vue | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/index.html b/index.html
index 652e223..3d58041 100644
--- a/index.html
+++ b/index.html
@@ -104,8 +104,8 @@
+ src="https://webapi.amap.com/maps?v=2.0&key=8d7b8cd643454bec7737b3423647be21&plugin=AMap.Autocomplete,AMap.PlaceSearch,AMap.MouseTool,AMap.Geocoder,AMap.Driving"
+ defer="defer">
diff --git a/src/views/sevenLargeScreen/digitalConstruction/carPosition/index.vue b/src/views/sevenLargeScreen/digitalConstruction/carPosition/index.vue
index 5fc22db..16c2e1d 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/carPosition/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/carPosition/index.vue
@@ -963,6 +963,7 @@ function initMap() {
map = new AMap.Map("mapContainer", {
resizeEnable: true
});
+ map.setFeatures(['bg','road','point','building']);
// var geocoder = new AMap.Geocoder({});
// //输入提示
// var autoOptions = {
diff --git a/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue b/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
index 5ce05ab..f2b5b21 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
@@ -1142,6 +1142,7 @@ function initMap() {
map = new AMap.Map("mapContainer", {
resizeEnable: true
});
+ map.setFeatures(['bg','road','point','building']);
var geocoder = new AMap.Geocoder({});
//输入提示
var autoOptions = {
diff --git a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
index bbc0bd9..3316b4f 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
@@ -1404,6 +1404,7 @@ function initMap() {
// center: [116.39, 39.9],
// offset: new AMap.Pixel(-10, -10) // 设置地图偏移量
});
+ map.setFeatures(['bg','road','point','building']);
var geocoder = new AMap.Geocoder({});
//输入提示
var autoOptions = {
From 0a1fae63a76db7a4453e5a310d06ff7f96a84e38 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 28 Mar 2024 14:32:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sevenLargeScreen/digitalConstruction/carPosition/index.vue | 3 ++-
.../digitalConstruction/equipmentPosition/index.vue | 3 ++-
.../digitalConstruction/smartSafeHat/index.vue | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/views/sevenLargeScreen/digitalConstruction/carPosition/index.vue b/src/views/sevenLargeScreen/digitalConstruction/carPosition/index.vue
index 16c2e1d..bd614de 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/carPosition/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/carPosition/index.vue
@@ -961,7 +961,8 @@ function initMap() {
// var that = this;
//地图加载
map = new AMap.Map("mapContainer", {
- resizeEnable: true
+ resizeEnable: true,
+ showIndoorMap:true //显示地图自带的室内地图图层
});
map.setFeatures(['bg','road','point','building']);
// var geocoder = new AMap.Geocoder({});
diff --git a/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue b/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
index f2b5b21..a4f06f5 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue
@@ -1140,7 +1140,8 @@ function initMap() {
var that = this;
//地图加载
map = new AMap.Map("mapContainer", {
- resizeEnable: true
+ resizeEnable: true,
+ showIndoorMap: true //显示地图自带的室内地图图层
});
map.setFeatures(['bg','road','point','building']);
var geocoder = new AMap.Geocoder({});
diff --git a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
index 3316b4f..4e1205e 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
@@ -1400,7 +1400,8 @@ function initMap() {
//地图加载
map = new AMap.Map("mapContainer", {
// viewMode: '3D',
- resizeEnable: true
+ resizeEnable: true,
+ showIndoorMap:true //显示地图自带的室内地图图层
// center: [116.39, 39.9],
// offset: new AMap.Pixel(-10, -10) // 设置地图偏移量
});
From bfa8be06b799492673ef95b95c40c779747b3523 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 28 Mar 2024 18:46:39 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../digitalConstruction/smartSafeHat/index.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
index 4e1205e..672f949 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
@@ -1804,9 +1804,9 @@ function echoPersonMarker(item) {