|
@@ -3,7 +3,7 @@
|
|
|
* @Author: wangcc
|
|
|
* @Date: 2022-10-19 09:32:46
|
|
|
* @LastEditors: wangcc
|
|
|
- * @LastEditTime: 2023-03-13 11:26:34
|
|
|
+ * @LastEditTime: 2023-06-20 17:59:32
|
|
|
* @FilePath: \castgroup_bigscreen\src\components\amapPow.vue
|
|
|
* @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved.
|
|
|
-->
|
|
@@ -621,6 +621,7 @@ export default {
|
|
|
} else {
|
|
|
imgList.push('暂无图片');
|
|
|
}
|
|
|
+ let closeIcon = require('@/assets/img/close.png');
|
|
|
this.imgClick();
|
|
|
let smallLabel =
|
|
|
"<div class='info-details'>" +
|
|
@@ -695,6 +696,7 @@ export default {
|
|
|
'<p>森林健康度:' +
|
|
|
val.forestHealth +
|
|
|
'</p>' +
|
|
|
+ '</p>' +
|
|
|
'</div>' +
|
|
|
'</div>' +
|
|
|
'<div class="imgList">' +
|
|
@@ -703,7 +705,13 @@ export default {
|
|
|
imgList +
|
|
|
'</div>' +
|
|
|
'</div>' +
|
|
|
- '</div>';
|
|
|
+ '<a class="link-log" id="linkGuanHu">最新管护情况' +
|
|
|
+ '</a>' +
|
|
|
+ '<a class="link-close" id="linkClose">' +
|
|
|
+ '<img src="' +
|
|
|
+ closeIcon +
|
|
|
+ '" />';
|
|
|
+ '</a>' + '</div>';
|
|
|
let infoIcon = new AMap.Icon({
|
|
|
size: new AMap.Size(40, 25), // 图标尺寸
|
|
|
image: require('@/assets/img/small-marker.png'),
|
|
@@ -736,11 +744,6 @@ export default {
|
|
|
if (_this.smallClassProject) {
|
|
|
_this.map.remove(_this.smallClassProject);
|
|
|
}
|
|
|
- // _this.smallMarker.setLabel({
|
|
|
- // direction: 'right',
|
|
|
- // offset: new AMap.Pixel(-230, -160), //设置文本标注偏移量
|
|
|
- // content: smallLabel //设置文本标注内容
|
|
|
- // });
|
|
|
});
|
|
|
},
|
|
|
initAMap() {
|
|
@@ -1257,7 +1260,10 @@ export default {
|
|
|
});
|
|
|
res.rows.forEach((element) => {
|
|
|
if (element.courseLongitude && element.courseLatitude) {
|
|
|
- let lnglat = new AMap.LngLat(element.courseLongitude, element.courseLatitude);
|
|
|
+ let lnglat = new AMap.LngLat(
|
|
|
+ element.courseLongitude,
|
|
|
+ element.courseLatitude
|
|
|
+ );
|
|
|
var projectMarker = new AMap.Marker({
|
|
|
map: this.map,
|
|
|
position: lnglat,
|
|
@@ -1549,6 +1555,9 @@ export default {
|
|
|
'<p>森林健康度:' +
|
|
|
item.forestHealth +
|
|
|
'</p>' +
|
|
|
+ '<p>森林健康度11:' +
|
|
|
+ item.forestHealth +
|
|
|
+ '</p>' +
|
|
|
'</div>' +
|
|
|
'</div>' +
|
|
|
'<div class="imgList">' +
|
|
@@ -1621,6 +1630,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+
|
|
|
// 获取样地数据
|
|
|
getForestSample(page) {
|
|
|
forestSample({
|
|
@@ -2001,7 +2011,8 @@ export default {
|
|
|
this.baseMarker.setLabel({
|
|
|
direction: 'left',
|
|
|
offset: new AMap.Pixel(0, 0), //设置文本标注偏移量
|
|
|
- content: '<div class="base-marker-imgs">' + imgList.join(' ') + '</div>' //设置文本标注内容
|
|
|
+ content:
|
|
|
+ '<div class="base-marker-imgs">' + imgList.join(' ') + '</div>' //设置文本标注内容
|
|
|
});
|
|
|
this.baseMarkerArr.push(this.baseMarker);
|
|
|
this.baseMarker.on('click', function (e) {
|
|
@@ -2148,7 +2159,7 @@ export default {
|
|
|
padding-bottom: 13px;
|
|
|
// height: 10rem;
|
|
|
color: #fff;
|
|
|
-
|
|
|
+ overflow: hidden;
|
|
|
.marker-title {
|
|
|
margin: 0 auto;
|
|
|
line-height: 50px;
|
|
@@ -2170,12 +2181,38 @@ export default {
|
|
|
line-height: 18px;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ .link-log {
|
|
|
+ cursor: pointer;
|
|
|
+ color: #00f5ff;
|
|
|
+ font-size: 14px;
|
|
|
+ position: absolute;
|
|
|
+ right: 28px;
|
|
|
+ bottom: 31px;
|
|
|
+ z-index: 999;
|
|
|
+ &:hover {
|
|
|
+ text-decoration: underline;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .link-close {
|
|
|
+ cursor: pointer;
|
|
|
+ width: 50px;
|
|
|
+ height: 50px;
|
|
|
+ position: absolute;
|
|
|
+ top: 18px;
|
|
|
+ right: 12px;
|
|
|
+ img {
|
|
|
+ width: 100%;
|
|
|
+ height: 100%;
|
|
|
+ }
|
|
|
+ }
|
|
|
.imgList {
|
|
|
display: block;
|
|
|
text-align: left;
|
|
|
padding: 0 20px;
|
|
|
-
|
|
|
+ width: 56%;
|
|
|
+ display: flex;
|
|
|
+ flex-wrap: wrap;
|
|
|
+ float: left;
|
|
|
.marker-span {
|
|
|
display: block;
|
|
|
}
|
|
@@ -2219,6 +2256,7 @@ export default {
|
|
|
/deep/ .amap-marker-label {
|
|
|
border: 0;
|
|
|
background-color: transparent;
|
|
|
+ position: relative;
|
|
|
}
|
|
|
|
|
|
#mask {
|