|
@@ -162,7 +162,6 @@ export default {
|
|
|
},
|
|
|
'$store.state.addr.page': {
|
|
|
handler(val) {
|
|
|
- console.log(val);
|
|
|
this.leftPage = val;
|
|
|
if (!this.parentId) {
|
|
|
this.parentId = '520000';
|
|
@@ -934,6 +933,7 @@ export default {
|
|
|
|
|
|
// 按区域统计小班
|
|
|
getSmallClassCount() {
|
|
|
+ let _this = this;
|
|
|
let params = {
|
|
|
cityId: this.$store.state.addr.selectCity.areaId,
|
|
|
countyId: this.$store.state.addr.selectDistrict.areaId,
|
|
@@ -948,18 +948,23 @@ export default {
|
|
|
});
|
|
|
res.data.forEach((element) => {
|
|
|
if (element.longitude && element.latitude) {
|
|
|
- let infoContent = `<div class='infoLabel'><h3>${element.areaName}</h3><div class='content-sty'><p class='infoClass'>小班数量:${element.classNumber}个</p></div></div>`;
|
|
|
+ let infoContent = `<div id='infoStyle' class='infoLabel'><h3>${element.areaName}</h3><div class='content-sty'><p class='infoClass'>小班数量:${element.classNumber}个</p><p class='infoClass'>蓄积量:${element.smallClassStock}个</p><p class='infoClass'>占地面积:${element.landArea}个</p></div></div>`;
|
|
|
let lnglat = new AMap.LngLat(element.longitude, element.latitude);
|
|
|
var projectMarker = new AMap.Marker({
|
|
|
map: this.map,
|
|
|
position: lnglat,
|
|
|
offset: new AMap.Pixel(0, -30),
|
|
|
- icon: infoIcon
|
|
|
+ icon: infoIcon,
|
|
|
+ zIndex: 999
|
|
|
});
|
|
|
projectMarker.setLabel({
|
|
|
direction: 'top',
|
|
|
offset: new AMap.Pixel(0, 0), //设置文本标注偏移量
|
|
|
- content: infoContent //设置文本标注内容
|
|
|
+ content: infoContent, //设置文本标注内容
|
|
|
+ });
|
|
|
+ projectMarker.on('mouseover', function (e) {
|
|
|
+ // console.log(e);
|
|
|
+
|
|
|
});
|
|
|
this.projectMarkerArr.push(projectMarker);
|
|
|
}
|
|
@@ -1956,13 +1961,15 @@ export default {
|
|
|
margin: 0;
|
|
|
}
|
|
|
.content-sty {
|
|
|
- padding: 20px 10px 0 10px;
|
|
|
+ padding: 33px 10px 1px 10px;
|
|
|
.infoClass {
|
|
|
text-align: center;
|
|
|
background-image: url('../assets/img/project_tit.png');
|
|
|
background-repeat: no-repeat;
|
|
|
background-size: 100% 100%;
|
|
|
padding: 4px 10px;
|
|
|
+ margin-bottom: 6px;
|
|
|
+ margin-top: 0;
|
|
|
color: #ffaa00;
|
|
|
}
|
|
|
}
|