diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index 2de4619..c6d2900 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -218,7 +218,6 @@ config.filter[layername].layerName.forEach((name, index) => { let filter = map.getFilter(name); let fValues = config.filter[layername].filter[index]; - console.log('fValues---', fValues); isCheck ? filter.push(...fValues) : (filter = filter.filter(i => !fValues.includes(i))); map.setFilter(name, filter); }); diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index 2de4619..c6d2900 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -218,7 +218,6 @@ config.filter[layername].layerName.forEach((name, index) => { let filter = map.getFilter(name); let fValues = config.filter[layername].filter[index]; - console.log('fValues---', fValues); isCheck ? filter.push(...fValues) : (filter = filter.filter(i => !fValues.includes(i))); map.setFilter(name, filter); }); diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index c116d6b..afe247e 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -72,17 +72,17 @@ wscArea = this.getPolygonGeojson(WSCLCDataList); //污水处理厂范围 // 获取内涝点数据 18个考核点 - // let waterLogingRes = await waterloggingPointList(); - // if (waterLogingRes && waterLogingRes.code == 200) { - // waterLogingPoint = this.getGeojsonData(waterLogingRes.data); //内涝点 - // } - - // 管网水位监测点(和18个内涝点配套的) - let waterLogingRes = await getStationList({ monitorTargetType: 'waterlogging' }); + let waterLogingRes = await waterloggingPointList(); if (waterLogingRes && waterLogingRes.code == 200) { waterLogingPoint = this.getGeojsonData(waterLogingRes.data); //内涝点 } + // 管网水位监测点(和18个内涝点配套的) + // let waterLogingRes = await getStationList({ monitorTargetType: 'waterlogging' }); + // if (waterLogingRes && waterLogingRes.code == 200) { + // waterLogingPoint = this.getGeojsonData(waterLogingRes.data); //内涝点 + // } + // 管网监测点数据 let pipeRes = await getStationList({ monitorTargetType: 'pipeline' }); if (pipeRes && pipeRes.code == 200) { diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index 2de4619..c6d2900 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -218,7 +218,6 @@ config.filter[layername].layerName.forEach((name, index) => { let filter = map.getFilter(name); let fValues = config.filter[layername].filter[index]; - console.log('fValues---', fValues); isCheck ? filter.push(...fValues) : (filter = filter.filter(i => !fValues.includes(i))); map.setFilter(name, filter); }); diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index c116d6b..afe247e 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -72,17 +72,17 @@ wscArea = this.getPolygonGeojson(WSCLCDataList); //污水处理厂范围 // 获取内涝点数据 18个考核点 - // let waterLogingRes = await waterloggingPointList(); - // if (waterLogingRes && waterLogingRes.code == 200) { - // waterLogingPoint = this.getGeojsonData(waterLogingRes.data); //内涝点 - // } - - // 管网水位监测点(和18个内涝点配套的) - let waterLogingRes = await getStationList({ monitorTargetType: 'waterlogging' }); + let waterLogingRes = await waterloggingPointList(); if (waterLogingRes && waterLogingRes.code == 200) { waterLogingPoint = this.getGeojsonData(waterLogingRes.data); //内涝点 } + // 管网水位监测点(和18个内涝点配套的) + // let waterLogingRes = await getStationList({ monitorTargetType: 'waterlogging' }); + // if (waterLogingRes && waterLogingRes.code == 200) { + // waterLogingPoint = this.getGeojsonData(waterLogingRes.data); //内涝点 + // } + // 管网监测点数据 let pipeRes = await getStationList({ monitorTargetType: 'pipeline' }); if (pipeRes && pipeRes.code == 200) { diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue index ebd6966..5c8d86f 100644 --- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue +++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue @@ -213,7 +213,7 @@ } // 获取积水点列表 function getJSDList() { - listrtuSiteInfo({ monitorTargetType: 'waterlogging' }).then(res => { + listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => { jsdList.value = res.data || []; jsdVal.value = res.data[0].stCode; //站点编号 rainCode.value = res.data[0].referRainStCode; //关联雨量站站点编号 diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index 2de4619..c6d2900 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -218,7 +218,6 @@ config.filter[layername].layerName.forEach((name, index) => { let filter = map.getFilter(name); let fValues = config.filter[layername].filter[index]; - console.log('fValues---', fValues); isCheck ? filter.push(...fValues) : (filter = filter.filter(i => !fValues.includes(i))); map.setFilter(name, filter); }); diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index c116d6b..afe247e 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -72,17 +72,17 @@ wscArea = this.getPolygonGeojson(WSCLCDataList); //污水处理厂范围 // 获取内涝点数据 18个考核点 - // let waterLogingRes = await waterloggingPointList(); - // if (waterLogingRes && waterLogingRes.code == 200) { - // waterLogingPoint = this.getGeojsonData(waterLogingRes.data); //内涝点 - // } - - // 管网水位监测点(和18个内涝点配套的) - let waterLogingRes = await getStationList({ monitorTargetType: 'waterlogging' }); + let waterLogingRes = await waterloggingPointList(); if (waterLogingRes && waterLogingRes.code == 200) { waterLogingPoint = this.getGeojsonData(waterLogingRes.data); //内涝点 } + // 管网水位监测点(和18个内涝点配套的) + // let waterLogingRes = await getStationList({ monitorTargetType: 'waterlogging' }); + // if (waterLogingRes && waterLogingRes.code == 200) { + // waterLogingPoint = this.getGeojsonData(waterLogingRes.data); //内涝点 + // } + // 管网监测点数据 let pipeRes = await getStationList({ monitorTargetType: 'pipeline' }); if (pipeRes && pipeRes.code == 200) { diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue index ebd6966..5c8d86f 100644 --- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue +++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue @@ -213,7 +213,7 @@ } // 获取积水点列表 function getJSDList() { - listrtuSiteInfo({ monitorTargetType: 'waterlogging' }).then(res => { + listrtuSiteInfo({ monitorTargetType: 'pipeline' }).then(res => { jsdList.value = res.data || []; jsdVal.value = res.data[0].stCode; //站点编号 rainCode.value = res.data[0].referRainStCode; //关联雨量站站点编号 diff --git a/src/views/sponeScreen/projectHM/index.vue b/src/views/sponeScreen/projectHM/index.vue index a9fe073..8bb761e 100644 --- a/src/views/sponeScreen/projectHM/index.vue +++ b/src/views/sponeScreen/projectHM/index.vue @@ -20,7 +20,7 @@ - +