diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 0e881fe..c45b087 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -159,11 +159,27 @@ show: false, }, { - layername: 'rainLine', + layername: 'henan_kaifeng_ysline', + show: false, + }, + { + layername: 'henan_kaifeng_wsline', + show: false, + }, + { + layername: 'henan_kaifeng_hsline', + show: false, + }, + { + layername: 'pipeLineFlow', + show: false, + }, + { + layername: 'dynamicWater', show: false, }, ]); - NewFiberMapUtils.defaultPreventWaterlogging(newfiberMap); + //NewFiberMapUtils.defaultPreventWaterlogging(newfiberMap); } if (id == 5) NewFiberMapUtils.defaultPatrolDemo(newfiberMap); } diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 0e881fe..c45b087 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -159,11 +159,27 @@ show: false, }, { - layername: 'rainLine', + layername: 'henan_kaifeng_ysline', + show: false, + }, + { + layername: 'henan_kaifeng_wsline', + show: false, + }, + { + layername: 'henan_kaifeng_hsline', + show: false, + }, + { + layername: 'pipeLineFlow', + show: false, + }, + { + layername: 'dynamicWater', show: false, }, ]); - NewFiberMapUtils.defaultPreventWaterlogging(newfiberMap); + //NewFiberMapUtils.defaultPreventWaterlogging(newfiberMap); } if (id == 5) NewFiberMapUtils.defaultPatrolDemo(newfiberMap); } diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index ca97be3..26e7780 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -23,7 +23,6 @@ let rainStation = results[2]; //雨水泵站 let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站 - console.log('YSBZDataList--', YSBZDataList); let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站 let HLBZDataList = resRainwater.data.filter(data => data.pumpType == 'confluence'); //合流泵站 let rainDataList = rainStation.data; //雨量站 @@ -273,7 +272,7 @@ [ { isCheck: false, - name: '排水管网', + name: '三维管网', layername: 'rainLine', url: 'rainLine_icon.png', //图层+json √ type: '3dModel', diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index 0e881fe..c45b087 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -159,11 +159,27 @@ show: false, }, { - layername: 'rainLine', + layername: 'henan_kaifeng_ysline', + show: false, + }, + { + layername: 'henan_kaifeng_wsline', + show: false, + }, + { + layername: 'henan_kaifeng_hsline', + show: false, + }, + { + layername: 'pipeLineFlow', + show: false, + }, + { + layername: 'dynamicWater', show: false, }, ]); - NewFiberMapUtils.defaultPreventWaterlogging(newfiberMap); + //NewFiberMapUtils.defaultPreventWaterlogging(newfiberMap); } if (id == 5) NewFiberMapUtils.defaultPatrolDemo(newfiberMap); } diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js index ca97be3..26e7780 100644 --- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js +++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js @@ -23,7 +23,6 @@ let rainStation = results[2]; //雨水泵站 let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站 - console.log('YSBZDataList--', YSBZDataList); let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站 let HLBZDataList = resRainwater.data.filter(data => data.pumpType == 'confluence'); //合流泵站 let rainDataList = rainStation.data; //雨量站 @@ -273,7 +272,7 @@ [ { isCheck: false, - name: '排水管网', + name: '三维管网', layername: 'rainLine', url: 'rainLine_icon.png', //图层+json √ type: '3dModel', diff --git a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js index 492e32e..8592a11 100644 --- a/src/views/sponeScreen/gisMF/newfiberVectorLayer.js +++ b/src/views/sponeScreen/gisMF/newfiberVectorLayer.js @@ -14,12 +14,17 @@ height: 30, pixelOffset: [0, 0], }, - name: - feature.properties.name || - feature.properties.pumpName || - feature.properties.projectAbbreviation || - feature.properties.sewageName || - feature.properties.stName, + name: feature.properties.name + ? feature.properties.name + : feature.properties.pumpName + ? feature.properties.pumpName + : feature.properties.projectAbbreviation + ? feature.properties.projectAbbreviation + : feature.properties.sewageName + ? feature.properties.sewageName + : feature.properties.stName + ? feature.properties.stName + : '', id: newfiberId, labelOptions: { font: '16px PingFang SC',