diff --git a/src/api/scada/pumpStationInformation.js b/src/api/scada/pumpStationInformation.js index a81adc3..891c931 100644 --- a/src/api/scada/pumpStationInformation.js +++ b/src/api/scada/pumpStationInformation.js @@ -41,3 +41,11 @@ method: 'delete', }); } +// 获取海绵一张图泵站信息 +export function oneMapFacilityPumpList(params) { + return request({ + url: `/business/facilityPump/list`, + method: 'get', + params, + }); +} diff --git a/src/api/scada/pumpStationInformation.js b/src/api/scada/pumpStationInformation.js index a81adc3..891c931 100644 --- a/src/api/scada/pumpStationInformation.js +++ b/src/api/scada/pumpStationInformation.js @@ -41,3 +41,11 @@ method: 'delete', }); } +// 获取海绵一张图泵站信息 +export function oneMapFacilityPumpList(params) { + return request({ + url: `/business/facilityPump/list`, + method: 'get', + params, + }); +} diff --git a/src/assets/newImgs/topography.png b/src/assets/newImgs/topography.png index 802ed4e..1565916 100644 --- a/src/assets/newImgs/topography.png +++ b/src/assets/newImgs/topography.png Binary files differ diff --git a/src/api/scada/pumpStationInformation.js b/src/api/scada/pumpStationInformation.js index a81adc3..891c931 100644 --- a/src/api/scada/pumpStationInformation.js +++ b/src/api/scada/pumpStationInformation.js @@ -41,3 +41,11 @@ method: 'delete', }); } +// 获取海绵一张图泵站信息 +export function oneMapFacilityPumpList(params) { + return request({ + url: `/business/facilityPump/list`, + method: 'get', + params, + }); +} diff --git a/src/assets/newImgs/topography.png b/src/assets/newImgs/topography.png index 802ed4e..1565916 100644 --- a/src/assets/newImgs/topography.png +++ b/src/assets/newImgs/topography.png Binary files differ diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 10e9ba4..52706f9 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -2,6 +2,8 @@ import centerCity from '@/assets/geojson/kaifeng/centerCity.json'; import cityArea from '@/assets/geojson/kaifeng/cityArea.json'; import riverLake from '@/assets/geojson/kaifeng/riverLake.json'; +import { oneMapFacilityPumpList } from '@/api/scada/pumpStationInformation'; + let cesiumMapLegend = [ { diff --git a/src/api/scada/pumpStationInformation.js b/src/api/scada/pumpStationInformation.js index a81adc3..891c931 100644 --- a/src/api/scada/pumpStationInformation.js +++ b/src/api/scada/pumpStationInformation.js @@ -41,3 +41,11 @@ method: 'delete', }); } +// 获取海绵一张图泵站信息 +export function oneMapFacilityPumpList(params) { + return request({ + url: `/business/facilityPump/list`, + method: 'get', + params, + }); +} diff --git a/src/assets/newImgs/topography.png b/src/assets/newImgs/topography.png index 802ed4e..1565916 100644 --- a/src/assets/newImgs/topography.png +++ b/src/assets/newImgs/topography.png Binary files differ diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 10e9ba4..52706f9 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -2,6 +2,8 @@ import centerCity from '@/assets/geojson/kaifeng/centerCity.json'; import cityArea from '@/assets/geojson/kaifeng/cityArea.json'; import riverLake from '@/assets/geojson/kaifeng/riverLake.json'; +import { oneMapFacilityPumpList } from '@/api/scada/pumpStationInformation'; + let cesiumMapLegend = [ { diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue index 0da3842..c49d8c6 100644 --- a/src/views/sponeScreen/gisMF/legendKF.vue +++ b/src/views/sponeScreen/gisMF/legendKF.vue @@ -89,7 +89,7 @@ newfiberMap.getMap().entities.add({ id: 'topography', rectangle: { - coordinates: Cesium.Rectangle.fromDegrees(114.111405832621, 34.557500575175, 114.508475798663, 34.904081845253), + coordinates: Cesium.Rectangle.fromDegrees(114.110631109158, 34.6762585421128, 114.550431262765, 34.9438974105791), material: new Cesium.ImageMaterialProperty({ // 纹理 image: topography, @@ -133,8 +133,8 @@ } } if (item.type == '3dModel') { - item.data.forEach(url => { - newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername); + item.data.forEach((url, index) => { + newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername + index); }); } } @@ -146,7 +146,9 @@ newfiberVectorLayer.setDynamicWaterVisible(item.isCheck); } if (item.type == '3dModel') { - newfiberVectorLayer.set3DModelVisible(item.layername, item.isCheck); + item.data.forEach((url, index) => { + newfiberVectorLayer.set3DModelVisible(item.layername + index, item.isCheck); + }); } newfiberMap.removeByIds([item.layername]); } diff --git a/src/api/scada/pumpStationInformation.js b/src/api/scada/pumpStationInformation.js index a81adc3..891c931 100644 --- a/src/api/scada/pumpStationInformation.js +++ b/src/api/scada/pumpStationInformation.js @@ -41,3 +41,11 @@ method: 'delete', }); } +// 获取海绵一张图泵站信息 +export function oneMapFacilityPumpList(params) { + return request({ + url: `/business/facilityPump/list`, + method: 'get', + params, + }); +} diff --git a/src/assets/newImgs/topography.png b/src/assets/newImgs/topography.png index 802ed4e..1565916 100644 --- a/src/assets/newImgs/topography.png +++ b/src/assets/newImgs/topography.png Binary files differ diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index 10e9ba4..52706f9 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -2,6 +2,8 @@ import centerCity from '@/assets/geojson/kaifeng/centerCity.json'; import cityArea from '@/assets/geojson/kaifeng/cityArea.json'; import riverLake from '@/assets/geojson/kaifeng/riverLake.json'; +import { oneMapFacilityPumpList } from '@/api/scada/pumpStationInformation'; + let cesiumMapLegend = [ { diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue index 0da3842..c49d8c6 100644 --- a/src/views/sponeScreen/gisMF/legendKF.vue +++ b/src/views/sponeScreen/gisMF/legendKF.vue @@ -89,7 +89,7 @@ newfiberMap.getMap().entities.add({ id: 'topography', rectangle: { - coordinates: Cesium.Rectangle.fromDegrees(114.111405832621, 34.557500575175, 114.508475798663, 34.904081845253), + coordinates: Cesium.Rectangle.fromDegrees(114.110631109158, 34.6762585421128, 114.550431262765, 34.9438974105791), material: new Cesium.ImageMaterialProperty({ // 纹理 image: topography, @@ -133,8 +133,8 @@ } } if (item.type == '3dModel') { - item.data.forEach(url => { - newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername); + item.data.forEach((url, index) => { + newfiberVectorLayer.add3DModelLayers(newfiberMap, url, item.layername + index); }); } } @@ -146,7 +146,9 @@ newfiberVectorLayer.setDynamicWaterVisible(item.isCheck); } if (item.type == '3dModel') { - newfiberVectorLayer.set3DModelVisible(item.layername, item.isCheck); + item.data.forEach((url, index) => { + newfiberVectorLayer.set3DModelVisible(item.layername + index, item.isCheck); + }); } newfiberMap.removeByIds([item.layername]); } diff --git a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js index 79e73f2..d5466ea 100644 --- a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js +++ b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js @@ -1,17 +1,18 @@ export default class newfiberVectorLayer { //添加图标标注点 - static addGeojsonPoint(newfiberMap, geojson, newfiberId) { + static addGeojsonPoint(newfiberMap, geojson, icon_url, newfiberId) { geojson.features.forEach( feature => (feature.properties = Object.assign(feature.properties, { style_: { - type: NewFiberMap.Enum.VectorType.POLYGON, + type: NewFiberMap.Enum.VectorType.ICON, options: { show: true, - material: !!feature.properties.fillcolor ? feature.properties.fillcolor : 'rgba(154,104,171,0.4)', - outline: true, - outlineColorBottom: !!feature.properties.outcolor ? feature.properties.outcolor : 'rgba(189,127,171,0.75)', - outlineWidthBottom: 3, + url: icon_url, + width: 55, + height: 55, + pixelOffset: [0, 0], + distanceDisplayCondition: [Number.MIN_VALUE, 7000000], }, name: feature.properties.name != ' ' ? feature.properties.name : null, id: newfiberId,