diff --git a/src/views/deviceManage/map3d/map.vue b/src/views/deviceManage/map3d/map.vue index 5bffeb3..0e6f5c6 100644 --- a/src/views/deviceManage/map3d/map.vue +++ b/src/views/deviceManage/map3d/map.vue @@ -1,7 +1,8 @@ @@ -20,6 +21,10 @@ export default { default: function() { return {} } + }, + toShlef: { + type: Boolean, + default: false } }, data() { @@ -73,7 +78,7 @@ export default { // themeID: '1574346301450625025', // themeURL: '/fengmap/data/theme/', level: this.level, - mapZoom: 19.5, + mapZoom: this.toShlef ? 19.8 : 19.5, backgroundColor: '#fff' } console.log('地图配置:', options) @@ -96,7 +101,7 @@ export default { floorButtonCount: 5, offset: { x: -20, - y: 150 + y: this.toShlef ? 200 : 150 }, viewModeControl: true, floorModeControl: true, diff --git a/src/views/deviceManage/shelfManage/shelf3dPosition.vue b/src/views/deviceManage/shelfManage/shelf3dPosition.vue index 8a19d20..4a5288c 100644 --- a/src/views/deviceManage/shelfManage/shelf3dPosition.vue +++ b/src/views/deviceManage/shelfManage/shelf3dPosition.vue @@ -1,24 +1,363 @@ -