diff --git a/src/api/scada/sewage.js b/src/api/scada/sewage.js index 04d37e7..59933d3 100644 --- a/src/api/scada/sewage.js +++ b/src/api/scada/sewage.js @@ -8,6 +8,14 @@ params, }); } +// 获取污水厂信息管理列表 +export function haiMianfacilitySewagePage(params) { + return request({ + url: `/business/facilitySewage/list`, + method: 'get', + params, + }); +} export function facilitySewageList(params) { return request({ url: `/scada/facilitySewage/list`, diff --git a/src/api/scada/sewage.js b/src/api/scada/sewage.js index 04d37e7..59933d3 100644 --- a/src/api/scada/sewage.js +++ b/src/api/scada/sewage.js @@ -8,6 +8,14 @@ params, }); } +// 获取污水厂信息管理列表 +export function haiMianfacilitySewagePage(params) { + return request({ + url: `/business/facilitySewage/list`, + method: 'get', + params, + }); +} export function facilitySewageList(params) { return request({ url: `/scada/facilitySewage/list`, diff --git a/src/api/sponeScreen/syntherticData.js b/src/api/sponeScreen/syntherticData.js index c216e5b..c7fcabe 100644 --- a/src/api/sponeScreen/syntherticData.js +++ b/src/api/sponeScreen/syntherticData.js @@ -1,7 +1,7 @@ import request from '@/utils/request'; // 数据统计-动态表头 -export function dataAnalysisHead (query) { +export function dataAnalysisHead(query) { return request({ url: '/business/siteHistoryMonitor/dataAnalysis/heads', method: 'get', @@ -9,7 +9,7 @@ }); } // 数据统计-表格数据 -export function dataAnalysisBody (query) { +export function dataAnalysisBody(query) { return request({ url: '/business/siteHistoryMonitor/dataAnalysis', method: 'get', @@ -17,7 +17,7 @@ }); } // 图形报表分析-echarts -export function graphicReport (query) { +export function graphicReport(query) { return request({ url: '/business/siteHistoryMonitor/graphicReport', method: 'get', @@ -25,7 +25,7 @@ }); } // 获取每种监测类型对应的站点类型和建设方式对应的数量 -export function getSiteInfoCountZH (query) { +export function getSiteInfoCountZH(query) { return request({ url: '/business/rtuSiteInfo/getSiteInfoCount', method: 'get', @@ -33,7 +33,7 @@ }); } // 获取所有站点设备 -export function getStationList (query) { +export function getStationList(query) { return request({ url: '/business/rtuSiteInfo/list', method: 'get', @@ -41,21 +41,21 @@ }); } // 获取站点详情数据 -export function getStationDetail (id) { +export function getStationDetail(id) { return request({ url: '/business/rtuSiteInfo/' + id, method: 'get', }); } // 获取站点详情数据 扩展 -export function getStationDetailExtend (stCode) { +export function getStationDetailExtend(stCode) { return request({ url: '/business/rtuSiteInfo/extend/' + stCode, method: 'get', }); } // 各类型站点状态统计 -export function rtuSiteTypeStatusCount (query) { +export function rtuSiteTypeStatusCount(query) { return request({ url: '/business/rtuSiteInfo/rtuSiteTypeStatusCount', method: 'get', @@ -63,14 +63,14 @@ }); } // 站点最新一条数据记录 -export function realtimeDataLatest (stCode) { +export function realtimeDataLatest(stCode) { return request({ url: '/business/rtuSiteMonitor/realtimeData/' + stCode, method: 'get', }); } // 综合分析--趋势统计 -export function tendencyStatistics (query) { +export function tendencyStatistics(query) { return request({ url: '/business/siteHistoryMonitor/tendencyStatistics', method: 'get', @@ -78,7 +78,7 @@ }); } // 综合分析--数据分析 -export function getDataAnalyse (query) { +export function getDataAnalyse(query) { return request({ url: '/business/siteHistoryMonitor/dataAnalyse', method: 'get', @@ -86,7 +86,7 @@ }); } // 综合分析--数据分析-决策分析 -export function decisionSuggest (query) { +export function decisionSuggest(query) { return request({ url: '/business/siteHistoryMonitor/decisionSuggest', method: 'get', @@ -94,7 +94,7 @@ }); } // 综合分析--报警分析 -export function getAlarmAnalysis (query) { +export function getAlarmAnalysis(query) { return request({ url: '/business/rtuWarnRecordRealtime/alarmAnalysis', method: 'get', @@ -102,7 +102,7 @@ }); } // 查询站点对应的指定监测数据echarts数据(公共接口) -export function monitorPropertyEchart (query) { +export function monitorPropertyEchart(query) { return request({ url: '/business/siteHistoryMonitor/monitorPropertyGraphicReport', method: 'get', @@ -110,7 +110,7 @@ }); } // 故障及离线设备分析-历次故障分析 -export function stationFaultTime (query) { +export function stationFaultTime(query) { return request({ url: '/business/rtuFaultTimeSectionRealtime/page', method: 'get', @@ -118,14 +118,14 @@ }); } // 故障及离线设备分析-问题建议 -export function stationFaultSuggest (stCode) { +export function stationFaultSuggest(stCode) { return request({ url: '/business/rtuFaultTimeSectionHistory/problemSuggest/' + stCode, method: 'get', }); } // 站点对比分析-监测项 -export function monitorPropertyList (query) { +export function monitorPropertyList(query) { return request({ url: '/business/rtuSiteInfo/tree', method: 'get', @@ -133,7 +133,7 @@ }); } // 站点对比分析-对比数据 -export function monitorPropertyGraphicCompare (data) { +export function monitorPropertyGraphicCompare(data) { return request({ url: '/business/siteHistoryMonitor/monitorPropertyGraphicCompare', method: 'post', @@ -141,7 +141,7 @@ }); } // 根据监测目标类型查询下拉列表-对比数据 -export function getListByTargetType (query) { +export function getListByTargetType(query) { return request({ url: '/business/rtuSiteInfo/getListByTargetType', method: 'get', @@ -149,7 +149,7 @@ }); } // 内涝风险模拟 -export function waterLoggingRiskSim (data) { +export function waterLoggingRiskSim(data) { return request({ url: '/business/monitorEvaluate/waterLoggingRiskSim', method: 'post', @@ -157,7 +157,7 @@ }); } // 排水口流量对比分析 -export function outfallFlowAnalysis (data) { +export function outfallFlowAnalysis(data) { return request({ url: '/business/monitorEvaluate/outfallFlowAnalysis', method: 'post', @@ -165,7 +165,7 @@ }); } // 典型下垫面SS总量削减率分析 -export function UnderSurfaceSsReductionRate (query) { +export function UnderSurfaceSsReductionRate(query) { return request({ url: '/business/monitorEvaluate/UnderSurfaceSsReductionRate', method: 'get', @@ -173,7 +173,7 @@ }); } // 预案方案列表 -export function getYuAnIndexList (data) { +export function getYuAnIndexList(data) { return request({ url: '/business/module_data/getYuAnIndexList', method: 'post', @@ -181,14 +181,14 @@ }); } // 图例 -export function screenMapLayerList (type) { +export function screenMapLayerList(type) { return request({ url: '/business/screen-map-layer/list-type/' + type, method: 'get', }); } // 站点对比分析-对比数据 -export function monitorPropertyGraphicTimeCompare (data) { +export function monitorPropertyGraphicTimeCompare(data) { return request({ url: '/business/siteHistoryMonitor/monitorPropertyGraphicTimeCompare', method: 'post', @@ -196,15 +196,23 @@ }); } // 易涝点数据 -export function waterloggingPointList (query) { +export function waterloggingPointList(query) { return request({ url: '/business/preventFlood/waterloggingPoint/list', method: 'get', params: query, }); } +// 海绵设施 +export function queryProjectStation(data) { + return request({ + url: '/business/projectInfoNew/queryProjectStation', + method: 'post', + data: data, + }); +} // 分区信息 -export function partitionInfoList (query) { +export function partitionInfoList(query) { return request({ url: '/business/partitionInfo/list', method: 'get', @@ -212,16 +220,16 @@ }); } // 动态tab-监测点 -export function rtuSiteInfoDynamicTab (stCode) { +export function rtuSiteInfoDynamicTab(stCode) { return request({ url: '/business/rtuSiteInfo/dynamicTab/' + stCode, method: 'get', }); } // 动态tab-项目 -export function projectlnfoNewDynamicTab (stCode) { +export function projectlnfoNewDynamicTab(stCode) { return request({ url: '/business/projectInfoNew/dynamicTab/' + stCode, method: 'get', }); -} \ No newline at end of file +} diff --git a/src/api/scada/sewage.js b/src/api/scada/sewage.js index 04d37e7..59933d3 100644 --- a/src/api/scada/sewage.js +++ b/src/api/scada/sewage.js @@ -8,6 +8,14 @@ params, }); } +// 获取污水厂信息管理列表 +export function haiMianfacilitySewagePage(params) { + return request({ + url: `/business/facilitySewage/list`, + method: 'get', + params, + }); +} export function facilitySewageList(params) { return request({ url: `/scada/facilitySewage/list`, diff --git a/src/api/sponeScreen/syntherticData.js b/src/api/sponeScreen/syntherticData.js index c216e5b..c7fcabe 100644 --- a/src/api/sponeScreen/syntherticData.js +++ b/src/api/sponeScreen/syntherticData.js @@ -1,7 +1,7 @@ import request from '@/utils/request'; // 数据统计-动态表头 -export function dataAnalysisHead (query) { +export function dataAnalysisHead(query) { return request({ url: '/business/siteHistoryMonitor/dataAnalysis/heads', method: 'get', @@ -9,7 +9,7 @@ }); } // 数据统计-表格数据 -export function dataAnalysisBody (query) { +export function dataAnalysisBody(query) { return request({ url: '/business/siteHistoryMonitor/dataAnalysis', method: 'get', @@ -17,7 +17,7 @@ }); } // 图形报表分析-echarts -export function graphicReport (query) { +export function graphicReport(query) { return request({ url: '/business/siteHistoryMonitor/graphicReport', method: 'get', @@ -25,7 +25,7 @@ }); } // 获取每种监测类型对应的站点类型和建设方式对应的数量 -export function getSiteInfoCountZH (query) { +export function getSiteInfoCountZH(query) { return request({ url: '/business/rtuSiteInfo/getSiteInfoCount', method: 'get', @@ -33,7 +33,7 @@ }); } // 获取所有站点设备 -export function getStationList (query) { +export function getStationList(query) { return request({ url: '/business/rtuSiteInfo/list', method: 'get', @@ -41,21 +41,21 @@ }); } // 获取站点详情数据 -export function getStationDetail (id) { +export function getStationDetail(id) { return request({ url: '/business/rtuSiteInfo/' + id, method: 'get', }); } // 获取站点详情数据 扩展 -export function getStationDetailExtend (stCode) { +export function getStationDetailExtend(stCode) { return request({ url: '/business/rtuSiteInfo/extend/' + stCode, method: 'get', }); } // 各类型站点状态统计 -export function rtuSiteTypeStatusCount (query) { +export function rtuSiteTypeStatusCount(query) { return request({ url: '/business/rtuSiteInfo/rtuSiteTypeStatusCount', method: 'get', @@ -63,14 +63,14 @@ }); } // 站点最新一条数据记录 -export function realtimeDataLatest (stCode) { +export function realtimeDataLatest(stCode) { return request({ url: '/business/rtuSiteMonitor/realtimeData/' + stCode, method: 'get', }); } // 综合分析--趋势统计 -export function tendencyStatistics (query) { +export function tendencyStatistics(query) { return request({ url: '/business/siteHistoryMonitor/tendencyStatistics', method: 'get', @@ -78,7 +78,7 @@ }); } // 综合分析--数据分析 -export function getDataAnalyse (query) { +export function getDataAnalyse(query) { return request({ url: '/business/siteHistoryMonitor/dataAnalyse', method: 'get', @@ -86,7 +86,7 @@ }); } // 综合分析--数据分析-决策分析 -export function decisionSuggest (query) { +export function decisionSuggest(query) { return request({ url: '/business/siteHistoryMonitor/decisionSuggest', method: 'get', @@ -94,7 +94,7 @@ }); } // 综合分析--报警分析 -export function getAlarmAnalysis (query) { +export function getAlarmAnalysis(query) { return request({ url: '/business/rtuWarnRecordRealtime/alarmAnalysis', method: 'get', @@ -102,7 +102,7 @@ }); } // 查询站点对应的指定监测数据echarts数据(公共接口) -export function monitorPropertyEchart (query) { +export function monitorPropertyEchart(query) { return request({ url: '/business/siteHistoryMonitor/monitorPropertyGraphicReport', method: 'get', @@ -110,7 +110,7 @@ }); } // 故障及离线设备分析-历次故障分析 -export function stationFaultTime (query) { +export function stationFaultTime(query) { return request({ url: '/business/rtuFaultTimeSectionRealtime/page', method: 'get', @@ -118,14 +118,14 @@ }); } // 故障及离线设备分析-问题建议 -export function stationFaultSuggest (stCode) { +export function stationFaultSuggest(stCode) { return request({ url: '/business/rtuFaultTimeSectionHistory/problemSuggest/' + stCode, method: 'get', }); } // 站点对比分析-监测项 -export function monitorPropertyList (query) { +export function monitorPropertyList(query) { return request({ url: '/business/rtuSiteInfo/tree', method: 'get', @@ -133,7 +133,7 @@ }); } // 站点对比分析-对比数据 -export function monitorPropertyGraphicCompare (data) { +export function monitorPropertyGraphicCompare(data) { return request({ url: '/business/siteHistoryMonitor/monitorPropertyGraphicCompare', method: 'post', @@ -141,7 +141,7 @@ }); } // 根据监测目标类型查询下拉列表-对比数据 -export function getListByTargetType (query) { +export function getListByTargetType(query) { return request({ url: '/business/rtuSiteInfo/getListByTargetType', method: 'get', @@ -149,7 +149,7 @@ }); } // 内涝风险模拟 -export function waterLoggingRiskSim (data) { +export function waterLoggingRiskSim(data) { return request({ url: '/business/monitorEvaluate/waterLoggingRiskSim', method: 'post', @@ -157,7 +157,7 @@ }); } // 排水口流量对比分析 -export function outfallFlowAnalysis (data) { +export function outfallFlowAnalysis(data) { return request({ url: '/business/monitorEvaluate/outfallFlowAnalysis', method: 'post', @@ -165,7 +165,7 @@ }); } // 典型下垫面SS总量削减率分析 -export function UnderSurfaceSsReductionRate (query) { +export function UnderSurfaceSsReductionRate(query) { return request({ url: '/business/monitorEvaluate/UnderSurfaceSsReductionRate', method: 'get', @@ -173,7 +173,7 @@ }); } // 预案方案列表 -export function getYuAnIndexList (data) { +export function getYuAnIndexList(data) { return request({ url: '/business/module_data/getYuAnIndexList', method: 'post', @@ -181,14 +181,14 @@ }); } // 图例 -export function screenMapLayerList (type) { +export function screenMapLayerList(type) { return request({ url: '/business/screen-map-layer/list-type/' + type, method: 'get', }); } // 站点对比分析-对比数据 -export function monitorPropertyGraphicTimeCompare (data) { +export function monitorPropertyGraphicTimeCompare(data) { return request({ url: '/business/siteHistoryMonitor/monitorPropertyGraphicTimeCompare', method: 'post', @@ -196,15 +196,23 @@ }); } // 易涝点数据 -export function waterloggingPointList (query) { +export function waterloggingPointList(query) { return request({ url: '/business/preventFlood/waterloggingPoint/list', method: 'get', params: query, }); } +// 海绵设施 +export function queryProjectStation(data) { + return request({ + url: '/business/projectInfoNew/queryProjectStation', + method: 'post', + data: data, + }); +} // 分区信息 -export function partitionInfoList (query) { +export function partitionInfoList(query) { return request({ url: '/business/partitionInfo/list', method: 'get', @@ -212,16 +220,16 @@ }); } // 动态tab-监测点 -export function rtuSiteInfoDynamicTab (stCode) { +export function rtuSiteInfoDynamicTab(stCode) { return request({ url: '/business/rtuSiteInfo/dynamicTab/' + stCode, method: 'get', }); } // 动态tab-项目 -export function projectlnfoNewDynamicTab (stCode) { +export function projectlnfoNewDynamicTab(stCode) { return request({ url: '/business/projectInfoNew/dynamicTab/' + stCode, method: 'get', }); -} \ No newline at end of file +} diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 5c73c50..89a7f72 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -4,14 +4,15 @@ import riverLake from '@/assets/geojson/kaifeng/riverLake.json'; import pipeFlow from '@/assets/geojson/kaifeng/pipeFlow.json'; import { oneMapFacilityPumpList } from '@/api/scada/pumpStationInformation'; -import { facilitySewageList } from '@/api/scada/sewage'; +import { haiMianfacilitySewagePage } from '@/api/scada/sewage'; +import { waterloggingPointList, queryProjectStation } from '@/api/sponeScreen/syntherticData.js'; import bus from '@/bus'; -let YSBZ, WSBZ, HLBZ, WSCLC; +let YSBZ, WSBZ, HLBZ, WSCLC, waterLogingPoint, projectStation, ysArea, wsArea, hsArea, wscArea; let legendDataList; export default class cesiumMapCommonLegend { //获取站点数据 static async getStationData() { - let results = await Promise.all([oneMapFacilityPumpList(), facilitySewageList()]); + let results = await Promise.all([oneMapFacilityPumpList(), haiMianfacilitySewagePage()]); let resRainwater = results[0]; let resWSCLC = results[1]; //雨水泵站 @@ -21,14 +22,39 @@ YSBZ = this.getGeojsonData(YSBZDataList); WSBZ = this.getGeojsonData(WSBZDataList); HLBZ = this.getGeojsonData(HLBZDataList); - + ysArea = this.getPolygonGeojson(YSBZDataList); + wsArea = this.getPolygonGeojson(WSBZDataList); + hsArea = this.getPolygonGeojson(HLBZDataList); let WSCLCDataList = resWSCLC.data; WSCLC = this.getGeojsonData(WSCLCDataList); - + wscArea = this.getPolygonGeojson(WSCLCDataList); + let waterLogingRes = await waterloggingPointList(); + if (waterLogingRes && waterLogingRes.code == 200) { + waterLogingPoint = this.getGeojsonData(waterLogingRes.data); + } + let params = {}; + let projectStationRes = await queryProjectStation(params); + if (projectStationRes && projectStationRes.code == 200) { + projectStation = this.getGeojsonData(projectStationRes.data); + } //发送图例 legendDataList = this.legendData(); bus.emit('legendDataList', legendDataList); } + //汇水范围json + static getPolygonGeojson(dataList) { + let features = []; + let feature = {}; + dataList.forEach(data => { + if (!data.geometrys) return; + feature = turf.feature(Terraformer.WKT.parse(data.geometrys), data); + features.push(feature); + }); + return { + type: 'FeatureCollection', + features: features, + }; + } //构建geojson格式 static getGeojsonData(dataList) { let features = []; @@ -44,6 +70,16 @@ }, properties: data, }; + } else if (data.lonlat) { + let lonlat = data.lonlat.split(','); + feature = { + type: 'Feature', + geometry: { + type: 'Point', + coordinates: [Number(lonlat[0]), Number(lonlat[1])], + }, + properties: data, + }; } else if (data.lon && data.lat) { feature = { type: 'Feature', @@ -62,6 +98,15 @@ }, properties: data, }; + } else if (data.longitude && data.latitude) { + feature = { + type: 'Feature', + geometry: { + type: 'Point', + coordinates: [Number(data.longitude), Number(data.latitude)], + }, + properties: data, + }; } features.push(feature); }); @@ -221,7 +266,7 @@ mapUrl: 'paiLaoBeng.png', type: 'point', data: YSBZ, - //data: ysBengZhan, + dataArea: ysArea, }, ], [ @@ -244,7 +289,7 @@ mapUrl: 'wsBeng.png', type: 'point', data: WSBZ, - //data: wsBengZhan, + dataArea: wsArea, }, ], [ @@ -267,7 +312,7 @@ mapUrl: 'wsBeng.png', type: 'point', data: HLBZ, - //data: wsBengZhan, + dataArea: hsArea, }, ], [ @@ -280,6 +325,7 @@ type: 'point', data: WSCLC, //data: wuShuiChang, + dataArea: wscArea, }, { isCheck: false, @@ -304,7 +350,7 @@ url: 'waterLoging_icon.png', mapUrl: 'rain.png', type: 'point', - //data: rainStation, + data: waterLogingPoint, }, { isCheck: false, @@ -344,7 +390,7 @@ url: 'spongeFacility_icon.png', //图层+json √ mapUrl: 'yiLao.png', type: 'point', - //data: waterlog, + data: projectStation, }, ], ], diff --git a/src/api/scada/sewage.js b/src/api/scada/sewage.js index 04d37e7..59933d3 100644 --- a/src/api/scada/sewage.js +++ b/src/api/scada/sewage.js @@ -8,6 +8,14 @@ params, }); } +// 获取污水厂信息管理列表 +export function haiMianfacilitySewagePage(params) { + return request({ + url: `/business/facilitySewage/list`, + method: 'get', + params, + }); +} export function facilitySewageList(params) { return request({ url: `/scada/facilitySewage/list`, diff --git a/src/api/sponeScreen/syntherticData.js b/src/api/sponeScreen/syntherticData.js index c216e5b..c7fcabe 100644 --- a/src/api/sponeScreen/syntherticData.js +++ b/src/api/sponeScreen/syntherticData.js @@ -1,7 +1,7 @@ import request from '@/utils/request'; // 数据统计-动态表头 -export function dataAnalysisHead (query) { +export function dataAnalysisHead(query) { return request({ url: '/business/siteHistoryMonitor/dataAnalysis/heads', method: 'get', @@ -9,7 +9,7 @@ }); } // 数据统计-表格数据 -export function dataAnalysisBody (query) { +export function dataAnalysisBody(query) { return request({ url: '/business/siteHistoryMonitor/dataAnalysis', method: 'get', @@ -17,7 +17,7 @@ }); } // 图形报表分析-echarts -export function graphicReport (query) { +export function graphicReport(query) { return request({ url: '/business/siteHistoryMonitor/graphicReport', method: 'get', @@ -25,7 +25,7 @@ }); } // 获取每种监测类型对应的站点类型和建设方式对应的数量 -export function getSiteInfoCountZH (query) { +export function getSiteInfoCountZH(query) { return request({ url: '/business/rtuSiteInfo/getSiteInfoCount', method: 'get', @@ -33,7 +33,7 @@ }); } // 获取所有站点设备 -export function getStationList (query) { +export function getStationList(query) { return request({ url: '/business/rtuSiteInfo/list', method: 'get', @@ -41,21 +41,21 @@ }); } // 获取站点详情数据 -export function getStationDetail (id) { +export function getStationDetail(id) { return request({ url: '/business/rtuSiteInfo/' + id, method: 'get', }); } // 获取站点详情数据 扩展 -export function getStationDetailExtend (stCode) { +export function getStationDetailExtend(stCode) { return request({ url: '/business/rtuSiteInfo/extend/' + stCode, method: 'get', }); } // 各类型站点状态统计 -export function rtuSiteTypeStatusCount (query) { +export function rtuSiteTypeStatusCount(query) { return request({ url: '/business/rtuSiteInfo/rtuSiteTypeStatusCount', method: 'get', @@ -63,14 +63,14 @@ }); } // 站点最新一条数据记录 -export function realtimeDataLatest (stCode) { +export function realtimeDataLatest(stCode) { return request({ url: '/business/rtuSiteMonitor/realtimeData/' + stCode, method: 'get', }); } // 综合分析--趋势统计 -export function tendencyStatistics (query) { +export function tendencyStatistics(query) { return request({ url: '/business/siteHistoryMonitor/tendencyStatistics', method: 'get', @@ -78,7 +78,7 @@ }); } // 综合分析--数据分析 -export function getDataAnalyse (query) { +export function getDataAnalyse(query) { return request({ url: '/business/siteHistoryMonitor/dataAnalyse', method: 'get', @@ -86,7 +86,7 @@ }); } // 综合分析--数据分析-决策分析 -export function decisionSuggest (query) { +export function decisionSuggest(query) { return request({ url: '/business/siteHistoryMonitor/decisionSuggest', method: 'get', @@ -94,7 +94,7 @@ }); } // 综合分析--报警分析 -export function getAlarmAnalysis (query) { +export function getAlarmAnalysis(query) { return request({ url: '/business/rtuWarnRecordRealtime/alarmAnalysis', method: 'get', @@ -102,7 +102,7 @@ }); } // 查询站点对应的指定监测数据echarts数据(公共接口) -export function monitorPropertyEchart (query) { +export function monitorPropertyEchart(query) { return request({ url: '/business/siteHistoryMonitor/monitorPropertyGraphicReport', method: 'get', @@ -110,7 +110,7 @@ }); } // 故障及离线设备分析-历次故障分析 -export function stationFaultTime (query) { +export function stationFaultTime(query) { return request({ url: '/business/rtuFaultTimeSectionRealtime/page', method: 'get', @@ -118,14 +118,14 @@ }); } // 故障及离线设备分析-问题建议 -export function stationFaultSuggest (stCode) { +export function stationFaultSuggest(stCode) { return request({ url: '/business/rtuFaultTimeSectionHistory/problemSuggest/' + stCode, method: 'get', }); } // 站点对比分析-监测项 -export function monitorPropertyList (query) { +export function monitorPropertyList(query) { return request({ url: '/business/rtuSiteInfo/tree', method: 'get', @@ -133,7 +133,7 @@ }); } // 站点对比分析-对比数据 -export function monitorPropertyGraphicCompare (data) { +export function monitorPropertyGraphicCompare(data) { return request({ url: '/business/siteHistoryMonitor/monitorPropertyGraphicCompare', method: 'post', @@ -141,7 +141,7 @@ }); } // 根据监测目标类型查询下拉列表-对比数据 -export function getListByTargetType (query) { +export function getListByTargetType(query) { return request({ url: '/business/rtuSiteInfo/getListByTargetType', method: 'get', @@ -149,7 +149,7 @@ }); } // 内涝风险模拟 -export function waterLoggingRiskSim (data) { +export function waterLoggingRiskSim(data) { return request({ url: '/business/monitorEvaluate/waterLoggingRiskSim', method: 'post', @@ -157,7 +157,7 @@ }); } // 排水口流量对比分析 -export function outfallFlowAnalysis (data) { +export function outfallFlowAnalysis(data) { return request({ url: '/business/monitorEvaluate/outfallFlowAnalysis', method: 'post', @@ -165,7 +165,7 @@ }); } // 典型下垫面SS总量削减率分析 -export function UnderSurfaceSsReductionRate (query) { +export function UnderSurfaceSsReductionRate(query) { return request({ url: '/business/monitorEvaluate/UnderSurfaceSsReductionRate', method: 'get', @@ -173,7 +173,7 @@ }); } // 预案方案列表 -export function getYuAnIndexList (data) { +export function getYuAnIndexList(data) { return request({ url: '/business/module_data/getYuAnIndexList', method: 'post', @@ -181,14 +181,14 @@ }); } // 图例 -export function screenMapLayerList (type) { +export function screenMapLayerList(type) { return request({ url: '/business/screen-map-layer/list-type/' + type, method: 'get', }); } // 站点对比分析-对比数据 -export function monitorPropertyGraphicTimeCompare (data) { +export function monitorPropertyGraphicTimeCompare(data) { return request({ url: '/business/siteHistoryMonitor/monitorPropertyGraphicTimeCompare', method: 'post', @@ -196,15 +196,23 @@ }); } // 易涝点数据 -export function waterloggingPointList (query) { +export function waterloggingPointList(query) { return request({ url: '/business/preventFlood/waterloggingPoint/list', method: 'get', params: query, }); } +// 海绵设施 +export function queryProjectStation(data) { + return request({ + url: '/business/projectInfoNew/queryProjectStation', + method: 'post', + data: data, + }); +} // 分区信息 -export function partitionInfoList (query) { +export function partitionInfoList(query) { return request({ url: '/business/partitionInfo/list', method: 'get', @@ -212,16 +220,16 @@ }); } // 动态tab-监测点 -export function rtuSiteInfoDynamicTab (stCode) { +export function rtuSiteInfoDynamicTab(stCode) { return request({ url: '/business/rtuSiteInfo/dynamicTab/' + stCode, method: 'get', }); } // 动态tab-项目 -export function projectlnfoNewDynamicTab (stCode) { +export function projectlnfoNewDynamicTab(stCode) { return request({ url: '/business/projectInfoNew/dynamicTab/' + stCode, method: 'get', }); -} \ No newline at end of file +} diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 5c73c50..89a7f72 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -4,14 +4,15 @@ import riverLake from '@/assets/geojson/kaifeng/riverLake.json'; import pipeFlow from '@/assets/geojson/kaifeng/pipeFlow.json'; import { oneMapFacilityPumpList } from '@/api/scada/pumpStationInformation'; -import { facilitySewageList } from '@/api/scada/sewage'; +import { haiMianfacilitySewagePage } from '@/api/scada/sewage'; +import { waterloggingPointList, queryProjectStation } from '@/api/sponeScreen/syntherticData.js'; import bus from '@/bus'; -let YSBZ, WSBZ, HLBZ, WSCLC; +let YSBZ, WSBZ, HLBZ, WSCLC, waterLogingPoint, projectStation, ysArea, wsArea, hsArea, wscArea; let legendDataList; export default class cesiumMapCommonLegend { //获取站点数据 static async getStationData() { - let results = await Promise.all([oneMapFacilityPumpList(), facilitySewageList()]); + let results = await Promise.all([oneMapFacilityPumpList(), haiMianfacilitySewagePage()]); let resRainwater = results[0]; let resWSCLC = results[1]; //雨水泵站 @@ -21,14 +22,39 @@ YSBZ = this.getGeojsonData(YSBZDataList); WSBZ = this.getGeojsonData(WSBZDataList); HLBZ = this.getGeojsonData(HLBZDataList); - + ysArea = this.getPolygonGeojson(YSBZDataList); + wsArea = this.getPolygonGeojson(WSBZDataList); + hsArea = this.getPolygonGeojson(HLBZDataList); let WSCLCDataList = resWSCLC.data; WSCLC = this.getGeojsonData(WSCLCDataList); - + wscArea = this.getPolygonGeojson(WSCLCDataList); + let waterLogingRes = await waterloggingPointList(); + if (waterLogingRes && waterLogingRes.code == 200) { + waterLogingPoint = this.getGeojsonData(waterLogingRes.data); + } + let params = {}; + let projectStationRes = await queryProjectStation(params); + if (projectStationRes && projectStationRes.code == 200) { + projectStation = this.getGeojsonData(projectStationRes.data); + } //发送图例 legendDataList = this.legendData(); bus.emit('legendDataList', legendDataList); } + //汇水范围json + static getPolygonGeojson(dataList) { + let features = []; + let feature = {}; + dataList.forEach(data => { + if (!data.geometrys) return; + feature = turf.feature(Terraformer.WKT.parse(data.geometrys), data); + features.push(feature); + }); + return { + type: 'FeatureCollection', + features: features, + }; + } //构建geojson格式 static getGeojsonData(dataList) { let features = []; @@ -44,6 +70,16 @@ }, properties: data, }; + } else if (data.lonlat) { + let lonlat = data.lonlat.split(','); + feature = { + type: 'Feature', + geometry: { + type: 'Point', + coordinates: [Number(lonlat[0]), Number(lonlat[1])], + }, + properties: data, + }; } else if (data.lon && data.lat) { feature = { type: 'Feature', @@ -62,6 +98,15 @@ }, properties: data, }; + } else if (data.longitude && data.latitude) { + feature = { + type: 'Feature', + geometry: { + type: 'Point', + coordinates: [Number(data.longitude), Number(data.latitude)], + }, + properties: data, + }; } features.push(feature); }); @@ -221,7 +266,7 @@ mapUrl: 'paiLaoBeng.png', type: 'point', data: YSBZ, - //data: ysBengZhan, + dataArea: ysArea, }, ], [ @@ -244,7 +289,7 @@ mapUrl: 'wsBeng.png', type: 'point', data: WSBZ, - //data: wsBengZhan, + dataArea: wsArea, }, ], [ @@ -267,7 +312,7 @@ mapUrl: 'wsBeng.png', type: 'point', data: HLBZ, - //data: wsBengZhan, + dataArea: hsArea, }, ], [ @@ -280,6 +325,7 @@ type: 'point', data: WSCLC, //data: wuShuiChang, + dataArea: wscArea, }, { isCheck: false, @@ -304,7 +350,7 @@ url: 'waterLoging_icon.png', mapUrl: 'rain.png', type: 'point', - //data: rainStation, + data: waterLogingPoint, }, { isCheck: false, @@ -344,7 +390,7 @@ url: 'spongeFacility_icon.png', //图层+json √ mapUrl: 'yiLao.png', type: 'point', - //data: waterlog, + data: projectStation, }, ], ], diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue index e3f84ac..1502c0d 100644 --- a/src/views/sponeScreen/gisMF/legendKF.vue +++ b/src/views/sponeScreen/gisMF/legendKF.vue @@ -70,8 +70,8 @@ const changeLegend = item => { item.isCheck = !item.isCheck; console.log('item--', item); - if(item.layername == 'weather_cloud'){ - return newfiberMap.setLayersVisible([item.layername],item.isCheck); + if (item.layername == 'weather_cloud') { + return newfiberMap.setLayersVisible([item.layername], item.isCheck); } if (item.layername == 'whiteMap') { legendList.value[0]['children'][0][1].isCheck = false; @@ -126,7 +126,7 @@ newfiberVectorLayer.addGeojsonPolygon(newfiberMap, item.data, item.layername); } if (item.type == 'point') { - newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data,item.url, item.layername); + newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, item.url, item.layername); } if (item.type == 'areaWall') { newfiberVectorLayer.addGeojsonWall(newfiberMap, item.data, item.layername); @@ -146,6 +146,9 @@ } if (item.type == 'point') { newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, getImageUrl(item.url, 'cesiumMap/legendIcon'), item.layername); + if (item.dataArea) { + newfiberVectorLayer.addGeojsonPolygon(newfiberMap, item.dataArea, item.layername); + } } if (item.layername == 'pipeLineFlow') { newfiberVectorLayer.addDynamicLine(item.data, item.layername); diff --git a/src/api/scada/sewage.js b/src/api/scada/sewage.js index 04d37e7..59933d3 100644 --- a/src/api/scada/sewage.js +++ b/src/api/scada/sewage.js @@ -8,6 +8,14 @@ params, }); } +// 获取污水厂信息管理列表 +export function haiMianfacilitySewagePage(params) { + return request({ + url: `/business/facilitySewage/list`, + method: 'get', + params, + }); +} export function facilitySewageList(params) { return request({ url: `/scada/facilitySewage/list`, diff --git a/src/api/sponeScreen/syntherticData.js b/src/api/sponeScreen/syntherticData.js index c216e5b..c7fcabe 100644 --- a/src/api/sponeScreen/syntherticData.js +++ b/src/api/sponeScreen/syntherticData.js @@ -1,7 +1,7 @@ import request from '@/utils/request'; // 数据统计-动态表头 -export function dataAnalysisHead (query) { +export function dataAnalysisHead(query) { return request({ url: '/business/siteHistoryMonitor/dataAnalysis/heads', method: 'get', @@ -9,7 +9,7 @@ }); } // 数据统计-表格数据 -export function dataAnalysisBody (query) { +export function dataAnalysisBody(query) { return request({ url: '/business/siteHistoryMonitor/dataAnalysis', method: 'get', @@ -17,7 +17,7 @@ }); } // 图形报表分析-echarts -export function graphicReport (query) { +export function graphicReport(query) { return request({ url: '/business/siteHistoryMonitor/graphicReport', method: 'get', @@ -25,7 +25,7 @@ }); } // 获取每种监测类型对应的站点类型和建设方式对应的数量 -export function getSiteInfoCountZH (query) { +export function getSiteInfoCountZH(query) { return request({ url: '/business/rtuSiteInfo/getSiteInfoCount', method: 'get', @@ -33,7 +33,7 @@ }); } // 获取所有站点设备 -export function getStationList (query) { +export function getStationList(query) { return request({ url: '/business/rtuSiteInfo/list', method: 'get', @@ -41,21 +41,21 @@ }); } // 获取站点详情数据 -export function getStationDetail (id) { +export function getStationDetail(id) { return request({ url: '/business/rtuSiteInfo/' + id, method: 'get', }); } // 获取站点详情数据 扩展 -export function getStationDetailExtend (stCode) { +export function getStationDetailExtend(stCode) { return request({ url: '/business/rtuSiteInfo/extend/' + stCode, method: 'get', }); } // 各类型站点状态统计 -export function rtuSiteTypeStatusCount (query) { +export function rtuSiteTypeStatusCount(query) { return request({ url: '/business/rtuSiteInfo/rtuSiteTypeStatusCount', method: 'get', @@ -63,14 +63,14 @@ }); } // 站点最新一条数据记录 -export function realtimeDataLatest (stCode) { +export function realtimeDataLatest(stCode) { return request({ url: '/business/rtuSiteMonitor/realtimeData/' + stCode, method: 'get', }); } // 综合分析--趋势统计 -export function tendencyStatistics (query) { +export function tendencyStatistics(query) { return request({ url: '/business/siteHistoryMonitor/tendencyStatistics', method: 'get', @@ -78,7 +78,7 @@ }); } // 综合分析--数据分析 -export function getDataAnalyse (query) { +export function getDataAnalyse(query) { return request({ url: '/business/siteHistoryMonitor/dataAnalyse', method: 'get', @@ -86,7 +86,7 @@ }); } // 综合分析--数据分析-决策分析 -export function decisionSuggest (query) { +export function decisionSuggest(query) { return request({ url: '/business/siteHistoryMonitor/decisionSuggest', method: 'get', @@ -94,7 +94,7 @@ }); } // 综合分析--报警分析 -export function getAlarmAnalysis (query) { +export function getAlarmAnalysis(query) { return request({ url: '/business/rtuWarnRecordRealtime/alarmAnalysis', method: 'get', @@ -102,7 +102,7 @@ }); } // 查询站点对应的指定监测数据echarts数据(公共接口) -export function monitorPropertyEchart (query) { +export function monitorPropertyEchart(query) { return request({ url: '/business/siteHistoryMonitor/monitorPropertyGraphicReport', method: 'get', @@ -110,7 +110,7 @@ }); } // 故障及离线设备分析-历次故障分析 -export function stationFaultTime (query) { +export function stationFaultTime(query) { return request({ url: '/business/rtuFaultTimeSectionRealtime/page', method: 'get', @@ -118,14 +118,14 @@ }); } // 故障及离线设备分析-问题建议 -export function stationFaultSuggest (stCode) { +export function stationFaultSuggest(stCode) { return request({ url: '/business/rtuFaultTimeSectionHistory/problemSuggest/' + stCode, method: 'get', }); } // 站点对比分析-监测项 -export function monitorPropertyList (query) { +export function monitorPropertyList(query) { return request({ url: '/business/rtuSiteInfo/tree', method: 'get', @@ -133,7 +133,7 @@ }); } // 站点对比分析-对比数据 -export function monitorPropertyGraphicCompare (data) { +export function monitorPropertyGraphicCompare(data) { return request({ url: '/business/siteHistoryMonitor/monitorPropertyGraphicCompare', method: 'post', @@ -141,7 +141,7 @@ }); } // 根据监测目标类型查询下拉列表-对比数据 -export function getListByTargetType (query) { +export function getListByTargetType(query) { return request({ url: '/business/rtuSiteInfo/getListByTargetType', method: 'get', @@ -149,7 +149,7 @@ }); } // 内涝风险模拟 -export function waterLoggingRiskSim (data) { +export function waterLoggingRiskSim(data) { return request({ url: '/business/monitorEvaluate/waterLoggingRiskSim', method: 'post', @@ -157,7 +157,7 @@ }); } // 排水口流量对比分析 -export function outfallFlowAnalysis (data) { +export function outfallFlowAnalysis(data) { return request({ url: '/business/monitorEvaluate/outfallFlowAnalysis', method: 'post', @@ -165,7 +165,7 @@ }); } // 典型下垫面SS总量削减率分析 -export function UnderSurfaceSsReductionRate (query) { +export function UnderSurfaceSsReductionRate(query) { return request({ url: '/business/monitorEvaluate/UnderSurfaceSsReductionRate', method: 'get', @@ -173,7 +173,7 @@ }); } // 预案方案列表 -export function getYuAnIndexList (data) { +export function getYuAnIndexList(data) { return request({ url: '/business/module_data/getYuAnIndexList', method: 'post', @@ -181,14 +181,14 @@ }); } // 图例 -export function screenMapLayerList (type) { +export function screenMapLayerList(type) { return request({ url: '/business/screen-map-layer/list-type/' + type, method: 'get', }); } // 站点对比分析-对比数据 -export function monitorPropertyGraphicTimeCompare (data) { +export function monitorPropertyGraphicTimeCompare(data) { return request({ url: '/business/siteHistoryMonitor/monitorPropertyGraphicTimeCompare', method: 'post', @@ -196,15 +196,23 @@ }); } // 易涝点数据 -export function waterloggingPointList (query) { +export function waterloggingPointList(query) { return request({ url: '/business/preventFlood/waterloggingPoint/list', method: 'get', params: query, }); } +// 海绵设施 +export function queryProjectStation(data) { + return request({ + url: '/business/projectInfoNew/queryProjectStation', + method: 'post', + data: data, + }); +} // 分区信息 -export function partitionInfoList (query) { +export function partitionInfoList(query) { return request({ url: '/business/partitionInfo/list', method: 'get', @@ -212,16 +220,16 @@ }); } // 动态tab-监测点 -export function rtuSiteInfoDynamicTab (stCode) { +export function rtuSiteInfoDynamicTab(stCode) { return request({ url: '/business/rtuSiteInfo/dynamicTab/' + stCode, method: 'get', }); } // 动态tab-项目 -export function projectlnfoNewDynamicTab (stCode) { +export function projectlnfoNewDynamicTab(stCode) { return request({ url: '/business/projectInfoNew/dynamicTab/' + stCode, method: 'get', }); -} \ No newline at end of file +} diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 5c73c50..89a7f72 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -4,14 +4,15 @@ import riverLake from '@/assets/geojson/kaifeng/riverLake.json'; import pipeFlow from '@/assets/geojson/kaifeng/pipeFlow.json'; import { oneMapFacilityPumpList } from '@/api/scada/pumpStationInformation'; -import { facilitySewageList } from '@/api/scada/sewage'; +import { haiMianfacilitySewagePage } from '@/api/scada/sewage'; +import { waterloggingPointList, queryProjectStation } from '@/api/sponeScreen/syntherticData.js'; import bus from '@/bus'; -let YSBZ, WSBZ, HLBZ, WSCLC; +let YSBZ, WSBZ, HLBZ, WSCLC, waterLogingPoint, projectStation, ysArea, wsArea, hsArea, wscArea; let legendDataList; export default class cesiumMapCommonLegend { //获取站点数据 static async getStationData() { - let results = await Promise.all([oneMapFacilityPumpList(), facilitySewageList()]); + let results = await Promise.all([oneMapFacilityPumpList(), haiMianfacilitySewagePage()]); let resRainwater = results[0]; let resWSCLC = results[1]; //雨水泵站 @@ -21,14 +22,39 @@ YSBZ = this.getGeojsonData(YSBZDataList); WSBZ = this.getGeojsonData(WSBZDataList); HLBZ = this.getGeojsonData(HLBZDataList); - + ysArea = this.getPolygonGeojson(YSBZDataList); + wsArea = this.getPolygonGeojson(WSBZDataList); + hsArea = this.getPolygonGeojson(HLBZDataList); let WSCLCDataList = resWSCLC.data; WSCLC = this.getGeojsonData(WSCLCDataList); - + wscArea = this.getPolygonGeojson(WSCLCDataList); + let waterLogingRes = await waterloggingPointList(); + if (waterLogingRes && waterLogingRes.code == 200) { + waterLogingPoint = this.getGeojsonData(waterLogingRes.data); + } + let params = {}; + let projectStationRes = await queryProjectStation(params); + if (projectStationRes && projectStationRes.code == 200) { + projectStation = this.getGeojsonData(projectStationRes.data); + } //发送图例 legendDataList = this.legendData(); bus.emit('legendDataList', legendDataList); } + //汇水范围json + static getPolygonGeojson(dataList) { + let features = []; + let feature = {}; + dataList.forEach(data => { + if (!data.geometrys) return; + feature = turf.feature(Terraformer.WKT.parse(data.geometrys), data); + features.push(feature); + }); + return { + type: 'FeatureCollection', + features: features, + }; + } //构建geojson格式 static getGeojsonData(dataList) { let features = []; @@ -44,6 +70,16 @@ }, properties: data, }; + } else if (data.lonlat) { + let lonlat = data.lonlat.split(','); + feature = { + type: 'Feature', + geometry: { + type: 'Point', + coordinates: [Number(lonlat[0]), Number(lonlat[1])], + }, + properties: data, + }; } else if (data.lon && data.lat) { feature = { type: 'Feature', @@ -62,6 +98,15 @@ }, properties: data, }; + } else if (data.longitude && data.latitude) { + feature = { + type: 'Feature', + geometry: { + type: 'Point', + coordinates: [Number(data.longitude), Number(data.latitude)], + }, + properties: data, + }; } features.push(feature); }); @@ -221,7 +266,7 @@ mapUrl: 'paiLaoBeng.png', type: 'point', data: YSBZ, - //data: ysBengZhan, + dataArea: ysArea, }, ], [ @@ -244,7 +289,7 @@ mapUrl: 'wsBeng.png', type: 'point', data: WSBZ, - //data: wsBengZhan, + dataArea: wsArea, }, ], [ @@ -267,7 +312,7 @@ mapUrl: 'wsBeng.png', type: 'point', data: HLBZ, - //data: wsBengZhan, + dataArea: hsArea, }, ], [ @@ -280,6 +325,7 @@ type: 'point', data: WSCLC, //data: wuShuiChang, + dataArea: wscArea, }, { isCheck: false, @@ -304,7 +350,7 @@ url: 'waterLoging_icon.png', mapUrl: 'rain.png', type: 'point', - //data: rainStation, + data: waterLogingPoint, }, { isCheck: false, @@ -344,7 +390,7 @@ url: 'spongeFacility_icon.png', //图层+json √ mapUrl: 'yiLao.png', type: 'point', - //data: waterlog, + data: projectStation, }, ], ], diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue index e3f84ac..1502c0d 100644 --- a/src/views/sponeScreen/gisMF/legendKF.vue +++ b/src/views/sponeScreen/gisMF/legendKF.vue @@ -70,8 +70,8 @@ const changeLegend = item => { item.isCheck = !item.isCheck; console.log('item--', item); - if(item.layername == 'weather_cloud'){ - return newfiberMap.setLayersVisible([item.layername],item.isCheck); + if (item.layername == 'weather_cloud') { + return newfiberMap.setLayersVisible([item.layername], item.isCheck); } if (item.layername == 'whiteMap') { legendList.value[0]['children'][0][1].isCheck = false; @@ -126,7 +126,7 @@ newfiberVectorLayer.addGeojsonPolygon(newfiberMap, item.data, item.layername); } if (item.type == 'point') { - newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data,item.url, item.layername); + newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, item.url, item.layername); } if (item.type == 'areaWall') { newfiberVectorLayer.addGeojsonWall(newfiberMap, item.data, item.layername); @@ -146,6 +146,9 @@ } if (item.type == 'point') { newfiberVectorLayer.addGeojsonPoint(newfiberMap, item.data, getImageUrl(item.url, 'cesiumMap/legendIcon'), item.layername); + if (item.dataArea) { + newfiberVectorLayer.addGeojsonPolygon(newfiberMap, item.dataArea, item.layername); + } } if (item.layername == 'pipeLineFlow') { newfiberVectorLayer.addDynamicLine(item.data, item.layername); diff --git a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js index 75b99ca..36e6c6a 100644 --- a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js +++ b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js @@ -14,7 +14,12 @@ pixelOffset: [0, 0], distanceDisplayCondition: [Number.MIN_VALUE, 7000000], }, - name: feature.properties.name || feature.properties.pumpName || feature.properties.projectAbbreviation || feature.properties.sewageName, + name: + feature.properties.name || + feature.properties.pumpName || + feature.properties.projectAbbreviation || + feature.properties.sewageName || + feature.properties.stName, id: newfiberId, labelOptions: { font: '16px PingFang SC',