diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 17c17d2..c92ca14 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -110,9 +110,9 @@ }, ]); newfiberMapbox.map.easeTo({ - center: [114.312, 34.202], - zoom: 9, - pitch: 55, + center: [114.312, 34.852], + zoom: 10.4, + pitch: 10, }); }; const showCenterCity = () => { @@ -146,8 +146,8 @@ }, ]); newfiberMapbox.map.easeTo({ - center: [114.312, 34.212], - zoom: 10.5, + center: [114.312, 34.802], + zoom: 10, pitch: 10, }); }; @@ -182,8 +182,8 @@ }, ]); newfiberMapbox.map.easeTo({ - center: [114.312, 34.262], - zoom: 10.5, + center: [114.322, 34.852], + zoom: 10.4, pitch: 10, }); // newfiberMap.setCenter({ @@ -210,7 +210,7 @@ }, { layername: 'builtCity', - show: false, + show: true, }, { layername: 'centerCity', @@ -256,14 +256,17 @@ }; onMounted(() => { - newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter', oneCenter); - newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter1', oneCenter1); - newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter2', oneCenter2); - newfiberMapbox.map.easeTo({ - center: [114.315, 34.852], - zoom: 10.4, - pitch: 10, - }); + setTimeout(() => { + newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter', oneCenter); + newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter1', oneCenter1); + newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter2', oneCenter2); + newfiberMapbox.map.easeTo({ + center: [114.315, 34.852], + zoom: 10.4, + pitch: 10, + }); + }, 3000); + // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter1, 'oneCenter'); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter2, 'oneCenter'); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter, 'oneCenter'); diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 17c17d2..c92ca14 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -110,9 +110,9 @@ }, ]); newfiberMapbox.map.easeTo({ - center: [114.312, 34.202], - zoom: 9, - pitch: 55, + center: [114.312, 34.852], + zoom: 10.4, + pitch: 10, }); }; const showCenterCity = () => { @@ -146,8 +146,8 @@ }, ]); newfiberMapbox.map.easeTo({ - center: [114.312, 34.212], - zoom: 10.5, + center: [114.312, 34.802], + zoom: 10, pitch: 10, }); }; @@ -182,8 +182,8 @@ }, ]); newfiberMapbox.map.easeTo({ - center: [114.312, 34.262], - zoom: 10.5, + center: [114.322, 34.852], + zoom: 10.4, pitch: 10, }); // newfiberMap.setCenter({ @@ -210,7 +210,7 @@ }, { layername: 'builtCity', - show: false, + show: true, }, { layername: 'centerCity', @@ -256,14 +256,17 @@ }; onMounted(() => { - newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter', oneCenter); - newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter1', oneCenter1); - newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter2', oneCenter2); - newfiberMapbox.map.easeTo({ - center: [114.315, 34.852], - zoom: 10.4, - pitch: 10, - }); + setTimeout(() => { + newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter', oneCenter); + newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter1', oneCenter1); + newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter2', oneCenter2); + newfiberMapbox.map.easeTo({ + center: [114.315, 34.852], + zoom: 10.4, + pitch: 10, + }); + }, 3000); + // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter1, 'oneCenter'); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter2, 'oneCenter'); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter, 'oneCenter'); diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue index 0268099..5ae316c 100644 --- a/src/views/sponeScreen/cityGK/index.vue +++ b/src/views/sponeScreen/cityGK/index.vue @@ -66,7 +66,7 @@ // }, 5000); }); onBeforeUnmount(() => { - if (!newfiberMap) return; + if (!newfiberMapbox) return; newfiberMapBoxVectorLayer.removeByIds([ 'oneCenter', 'oneCenter_label', diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 17c17d2..c92ca14 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -110,9 +110,9 @@ }, ]); newfiberMapbox.map.easeTo({ - center: [114.312, 34.202], - zoom: 9, - pitch: 55, + center: [114.312, 34.852], + zoom: 10.4, + pitch: 10, }); }; const showCenterCity = () => { @@ -146,8 +146,8 @@ }, ]); newfiberMapbox.map.easeTo({ - center: [114.312, 34.212], - zoom: 10.5, + center: [114.312, 34.802], + zoom: 10, pitch: 10, }); }; @@ -182,8 +182,8 @@ }, ]); newfiberMapbox.map.easeTo({ - center: [114.312, 34.262], - zoom: 10.5, + center: [114.322, 34.852], + zoom: 10.4, pitch: 10, }); // newfiberMap.setCenter({ @@ -210,7 +210,7 @@ }, { layername: 'builtCity', - show: false, + show: true, }, { layername: 'centerCity', @@ -256,14 +256,17 @@ }; onMounted(() => { - newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter', oneCenter); - newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter1', oneCenter1); - newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter2', oneCenter2); - newfiberMapbox.map.easeTo({ - center: [114.315, 34.852], - zoom: 10.4, - pitch: 10, - }); + setTimeout(() => { + newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter', oneCenter); + newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter1', oneCenter1); + newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter2', oneCenter2); + newfiberMapbox.map.easeTo({ + center: [114.315, 34.852], + zoom: 10.4, + pitch: 10, + }); + }, 3000); + // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter1, 'oneCenter'); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter2, 'oneCenter'); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter, 'oneCenter'); diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue index 0268099..5ae316c 100644 --- a/src/views/sponeScreen/cityGK/index.vue +++ b/src/views/sponeScreen/cityGK/index.vue @@ -66,7 +66,7 @@ // }, 5000); }); onBeforeUnmount(() => { - if (!newfiberMap) return; + if (!newfiberMapbox) return; newfiberMapBoxVectorLayer.removeByIds([ 'oneCenter', 'oneCenter_label', diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue index 850382e..4f339c1 100644 --- a/src/views/sponeScreen/gisMF/legendKF.vue +++ b/src/views/sponeScreen/gisMF/legendKF.vue @@ -77,6 +77,7 @@ const changeLegend = async item => { item.isCheck = !item.isCheck; console.log('item--', item); + bus.emit('setLayerVisible', item); // if (item.layername == 'weather_cloud') { // return newfiberMap.setLayersVisible([item.layername], item.isCheck); // } @@ -202,7 +203,7 @@ newfiberMapBoxVectorLayer.removeByIds([item.layername, item.layername + '_label']); } } - bus.emit('setLayerVisible', item); + // if (item.layername == 'weather_cloud') { // return newfiberMap.setLayersVisible([item.layername], item.isCheck); // } @@ -352,37 +353,38 @@ }; onMounted(() => { cesiumMapCommonLegend.getStationData(); - nextTick(() => { - bus.on('cesiumLegendDataList', legendDataList => { - legendList.value = legendDataList; - legendList.value = legendDataList; - allMapList.value = legendList.value[1].children.concat(legendList.value[2].children).concat(legendList.value[0].children).flat(); - bus.emit('setLegendData', allMapList.value); - }); + bus.on('cesiumLegendDataList', legendDataList => { + legendList.value = legendDataList; + legendList.value = legendDataList; + allMapList.value = legendList.value[1].children.concat(legendList.value[2].children).concat(legendList.value[0].children).flat(); + bus.emit('setLegendData', allMapList.value); }); - bus.on('setIniteLayer', data => { - console.log('data---', data); - if (!data.length) { - let legendList_1 = legendList.value[1]['children'].concat(legendList.value[2]['children']).flat(); - legendList_1.forEach(layer => { - layer.isCheck = true; - changeLegend(layer); - }); - } else { - if (legendList.value.length == 0) return; - let legendList_1 = legendList.value[0]['children'] - .concat(legendList.value[1]['children']) - .concat(legendList.value[2]['children']) - .flat(); - data.forEach(layer => { - let selectedLayer = legendList_1.filter(item => item.layername == layer.layername); - console.log('selectedLayer--', selectedLayer); - selectedLayer.map(i => { - i.isCheck = layer.show; - changeLegend(i); + nextTick(() => { + bus.on('setIniteLayer', data => { + console.log('data---', data); + if (!data.length) { + let legendList_1 = legendList.value[1]['children'].concat(legendList.value[2]['children']).flat(); + legendList_1.forEach(layer => { + layer.isCheck = true; + changeLegend(layer); }); - }); - } + } else { + //if (legendList.value.length == 0) return; + let legendList_1 = legendList.value[0]['children'] + .concat(legendList.value[1]['children']) + .concat(legendList.value[2]['children']) + .flat(); + data.forEach(layer => { + let selectedLayer = legendList_1.filter(item => item.layername == layer.layername); + console.log('selectedLayer--', selectedLayer); + selectedLayer.forEach(i => { + i.isCheck = layer.show; + console.log('iiiiiiii---', i, layer); + changeLegend(i); + }); + }); + } + }); }); }); onBeforeUnmount(() => { diff --git a/src/views/sponeScreen/cityGK/PhysicalGeography.vue b/src/views/sponeScreen/cityGK/PhysicalGeography.vue index 17c17d2..c92ca14 100644 --- a/src/views/sponeScreen/cityGK/PhysicalGeography.vue +++ b/src/views/sponeScreen/cityGK/PhysicalGeography.vue @@ -110,9 +110,9 @@ }, ]); newfiberMapbox.map.easeTo({ - center: [114.312, 34.202], - zoom: 9, - pitch: 55, + center: [114.312, 34.852], + zoom: 10.4, + pitch: 10, }); }; const showCenterCity = () => { @@ -146,8 +146,8 @@ }, ]); newfiberMapbox.map.easeTo({ - center: [114.312, 34.212], - zoom: 10.5, + center: [114.312, 34.802], + zoom: 10, pitch: 10, }); }; @@ -182,8 +182,8 @@ }, ]); newfiberMapbox.map.easeTo({ - center: [114.312, 34.262], - zoom: 10.5, + center: [114.322, 34.852], + zoom: 10.4, pitch: 10, }); // newfiberMap.setCenter({ @@ -210,7 +210,7 @@ }, { layername: 'builtCity', - show: false, + show: true, }, { layername: 'centerCity', @@ -256,14 +256,17 @@ }; onMounted(() => { - newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter', oneCenter); - newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter1', oneCenter1); - newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter2', oneCenter2); - newfiberMapbox.map.easeTo({ - center: [114.315, 34.852], - zoom: 10.4, - pitch: 10, - }); + setTimeout(() => { + newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter', oneCenter); + newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter1', oneCenter1); + newfiberMapBoxVectorLayer.addGeojsonPolygonWithLabel('oneCenter2', oneCenter2); + newfiberMapbox.map.easeTo({ + center: [114.315, 34.852], + zoom: 10.4, + pitch: 10, + }); + }, 3000); + // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter1, 'oneCenter'); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter2, 'oneCenter'); // newfiberVectorLayer.addGeojsonPolygon(newfiberMap, oneCenter, 'oneCenter'); diff --git a/src/views/sponeScreen/cityGK/index.vue b/src/views/sponeScreen/cityGK/index.vue index 0268099..5ae316c 100644 --- a/src/views/sponeScreen/cityGK/index.vue +++ b/src/views/sponeScreen/cityGK/index.vue @@ -66,7 +66,7 @@ // }, 5000); }); onBeforeUnmount(() => { - if (!newfiberMap) return; + if (!newfiberMapbox) return; newfiberMapBoxVectorLayer.removeByIds([ 'oneCenter', 'oneCenter_label', diff --git a/src/views/sponeScreen/gisMF/legendKF.vue b/src/views/sponeScreen/gisMF/legendKF.vue index 850382e..4f339c1 100644 --- a/src/views/sponeScreen/gisMF/legendKF.vue +++ b/src/views/sponeScreen/gisMF/legendKF.vue @@ -77,6 +77,7 @@ const changeLegend = async item => { item.isCheck = !item.isCheck; console.log('item--', item); + bus.emit('setLayerVisible', item); // if (item.layername == 'weather_cloud') { // return newfiberMap.setLayersVisible([item.layername], item.isCheck); // } @@ -202,7 +203,7 @@ newfiberMapBoxVectorLayer.removeByIds([item.layername, item.layername + '_label']); } } - bus.emit('setLayerVisible', item); + // if (item.layername == 'weather_cloud') { // return newfiberMap.setLayersVisible([item.layername], item.isCheck); // } @@ -352,37 +353,38 @@ }; onMounted(() => { cesiumMapCommonLegend.getStationData(); - nextTick(() => { - bus.on('cesiumLegendDataList', legendDataList => { - legendList.value = legendDataList; - legendList.value = legendDataList; - allMapList.value = legendList.value[1].children.concat(legendList.value[2].children).concat(legendList.value[0].children).flat(); - bus.emit('setLegendData', allMapList.value); - }); + bus.on('cesiumLegendDataList', legendDataList => { + legendList.value = legendDataList; + legendList.value = legendDataList; + allMapList.value = legendList.value[1].children.concat(legendList.value[2].children).concat(legendList.value[0].children).flat(); + bus.emit('setLegendData', allMapList.value); }); - bus.on('setIniteLayer', data => { - console.log('data---', data); - if (!data.length) { - let legendList_1 = legendList.value[1]['children'].concat(legendList.value[2]['children']).flat(); - legendList_1.forEach(layer => { - layer.isCheck = true; - changeLegend(layer); - }); - } else { - if (legendList.value.length == 0) return; - let legendList_1 = legendList.value[0]['children'] - .concat(legendList.value[1]['children']) - .concat(legendList.value[2]['children']) - .flat(); - data.forEach(layer => { - let selectedLayer = legendList_1.filter(item => item.layername == layer.layername); - console.log('selectedLayer--', selectedLayer); - selectedLayer.map(i => { - i.isCheck = layer.show; - changeLegend(i); + nextTick(() => { + bus.on('setIniteLayer', data => { + console.log('data---', data); + if (!data.length) { + let legendList_1 = legendList.value[1]['children'].concat(legendList.value[2]['children']).flat(); + legendList_1.forEach(layer => { + layer.isCheck = true; + changeLegend(layer); }); - }); - } + } else { + //if (legendList.value.length == 0) return; + let legendList_1 = legendList.value[0]['children'] + .concat(legendList.value[1]['children']) + .concat(legendList.value[2]['children']) + .flat(); + data.forEach(layer => { + let selectedLayer = legendList_1.filter(item => item.layername == layer.layername); + console.log('selectedLayer--', selectedLayer); + selectedLayer.forEach(i => { + i.isCheck = layer.show; + console.log('iiiiiiii---', i, layer); + changeLegend(i); + }); + }); + } + }); }); }); onBeforeUnmount(() => { diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue index 2db146b..fd6f0f7 100644 --- a/src/views/sponeScreen/waterFlood/index.vue +++ b/src/views/sponeScreen/waterFlood/index.vue @@ -101,7 +101,11 @@ // pitch: -25.2508969308367, // roll: 0.005453465256790101, // }); - + newfiberMapbox.map.easeTo({ + center: [114.312, 34.802], + zoom: 12.9, + pitch: 55, + }); bus.emit('setIniteLayer', [ { layername: 'YSBZ', //雨水泵站