diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 3762d58..bef5579 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -274,7 +274,7 @@ console.log('地图点击---', properties); newfiberMapBoxVectorLayer.removeByIds(['bengzhan_Area']); // 管网监测点 - if (properties.type == 'pipeMonitor') { + if (properties.type == 'pipeMonitor' || properties.type == 'origine') { bus.emit('pipeMonitorBus', properties); } // 海绵设施 diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 3762d58..bef5579 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -274,7 +274,7 @@ console.log('地图点击---', properties); newfiberMapBoxVectorLayer.removeByIds(['bengzhan_Area']); // 管网监测点 - if (properties.type == 'pipeMonitor') { + if (properties.type == 'pipeMonitor' || properties.type == 'origine') { bus.emit('pipeMonitorBus', properties); } // 海绵设施 diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index b6e3359..c38378d 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -286,13 +286,13 @@ newfiberMapBoxVectorLayer.addGeojsonLabel('oneCenter3', oneCenter3); newfiberMapbox.map.setLayoutProperty('kaifengWaterLabel1', 'visibility', 'none'); newfiberMapbox.map.setLayoutProperty('kaifengWaterLabel2', 'visibility', 'none'); + newfiberMapbox.map.easeTo({ + center: [114.315, 34.832], + zoom: 10.7, + pitch: 30, + }); clearInterval(mapboxTimer); }); - newfiberMapbox.map.easeTo({ - center: [114.315, 34.832], - zoom: 10.7, - pitch: 30, - }); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter1, 'oneCenter'); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter2, 'oneCenter'); diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 3762d58..bef5579 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -274,7 +274,7 @@ console.log('地图点击---', properties); newfiberMapBoxVectorLayer.removeByIds(['bengzhan_Area']); // 管网监测点 - if (properties.type == 'pipeMonitor') { + if (properties.type == 'pipeMonitor' || properties.type == 'origine') { bus.emit('pipeMonitorBus', properties); } // 海绵设施 diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index b6e3359..c38378d 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -286,13 +286,13 @@ newfiberMapBoxVectorLayer.addGeojsonLabel('oneCenter3', oneCenter3); newfiberMapbox.map.setLayoutProperty('kaifengWaterLabel1', 'visibility', 'none'); newfiberMapbox.map.setLayoutProperty('kaifengWaterLabel2', 'visibility', 'none'); + newfiberMapbox.map.easeTo({ + center: [114.315, 34.832], + zoom: 10.7, + pitch: 30, + }); clearInterval(mapboxTimer); }); - newfiberMapbox.map.easeTo({ - center: [114.315, 34.832], - zoom: 10.7, - pitch: 30, - }); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter1, 'oneCenter'); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter2, 'oneCenter'); diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index d5bfe4e..ca67915 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -30,7 +30,8 @@ rainStationArea, riverSuperVise, waterFactory, - spongeFacility; + spongeFacility, + origine; let legendDataList; export default class cesiumMapCommonLegend { @@ -56,11 +57,13 @@ let riverDataList = stationDataList.data.filter(data => data.monitorTargetType == 'river'); //河道监测 let spongeFacilityList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'drain_outlet'); //海绵设施 + let origineList = spongeFacilityDataList.data.filter(data => data.monitorTargetType == 'typical_land'); //典型地块 YSBZ = this.getGeojsonData(YSBZDataList); WSBZ = this.getGeojsonData(WSBZDataList); - HLBZ = this.getGeojsonData(spongeFacilityList); - spongeFacility = this.getGeojsonData(HLBZDataList); + HLBZ = this.getGeojsonData(HLBZDataList); + spongeFacility = this.getGeojsonData(spongeFacilityList); riverSuperVise = this.getGeojsonData(riverDataList); + origine = this.getGeojsonData(origineList); waterFactory = this.getGeojsonData(waterFactoryDatalist.data); //水厂 ysArea = this.getPolygonGeojson(YSBZDataList); //雨水泵站范围 wsArea = this.getPolygonGeojson(WSBZDataList); //污水泵站范围 @@ -432,12 +435,12 @@ }, { isCheck: false, - name: '源头地块', + name: '典型项目', layername: 'origine', //图层+json √ url: 'origine_icon.png', mapUrl: 'rainSupervise.png', type: 'point', - //data: pipeSupervise, + data: origine, }, ], [