合并rongtu_dev分支
This commit is contained in:
commit
fb622c8aa2
@ -979,8 +979,10 @@ 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({});
|
||||
// //输入提示
|
||||
// var autoOptions = {
|
||||
|
||||
@ -1141,9 +1141,10 @@ function initMap() {
|
||||
var that = this;
|
||||
//地图加载
|
||||
map = new AMap.Map("mapContainer", {
|
||||
// viewMode: '3D',
|
||||
resizeEnable: true
|
||||
resizeEnable: true,
|
||||
showIndoorMap: true //显示地图自带的室内地图图层
|
||||
});
|
||||
map.setFeatures(['bg','road','point','building']);
|
||||
var geocoder = new AMap.Geocoder({});
|
||||
//输入提示
|
||||
var autoOptions = {
|
||||
|
||||
@ -1485,10 +1485,12 @@ 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) // 设置地图偏移量
|
||||
});
|
||||
map.setFeatures(['bg','road','point','building']);
|
||||
var geocoder = new AMap.Geocoder({});
|
||||
//输入提示
|
||||
var autoOptions = {
|
||||
@ -1952,6 +1954,7 @@ function echoPersonMarker(item) {
|
||||
:deep(.h-card .content) {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.welanMask {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
@ -2076,10 +2079,6 @@ function echoPersonMarker(item) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
:deep(.h-card .content) {
|
||||
overflow: hidden;
|
||||
}
|
||||
// 多边形表单
|
||||
.fence-shape {
|
||||
display: flex;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user