|
@@ -5,7 +5,7 @@
|
|
|
<transition name='fade'>
|
|
|
<div class="map-tit" v-show="mapshow">
|
|
|
<div class="top-tit">
|
|
|
- <i class="iconfont sj-icon-jkzx"></i>
|
|
|
+ <i class="iconfont sj-icon-jkzx" @click="openTvwall()"></i>
|
|
|
<span><img src="../assets/images/close.svg" @click="mapshow=false" /></span>
|
|
|
</div>
|
|
|
<div class="map-txt" v-html="bindPopupHtml">
|
|
@@ -736,10 +736,10 @@
|
|
|
that.cacheData.XianJie = withinData[14]
|
|
|
that.cacheData.XiangZhenJie = withinData[15]
|
|
|
that.cacheData.Cun = withinData[16]
|
|
|
- that.road_name.then(function (layers) {
|
|
|
- let xianJie_textLayer = that.scene.layers.find(withinData[14]);//区县文字图层
|
|
|
- let xiangZhenJie_textLayer = that.scene.layers.find(withinData[15]);//乡镇文字图层
|
|
|
- let cun_textLayer = that.scene.layers.find(withinData[16]);//村文字图层
|
|
|
+ that.road_name.then(function(layers) {
|
|
|
+ let xianJie_textLayer = that.scene.layers.find(withinData[14]); //区县文字图层
|
|
|
+ let xiangZhenJie_textLayer = that.scene.layers.find(withinData[15]); //乡镇文字图层
|
|
|
+ let cun_textLayer = that.scene.layers.find(withinData[16]); //村文字图层
|
|
|
//关闭避让
|
|
|
xianJie_textLayer.isOverlapDisplayed = true;
|
|
|
xiangZhenJie_textLayer.isOverlapDisplayed = true;
|
|
@@ -781,17 +781,52 @@
|
|
|
}]
|
|
|
})
|
|
|
}
|
|
|
- const dianshiqiang = [{
|
|
|
+ that.dianshiqiang = [{
|
|
|
"switchTab": "2",
|
|
|
"treeLabels": treeLabels,
|
|
|
"labelChannels": labelChannels
|
|
|
}]
|
|
|
- that.$emit('fatherMethod', dianshiqiang, res.data[0].longitude, res.data[0].latitude, res.data[0]
|
|
|
- .userList);
|
|
|
+ that.longitude = res.data[0].longitude;
|
|
|
+ that.latitude = res.data[0].latitude;
|
|
|
+ that.userList = res.data[0].userList;
|
|
|
+ let html =
|
|
|
+ '<div class="map-tip">' +
|
|
|
+ "<span>" +
|
|
|
+ ' <div class="d-l-con">' +
|
|
|
+ ' <div class="d-l-l-text">' +
|
|
|
+ " <h4>名称:" + res.data[0].name +
|
|
|
+ "</h4>" +
|
|
|
+ " </div>" +
|
|
|
+ " </div>" +
|
|
|
+ " </span>";
|
|
|
+ for (let i in res.data[0].userList) {
|
|
|
+ html += "<span>" +
|
|
|
+ ' <div class="d-l-con">' +
|
|
|
+ ' <div class="d-l-l-text">' +
|
|
|
+ " <h4>" + res.data[0].userList[0].position + ":" + res.data[0].userList[0]
|
|
|
+ .name + "</h4>" +
|
|
|
+ " </div>" +
|
|
|
+ " </div>" +
|
|
|
+ " </span>" +
|
|
|
+ "<span>" +
|
|
|
+ ' <div class="d-l-con">' +
|
|
|
+ ' <div class="d-l-l-text">' +
|
|
|
+ " <h4>电话:" + (res.data[0].userList[i].phone ? res.data[0].userList[i].phone :
|
|
|
+ "") + "</h4>" +
|
|
|
+ " </div>" +
|
|
|
+ " </div>" +
|
|
|
+ " </span>";
|
|
|
+ }
|
|
|
+ html += "</div>";
|
|
|
+ that.bindPopupHtml = html;
|
|
|
+ that.mapshow = true
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ openTvwall() {
|
|
|
+ this.$emit('fatherMethod', this.dianshiqiang, this.longitude, this.latitude, this.userList);
|
|
|
+ },
|
|
|
/**
|
|
|
* 地图落点
|
|
|
*/
|