diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index cd2ae40..b65fcab 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -150,7 +150,7 @@ function menuClick(id) { menuIndex.value = id; showPanel.value = false; - NewFiberMapUtils.removeByIds(Object.values(NewFiberMapUtils.defaultParams.keys)); + //NewFiberMapUtils.removeByIds(Object.values(NewFiberMapUtils.defaultParams.keys)); if (id == 4) { } if (id == 5) NewFiberMapUtils.defaultPatrolDemo(newfiberMap); diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index cd2ae40..b65fcab 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -150,7 +150,7 @@ function menuClick(id) { menuIndex.value = id; showPanel.value = false; - NewFiberMapUtils.removeByIds(Object.values(NewFiberMapUtils.defaultParams.keys)); + //NewFiberMapUtils.removeByIds(Object.values(NewFiberMapUtils.defaultParams.keys)); if (id == 4) { } if (id == 5) NewFiberMapUtils.defaultPatrolDemo(newfiberMap); diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue index 983cf73..952964a 100644 --- a/src/views/sponeScreen/cityGK/index.vue +++ b/src/views/sponeScreen/cityGK/index.vue @@ -89,9 +89,9 @@ show: true, }, ]); - let dileiLayer = newfiberMap.getMap().imageryLayers._layers.filter(layer => layer.imageryProvider.layers == 'demo:hn_kf_hm_dilei'); - if (!dileiLayer.length) return; - dileiLayer[0].show = false; + // let dileiLayer = newfiberMap.getMap().imageryLayers._layers.filter(layer => layer.imageryProvider.layers == 'demo:hn_kf_hm_dilei'); + // if (!dileiLayer.length) return; + // dileiLayer[0].show = false; }); diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index cd2ae40..b65fcab 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -150,7 +150,7 @@ function menuClick(id) { menuIndex.value = id; showPanel.value = false; - NewFiberMapUtils.removeByIds(Object.values(NewFiberMapUtils.defaultParams.keys)); + //NewFiberMapUtils.removeByIds(Object.values(NewFiberMapUtils.defaultParams.keys)); if (id == 4) { } if (id == 5) NewFiberMapUtils.defaultPatrolDemo(newfiberMap); diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue index 983cf73..952964a 100644 --- a/src/views/sponeScreen/cityGK/index.vue +++ b/src/views/sponeScreen/cityGK/index.vue @@ -89,9 +89,9 @@ show: true, }, ]); - let dileiLayer = newfiberMap.getMap().imageryLayers._layers.filter(layer => layer.imageryProvider.layers == 'demo:hn_kf_hm_dilei'); - if (!dileiLayer.length) return; - dileiLayer[0].show = false; + // let dileiLayer = newfiberMap.getMap().imageryLayers._layers.filter(layer => layer.imageryProvider.layers == 'demo:hn_kf_hm_dilei'); + // if (!dileiLayer.length) return; + // dileiLayer[0].show = false; }); diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue index 88d699f..c6a4e74 100644 --- a/src/views/sponeScreen/cityGK/rainfall.vue +++ b/src/views/sponeScreen/cityGK/rainfall.vue @@ -124,16 +124,15 @@ } }, 2000); } else { - clearInterval(weatherTimer.value); - weatherTimer.value = null; - newfiberMap.weatherRemove(); - //恢复实时天气效果 - window.currentWeatherTimer = null; - - newfiberVectorLayer.setCurrentWeather(); - window.currentWeatherTimer = setInterval(() => { - newfiberVectorLayer.setCurrentWeather(); - }, 300000); + // clearInterval(weatherTimer.value); + // weatherTimer.value = null; + // newfiberMap.weatherRemove(); + // //恢复实时天气效果 + // window.currentWeatherTimer = null; + // newfiberVectorLayer.setCurrentWeather(); + // window.currentWeatherTimer = setInterval(() => { + // newfiberVectorLayer.setCurrentWeather(); + // }, 300000); } } @@ -142,8 +141,8 @@ onBeforeUnmount(() => { clearInterval(weatherTimer.value); weatherTimer.value = null; - if (!newfiberMap) return; - newfiberMap.weatherRemove(); + // if (!newfiberMap) return; + // newfiberMap.weatherRemove(); }); diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index cd2ae40..b65fcab 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -150,7 +150,7 @@ function menuClick(id) { menuIndex.value = id; showPanel.value = false; - NewFiberMapUtils.removeByIds(Object.values(NewFiberMapUtils.defaultParams.keys)); + //NewFiberMapUtils.removeByIds(Object.values(NewFiberMapUtils.defaultParams.keys)); if (id == 4) { } if (id == 5) NewFiberMapUtils.defaultPatrolDemo(newfiberMap); diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue index 983cf73..952964a 100644 --- a/src/views/sponeScreen/cityGK/index.vue +++ b/src/views/sponeScreen/cityGK/index.vue @@ -89,9 +89,9 @@ show: true, }, ]); - let dileiLayer = newfiberMap.getMap().imageryLayers._layers.filter(layer => layer.imageryProvider.layers == 'demo:hn_kf_hm_dilei'); - if (!dileiLayer.length) return; - dileiLayer[0].show = false; + // let dileiLayer = newfiberMap.getMap().imageryLayers._layers.filter(layer => layer.imageryProvider.layers == 'demo:hn_kf_hm_dilei'); + // if (!dileiLayer.length) return; + // dileiLayer[0].show = false; }); diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue index 88d699f..c6a4e74 100644 --- a/src/views/sponeScreen/cityGK/rainfall.vue +++ b/src/views/sponeScreen/cityGK/rainfall.vue @@ -124,16 +124,15 @@ } }, 2000); } else { - clearInterval(weatherTimer.value); - weatherTimer.value = null; - newfiberMap.weatherRemove(); - //恢复实时天气效果 - window.currentWeatherTimer = null; - - newfiberVectorLayer.setCurrentWeather(); - window.currentWeatherTimer = setInterval(() => { - newfiberVectorLayer.setCurrentWeather(); - }, 300000); + // clearInterval(weatherTimer.value); + // weatherTimer.value = null; + // newfiberMap.weatherRemove(); + // //恢复实时天气效果 + // window.currentWeatherTimer = null; + // newfiberVectorLayer.setCurrentWeather(); + // window.currentWeatherTimer = setInterval(() => { + // newfiberVectorLayer.setCurrentWeather(); + // }, 300000); } } @@ -142,8 +141,8 @@ onBeforeUnmount(() => { clearInterval(weatherTimer.value); weatherTimer.value = null; - if (!newfiberMap) return; - newfiberMap.weatherRemove(); + // if (!newfiberMap) return; + // newfiberMap.weatherRemove(); }); diff --git a/src/views/sponeScreen/gisMF/mapboxVectorLayer.js b/src/views/sponeScreen/gisMF/mapboxVectorLayer.js index 3181a00..f2a471b 100644 --- a/src/views/sponeScreen/gisMF/mapboxVectorLayer.js +++ b/src/views/sponeScreen/gisMF/mapboxVectorLayer.js @@ -6,6 +6,10 @@ type: 'geojson', data: geojson, }); + newfiberMapbox.map.addSource(layerId + '_label', { + type: 'geojson', + data: geojson, + }); newfiberMapbox.map.addLayer({ id: layerId, type: 'circle', @@ -19,7 +23,7 @@ id: layerId + '_label', type: 'symbol', minzoom: minzoom ? minzoom : 0, - source: layerId, + source: layerId + '_label', paint: { 'text-color': 'rgba(255, 255, 255, 1)', 'text-halo-color': 'rgba(14, 139, 90, 1)', @@ -256,6 +260,10 @@ newfiberMapbox.map.removeLayer(layerName); newfiberMapbox.map.removeSource(layerName); } + if (newfiberMapbox.map.getSource(layerName)) { + newfiberMapbox.map.removeLayer(layerName); + newfiberMapbox.map.removeSource(layerName); + } }); } } diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index cd2ae40..b65fcab 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -150,7 +150,7 @@ function menuClick(id) { menuIndex.value = id; showPanel.value = false; - NewFiberMapUtils.removeByIds(Object.values(NewFiberMapUtils.defaultParams.keys)); + //NewFiberMapUtils.removeByIds(Object.values(NewFiberMapUtils.defaultParams.keys)); if (id == 4) { } if (id == 5) NewFiberMapUtils.defaultPatrolDemo(newfiberMap); diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue index 983cf73..952964a 100644 --- a/src/views/sponeScreen/cityGK/index.vue +++ b/src/views/sponeScreen/cityGK/index.vue @@ -89,9 +89,9 @@ show: true, }, ]); - let dileiLayer = newfiberMap.getMap().imageryLayers._layers.filter(layer => layer.imageryProvider.layers == 'demo:hn_kf_hm_dilei'); - if (!dileiLayer.length) return; - dileiLayer[0].show = false; + // let dileiLayer = newfiberMap.getMap().imageryLayers._layers.filter(layer => layer.imageryProvider.layers == 'demo:hn_kf_hm_dilei'); + // if (!dileiLayer.length) return; + // dileiLayer[0].show = false; }); diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue index 88d699f..c6a4e74 100644 --- a/src/views/sponeScreen/cityGK/rainfall.vue +++ b/src/views/sponeScreen/cityGK/rainfall.vue @@ -124,16 +124,15 @@ } }, 2000); } else { - clearInterval(weatherTimer.value); - weatherTimer.value = null; - newfiberMap.weatherRemove(); - //恢复实时天气效果 - window.currentWeatherTimer = null; - - newfiberVectorLayer.setCurrentWeather(); - window.currentWeatherTimer = setInterval(() => { - newfiberVectorLayer.setCurrentWeather(); - }, 300000); + // clearInterval(weatherTimer.value); + // weatherTimer.value = null; + // newfiberMap.weatherRemove(); + // //恢复实时天气效果 + // window.currentWeatherTimer = null; + // newfiberVectorLayer.setCurrentWeather(); + // window.currentWeatherTimer = setInterval(() => { + // newfiberVectorLayer.setCurrentWeather(); + // }, 300000); } } @@ -142,8 +141,8 @@ onBeforeUnmount(() => { clearInterval(weatherTimer.value); weatherTimer.value = null; - if (!newfiberMap) return; - newfiberMap.weatherRemove(); + // if (!newfiberMap) return; + // newfiberMap.weatherRemove(); }); diff --git a/src/views/sponeScreen/gisMF/mapboxVectorLayer.js b/src/views/sponeScreen/gisMF/mapboxVectorLayer.js index 3181a00..f2a471b 100644 --- a/src/views/sponeScreen/gisMF/mapboxVectorLayer.js +++ b/src/views/sponeScreen/gisMF/mapboxVectorLayer.js @@ -6,6 +6,10 @@ type: 'geojson', data: geojson, }); + newfiberMapbox.map.addSource(layerId + '_label', { + type: 'geojson', + data: geojson, + }); newfiberMapbox.map.addLayer({ id: layerId, type: 'circle', @@ -19,7 +23,7 @@ id: layerId + '_label', type: 'symbol', minzoom: minzoom ? minzoom : 0, - source: layerId, + source: layerId + '_label', paint: { 'text-color': 'rgba(255, 255, 255, 1)', 'text-halo-color': 'rgba(14, 139, 90, 1)', @@ -256,6 +260,10 @@ newfiberMapbox.map.removeLayer(layerName); newfiberMapbox.map.removeSource(layerName); } + if (newfiberMapbox.map.getSource(layerName)) { + newfiberMapbox.map.removeLayer(layerName); + newfiberMapbox.map.removeSource(layerName); + } }); } } diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay_1.vue b/src/views/sponeScreen/projectHM/ProjectDisplay_1.vue index 4d0443b..df78115 100644 --- a/src/views/sponeScreen/projectHM/ProjectDisplay_1.vue +++ b/src/views/sponeScreen/projectHM/ProjectDisplay_1.vue @@ -193,6 +193,11 @@ onMounted(() => { bus.emit('setIniteLayer', []); addProjectLayers(); + newfiberMapbox.map.easeTo({ + center: [114.35, 34.802], + zoom: 12.9, + pitch: 55, + }); // newfiberMap.setCenter({ // lng: 114.322, // lat: 34.602,