|
@@ -5,12 +5,15 @@
|
|
|
<transition name='fade'>
|
|
|
<div class="map-tit" v-show="mapshow">
|
|
|
<div class="top-tit">
|
|
|
- <i class="iconfont sj-icon-jkzx" @click="openTvwall()"></i>
|
|
|
+ <i class="iconfont sj-icon-jkzx"></i>
|
|
|
<span><img src="../assets/images/close.svg" @click="mapShow" /></span>
|
|
|
</div>
|
|
|
<div class="map-txt" v-html="bindPopupHtml">
|
|
|
</div>
|
|
|
- <div id="super2" />
|
|
|
+
|
|
|
+ <el-button size="mini" type="primary" class="sj-icon-btn" @click="openTvwall()">
|
|
|
+ 查看
|
|
|
+ </el-button>
|
|
|
</div>
|
|
|
</transition>
|
|
|
<!--地图top 显示 结束-->
|
|
@@ -31,6 +34,8 @@
|
|
|
name: 'supermap-2.5d',
|
|
|
data() {
|
|
|
return {
|
|
|
+ _click:null,
|
|
|
+ _parameter:null,
|
|
|
bindPopupHtml: null,
|
|
|
mapshow: false,
|
|
|
openZt:false,
|
|
@@ -841,9 +846,11 @@
|
|
|
});
|
|
|
},
|
|
|
openTvwall() {
|
|
|
+ this.mapshow=false;
|
|
|
if(this.openZt){
|
|
|
- this.mapshow=false;
|
|
|
this.$emit('fatherMethod', this.dianshiqiang, this.longitude, this.latitude, this.userList);
|
|
|
+ }else{
|
|
|
+ this.$emit(this._click,this._parameter);
|
|
|
}
|
|
|
},
|
|
|
/**
|
|
@@ -892,6 +899,8 @@
|
|
|
that.bindPopupHtml = html
|
|
|
that.mapshow = true
|
|
|
that.openZt = false
|
|
|
+ that._click = id._click;
|
|
|
+ that._parameter = id._parameter;
|
|
|
} else if (html == 'cgq') {
|
|
|
that.timer = setInterval(function() {
|
|
|
var color = "green";
|
|
@@ -1045,4 +1054,13 @@
|
|
|
opacity: 0;
|
|
|
transform: translateY(-10rem);
|
|
|
}
|
|
|
+ .map-tit{
|
|
|
+ .sj-icon-btn{
|
|
|
+ display: block;
|
|
|
+ margin: 10px auto 15px auto;
|
|
|
+ padding: 0px 16px;
|
|
|
+ font-size: 10px;
|
|
|
+ height: 1.7rem;
|
|
|
+ }
|
|
|
+ }
|
|
|
</style>
|