合并rongtu_dev分支

This commit is contained in:
Vce 2024-03-28 18:53:33 +08:00
commit fb622c8aa2
3 changed files with 10 additions and 8 deletions

View File

@ -979,8 +979,10 @@ function initMap() {
// var that = this; // var that = this;
// //
map = new AMap.Map("mapContainer", { map = new AMap.Map("mapContainer", {
resizeEnable: true resizeEnable: true,
showIndoorMap:true //
}); });
map.setFeatures(['bg','road','point','building']);
// var geocoder = new AMap.Geocoder({}); // var geocoder = new AMap.Geocoder({});
// // // //
// var autoOptions = { // var autoOptions = {

View File

@ -1141,9 +1141,10 @@ function initMap() {
var that = this; var that = this;
// //
map = new AMap.Map("mapContainer", { 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 geocoder = new AMap.Geocoder({});
// //
var autoOptions = { var autoOptions = {

View File

@ -1485,10 +1485,12 @@ function initMap() {
// //
map = new AMap.Map("mapContainer", { map = new AMap.Map("mapContainer", {
// viewMode: '3D', // viewMode: '3D',
resizeEnable: true resizeEnable: true,
showIndoorMap:true //
// center: [116.39, 39.9], // center: [116.39, 39.9],
// offset: new AMap.Pixel(-10, -10) // // offset: new AMap.Pixel(-10, -10) //
}); });
map.setFeatures(['bg','road','point','building']);
var geocoder = new AMap.Geocoder({}); var geocoder = new AMap.Geocoder({});
// //
var autoOptions = { var autoOptions = {
@ -1952,6 +1954,7 @@ function echoPersonMarker(item) {
:deep(.h-card .content) { :deep(.h-card .content) {
overflow: hidden; overflow: hidden;
} }
.welanMask { .welanMask {
position: fixed; position: fixed;
top: 0; top: 0;
@ -2076,10 +2079,6 @@ function echoPersonMarker(item) {
} }
} }
} }
:deep(.h-card .content) {
overflow: hidden;
}
// //
.fence-shape { .fence-shape {
display: flex; display: flex;