diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 0aac354..4900446 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -623,7 +623,7 @@ "text-max-width": 50, "text-offset": [ 0, - -0.8 + 3 ] }, "mType": "geojson" diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 0aac354..4900446 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -623,7 +623,7 @@ "text-max-width": 50, "text-offset": [ 0, - -0.8 + 3 ] }, "mType": "geojson" diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index fae0f1e..89bb3ff 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -297,20 +297,22 @@ console.log('popup接收地图标注点值---', params); allData.dataList = params.popupInfo; let pipePopupDiv = document.getElementById('cesiumPopupID'); + console.log(Terraformer.WKT.parse(allData.dataList.geometry)); + let popupCenter = Terraformer.WKT.parse(allData.dataList.geometry).coordinates; window.window.pipePopup = new mapboxL7.Popup({ html: pipePopupDiv, lngLat: { - lng: params.point[0], - lat: params.point[1], + lng: popupCenter[0], + lat: popupCenter[1], }, anchor: 'center', - offsets: [-30, 150], + offsets: [-130, 200], autoClose: false, }); newfiberMapbox.addPopup(pipePopup); newfiberMapbox.map.easeTo({ - center: [params.point[0], params.point[1]], - zoom: 17, + center: [popupCenter[0], popupCenter[1] + 0.005], + zoom: 15, }); allData.popupShow = true; if (allData.dataList.siteType == 'rain') changeDate(); //雨量站曲线图 @@ -333,12 +335,12 @@ display: none; } .cesiumPopup { - position: absolute; width: 500px; height: 300px; padding: 10px; background: #003b6d; border: 1px solid #6acefe; + z-index: 999; #chartPopupRainC { width: 100%; height: 200px;