diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 7b85f48..ea40faf 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -5,10 +5,22 @@ import pipeFlow from '@/assets/geojson/kaifeng/pipeFlow.json'; import { oneMapFacilityPumpList } from '@/api/scada/pumpStationInformation'; import { haiMianfacilitySewagePage } from '@/api/scada/sewage'; -import { waterloggingPointList, queryProjectStation } from '@/api/sponeScreen/syntherticData.js'; +import { waterloggingPointList, queryProjectStation, getStationList } from '@/api/sponeScreen/syntherticData.js'; import { realtimeRainfallStatistics } from '@/api/floodSys/oneMap.js'; import bus from '@/bus'; -let YSBZ, WSBZ, HLBZ, WSCLC, waterLogingPoint, projectStation, ysArea, wsArea, hsArea, wscArea, rainStationData, rainStationArea; +let YSBZ, + WSBZ, + HLBZ, + WSCLC, + waterLogingPoint, + projectStation, + ysArea, + wsArea, + hsArea, + wscArea, + rainStationData, + rainStationArea, + riverSuperVise; let legendDataList; export default class cesiumMapCommonLegend { //获取站点数据 @@ -17,21 +29,25 @@ oneMapFacilityPumpList(), haiMianfacilitySewagePage(), realtimeRainfallStatistics({ monitorTargetType: 'rainfall', orderBy: 'tt desc' }), + getStationList(), ]); let resRainwater = results[0]; let resWSCLC = results[1]; let rainStation = results[2]; + let stationDataList = results[3]; //雨水泵站 let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站 let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站 let HLBZDataList = resRainwater.data.filter(data => data.pumpType == 'confluence'); //合流泵站 let rainDataList = rainStation.data; //雨量站 + let riverDataList = stationDataList.data.filter(data => data.siteType == 'water_level'); //河道监测 rainDataList.forEach(item => { item.stName = item.stName + '/' + item.pn05 + 'mm'; }); YSBZ = this.getGeojsonData(YSBZDataList); WSBZ = this.getGeojsonData(WSBZDataList); HLBZ = this.getGeojsonData(HLBZDataList); + riverSuperVise = this.getGeojsonData(riverDataList); ysArea = this.getPolygonGeojson(YSBZDataList); //雨水泵站范围 wsArea = this.getPolygonGeojson(WSBZDataList); //污水泵站范围 hsArea = this.getPolygonGeojson(HLBZDataList); //合流泵站范围 @@ -438,7 +454,7 @@ url: 'waterCourse_icon.png', //图层+json √ mapUrl: 'KDJZWMX.png', type: 'point', - //data: riverLake, + data: riverSuperVise, }, ], [ diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 7b85f48..ea40faf 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -5,10 +5,22 @@ import pipeFlow from '@/assets/geojson/kaifeng/pipeFlow.json'; import { oneMapFacilityPumpList } from '@/api/scada/pumpStationInformation'; import { haiMianfacilitySewagePage } from '@/api/scada/sewage'; -import { waterloggingPointList, queryProjectStation } from '@/api/sponeScreen/syntherticData.js'; +import { waterloggingPointList, queryProjectStation, getStationList } from '@/api/sponeScreen/syntherticData.js'; import { realtimeRainfallStatistics } from '@/api/floodSys/oneMap.js'; import bus from '@/bus'; -let YSBZ, WSBZ, HLBZ, WSCLC, waterLogingPoint, projectStation, ysArea, wsArea, hsArea, wscArea, rainStationData, rainStationArea; +let YSBZ, + WSBZ, + HLBZ, + WSCLC, + waterLogingPoint, + projectStation, + ysArea, + wsArea, + hsArea, + wscArea, + rainStationData, + rainStationArea, + riverSuperVise; let legendDataList; export default class cesiumMapCommonLegend { //获取站点数据 @@ -17,21 +29,25 @@ oneMapFacilityPumpList(), haiMianfacilitySewagePage(), realtimeRainfallStatistics({ monitorTargetType: 'rainfall', orderBy: 'tt desc' }), + getStationList(), ]); let resRainwater = results[0]; let resWSCLC = results[1]; let rainStation = results[2]; + let stationDataList = results[3]; //雨水泵站 let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站 let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站 let HLBZDataList = resRainwater.data.filter(data => data.pumpType == 'confluence'); //合流泵站 let rainDataList = rainStation.data; //雨量站 + let riverDataList = stationDataList.data.filter(data => data.siteType == 'water_level'); //河道监测 rainDataList.forEach(item => { item.stName = item.stName + '/' + item.pn05 + 'mm'; }); YSBZ = this.getGeojsonData(YSBZDataList); WSBZ = this.getGeojsonData(WSBZDataList); HLBZ = this.getGeojsonData(HLBZDataList); + riverSuperVise = this.getGeojsonData(riverDataList); ysArea = this.getPolygonGeojson(YSBZDataList); //雨水泵站范围 wsArea = this.getPolygonGeojson(WSBZDataList); //污水泵站范围 hsArea = this.getPolygonGeojson(HLBZDataList); //合流泵站范围 @@ -438,7 +454,7 @@ url: 'waterCourse_icon.png', //图层+json √ mapUrl: 'KDJZWMX.png', type: 'point', - //data: riverLake, + data: riverSuperVise, }, ], [ diff --git a/src/views/sponeScreen/waterFlood/equipMonitor.vue b/src/views/sponeScreen/waterFlood/equipMonitor.vue index e44f2e5..f3f0f35 100644 --- a/src/views/sponeScreen/waterFlood/equipMonitor.vue +++ b/src/views/sponeScreen/waterFlood/equipMonitor.vue @@ -127,6 +127,20 @@ onMounted(() => { getStationCount(); // 获取不同监测类型对应数量 checkStation('total'); //加载全部站点 + bus.emit('setIniteLayer', [ + { + layername: 'YSBZ', + show: false, + }, + { + layername: 'WSBZ', + show: false, + }, + { + layername: 'sewageFactory', + show: false, + }, + ]); }); diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 7b85f48..ea40faf 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -5,10 +5,22 @@ import pipeFlow from '@/assets/geojson/kaifeng/pipeFlow.json'; import { oneMapFacilityPumpList } from '@/api/scada/pumpStationInformation'; import { haiMianfacilitySewagePage } from '@/api/scada/sewage'; -import { waterloggingPointList, queryProjectStation } from '@/api/sponeScreen/syntherticData.js'; +import { waterloggingPointList, queryProjectStation, getStationList } from '@/api/sponeScreen/syntherticData.js'; import { realtimeRainfallStatistics } from '@/api/floodSys/oneMap.js'; import bus from '@/bus'; -let YSBZ, WSBZ, HLBZ, WSCLC, waterLogingPoint, projectStation, ysArea, wsArea, hsArea, wscArea, rainStationData, rainStationArea; +let YSBZ, + WSBZ, + HLBZ, + WSCLC, + waterLogingPoint, + projectStation, + ysArea, + wsArea, + hsArea, + wscArea, + rainStationData, + rainStationArea, + riverSuperVise; let legendDataList; export default class cesiumMapCommonLegend { //获取站点数据 @@ -17,21 +29,25 @@ oneMapFacilityPumpList(), haiMianfacilitySewagePage(), realtimeRainfallStatistics({ monitorTargetType: 'rainfall', orderBy: 'tt desc' }), + getStationList(), ]); let resRainwater = results[0]; let resWSCLC = results[1]; let rainStation = results[2]; + let stationDataList = results[3]; //雨水泵站 let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站 let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站 let HLBZDataList = resRainwater.data.filter(data => data.pumpType == 'confluence'); //合流泵站 let rainDataList = rainStation.data; //雨量站 + let riverDataList = stationDataList.data.filter(data => data.siteType == 'water_level'); //河道监测 rainDataList.forEach(item => { item.stName = item.stName + '/' + item.pn05 + 'mm'; }); YSBZ = this.getGeojsonData(YSBZDataList); WSBZ = this.getGeojsonData(WSBZDataList); HLBZ = this.getGeojsonData(HLBZDataList); + riverSuperVise = this.getGeojsonData(riverDataList); ysArea = this.getPolygonGeojson(YSBZDataList); //雨水泵站范围 wsArea = this.getPolygonGeojson(WSBZDataList); //污水泵站范围 hsArea = this.getPolygonGeojson(HLBZDataList); //合流泵站范围 @@ -438,7 +454,7 @@ url: 'waterCourse_icon.png', //图层+json √ mapUrl: 'KDJZWMX.png', type: 'point', - //data: riverLake, + data: riverSuperVise, }, ], [ diff --git a/src/views/sponeScreen/waterFlood/equipMonitor.vue b/src/views/sponeScreen/waterFlood/equipMonitor.vue index e44f2e5..f3f0f35 100644 --- a/src/views/sponeScreen/waterFlood/equipMonitor.vue +++ b/src/views/sponeScreen/waterFlood/equipMonitor.vue @@ -127,6 +127,20 @@ onMounted(() => { getStationCount(); // 获取不同监测类型对应数量 checkStation('total'); //加载全部站点 + bus.emit('setIniteLayer', [ + { + layername: 'YSBZ', + show: false, + }, + { + layername: 'WSBZ', + show: false, + }, + { + layername: 'sewageFactory', + show: false, + }, + ]); }); diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue index 5ceec8e..e1ae0fc 100644 --- a/src/views/sponeScreen/waterFlood/index.vue +++ b/src/views/sponeScreen/waterFlood/index.vue @@ -110,10 +110,10 @@ layername: 'pipeLineFlow', show: false, }, - { - layername: 'dynamicWater', - show: false, - }, + // { + // layername: 'dynamicWater', + // show: false, + // }, ]); }, 8000); });