Merge branch 'dev' of http://222.212.85.86:8222/bdzl2/bxztApp into dev
This commit is contained in:
commit
9dd95e306b
@ -8,6 +8,14 @@ import { onMounted, onBeforeUnmount } from 'vue'
|
||||
import { useRoute } from 'vue-router'
|
||||
import useMapStore from '@/map/stores/mapStore'
|
||||
|
||||
const props = defineProps({
|
||||
// 是否加载默认底图,也就是天地图
|
||||
isLoadDefaultBaseMap: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
}
|
||||
})
|
||||
|
||||
const mapStore = useMapStore()
|
||||
const route = useRoute()
|
||||
let viewer = null
|
||||
@ -90,8 +98,10 @@ async function initViewer() {
|
||||
} else if (!skipInitialView) {
|
||||
await applyInitialCameraView()
|
||||
}
|
||||
|
||||
if (props.isLoadDefaultBaseMap) {
|
||||
await loadBaseMap()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
async function applyInitialCameraView() {
|
||||
|
||||
@ -224,6 +224,8 @@ export function createLayerService(deps) {
|
||||
request: 'GetMap',
|
||||
format: queryParams.get('format') || layerOptions.format || 'image/png',
|
||||
transparent: true,
|
||||
cql_filter:queryParams.get('cql_filter')||'',
|
||||
...layerOptions.extraParameters,
|
||||
...layerOptions.parameters,
|
||||
},
|
||||
enablePickFeatures: true,
|
||||
|
||||
@ -1,37 +1,29 @@
|
||||
import { request } from '@shared/utils/request'
|
||||
import si from './si.json'
|
||||
import ddt from './DDT.json'
|
||||
|
||||
// 获取业务基础地图
|
||||
export function getBusinessBaseMapDDT() {
|
||||
return [...ddt]
|
||||
// return request({
|
||||
// url: '/snow-ops-platform/dataDirectory/queryCatalog',
|
||||
// method: 'GET',
|
||||
// params: {
|
||||
// pcatalog: 'DDT'
|
||||
// }
|
||||
// })
|
||||
}
|
||||
|
||||
// 获取业务基础地图
|
||||
export function getBusinessBaseMapSI() {
|
||||
return [...si]
|
||||
// return request({
|
||||
// url: '/snow-ops-platform/dataDirectory/queryCatalog',
|
||||
// method: 'GET',
|
||||
// params: {
|
||||
// pcatalog: 'SI'
|
||||
// }
|
||||
// })
|
||||
}
|
||||
|
||||
export function test() {
|
||||
// 获取业务底图
|
||||
export function getBaseMap() {
|
||||
// return [...ddt]
|
||||
return request({
|
||||
url: '/ylzggeoserver/gwc/service/wms?service=WMS&request=GetMap&transparent=true&srs=EPSG%3A3857&format=image%2Fpng&styles=&layers=chongqing_yx&bbox=12053813.612459153%2C3130860.6785608195%2C12210356.646387197%2C3287403.71248886&width=256&height=256',
|
||||
method: 'get'
|
||||
url: '/snow-ops-platform/dataDirectory/queryCatalog',
|
||||
method: 'GET',
|
||||
params: {
|
||||
pcatalog: 'DDT'
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 获取业务图
|
||||
export function getBusinessMap() {
|
||||
// return [...si]
|
||||
return request({
|
||||
url: '/snow-ops-platform/dataDirectory/queryCatalog',
|
||||
method: 'GET',
|
||||
params: {
|
||||
pcatalog: 'SI'
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div class="map-center">
|
||||
<div class="map-container">
|
||||
<MapViewport />
|
||||
<MapViewport :isLoadDefaultBaseMap="false"/>
|
||||
<MapControls />
|
||||
</div>
|
||||
<!-- 顶部功能按钮 -->
|
||||
|
||||
@ -1,13 +1,16 @@
|
||||
import { getBusinessBaseMapDDT, getBusinessBaseMapSI, test } from '@/views/cockpit/api/commonHttp.js'
|
||||
import { getBaseMap, getBusinessMap } from '@/views/cockpit/api/commonHttp.js'
|
||||
import * as Cesium from 'cesium'
|
||||
|
||||
|
||||
// 当前页面的最基础地图服务
|
||||
// 主要是加载地图底图
|
||||
export const useMapBase = (mapStore) => {
|
||||
|
||||
const loadBusinessBaseMapDDT = async () => {
|
||||
// 加载当前业务的底图, 类似于天地图,但是没有使用天地图作为底图,有大的地块的地形纹理,但是缩小范围很小,属于比较粗的图
|
||||
const loadBaseMap = async () => {
|
||||
const layerService = mapStore.services().layer
|
||||
const res = await getBusinessBaseMapDDT()
|
||||
const data = [...res]
|
||||
const res = await getBaseMap()
|
||||
const data = [...res.data]
|
||||
mapStore.baseMapGroups = data
|
||||
for (const item of data) {
|
||||
const layers = mapStore.getBaseMapLayersForGroup(item.Attribute?.rid || item.Rid)
|
||||
@ -18,9 +21,11 @@ export const useMapBase = (mapStore) => {
|
||||
url: layerConfig.url,
|
||||
meta: layerConfig.meta,
|
||||
options: {
|
||||
parameters: {
|
||||
// 瓦片方案,必传,由于cesium版本较老,必传
|
||||
tilingScheme: new Cesium.WebMercatorTilingScheme(),
|
||||
maximumLevel: 18, // 限制最大级别以匹配 GWC 缓存尺度,避免分辨率不匹配错误
|
||||
extraParameters: {
|
||||
srs: 'EPSG:3857',
|
||||
transparent: true,
|
||||
}
|
||||
}
|
||||
|
||||
@ -30,12 +35,33 @@ export const useMapBase = (mapStore) => {
|
||||
}
|
||||
}
|
||||
|
||||
const loadBusinessBaseMapLayerSI = async () => {
|
||||
// 处理启动加载的图层
|
||||
const collectBootLoadLayers = (nodes, layers = [], parent = null) => {
|
||||
nodes.forEach(node => {
|
||||
if (node.Attribute?.servicePath && node.Attribute.bootLoad === 1) {
|
||||
// 确保 bootLoad 图层包含正确的 parentSortIndex
|
||||
const layerWithParentSort = {
|
||||
...node,
|
||||
parentSortIndex: parent?.Attribute?.sortValue
|
||||
};
|
||||
layers.push(layerWithParentSort);
|
||||
}
|
||||
if (node.Children) {
|
||||
collectBootLoadLayers(node.Children, layers, node);
|
||||
}
|
||||
});
|
||||
return layers;
|
||||
};
|
||||
|
||||
// 加载业务地图,业务地图主要是高亮当前业务下的地区的区县,边界都会有高亮线条
|
||||
const loadBusinessMap = async () => {
|
||||
const layerService = mapStore.services().layer
|
||||
const res = await getBusinessBaseMapSI()
|
||||
const data = [...res]
|
||||
mapStore.baseMapGroups = data
|
||||
for (const item of data) {
|
||||
const res = await getBusinessMap()
|
||||
const resData = res.data
|
||||
const data = collectBootLoadLayers(resData)
|
||||
resData[0].Children = data
|
||||
mapStore.baseMapGroups = resData
|
||||
for (const item of resData) {
|
||||
const layers = mapStore.getBaseMapLayersForGroup(item.Attribute?.rid || item.Rid)
|
||||
for (const layerConfig of layers) {
|
||||
const layer = {
|
||||
@ -51,9 +77,8 @@ export const useMapBase = (mapStore) => {
|
||||
|
||||
const loadBaseData = () => {
|
||||
setTimeout(() => {
|
||||
// loadBusinessBaseMapDDT()
|
||||
// test()
|
||||
loadBusinessBaseMapLayerSI()
|
||||
loadBaseMap()
|
||||
loadBusinessMap()
|
||||
}, 0)
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user