|
|
|
@ -397,7 +397,7 @@
|
|
|
|
|
<!-- <video-wall ref="videoWall"></video-wall> -->
|
|
|
|
|
<alone-video ref="aloneVideo"></alone-video>
|
|
|
|
|
<shop ref="shop" width="50%" title="商铺详情查看" />
|
|
|
|
|
<new-event ref="newEvent"></new-event>
|
|
|
|
|
<new-event ref="newEvent" @cancel="cancel"></new-event>
|
|
|
|
|
<!-- 强制观摩弹框 -->
|
|
|
|
|
<el-dialog
|
|
|
|
|
:visible.sync="showVideo"
|
|
|
|
@ -827,7 +827,7 @@ export default {
|
|
|
|
|
// console.log(addressName,'this.addressName');
|
|
|
|
|
if(this.layers.layer4) {
|
|
|
|
|
// e.target.getExtData().name; e.target.getExtData()获取给图层设置的extData属性的name
|
|
|
|
|
this.$refs.newEvent.open({lnglat:e.lnglat,address:addressName,meshOccurs:e.target.getExtData().name});
|
|
|
|
|
this.$refs.newEvent.open({lnglat:e.lnglat,address:addressName,meshOccurs:e.target.getExtData().name,marker:marker});
|
|
|
|
|
this.isPositioning = false;
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
@ -1822,7 +1822,7 @@ export default {
|
|
|
|
|
// console.log(addressName,'this.addressName');
|
|
|
|
|
if(this.layers.layer4) {
|
|
|
|
|
// e.target.getExtData().name; e.target.getExtData()获取给图层设置的extData属性的name
|
|
|
|
|
this.$refs.newEvent.open({lnglat:latlng,address:addressName,meshOccurs:name});
|
|
|
|
|
this.$refs.newEvent.open({lnglat:latlng,address:addressName,meshOccurs:name,marker:marker});
|
|
|
|
|
this.isPositioning = false;
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
@ -2737,6 +2737,10 @@ export default {
|
|
|
|
|
this.isPositioning = true;
|
|
|
|
|
// this.$refs.videoWall.open();
|
|
|
|
|
},
|
|
|
|
|
// 弹框点击取消事件
|
|
|
|
|
cancel(marker){
|
|
|
|
|
this.layers.layer4.removeOverlay(marker)
|
|
|
|
|
},
|
|
|
|
|
// 切换地图事件
|
|
|
|
|
changeMap(id) {
|
|
|
|
|
this.actionMap = id;
|
|
|
|
|