diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 587f591..b5de6fc 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -217,12 +217,6 @@ properties.type == 'sewageFactory' || properties.type == 'waterLoging' ) { - //泵站范围 - if (properties.geometrys) { - let geometrysToMap = turf.featureCollection([turf.feature(Terraformer.WKT.parse(properties.geometrys), properties)]); - console.log('geometrysToMap---', geometrysToMap); - newfiberMapBoxVectorLayer.addGeojsonPolygon('bengzhan_Area', geometrysToMap); - } bus.emit('popupcontent', { popupShow: true, point: point, @@ -232,13 +226,18 @@ }; //鼠标移入 const moveOn = (point, properties) => { - // console.log('point', point); // console.log('鼠标移入--', properties); + // 雨水泵站收水范围 + if (properties.type == 'YSBZ' && properties.geometrys) { + let geometrysToMap = turf.featureCollection([turf.feature(Terraformer.WKT.parse(properties.geometrys), properties)]); + console.log('geometrysToMap---', geometrysToMap); + newfiberMapBoxVectorLayer.addGeojsonPolygon('bengzhan_Area', geometrysToMap); + } }; //鼠标移出 const moveLeave = (point, properties) => { - // console.log('point', point); // console.log('鼠标移出--', properties); + newfiberMapBoxVectorLayer.removeByIds(['bengzhan_Area']); //清除泵站范围 }; //关闭三维管网弹窗 const closePipe = () => { diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 587f591..b5de6fc 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -217,12 +217,6 @@ properties.type == 'sewageFactory' || properties.type == 'waterLoging' ) { - //泵站范围 - if (properties.geometrys) { - let geometrysToMap = turf.featureCollection([turf.feature(Terraformer.WKT.parse(properties.geometrys), properties)]); - console.log('geometrysToMap---', geometrysToMap); - newfiberMapBoxVectorLayer.addGeojsonPolygon('bengzhan_Area', geometrysToMap); - } bus.emit('popupcontent', { popupShow: true, point: point, @@ -232,13 +226,18 @@ }; //鼠标移入 const moveOn = (point, properties) => { - // console.log('point', point); // console.log('鼠标移入--', properties); + // 雨水泵站收水范围 + if (properties.type == 'YSBZ' && properties.geometrys) { + let geometrysToMap = turf.featureCollection([turf.feature(Terraformer.WKT.parse(properties.geometrys), properties)]); + console.log('geometrysToMap---', geometrysToMap); + newfiberMapBoxVectorLayer.addGeojsonPolygon('bengzhan_Area', geometrysToMap); + } }; //鼠标移出 const moveLeave = (point, properties) => { - // console.log('point', point); // console.log('鼠标移出--', properties); + newfiberMapBoxVectorLayer.removeByIds(['bengzhan_Area']); //清除泵站范围 }; //关闭三维管网弹窗 const closePipe = () => { diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index 24548d8..a849deb 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -144,7 +144,7 @@ // function closePopupCES() { - newfiberMapBoxVectorLayer.removeByIds(['bengzhan_Area']); //清除泵站范围 + // newfiberMapBoxVectorLayer.removeByIds(['bengzhan_Area']); //清除泵站范围 allData.popupShow = false; // 关闭之后回到中心点 @@ -331,7 +331,7 @@ lat: popupCenter[1], }, anchor: 'center', - offsets: [-130, 200], + offsets: [-130, 130], autoClose: false, }); newfiberMapbox.addPopup(pipePopup);