diff --git a/src/views/floodSys/floodYP/riskAsses.vue b/src/views/floodSys/floodYP/riskAsses.vue index 47d1a56..072de88 100644 --- a/src/views/floodSys/floodYP/riskAsses.vue +++ b/src/views/floodSys/floodYP/riskAsses.vue @@ -218,6 +218,8 @@ } // 不同模拟方案选择 function changeObject(val) { + !!newfiberMap_risk.map.getLayer('riskAssesImage') && newfiberMap_risk.map.removeLayer('riskAssesImage'); + !!newfiberMap_risk.map.getSource('riskAssesImage') && newfiberMap_risk.map.removeSource('riskAssesImage'); allData.queryParams.scenario = ''; allData.queryParams.duration = ''; if (val == 'duration-depth') { diff --git a/src/views/floodSys/floodYP/riskAsses.vue b/src/views/floodSys/floodYP/riskAsses.vue index 47d1a56..072de88 100644 --- a/src/views/floodSys/floodYP/riskAsses.vue +++ b/src/views/floodSys/floodYP/riskAsses.vue @@ -218,6 +218,8 @@ } // 不同模拟方案选择 function changeObject(val) { + !!newfiberMap_risk.map.getLayer('riskAssesImage') && newfiberMap_risk.map.removeLayer('riskAssesImage'); + !!newfiberMap_risk.map.getSource('riskAssesImage') && newfiberMap_risk.map.removeSource('riskAssesImage'); allData.queryParams.scenario = ''; allData.queryParams.duration = ''; if (val == 'duration-depth') { diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 8fe7c41..1f180d2 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -242,7 +242,7 @@ }); }; const setLayerVisible = () => { - wmsVisibility.value = !wmsVisibility.value; + // wmsVisibility.value = !wmsVisibility.value; newfiberMapBoxVectorLayer.removeByIds([ 'oneCenter', 'oneCenter_label', @@ -251,6 +251,8 @@ 'oneCenter2', 'oneCenter2_label', 'oneCenter3', + 'rainAreaLayer', //年经总量控制率 + 'rainAreaLayer_label', ]); // newfiberMap.removeByIds(['oneCenter']); // if (!newfiberMap.xdmWms) { @@ -263,11 +265,11 @@ // } // let imageryProvider = newfiberMap.getLayers([newfiberMap.xdmWms])[0]; // imageryProvider.show = !!!imageryProvider.show; - if (wmsVisibility.value) { - newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'visible'); - } else { - newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none'); - } + // if (wmsVisibility.value) { + newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'visible'); + // } else { + // newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none'); + // } }; onMounted(() => { diff --git a/src/views/floodSys/floodYP/riskAsses.vue b/src/views/floodSys/floodYP/riskAsses.vue index 47d1a56..072de88 100644 --- a/src/views/floodSys/floodYP/riskAsses.vue +++ b/src/views/floodSys/floodYP/riskAsses.vue @@ -218,6 +218,8 @@ } // 不同模拟方案选择 function changeObject(val) { + !!newfiberMap_risk.map.getLayer('riskAssesImage') && newfiberMap_risk.map.removeLayer('riskAssesImage'); + !!newfiberMap_risk.map.getSource('riskAssesImage') && newfiberMap_risk.map.removeSource('riskAssesImage'); allData.queryParams.scenario = ''; allData.queryParams.duration = ''; if (val == 'duration-depth') { diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 8fe7c41..1f180d2 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -242,7 +242,7 @@ }); }; const setLayerVisible = () => { - wmsVisibility.value = !wmsVisibility.value; + // wmsVisibility.value = !wmsVisibility.value; newfiberMapBoxVectorLayer.removeByIds([ 'oneCenter', 'oneCenter_label', @@ -251,6 +251,8 @@ 'oneCenter2', 'oneCenter2_label', 'oneCenter3', + 'rainAreaLayer', //年经总量控制率 + 'rainAreaLayer_label', ]); // newfiberMap.removeByIds(['oneCenter']); // if (!newfiberMap.xdmWms) { @@ -263,11 +265,11 @@ // } // let imageryProvider = newfiberMap.getLayers([newfiberMap.xdmWms])[0]; // imageryProvider.show = !!!imageryProvider.show; - if (wmsVisibility.value) { - newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'visible'); - } else { - newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none'); - } + // if (wmsVisibility.value) { + newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'visible'); + // } else { + // newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none'); + // } }; onMounted(() => { diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue index 08cddc5..5afb568 100644 --- a/src/views/sponeScreen/cityGK/cityplanning.vue +++ b/src/views/sponeScreen/cityGK/cityplanning.vue @@ -155,6 +155,7 @@ let YSFQ2_cope; //移除一心一核 + newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none'); //下垫面 newfiberMapBoxVectorLayer.removeByIds([ 'oneCenter', 'oneCenter_label', diff --git a/src/views/floodSys/floodYP/riskAsses.vue b/src/views/floodSys/floodYP/riskAsses.vue index 47d1a56..072de88 100644 --- a/src/views/floodSys/floodYP/riskAsses.vue +++ b/src/views/floodSys/floodYP/riskAsses.vue @@ -218,6 +218,8 @@ } // 不同模拟方案选择 function changeObject(val) { + !!newfiberMap_risk.map.getLayer('riskAssesImage') && newfiberMap_risk.map.removeLayer('riskAssesImage'); + !!newfiberMap_risk.map.getSource('riskAssesImage') && newfiberMap_risk.map.removeSource('riskAssesImage'); allData.queryParams.scenario = ''; allData.queryParams.duration = ''; if (val == 'duration-depth') { diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 8fe7c41..1f180d2 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -242,7 +242,7 @@ }); }; const setLayerVisible = () => { - wmsVisibility.value = !wmsVisibility.value; + // wmsVisibility.value = !wmsVisibility.value; newfiberMapBoxVectorLayer.removeByIds([ 'oneCenter', 'oneCenter_label', @@ -251,6 +251,8 @@ 'oneCenter2', 'oneCenter2_label', 'oneCenter3', + 'rainAreaLayer', //年经总量控制率 + 'rainAreaLayer_label', ]); // newfiberMap.removeByIds(['oneCenter']); // if (!newfiberMap.xdmWms) { @@ -263,11 +265,11 @@ // } // let imageryProvider = newfiberMap.getLayers([newfiberMap.xdmWms])[0]; // imageryProvider.show = !!!imageryProvider.show; - if (wmsVisibility.value) { - newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'visible'); - } else { - newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none'); - } + // if (wmsVisibility.value) { + newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'visible'); + // } else { + // newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none'); + // } }; onMounted(() => { diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue index 08cddc5..5afb568 100644 --- a/src/views/sponeScreen/cityGK/cityplanning.vue +++ b/src/views/sponeScreen/cityGK/cityplanning.vue @@ -155,6 +155,7 @@ let YSFQ2_cope; //移除一心一核 + newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none'); //下垫面 newfiberMapBoxVectorLayer.removeByIds([ 'oneCenter', 'oneCenter_label', diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue index 8a9f469..9dd2898 100644 --- a/src/views/sponeScreen/cityGK/index.vue +++ b/src/views/sponeScreen/cityGK/index.vue @@ -48,10 +48,9 @@ ); onMounted(() => { - setTimeout(() => { - //newfiberMapBoxVectorLayer.addMapboxWeather(); - }, 6000); - + // setTimeout(() => { + // newfiberMapBoxVectorLayer.addMapboxWeather(); + // }, 6000); // newfiberMap.setView({ // lng: 114.312, // lat: 34.502, @@ -77,6 +76,7 @@ //显示河湖标注 newfiberMapbox.map.setLayoutProperty('kaifengWaterLabel1', 'visibility', 'visible'); newfiberMapbox.map.setLayoutProperty('kaifengWaterLabel2', 'visibility', 'visible'); + newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none'); bus.emit('setIniteLayer', [ { layername: 'buildingModel', diff --git a/src/views/floodSys/floodYP/riskAsses.vue b/src/views/floodSys/floodYP/riskAsses.vue index 47d1a56..072de88 100644 --- a/src/views/floodSys/floodYP/riskAsses.vue +++ b/src/views/floodSys/floodYP/riskAsses.vue @@ -218,6 +218,8 @@ } // 不同模拟方案选择 function changeObject(val) { + !!newfiberMap_risk.map.getLayer('riskAssesImage') && newfiberMap_risk.map.removeLayer('riskAssesImage'); + !!newfiberMap_risk.map.getSource('riskAssesImage') && newfiberMap_risk.map.removeSource('riskAssesImage'); allData.queryParams.scenario = ''; allData.queryParams.duration = ''; if (val == 'duration-depth') { diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 8fe7c41..1f180d2 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -242,7 +242,7 @@ }); }; const setLayerVisible = () => { - wmsVisibility.value = !wmsVisibility.value; + // wmsVisibility.value = !wmsVisibility.value; newfiberMapBoxVectorLayer.removeByIds([ 'oneCenter', 'oneCenter_label', @@ -251,6 +251,8 @@ 'oneCenter2', 'oneCenter2_label', 'oneCenter3', + 'rainAreaLayer', //年经总量控制率 + 'rainAreaLayer_label', ]); // newfiberMap.removeByIds(['oneCenter']); // if (!newfiberMap.xdmWms) { @@ -263,11 +265,11 @@ // } // let imageryProvider = newfiberMap.getLayers([newfiberMap.xdmWms])[0]; // imageryProvider.show = !!!imageryProvider.show; - if (wmsVisibility.value) { - newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'visible'); - } else { - newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none'); - } + // if (wmsVisibility.value) { + newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'visible'); + // } else { + // newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none'); + // } }; onMounted(() => { diff --git a/src/views/sponeScreen/cityGK/cityplanning.vue b/src/views/sponeScreen/cityGK/cityplanning.vue index 08cddc5..5afb568 100644 --- a/src/views/sponeScreen/cityGK/cityplanning.vue +++ b/src/views/sponeScreen/cityGK/cityplanning.vue @@ -155,6 +155,7 @@ let YSFQ2_cope; //移除一心一核 + newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none'); //下垫面 newfiberMapBoxVectorLayer.removeByIds([ 'oneCenter', 'oneCenter_label', diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue index 8a9f469..9dd2898 100644 --- a/src/views/sponeScreen/cityGK/index.vue +++ b/src/views/sponeScreen/cityGK/index.vue @@ -48,10 +48,9 @@ ); onMounted(() => { - setTimeout(() => { - //newfiberMapBoxVectorLayer.addMapboxWeather(); - }, 6000); - + // setTimeout(() => { + // newfiberMapBoxVectorLayer.addMapboxWeather(); + // }, 6000); // newfiberMap.setView({ // lng: 114.312, // lat: 34.502, @@ -77,6 +76,7 @@ //显示河湖标注 newfiberMapbox.map.setLayoutProperty('kaifengWaterLabel1', 'visibility', 'visible'); newfiberMapbox.map.setLayoutProperty('kaifengWaterLabel2', 'visibility', 'visible'); + newfiberMapbox.map.setLayoutProperty('hn_kf_hm_dltb', 'visibility', 'none'); bus.emit('setIniteLayer', [ { layername: 'buildingModel', diff --git a/src/views/sponeScreen/gisMF/mapboxVectorLayer.js b/src/views/sponeScreen/gisMF/mapboxVectorLayer.js index dd7032f..bdd0aeb 100644 --- a/src/views/sponeScreen/gisMF/mapboxVectorLayer.js +++ b/src/views/sponeScreen/gisMF/mapboxVectorLayer.js @@ -422,7 +422,7 @@ const box = new THREE.Box3( new THREE.Vector3(-5000, 0, -5000), // 下雨的范围 - new THREE.Vector3(5000000, 5000, 5000000) + new THREE.Vector3(50000, 50000, 50000) ); //创建雨(雨的材质) @@ -488,7 +488,7 @@ const uvs = []; const indices = []; // 雨量 - for (let i = 0; i < 5000; i++) { + for (let i = 0; i < 50000; i++) { const pos = new THREE.Vector3(); pos.x = Math.random() * (box.max.x - box.min.x) + box.min.x; pos.y = Math.random() * (box.max.y - box.min.y) + box.min.y;