diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue index 7cd9dde..d4f6fe1 100644 --- a/src/views/sponeScreen/gisMF/cesiumMap.vue +++ b/src/views/sponeScreen/gisMF/cesiumMap.vue @@ -84,10 +84,13 @@ //添加三维管网 const addCesiumPipe = () => { let dataList = [ + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/yslineLabel/yslineLabel.scp', 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp', 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wslineLabel/wslineLabel.scp', 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp', 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hslineLabel/hslineLabel.scp', 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp', 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp', ]; diff --git a/src/views/sponeScreen/gisMF/cesiumMap.vue b/src/views/sponeScreen/gisMF/cesiumMap.vue index 7cd9dde..d4f6fe1 100644 --- a/src/views/sponeScreen/gisMF/cesiumMap.vue +++ b/src/views/sponeScreen/gisMF/cesiumMap.vue @@ -84,10 +84,13 @@ //添加三维管网 const addCesiumPipe = () => { let dataList = [ + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/yslineLabel/yslineLabel.scp', 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/ysline/ysline.scp', 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/YS_Point/YS_Point.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wslineLabel/wslineLabel.scp', 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/wsLine/wsLine.scp', 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/WS_Point/WS_Point.scp', + 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hslineLabel/hslineLabel.scp', 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hsLine/hsLine.scp', 'https://server1.wh-nf.cn:9000/newfiber-standard-kaifeng/2024/06/24/pipeData/hs_Point/hs_Point.scp', ]; diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue index 4d767ec..9ee8b66 100644 --- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue +++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue @@ -174,12 +174,12 @@ //newfiberMap.removeByIds(['projectBoundaryLayers', 'haimianFacility']); let arr = listDataXm.value.filter(i => i.checked); emitM('qipaoDateMeth', arr[0], arr[0]?.checked); - let lonlat = row.projectLocation.split(',').map(Number); - newfiberMapbox.map.easeTo({ - center: lonlat, - zoom: 15.5, - pitch: 15, - }); + // let lonlat = row.projectLocation.split(',').map(Number); + // newfiberMapbox.map.easeTo({ + // center: lonlat, + // zoom: 15.5, + // pitch: 15, + // }); }; const { queryParams } = toRefs(AllData); @@ -251,7 +251,7 @@ }); newfiberMapbox.addLayer(layer1); - newfiberMapbox.map.on('click', ['polygonGeojson', 'lineGeojson', 'pointGeojson'], e => { + newfiberMapbox.map.on('click', ['selectPoint', 'selectPolyLine', 'selectPolygon'], e => { const feature = newfiberMapbox.map .queryRenderedFeatures([ [e.point.x - 10 / 2, e.point.y - 10 / 2], @@ -279,6 +279,12 @@ geometry: Terraformer.WKT.parse(properties.geometry), properties: { fillcolor: 'rgba(17, 87, 153,1)', + projectNo: properties.projectNo, + name: properties.projectAbbreviation, + projectName: properties.projectName, + projectNo: properties.projectNo, + projectLocation: properties.projectLocation, + id: properties.id, }, }; if (properties.geometry.includes('POINT')) { @@ -299,12 +305,15 @@ } if (selectPolygon.features) { newfiberMapBoxVectorLayer.addGeojsonPolygon('selectPolygon', selectPolygon); + newfiberMapbox.map.moveLayer('selectPolygon', 'polygonGeojson_label'); } if (selectPolyLine.features) { newfiberMapBoxVectorLayer.addGeojsonLine('selectPolyLine', selectPolyLine, 5); + newfiberMapbox.map.moveLayer('selectPolyLine', 'lineGeojson_label'); } if (selectPoint.features) { newfiberMapBoxVectorLayer.addGeojsonCircle('selectPoint', selectPoint); + newfiberMapbox.map.moveLayer('selectPoint', 'pointGeojson_label'); } }); newfiberMapbox.map.on('mouseleave', ['polygonGeojson', 'lineGeojson', 'pointGeojson'], e => {