diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 9a6247f..21ebc8e 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -11,7 +11,7 @@ 34.852 ], "zoom": 10.4, - "pitch": 10, + "pitch": 30, "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json" }, "l7": { diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 9a6247f..21ebc8e 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -11,7 +11,7 @@ 34.852 ], "zoom": 10.4, - "pitch": 10, + "pitch": 30, "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json" }, "l7": { diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index 9d554a5..d90e881 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -306,7 +306,8 @@ a.properties.sewageName || a.properties.sectionName || a.properties.pumpName || - a.properties.projectName; + a.properties.projectName || + a.properties.plantName; }); }); diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 9a6247f..21ebc8e 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -11,7 +11,7 @@ 34.852 ], "zoom": 10.4, - "pitch": 10, + "pitch": 30, "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json" }, "l7": { diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index 9d554a5..d90e881 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -306,7 +306,8 @@ a.properties.sewageName || a.properties.sectionName || a.properties.pumpName || - a.properties.projectName; + a.properties.projectName || + a.properties.plantName; }); }); diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 8047bc8..1be38b4 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -116,7 +116,7 @@ newfiberMapbox.map.easeTo({ center: [114.312, 34.852], zoom: 10.4, - pitch: 10, + pitch: 30, }); }; const showCenterCity = () => { @@ -155,7 +155,7 @@ newfiberMapbox.map.easeTo({ center: [114.312, 34.802], zoom: 10, - pitch: 10, + pitch: 30, }); }; const showBuiltCity = () => { @@ -194,7 +194,7 @@ newfiberMapbox.map.easeTo({ center: [114.322, 34.852], zoom: 10.4, - pitch: 10, + pitch: 30, }); // newfiberMap.setCenter({ // lng: 114.312, @@ -238,7 +238,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.832], zoom: 10.7, - pitch: 10, + pitch: 30, }); }; const setLayerVisible = () => { @@ -288,7 +288,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.832], zoom: 10.7, - pitch: 10, + pitch: 30, }); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter1, 'oneCenter'); diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 9a6247f..21ebc8e 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -11,7 +11,7 @@ 34.852 ], "zoom": 10.4, - "pitch": 10, + "pitch": 30, "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json" }, "l7": { diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index 9d554a5..d90e881 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -306,7 +306,8 @@ a.properties.sewageName || a.properties.sectionName || a.properties.pumpName || - a.properties.projectName; + a.properties.projectName || + a.properties.plantName; }); }); diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 8047bc8..1be38b4 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -116,7 +116,7 @@ newfiberMapbox.map.easeTo({ center: [114.312, 34.852], zoom: 10.4, - pitch: 10, + pitch: 30, }); }; const showCenterCity = () => { @@ -155,7 +155,7 @@ newfiberMapbox.map.easeTo({ center: [114.312, 34.802], zoom: 10, - pitch: 10, + pitch: 30, }); }; const showBuiltCity = () => { @@ -194,7 +194,7 @@ newfiberMapbox.map.easeTo({ center: [114.322, 34.852], zoom: 10.4, - pitch: 10, + pitch: 30, }); // newfiberMap.setCenter({ // lng: 114.312, @@ -238,7 +238,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.832], zoom: 10.7, - pitch: 10, + pitch: 30, }); }; const setLayerVisible = () => { @@ -288,7 +288,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.832], zoom: 10.7, - pitch: 10, + pitch: 30, }); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter1, 'oneCenter'); diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue index 5afb568..d06fe14 100644 --- a/src/views/sponeScreen/cityGK/cityplanning.vue +++ b/src/views/sponeScreen/cityGK/cityplanning.vue @@ -188,7 +188,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.782], zoom: 10.4, - pitch: 10, + pitch: 30, }); }; diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 9a6247f..21ebc8e 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -11,7 +11,7 @@ 34.852 ], "zoom": 10.4, - "pitch": 10, + "pitch": 30, "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json" }, "l7": { diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index 9d554a5..d90e881 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -306,7 +306,8 @@ a.properties.sewageName || a.properties.sectionName || a.properties.pumpName || - a.properties.projectName; + a.properties.projectName || + a.properties.plantName; }); }); diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 8047bc8..1be38b4 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -116,7 +116,7 @@ newfiberMapbox.map.easeTo({ center: [114.312, 34.852], zoom: 10.4, - pitch: 10, + pitch: 30, }); }; const showCenterCity = () => { @@ -155,7 +155,7 @@ newfiberMapbox.map.easeTo({ center: [114.312, 34.802], zoom: 10, - pitch: 10, + pitch: 30, }); }; const showBuiltCity = () => { @@ -194,7 +194,7 @@ newfiberMapbox.map.easeTo({ center: [114.322, 34.852], zoom: 10.4, - pitch: 10, + pitch: 30, }); // newfiberMap.setCenter({ // lng: 114.312, @@ -238,7 +238,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.832], zoom: 10.7, - pitch: 10, + pitch: 30, }); }; const setLayerVisible = () => { @@ -288,7 +288,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.832], zoom: 10.7, - pitch: 10, + pitch: 30, }); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter1, 'oneCenter'); diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue index 5afb568..d06fe14 100644 --- a/src/views/sponeScreen/cityGK/cityplanning.vue +++ b/src/views/sponeScreen/cityGK/cityplanning.vue @@ -188,7 +188,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.782], zoom: 10.4, - pitch: 10, + pitch: 30, }); }; diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 23cb519..9cc5b48 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -10,6 +10,7 @@ import { haiMianfacilitySewagePage } from '@/api/scada/sewage'; import { waterloggingPointList, queryProjectStation, getStationList } from '@/api/sponeScreen/syntherticData.js'; import { realtimeRainfallStatistics } from '@/api/floodSys/oneMap.js'; +import { waterCompPage } from '@/api/longoPeration/RiverSection'; import bus from '@/bus'; let YSBZ, WSBZ, @@ -24,7 +25,9 @@ wscArea, rainStationData, rainStationArea, - riverSuperVise; + riverSuperVise, + waterFactory; + let legendDataList; export default class cesiumMapCommonLegend { //获取站点数据 @@ -34,11 +37,14 @@ haiMianfacilitySewagePage(), realtimeRainfallStatistics({ monitorTargetType: 'rainfall', orderBy: 'tt desc' }), getStationList(), + waterCompPage(), ]); let resRainwater = results[0]; let resWSCLC = results[1]; let rainStation = results[2]; let stationDataList = results[3]; + let waterFactoryDatalist = results[4]; + console.log('waterFactoryDatalist--', waterFactoryDatalist); //雨水泵站 let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站 let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站 @@ -50,6 +56,7 @@ WSBZ = this.getGeojsonData(WSBZDataList); HLBZ = this.getGeojsonData(HLBZDataList); riverSuperVise = this.getGeojsonData(riverDataList); + waterFactory = this.getGeojsonData(waterFactoryDatalist.data); //水厂 ysArea = this.getPolygonGeojson(YSBZDataList); //雨水泵站范围 wsArea = this.getPolygonGeojson(WSBZDataList); //污水泵站范围 hsArea = this.getPolygonGeojson(HLBZDataList); //合流泵站范围 @@ -247,7 +254,8 @@ name: '供水厂', url: 'waterFactory_icon.png', layername: 'waterFactory', - type: 'iconPoint', + type: 'point', + data: waterFactory, }, ], [ diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 9a6247f..21ebc8e 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -11,7 +11,7 @@ 34.852 ], "zoom": 10.4, - "pitch": 10, + "pitch": 30, "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json" }, "l7": { diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index 9d554a5..d90e881 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -306,7 +306,8 @@ a.properties.sewageName || a.properties.sectionName || a.properties.pumpName || - a.properties.projectName; + a.properties.projectName || + a.properties.plantName; }); }); diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 8047bc8..1be38b4 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -116,7 +116,7 @@ newfiberMapbox.map.easeTo({ center: [114.312, 34.852], zoom: 10.4, - pitch: 10, + pitch: 30, }); }; const showCenterCity = () => { @@ -155,7 +155,7 @@ newfiberMapbox.map.easeTo({ center: [114.312, 34.802], zoom: 10, - pitch: 10, + pitch: 30, }); }; const showBuiltCity = () => { @@ -194,7 +194,7 @@ newfiberMapbox.map.easeTo({ center: [114.322, 34.852], zoom: 10.4, - pitch: 10, + pitch: 30, }); // newfiberMap.setCenter({ // lng: 114.312, @@ -238,7 +238,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.832], zoom: 10.7, - pitch: 10, + pitch: 30, }); }; const setLayerVisible = () => { @@ -288,7 +288,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.832], zoom: 10.7, - pitch: 10, + pitch: 30, }); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter1, 'oneCenter'); diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue index 5afb568..d06fe14 100644 --- a/src/views/sponeScreen/cityGK/cityplanning.vue +++ b/src/views/sponeScreen/cityGK/cityplanning.vue @@ -188,7 +188,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.782], zoom: 10.4, - pitch: 10, + pitch: 30, }); }; diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 23cb519..9cc5b48 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -10,6 +10,7 @@ import { haiMianfacilitySewagePage } from '@/api/scada/sewage'; import { waterloggingPointList, queryProjectStation, getStationList } from '@/api/sponeScreen/syntherticData.js'; import { realtimeRainfallStatistics } from '@/api/floodSys/oneMap.js'; +import { waterCompPage } from '@/api/longoPeration/RiverSection'; import bus from '@/bus'; let YSBZ, WSBZ, @@ -24,7 +25,9 @@ wscArea, rainStationData, rainStationArea, - riverSuperVise; + riverSuperVise, + waterFactory; + let legendDataList; export default class cesiumMapCommonLegend { //获取站点数据 @@ -34,11 +37,14 @@ haiMianfacilitySewagePage(), realtimeRainfallStatistics({ monitorTargetType: 'rainfall', orderBy: 'tt desc' }), getStationList(), + waterCompPage(), ]); let resRainwater = results[0]; let resWSCLC = results[1]; let rainStation = results[2]; let stationDataList = results[3]; + let waterFactoryDatalist = results[4]; + console.log('waterFactoryDatalist--', waterFactoryDatalist); //雨水泵站 let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站 let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站 @@ -50,6 +56,7 @@ WSBZ = this.getGeojsonData(WSBZDataList); HLBZ = this.getGeojsonData(HLBZDataList); riverSuperVise = this.getGeojsonData(riverDataList); + waterFactory = this.getGeojsonData(waterFactoryDatalist.data); //水厂 ysArea = this.getPolygonGeojson(YSBZDataList); //雨水泵站范围 wsArea = this.getPolygonGeojson(WSBZDataList); //污水泵站范围 hsArea = this.getPolygonGeojson(HLBZDataList); //合流泵站范围 @@ -247,7 +254,8 @@ name: '供水厂', url: 'waterFactory_icon.png', layername: 'waterFactory', - type: 'iconPoint', + type: 'point', + data: waterFactory, }, ], [ diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue index ea6e89f..e7ee849 100644 --- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue +++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue @@ -154,7 +154,7 @@ newfiberMapbox.map.easeTo({ center: lonlat, zoom: 15.5, - pitch: 15, + pitch: 30, }); }; @@ -175,7 +175,7 @@ newfiberMapbox.map.easeTo({ center: [114.345, 34.801], zoom: 13.8, - pitch: 55, + pitch: 30, }); // newfiberMapBoxVectorLayer.addGeojsonLine('projectArea', projectArea, 20, 0.4, 0.6); // newfiberMapBoxVectorLayer.addGeojsonLine('projectArea_dynamicLine', projectArea, 3, 0.8); diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 9a6247f..21ebc8e 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -11,7 +11,7 @@ 34.852 ], "zoom": 10.4, - "pitch": 10, + "pitch": 30, "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json" }, "l7": { diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index 9d554a5..d90e881 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -306,7 +306,8 @@ a.properties.sewageName || a.properties.sectionName || a.properties.pumpName || - a.properties.projectName; + a.properties.projectName || + a.properties.plantName; }); }); diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 8047bc8..1be38b4 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -116,7 +116,7 @@ newfiberMapbox.map.easeTo({ center: [114.312, 34.852], zoom: 10.4, - pitch: 10, + pitch: 30, }); }; const showCenterCity = () => { @@ -155,7 +155,7 @@ newfiberMapbox.map.easeTo({ center: [114.312, 34.802], zoom: 10, - pitch: 10, + pitch: 30, }); }; const showBuiltCity = () => { @@ -194,7 +194,7 @@ newfiberMapbox.map.easeTo({ center: [114.322, 34.852], zoom: 10.4, - pitch: 10, + pitch: 30, }); // newfiberMap.setCenter({ // lng: 114.312, @@ -238,7 +238,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.832], zoom: 10.7, - pitch: 10, + pitch: 30, }); }; const setLayerVisible = () => { @@ -288,7 +288,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.832], zoom: 10.7, - pitch: 10, + pitch: 30, }); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter1, 'oneCenter'); diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue index 5afb568..d06fe14 100644 --- a/src/views/sponeScreen/cityGK/cityplanning.vue +++ b/src/views/sponeScreen/cityGK/cityplanning.vue @@ -188,7 +188,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.782], zoom: 10.4, - pitch: 10, + pitch: 30, }); }; diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 23cb519..9cc5b48 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -10,6 +10,7 @@ import { haiMianfacilitySewagePage } from '@/api/scada/sewage'; import { waterloggingPointList, queryProjectStation, getStationList } from '@/api/sponeScreen/syntherticData.js'; import { realtimeRainfallStatistics } from '@/api/floodSys/oneMap.js'; +import { waterCompPage } from '@/api/longoPeration/RiverSection'; import bus from '@/bus'; let YSBZ, WSBZ, @@ -24,7 +25,9 @@ wscArea, rainStationData, rainStationArea, - riverSuperVise; + riverSuperVise, + waterFactory; + let legendDataList; export default class cesiumMapCommonLegend { //获取站点数据 @@ -34,11 +37,14 @@ haiMianfacilitySewagePage(), realtimeRainfallStatistics({ monitorTargetType: 'rainfall', orderBy: 'tt desc' }), getStationList(), + waterCompPage(), ]); let resRainwater = results[0]; let resWSCLC = results[1]; let rainStation = results[2]; let stationDataList = results[3]; + let waterFactoryDatalist = results[4]; + console.log('waterFactoryDatalist--', waterFactoryDatalist); //雨水泵站 let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站 let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站 @@ -50,6 +56,7 @@ WSBZ = this.getGeojsonData(WSBZDataList); HLBZ = this.getGeojsonData(HLBZDataList); riverSuperVise = this.getGeojsonData(riverDataList); + waterFactory = this.getGeojsonData(waterFactoryDatalist.data); //水厂 ysArea = this.getPolygonGeojson(YSBZDataList); //雨水泵站范围 wsArea = this.getPolygonGeojson(WSBZDataList); //污水泵站范围 hsArea = this.getPolygonGeojson(HLBZDataList); //合流泵站范围 @@ -247,7 +254,8 @@ name: '供水厂', url: 'waterFactory_icon.png', layername: 'waterFactory', - type: 'iconPoint', + type: 'point', + data: waterFactory, }, ], [ diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue index ea6e89f..e7ee849 100644 --- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue +++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue @@ -154,7 +154,7 @@ newfiberMapbox.map.easeTo({ center: lonlat, zoom: 15.5, - pitch: 15, + pitch: 30, }); }; @@ -175,7 +175,7 @@ newfiberMapbox.map.easeTo({ center: [114.345, 34.801], zoom: 13.8, - pitch: 55, + pitch: 30, }); // newfiberMapBoxVectorLayer.addGeojsonLine('projectArea', projectArea, 20, 0.4, 0.6); // newfiberMapBoxVectorLayer.addGeojsonLine('projectArea_dynamicLine', projectArea, 3, 0.8); diff --git a/src/views/sponeScreen/projectHM/index.vue b/src/views/sponeScreen/projectHM/index.vue index 715daaa..4f652c0 100644 --- a/src/views/sponeScreen/projectHM/index.vue +++ b/src/views/sponeScreen/projectHM/index.vue @@ -57,7 +57,7 @@ newfiberMapbox.map.easeTo({ center: [114.345, 34.801], zoom: 13.8, - pitch: 55, + pitch: 30, }); } onMounted(() => {}); diff --git a/public/static/libs/mapbox/style/HaiMianScreen.json b/public/static/libs/mapbox/style/HaiMianScreen.json index 9a6247f..21ebc8e 100644 --- a/public/static/libs/mapbox/style/HaiMianScreen.json +++ b/public/static/libs/mapbox/style/HaiMianScreen.json @@ -11,7 +11,7 @@ 34.852 ], "zoom": 10.4, - "pitch": 10, + "pitch": 30, "style": "/static/libs/mapbox/style/customs/whiteMapStyle.json" }, "l7": { diff --git a/src/views/gisMapPage/gisMapBox1.vue b/src/views/gisMapPage/gisMapBox1.vue index 9d554a5..d90e881 100644 --- a/src/views/gisMapPage/gisMapBox1.vue +++ b/src/views/gisMapPage/gisMapBox1.vue @@ -306,7 +306,8 @@ a.properties.sewageName || a.properties.sectionName || a.properties.pumpName || - a.properties.projectName; + a.properties.projectName || + a.properties.plantName; }); }); diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 8047bc8..1be38b4 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -116,7 +116,7 @@ newfiberMapbox.map.easeTo({ center: [114.312, 34.852], zoom: 10.4, - pitch: 10, + pitch: 30, }); }; const showCenterCity = () => { @@ -155,7 +155,7 @@ newfiberMapbox.map.easeTo({ center: [114.312, 34.802], zoom: 10, - pitch: 10, + pitch: 30, }); }; const showBuiltCity = () => { @@ -194,7 +194,7 @@ newfiberMapbox.map.easeTo({ center: [114.322, 34.852], zoom: 10.4, - pitch: 10, + pitch: 30, }); // newfiberMap.setCenter({ // lng: 114.312, @@ -238,7 +238,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.832], zoom: 10.7, - pitch: 10, + pitch: 30, }); }; const setLayerVisible = () => { @@ -288,7 +288,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.832], zoom: 10.7, - pitch: 10, + pitch: 30, }); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter1, 'oneCenter'); diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue index 5afb568..d06fe14 100644 --- a/src/views/sponeScreen/cityGK/cityplanning.vue +++ b/src/views/sponeScreen/cityGK/cityplanning.vue @@ -188,7 +188,7 @@ newfiberMapbox.map.easeTo({ center: [114.315, 34.782], zoom: 10.4, - pitch: 10, + pitch: 30, }); }; diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 23cb519..9cc5b48 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -10,6 +10,7 @@ import { haiMianfacilitySewagePage } from '@/api/scada/sewage'; import { waterloggingPointList, queryProjectStation, getStationList } from '@/api/sponeScreen/syntherticData.js'; import { realtimeRainfallStatistics } from '@/api/floodSys/oneMap.js'; +import { waterCompPage } from '@/api/longoPeration/RiverSection'; import bus from '@/bus'; let YSBZ, WSBZ, @@ -24,7 +25,9 @@ wscArea, rainStationData, rainStationArea, - riverSuperVise; + riverSuperVise, + waterFactory; + let legendDataList; export default class cesiumMapCommonLegend { //获取站点数据 @@ -34,11 +37,14 @@ haiMianfacilitySewagePage(), realtimeRainfallStatistics({ monitorTargetType: 'rainfall', orderBy: 'tt desc' }), getStationList(), + waterCompPage(), ]); let resRainwater = results[0]; let resWSCLC = results[1]; let rainStation = results[2]; let stationDataList = results[3]; + let waterFactoryDatalist = results[4]; + console.log('waterFactoryDatalist--', waterFactoryDatalist); //雨水泵站 let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站 let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站 @@ -50,6 +56,7 @@ WSBZ = this.getGeojsonData(WSBZDataList); HLBZ = this.getGeojsonData(HLBZDataList); riverSuperVise = this.getGeojsonData(riverDataList); + waterFactory = this.getGeojsonData(waterFactoryDatalist.data); //水厂 ysArea = this.getPolygonGeojson(YSBZDataList); //雨水泵站范围 wsArea = this.getPolygonGeojson(WSBZDataList); //污水泵站范围 hsArea = this.getPolygonGeojson(HLBZDataList); //合流泵站范围 @@ -247,7 +254,8 @@ name: '供水厂', url: 'waterFactory_icon.png', layername: 'waterFactory', - type: 'iconPoint', + type: 'point', + data: waterFactory, }, ], [ diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue index ea6e89f..e7ee849 100644 --- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue +++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue @@ -154,7 +154,7 @@ newfiberMapbox.map.easeTo({ center: lonlat, zoom: 15.5, - pitch: 15, + pitch: 30, }); }; @@ -175,7 +175,7 @@ newfiberMapbox.map.easeTo({ center: [114.345, 34.801], zoom: 13.8, - pitch: 55, + pitch: 30, }); // newfiberMapBoxVectorLayer.addGeojsonLine('projectArea', projectArea, 20, 0.4, 0.6); // newfiberMapBoxVectorLayer.addGeojsonLine('projectArea_dynamicLine', projectArea, 3, 0.8); diff --git a/src/views/sponeScreen/projectHM/index.vue b/src/views/sponeScreen/projectHM/index.vue index 715daaa..4f652c0 100644 --- a/src/views/sponeScreen/projectHM/index.vue +++ b/src/views/sponeScreen/projectHM/index.vue @@ -57,7 +57,7 @@ newfiberMapbox.map.easeTo({ center: [114.345, 34.801], zoom: 13.8, - pitch: 55, + pitch: 30, }); } onMounted(() => {}); diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue index 7e5d067..1a2f0d1 100644 --- a/src/views/sponeScreen/waterFlood/index.vue +++ b/src/views/sponeScreen/waterFlood/index.vue @@ -132,7 +132,7 @@ newfiberMapbox.map.easeTo({ center: [114.344, 34.802], zoom: 13.6, - pitch: 55, + pitch: 30, }); bus.emit('setIniteLayer', [ {