zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

地图加载优化，地图接口更新

Browse Source
This commit is contained in:
扈兆增 2026-07-09 11:33:04 +08:00
parent f55b061bf2
commit b52ca56fd3
25 changed files with 920 additions and 547 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/src/api/ecoFlow/index.ts
View File

@ -1,19 +1,9 @@
import request from '@/utils/request'; import request from '@/utils/request';
import type { EcoFlowStandard, EcoFlowQueryParams } from './types'; import type { EcoFlowStandard, EcoFlowQueryParams } from './types';
/** export function getQgcStaticData(
* 获取生态流量达标情况数据 params?: EcoFlowQueryParams
* @param params 查询参数 ): Promise<{ data: EcoFlowStandard[] }> {
*/
export function getEcoFlowStandardData(params?: EcoFlowQueryParams): Promise<{ data: EcoFlowStandard[] }> {
return request({
url: '/api/eco-flow/standard',
method: 'get',
params
});
}
export function getQgcStaticData(params?: EcoFlowQueryParams): Promise<{ data: EcoFlowStandard[] }> {
return request({ return request({
url: '/eng/eq/interval/qgc/getQgcStaticData', url: '/eng/eq/interval/qgc/getQgcStaticData',
method: 'post', method: 'post',

27
frontend/src/api/home/index.ts
View File

@ -88,30 +88,3 @@ export function baseMsstbprptGetKendoList(data: any) {
data: data data: data
}); });
} }
// 降水量实时数据
export function getBaseStbprpDataPPTNR(data: any) {
return request({
url: '/api/dec-lygk-base-server/base/stbprpData/GetKendoListCust?tbCode=PPTN_R',
method: 'post',
data: data
});
}
// 气温气压实时数据
export function getBaseStbprpDataTMPR(data: any) {
return request({
url: '/api/dec-lygk-base-server/base/stbprpData/GetKendoListCust?tbCode=TMP_R',
method: 'post',
data: data
});
}
// 风速风向实时数据
export function getBaseStbprpDataWNDR(data: any) {
return request({
url: '/api/dec-lygk-base-server/base/stbprpData/GetKendoListCust?tbCode=WND_R',
method: 'post',
data: data
});
}

11
frontend/src/api/map.ts
View File

@ -3,9 +3,7 @@ import request from '@/utils/request';
// 获取图例列表 // 获取图例列表
export function getModuleMapLegendList(params?: { moduleId?: string }) { export function getModuleMapLegendList(params?: { moduleId?: string }) {
const url = params?.moduleId const url = params?.moduleId
? // ? `/api/wmp-sys-server/mapLegend/getModuleMapLegendList?moduleId=${params.moduleId}` ? `/mapLegend/getModuleMapLegendList?moduleId=${params.moduleId}`
// : '/api/wmp-sys-server/mapLegend/getModuleMapLegendList';
`/mapLegend/getModuleMapLegendList?moduleId=${params.moduleId}`
: '/mapLegend/getModuleMapLegendList'; : '/mapLegend/getModuleMapLegendList';
return request({ return request({
url, url,
@ -15,7 +13,6 @@ export function getModuleMapLegendList(params?: { moduleId?: string }) {
// 获取地图配置列表 // 获取地图配置列表
export function getMapList(data: any) { export function getMapList(data: any) {
return request({ return request({
// url: '/api/wmp-sys-server/mapmodule/getMapData',
url: '/mapmodule/getMapData', url: '/mapmodule/getMapData',
method: 'post', method: 'post',
data data
@ -24,7 +21,7 @@ export function getMapList(data: any) {
// 获取梯级流域地图 // 获取梯级流域地图
export function getQgcRvcd(data: any) { export function getQgcRvcd(data: any) {
return request({ return request({
url: '/api/wmp-eng-server/eng/rsvrcscdb/getQgcRvcd', url: '/eng/base/rsvrcscdb/getQgcRvcd',
method: 'post', method: 'post',
data data
}); });
@ -32,7 +29,7 @@ export function getQgcRvcd(data: any) {
// 获取梯级流域下拉框列表 // 获取梯级流域下拉框列表
export function getRvcdList(data: any) { export function getRvcdList(data: any) {
return request({ return request({
url: '/api/wmp-eng-server/eng/rsvrcscdb/rvcd', url: '/eng/base/rsvrcscdb/rvcd',
method: 'post', method: 'post',
data data
}); });
@ -41,7 +38,7 @@ export function getRvcdList(data: any) {
// 获取梯级流域下拉框图表数据 // 获取梯级流域下拉框图表数据
export function getKendoList(data: any) { export function getKendoList(data: any) {
return request({ return request({
url: '/api/wmp-eng-server/eng/rsvrcscdb/GetKendoList', url: '/eng/base/rsvrcscdb/GetKendoList',
method: 'post', method: 'post',
data data
}); });

11
frontend/src/api/yldc/index.ts
View File

@ -46,7 +46,7 @@ export function sdFprdRGetKendoListCust(data: any) {
data data
}); });
} }
//装置名称 /api/dec-lygk-base-server/base/vmsstbprpt/GetKendoList //装置名称
export function vmsstbprptGetKendoList(data: any) { export function vmsstbprptGetKendoList(data: any) {
return request({ return request({
url: '/fpr/vmsstbprpt/GetKendoList', url: '/fpr/vmsstbprpt/GetKendoList',
@ -54,15 +54,18 @@ export function vmsstbprptGetKendoList(data: any) {
data data
}); });
} }
//鱼种类 /api/wmp-env-server/sdFprdR/getFishInfo //鱼种类
export function sdFprdRgetFishInfo() { export function sdFprdRgetFishInfo() {
return request({ return request({
url: '/fpr/sdFprdR/getFishInfo', url: '/fpr/sdFprdR/getFishInfo',
method: 'post', method: 'post'
}); });
} }
//获取鱼类变化信息 //获取鱼类变化信息
export function sdFprdRGetFtpChangeInfo(data: { baseId: string; year: string }) { export function sdFprdRGetFtpChangeInfo(data: {
baseId: string;
year: string;
}) {
return request({ return request({
url: '/fpr/sdFprdR/getFtpChangeInfo', url: '/fpr/sdFprdR/getFtpChangeInfo',
method: 'post', method: 'post',

2
frontend/src/api/zngj/index.ts
View File

@ -9,7 +9,7 @@ export function getAisbdbyxList(data: any) {
}); });
} }
// AI识别大坝环境-获取饼图+表格数据 /api/wmp-env-server/env/ai/com/GetKendoListCust // AI识别大坝环境-获取饼图+表格数据
export function getAiChartTable(data: any) { export function getAiChartTable(data: any) {
return request({ return request({
url: '/warn/ai/com/GetKendoListCust', url: '/warn/ai/com/GetKendoListCust',

9
frontend/src/api/zxdzw/index.ts
View File

@ -1,6 +1,5 @@
import request from '@/utils/request'; import request from '@/utils/request';
export function vpcGetKendoListCust(data: any) { export function vpcGetKendoListCust(data: any) {
return request({ return request({
url: '/vap/vpc/GetKendoListCust', url: '/vap/vpc/GetKendoListCust',
@ -25,11 +24,3 @@ export function wvaGetKendoListCust(data: any) {
data data
}); });
} }
//植物园情况介绍
// export function vpcGetKendoListCust(data: any) {
// return request({
// url: '/api/wmp-env-server/env/vpc/GetKendoListCust',
// method: 'post',
// data
// });
// }

6
frontend/src/components/gis/GisView.vue
View File

@ -80,7 +80,6 @@ const init = async () => {
// 备注：地图控制器只分发简单视图切换命令，避免在页面入口堆叠复杂业务逻辑。 // 备注：地图控制器只分发简单视图切换命令，避免在页面入口堆叠复杂业务逻辑。
const handleMapController = async (e: any, mapType: any) => { const handleMapController = async (e: any, mapType: any) => {
console.log(e, mapType);
switch (e) { switch (e) {
case 'dim': case 'dim':
await mapClass.switchView(mapType); await mapClass.switchView(mapType);
@ -106,7 +105,6 @@ const fetchTjData = async () => {
for (let i = 0; i < res.data.data.length; i++) { for (let i = 0; i < res.data.data.length; i++) {
datas.push(res.data.data[i].rvcd); datas.push(res.data.data[i].rvcd);
} }
console.log(servers.Tertiarybasin);
mapClass.addTertiarybasinLayer( mapClass.addTertiarybasinLayer(
servers.Tertiarybasin, servers.Tertiarybasin,
'#4DFFDD', '#4DFFDD',
@ -119,9 +117,9 @@ const fetchTjData = async () => {
// 备注：页面切换后仅触发编排器重载页面，不在组件内继续拼装业务联动。 // 备注：页面切换后仅触发编排器重载页面，不在组件内继续拼装业务联动。
watch( watch(
() => pageKey.value, () => pageKey.value,
async newVal => { newVal => {
if (newVal && mapIsInited.value) { if (newVal && mapIsInited.value) {
await mapOrchestrator.handlePageChange(newVal, isShuiDianKaiFaMenu.value); void mapOrchestrator.handlePageChange(newVal, isShuiDianKaiFaMenu.value);
} }
} }
); );

5
frontend/src/components/gis/gisUtils.ts
View File

@ -19,7 +19,6 @@ declare global {
__mapMode?: string; // 建议同时声明代码中用到的其他全局变量 __mapMode?: string; // 建议同时声明代码中用到的其他全局变量
} }
} }
console.log(import.meta.env.VITE_APP_ATTACHMENT_URL);
/** /**
* 根据镜头高度获取地图级别 * 根据镜头高度获取地图级别
@ -531,9 +530,7 @@ export const mapOutPut = (imageUrl: string) => {
downloadElement.click(); downloadElement.click();
}; };
}) })
.catch((e: any) => { .catch(() => {});
console.log('e', e);
});
} else { } else {
downloadElement.href = canvas.toDataURL('image/png'); downloadElement.href = canvas.toDataURL('image/png');
downloadElement.download = 'download'; downloadElement.download = 'download';

1
frontend/src/components/gis/map.cesium.ts
View File

@ -196,7 +196,6 @@ export class MapCesium implements MapInterface {
// 清理临时元素 // 清理临时元素
document.body.removeChild(link); document.body.removeChild(link);
console.log('Map image exported successfully:', fileName);
} catch (error) { } catch (error) {
console.error('Failed to export map image:', error); console.error('Failed to export map image:', error);
if (error instanceof DOMException && error.name === 'SecurityError') { if (error instanceof DOMException && error.name === 'SecurityError') {

11
frontend/src/components/gis/map.class.ts
View File

@ -33,7 +33,6 @@ export class MapClass implements MapClassInterface {
this.service = new MapOl(); this.service = new MapOl();
} }
static getInstance(): MapClass { static getInstance(): MapClass {
console.log('getInstance');
if (!this.instance) { if (!this.instance) {
this.instance = new MapClass(); this.instance = new MapClass();
} }
@ -41,7 +40,6 @@ export class MapClass implements MapClassInterface {
} }
// 地图初始化 // 地图初始化
init(container: HTMLElement, rectangle?: any): Promise<any> { init(container: HTMLElement, rectangle?: any): Promise<any> {
console.log(container, rectangle);
return this.service.init(container, rectangle).then(map => { return this.service.init(container, rectangle).then(map => {
this.view = map; this.view = map;
return map; return map;
@ -176,7 +174,6 @@ export class MapClass implements MapClassInterface {
// 2. 根据类型初始化新的地图服务 // 2. 根据类型初始化新的地图服务
if (type === '2D') { if (type === '2D') {
console.log('Switching to 2D (OpenLayers)');
this.service = new MapOl(); this.service = new MapOl();
this.service this.service
@ -187,7 +184,6 @@ export class MapClass implements MapClassInterface {
}) })
.catch(err => reject(err)); .catch(err => reject(err));
} else if (type === '3D') { } else if (type === '3D') {
console.log('Switching to 3D (Cesium)');
this.service = new MapCesium(); this.service = new MapCesium();
this.service this.service
@ -261,12 +257,7 @@ export class MapClass implements MapClassInterface {
// }, 5000) // }, 5000)
// }) // })
// } // }
} catch (e) { } catch {
console.log(
'%c switchView: ',
'color: MidnightBlue; background: Aquamarine; font-size: 20px;',
e
);
reject(); reject();
} }
}); });

673
frontend/src/components/gis/map.ol.ts
View File

@ -60,6 +60,7 @@ export class MapOl implements MapInterface {
view: View | null = null; view: View | null = null;
private layerRegistry: Map<string, any> = new Map(); private layerRegistry: Map<string, any> = new Map();
private iconLoadState = new Map<string, 'loading' | 'loaded' | 'error'>(); private iconLoadState = new Map<string, 'loading' | 'loaded' | 'error'>();
private pointStyleCache = new Map<string, Style[]>();
private baseLayerConfig: any | null = null; private baseLayerConfig: any | null = null;
private hydropBaseConfig: any | null = null; private hydropBaseConfig: any | null = null;
private REGISTRY_KEY = 'customBaseLayer'; private REGISTRY_KEY = 'customBaseLayer';
@ -79,7 +80,9 @@ export class MapOl implements MapInterface {
private regionMaskManager: RegionMaskManager; private regionMaskManager: RegionMaskManager;
private isBatchPopupMode = false; private isBatchPopupMode = false;
private batchPopupRefreshFrameId: number | null = null; private batchPopupRefreshFrameId: number | null = null;
private pointLayerStyleRefreshFrameId: number | null = null;
private labelVisibilityRefreshFrameId: number | null = null; private labelVisibilityRefreshFrameId: number | null = null;
private labelVisibilityDebounceTimerId: number | null = null;
constructor() { constructor() {
this.pointLayerManager = new PointLayerManager({ this.pointLayerManager = new PointLayerManager({
map: null, map: null,
@ -201,9 +204,9 @@ export class MapOl implements MapInterface {
} }
}); });
this.map.on('moveend', () => { this.map.on('moveend', () => {
this.requestRefreshPointLabelVisibility(true); this.requestRefreshPointLabelVisibility(false, 60);
if (this.isBatchPopupMode) { if (this.isBatchPopupMode) {
this.requestUpdateBatchPopups(true); this.requestUpdateBatchPopups();
} }
}); });
@ -233,7 +236,7 @@ export class MapOl implements MapInterface {
const currentZoom = this.view ? this.view.getZoom() : INITIAL_ZOOM; const currentZoom = this.view ? this.view.getZoom() : INITIAL_ZOOM;
this.pointLayerManager.updateNearbyFeatureLayout(currentZoom); this.pointLayerManager.updateNearbyFeatureLayout(currentZoom);
this.requestRefreshPointLabelVisibility(true); this.requestRefreshPointLabelVisibility(false, 80);
} }
/** /**
* 初始化 Popup Overlay * 初始化 Popup Overlay
@ -334,10 +337,15 @@ export class MapOl implements MapInterface {
} }
const currentZoom: any = this.view ? this.view.getZoom() : 4.5; const currentZoom: any = this.view ? this.view.getZoom() : 4.5;
const cachedDensityVisible = feature.get('_densityVisible');
const densityVisible =
typeof cachedDensityVisible === 'boolean'
? cachedDensityVisible
: currentZoom >= this.getFeatureDensityMinZoom(feature);
const iconTargetVisible = const iconTargetVisible =
legendVisible !== false && legendVisible !== false &&
regionVisible !== false && regionVisible !== false &&
this.shouldRenderFeatureByDensity(feature, currentZoom) && densityVisible &&
this.shouldRenderNearbyFeature(feature, currentZoom); this.shouldRenderNearbyFeature(feature, currentZoom);
const dynamicScale = this.getDynamicPointScale(currentZoom); const dynamicScale = this.getDynamicPointScale(currentZoom);
@ -361,8 +369,20 @@ export class MapOl implements MapInterface {
return null; return null;
} }
const styles: Style[] = []; const styleCacheKey = [
styles.push( iconUrl,
dynamicScale.toFixed(2),
fontSize,
labelOffsetY,
labelTargetVisible ? formattedLabelText : '',
labelTargetVisible ? 1 : 0
].join('|');
const cachedStyles = this.pointStyleCache.get(styleCacheKey);
if (cachedStyles) {
return cachedStyles;
}
const styles: Style[] = [
new Style({ new Style({
image: new Icon({ image: new Icon({
src: iconUrl, src: iconUrl,
@ -372,7 +392,7 @@ export class MapOl implements MapInterface {
declutterMode: 'none' declutterMode: 'none'
}) })
}) })
); ];
if (formattedLabelText && labelTargetVisible) { if (formattedLabelText && labelTargetVisible) {
styles.push( styles.push(
@ -394,9 +414,170 @@ export class MapOl implements MapInterface {
); );
} }
this.pointStyleCache.set(styleCacheKey, styles);
return styles; return styles;
} }
private markFeatureVisibilityDirty(
feature: Feature,
key: '_densityVisible' | '_iconCollisionVisible' | '_labelCollisionVisible',
visible: boolean,
dirtyLayerKeys?: Set<string>
) {
if (feature.get(key) === visible) {
return;
}
feature.set(key, visible, true);
const layerKey = feature.get('_layerKey');
if (dirtyLayerKeys && layerKey) {
dirtyLayerKeys.add(String(layerKey));
}
}
private flushDirtyPointLayers(dirtyLayerKeys: Set<string>) {
dirtyLayerKeys.forEach(layerKey => {
const layer = this.pointLayerManager.getLayer(layerKey);
layer?.changed();
});
}
private syncFeatureDensityVisible(
feature: Feature,
visible: boolean,
dirtyLayerKeys?: Set<string>
) {
this.markFeatureVisibilityDirty(
feature,
'_densityVisible',
visible,
dirtyLayerKeys
);
}
private getFeaturePixelGridKey(
layerKey: string,
pixelX: number,
pixelY: number,
cellSize: number
) {
return `${layerKey}:${Math.floor(pixelX / cellSize)}:${Math.floor(
pixelY / cellSize
)}`;
}
private hasNearbyViewportFeature(
target: {
feature: Feature;
layerKey: string;
pixelX: number;
pixelY: number;
},
pixelGrid: Map<
string,
Array<{
feature: Feature;
layerKey: string;
pixelX: number;
pixelY: number;
}>
>,
threshold: number
): boolean {
const cellX = Math.floor(target.pixelX / threshold);
const cellY = Math.floor(target.pixelY / threshold);
for (let offsetX = -1; offsetX <= 1; offsetX += 1) {
for (let offsetY = -1; offsetY <= 1; offsetY += 1) {
const bucket = pixelGrid.get(
`${target.layerKey}:${cellX + offsetX}:${cellY + offsetY}`
);
if (!bucket?.length) {
continue;
}
for (const candidate of bucket) {
if (candidate.feature === target.feature) {
continue;
}
if (
Math.hypot(
candidate.pixelX - target.pixelX,
candidate.pixelY - target.pixelY
) <= threshold
) {
return true;
}
}
}
}
return false;
}
private getCollisionGridKeys(
rect: { left: number; right: number; top: number; bottom: number },
cellSize: number
): string[] {
const startX = Math.floor(rect.left / cellSize);
const endX = Math.floor(rect.right / cellSize);
const startY = Math.floor(rect.top / cellSize);
const endY = Math.floor(rect.bottom / cellSize);
const keys: string[] = [];
for (let x = startX; x <= endX; x += 1) {
for (let y = startY; y <= endY; y += 1) {
keys.push(`${x}:${y}`);
}
}
return keys;
}
private addRectToCollisionGrid<
T extends {
left: number;
right: number;
top: number;
bottom: number;
}
>(rect: T, grid: Map<string, T[]>, cellSize: number) {
this.getCollisionGridKeys(rect, cellSize).forEach(key => {
const bucket = grid.get(key) || [];
bucket.push(rect);
grid.set(key, bucket);
});
}
private findCollidingRectInGrid<
T extends {
left: number;
right: number;
top: number;
bottom: number;
}
>(
rect: { left: number; right: number; top: number; bottom: number },
grid: Map<string, T[]>,
cellSize: number,
isCollision: (candidate: T) => boolean
): T | undefined {
for (const key of this.getCollisionGridKeys(rect, cellSize)) {
const bucket = grid.get(key);
if (!bucket?.length) {
continue;
}
for (const candidate of bucket) {
if (isCollision(candidate)) {
return candidate;
}
}
}
return undefined;
}
private refreshPointLabelVisibility() { private refreshPointLabelVisibility() {
if (!this.map || !this.view) return; if (!this.map || !this.view) return;
@ -442,64 +623,185 @@ export class MapOl implements MapInterface {
}> = []; }> = [];
const viewportFeatures = this.pointLayerManager.getFeaturesInViewport(); const viewportFeatures = this.pointLayerManager.getFeaturesInViewport();
const dirtyLayerKeys = new Set<string>();
const densityIsolationThreshold = 56;
const densityPixelGrid = new Map<
string,
Array<{
feature: Feature;
layerKey: string;
pixelX: number;
pixelY: number;
}>
>();
const viewportEntries: Array<{
feature: Feature;
layerKey: string;
iconUrl: string;
legendVisible: boolean;
regionVisible: boolean;
densityPriority: number;
nearbyVisible: boolean;
labelText: string;
pixelX?: number;
pixelY?: number;
}> = [];
viewportFeatures.forEach(feature => {
const geometry = feature.getGeometry();
const pixel =
geometry && geometry.getType() === 'Point'
? this.map?.getPixelFromCoordinate(
(geometry as Point).getCoordinates()
)
: null;
const layerKey = String(feature.get('_layerKey') || '');
const entry = {
feature,
layerKey,
iconUrl: String(feature.get('_iconUrl') || ''),
legendVisible: feature.get('_legendVisible') !== false,
regionVisible: feature.get('_regionVisible') !== false,
densityPriority: this.getFeatureDensityPriority(feature),
nearbyVisible: this.shouldRenderNearbyFeature(feature, currentZoom),
labelText: this.formatPointLabelText(
feature.get('_labelText') as string
),
pixelX: pixel?.[0],
pixelY: pixel?.[1]
};
viewportEntries.push(entry);
if (
pixel &&
entry.layerKey &&
entry.legendVisible &&
entry.regionVisible
) {
const gridKey = this.getFeaturePixelGridKey(
entry.layerKey,
pixel[0],
pixel[1],
densityIsolationThreshold
);
const bucket = densityPixelGrid.get(gridKey) || [];
bucket.push({
feature,
layerKey: entry.layerKey,
pixelX: pixel[0],
pixelY: pixel[1]
});
densityPixelGrid.set(gridKey, bucket);
}
});
if (currentZoom >= FULL_DISPLAY_NO_COLLISION_ZOOM) { if (currentZoom >= FULL_DISPLAY_NO_COLLISION_ZOOM) {
viewportFeatures.forEach(feature => { viewportEntries.forEach(entry => {
const iconUrl = feature.get('_iconUrl') as string; const minZoom = this.getFeatureDensityMinZoom(entry.feature);
const shouldRenderIcon = const densityVisible =
!!iconUrl && currentZoom >= minZoom ||
this.isIconReady(iconUrl) && (entry.legendVisible &&
feature.get('_legendVisible') !== false && entry.regionVisible &&
feature.get('_regionVisible') !== false && !!entry.layerKey &&
this.shouldRenderFeatureByDensity(feature, currentZoom) && entry.pixelX !== undefined &&
this.shouldRenderNearbyFeature(feature, currentZoom); entry.pixelY !== undefined &&
const hasLabel = !!this.formatPointLabelText( !this.hasNearbyViewportFeature(
feature.get('_labelText') as string {
feature: entry.feature,
layerKey: entry.layerKey,
pixelX: entry.pixelX,
pixelY: entry.pixelY
},
densityPixelGrid,
densityIsolationThreshold
));
this.syncFeatureDensityVisible(
entry.feature,
densityVisible,
dirtyLayerKeys
); );
const shouldRenderIcon =
!!entry.iconUrl &&
this.isIconReady(entry.iconUrl) &&
entry.legendVisible &&
entry.regionVisible &&
densityVisible &&
entry.nearbyVisible;
const hasLabel = !!entry.labelText;
this.syncFeatureIconCollisionVisible(feature, shouldRenderIcon); this.syncFeatureIconCollisionVisible(
entry.feature,
shouldRenderIcon,
dirtyLayerKeys
);
this.syncFeatureLabelCollisionVisible( this.syncFeatureLabelCollisionVisible(
feature, entry.feature,
shouldRenderIcon && hasLabel shouldRenderIcon && hasLabel,
dirtyLayerKeys
); );
}); });
this.flushDirtyPointLayers(dirtyLayerKeys);
return; return;
} }
viewportFeatures.forEach(feature => { viewportEntries.forEach(entry => {
const iconUrl = feature.get('_iconUrl') as string; const minZoom = this.getFeatureDensityMinZoom(entry.feature);
const densityVisible =
currentZoom >= minZoom ||
(entry.legendVisible &&
entry.regionVisible &&
!!entry.layerKey &&
entry.pixelX !== undefined &&
entry.pixelY !== undefined &&
!this.hasNearbyViewportFeature(
{
feature: entry.feature,
layerKey: entry.layerKey,
pixelX: entry.pixelX,
pixelY: entry.pixelY
},
densityPixelGrid,
densityIsolationThreshold
));
this.syncFeatureDensityVisible(
entry.feature,
densityVisible,
dirtyLayerKeys
);
const shouldRenderIcon = const shouldRenderIcon =
!!iconUrl && !!entry.iconUrl &&
this.isIconReady(iconUrl) && this.isIconReady(entry.iconUrl) &&
feature.get('_legendVisible') !== false && entry.legendVisible &&
feature.get('_regionVisible') !== false && entry.regionVisible &&
this.shouldRenderFeatureByDensity(feature, currentZoom) && densityVisible &&
this.shouldRenderNearbyFeature(feature, currentZoom); entry.nearbyVisible;
if (!shouldRenderIcon) { if (!shouldRenderIcon) {
this.syncFeatureIconCollisionVisible(feature, false); this.syncFeatureIconCollisionVisible(
this.syncFeatureLabelCollisionVisible(feature, false); entry.feature,
false,
dirtyLayerKeys
);
this.syncFeatureLabelCollisionVisible(
entry.feature,
false,
dirtyLayerKeys
);
return; return;
} }
const geometry = feature.getGeometry(); if (entry.pixelX === undefined || entry.pixelY === undefined) {
if (!geometry || geometry.getType() !== 'Point') { this.syncFeatureIconCollisionVisible(
this.syncFeatureIconCollisionVisible(feature, false); entry.feature,
this.syncFeatureLabelCollisionVisible(feature, false); false,
return; dirtyLayerKeys
} );
this.syncFeatureLabelCollisionVisible(
const coordinates = (geometry as any).getCoordinates?.(); entry.feature,
if (!coordinates) { false,
this.syncFeatureIconCollisionVisible(feature, false); dirtyLayerKeys
this.syncFeatureLabelCollisionVisible(feature, false); );
return;
}
const pixel = this.map?.getPixelFromCoordinate(coordinates);
if (!pixel) {
this.syncFeatureIconCollisionVisible(feature, false);
this.syncFeatureLabelCollisionVisible(feature, false);
return; return;
} }
@ -508,13 +810,11 @@ export class MapOl implements MapInterface {
// 避免像“小浪底/三门峡”这类近点被过早裁掉成只剩一个点。 // 避免像“小浪底/三门峡”这类近点被过早裁掉成只剩一个点。
const iconCollisionSize = Math.max(12, 16 * dynamicScale); const iconCollisionSize = Math.max(12, 16 * dynamicScale);
const iconPadding = 0; const iconPadding = 0;
const iconLeft = pixel[0] - iconCollisionSize / 2 - iconPadding; const iconLeft = entry.pixelX - iconCollisionSize / 2 - iconPadding;
const iconRight = pixel[0] + iconCollisionSize / 2 + iconPadding; const iconRight = entry.pixelX + iconCollisionSize / 2 + iconPadding;
const iconTop = pixel[1] - iconCollisionSize / 2 - iconPadding; const iconTop = entry.pixelY - iconCollisionSize / 2 - iconPadding;
const iconBottom = pixel[1] + iconCollisionSize / 2 + iconPadding; const iconBottom = entry.pixelY + iconCollisionSize / 2 + iconPadding;
const labelText = this.formatPointLabelText( const labelText = entry.labelText;
feature.get('_labelText') as string
);
const fontSize = this.getPointFontSize(dynamicScale); const fontSize = this.getPointFontSize(dynamicScale);
const lines = labelText ? labelText.split('\n') : ['']; const lines = labelText ? labelText.split('\n') : [''];
const maxLineLength = Math.max(...lines.map(line => line.length), 1); const maxLineLength = Math.max(...lines.map(line => line.length), 1);
@ -525,22 +825,22 @@ export class MapOl implements MapInterface {
); );
const estimatedWidth = maxLineLength * fontSize * 0.6 + 16; const estimatedWidth = maxLineLength * fontSize * 0.6 + 16;
const estimatedHeight = labelLineCount * (fontSize + 4) + 8; const estimatedHeight = labelLineCount * (fontSize + 4) + 8;
const centerX = pixel[0]; const centerX = entry.pixelX;
const centerY = pixel[1] + labelOffsetY; const centerY = entry.pixelY + labelOffsetY;
const candidateId = String( const candidateId = String(
feature.getId?.() || feature.get('stcd') || '' entry.feature.getId?.() || entry.feature.get('stcd') || ''
); );
const dedupeKey = const dedupeKey =
candidateId || candidateId ||
[ [
feature.get('_layerKey') || '', entry.feature.get('_layerKey') || '',
pixel[0].toFixed(2), entry.pixelX.toFixed(2),
pixel[1].toFixed(2), entry.pixelY.toFixed(2),
labelText labelText
].join('|'); ].join('|');
candidateMap.set(dedupeKey, { candidateMap.set(dedupeKey, {
feature, feature: entry.feature,
iconLeft, iconLeft,
iconRight, iconRight,
iconTop, iconTop,
@ -550,11 +850,11 @@ export class MapOl implements MapInterface {
right: centerX + estimatedWidth / 2, right: centerX + estimatedWidth / 2,
top: centerY - estimatedHeight / 2, top: centerY - estimatedHeight / 2,
bottom: centerY + estimatedHeight / 2, bottom: centerY + estimatedHeight / 2,
priority: Number(feature.get('_nearbyPriority') || 9999), priority: Number(entry.feature.get('_nearbyPriority') || 9999),
densityPriority: this.getFeatureDensityPriority(feature), densityPriority: entry.densityPriority,
id: candidateId, id: candidateId,
pixelX: pixel[0], pixelX: entry.pixelX,
pixelY: pixel[1] pixelY: entry.pixelY
}); });
}); });
@ -582,6 +882,16 @@ export class MapOl implements MapInterface {
top: number; top: number;
bottom: number; bottom: number;
}> = []; }> = [];
const placedIconGrid = new Map<
string,
Array<{
featureId: string;
left: number;
right: number;
top: number;
bottom: number;
}>
>();
const placedLabelRects: Array<{ const placedLabelRects: Array<{
featureId: string; featureId: string;
left: number; left: number;
@ -589,9 +899,17 @@ export class MapOl implements MapInterface {
top: number; top: number;
bottom: number; bottom: number;
}> = []; }> = [];
let hiddenByIconCollisionCount = 0; const placedLabelGrid = new Map<
let hiddenByLabelCollisionCount = 0; string,
let hiddenByIconHiddenCount = 0; Array<{
featureId: string;
left: number;
right: number;
top: number;
bottom: number;
}>
>();
const collisionGridCellSize = 96;
candidates.forEach(candidate => { candidates.forEach(candidate => {
const featureId = String( const featureId = String(
@ -603,11 +921,18 @@ export class MapOl implements MapInterface {
top: candidate.iconTop, top: candidate.iconTop,
bottom: candidate.iconBottom bottom: candidate.iconBottom
}; };
const iconHasCollision = placedIconRects.some(rect => const iconHasCollision = !!this.findCollidingRectInGrid(
this.checkLabelCollision(rect, iconRect) iconRect,
placedIconGrid,
collisionGridCellSize,
rect => this.checkLabelCollision(rect, iconRect)
); );
const iconVisible = !iconHasCollision; const iconVisible = !iconHasCollision;
this.syncFeatureIconCollisionVisible(candidate.feature, iconVisible); this.syncFeatureIconCollisionVisible(
candidate.feature,
iconVisible,
dirtyLayerKeys
);
if (iconVisible) { if (iconVisible) {
placedIconRects.push({ placedIconRects.push({
@ -617,6 +942,11 @@ export class MapOl implements MapInterface {
top: iconRect.top, top: iconRect.top,
bottom: iconRect.bottom bottom: iconRect.bottom
}); });
this.addRectToCollisionGrid(
placedIconRects[placedIconRects.length - 1],
placedIconGrid,
collisionGridCellSize
);
} }
}); });
@ -640,37 +970,45 @@ export class MapOl implements MapInterface {
const iconVisible = const iconVisible =
candidate.feature.get('_iconCollisionVisible') !== false; candidate.feature.get('_iconCollisionVisible') !== false;
if (!candidate.hasLabel) { if (!candidate.hasLabel) {
this.syncFeatureLabelCollisionVisible(candidate.feature, false); this.syncFeatureLabelCollisionVisible(
candidate.feature,
false,
dirtyLayerKeys
);
return; return;
} }
if (!iconVisible) { if (!iconVisible) {
hiddenByIconHiddenCount += 1; this.syncFeatureLabelCollisionVisible(
this.syncFeatureLabelCollisionVisible(candidate.feature, false); candidate.feature,
false,
dirtyLayerKeys
);
return; return;
} }
const collidingIconRect = placedIconRects.find(rect => { const collidingIconRect = this.findCollidingRectInGrid(
if (rect.featureId === featureId) { candidate,
return false; placedIconGrid,
} collisionGridCellSize,
return this.checkLabelCollisionWithIcon(rect, candidate); rect =>
}); rect.featureId !== featureId &&
this.checkLabelCollisionWithIcon(rect, candidate)
);
const hasCollisionWithIcon = !!collidingIconRect; const hasCollisionWithIcon = !!collidingIconRect;
const collidingLabelRect = placedLabelRects.find(rect => const collidingLabelRect = this.findCollidingRectInGrid(
this.checkLabelCollision(rect, candidate) candidate,
placedLabelGrid,
collisionGridCellSize,
rect => this.checkLabelCollision(rect, candidate)
); );
const hasCollisionWithLabel = !!collidingLabelRect; const hasCollisionWithLabel = !!collidingLabelRect;
const visible = !hasCollisionWithIcon && !hasCollisionWithLabel; const visible = !hasCollisionWithIcon && !hasCollisionWithLabel;
if (!visible) { this.syncFeatureLabelCollisionVisible(
if (hasCollisionWithIcon) { candidate.feature,
hiddenByIconCollisionCount += 1; visible,
} else { dirtyLayerKeys
hiddenByLabelCollisionCount += 1; );
}
}
this.syncFeatureLabelCollisionVisible(candidate.feature, visible);
if (visible) { if (visible) {
placedLabelRects.push({ placedLabelRects.push({
@ -680,11 +1018,25 @@ export class MapOl implements MapInterface {
top: candidate.top, top: candidate.top,
bottom: candidate.bottom bottom: candidate.bottom
}); });
this.addRectToCollisionGrid(
placedLabelRects[placedLabelRects.length - 1],
placedLabelGrid,
collisionGridCellSize
);
} }
}); });
this.flushDirtyPointLayers(dirtyLayerKeys);
}
private requestRefreshPointLabelVisibility(
immediate = false,
debounceMs = 0
) {
if (this.labelVisibilityDebounceTimerId !== null) {
window.clearTimeout(this.labelVisibilityDebounceTimerId);
this.labelVisibilityDebounceTimerId = null;
} }
private requestRefreshPointLabelVisibility(immediate = false) {
if (immediate) { if (immediate) {
if (this.labelVisibilityRefreshFrameId !== null) { if (this.labelVisibilityRefreshFrameId !== null) {
cancelAnimationFrame(this.labelVisibilityRefreshFrameId); cancelAnimationFrame(this.labelVisibilityRefreshFrameId);
@ -694,6 +1046,14 @@ export class MapOl implements MapInterface {
return; return;
} }
if (debounceMs > 0) {
this.labelVisibilityDebounceTimerId = window.setTimeout(() => {
this.labelVisibilityDebounceTimerId = null;
this.requestRefreshPointLabelVisibility();
}, debounceMs);
return;
}
if (this.labelVisibilityRefreshFrameId !== null) { if (this.labelVisibilityRefreshFrameId !== null) {
return; return;
} }
@ -704,18 +1064,30 @@ export class MapOl implements MapInterface {
}); });
} }
private syncFeatureIconCollisionVisible(feature: Feature, visible: boolean) { private syncFeatureIconCollisionVisible(
if (feature.get('_iconCollisionVisible') !== visible) { feature: Feature,
feature.set('_iconCollisionVisible', visible); visible: boolean,
feature.changed(); dirtyLayerKeys?: Set<string>
} ) {
this.markFeatureVisibilityDirty(
feature,
'_iconCollisionVisible',
visible,
dirtyLayerKeys
);
} }
private syncFeatureLabelCollisionVisible(feature: Feature, visible: boolean) { private syncFeatureLabelCollisionVisible(
if (feature.get('_labelCollisionVisible') !== visible) { feature: Feature,
feature.set('_labelCollisionVisible', visible); visible: boolean,
feature.changed(); dirtyLayerKeys?: Set<string>
} ) {
this.markFeatureVisibilityDirty(
feature,
'_labelCollisionVisible',
visible,
dirtyLayerKeys
);
} }
private isIconReady(iconUrl: string): boolean { private isIconReady(iconUrl: string): boolean {
@ -740,11 +1112,11 @@ export class MapOl implements MapInterface {
image.crossOrigin = 'anonymous'; image.crossOrigin = 'anonymous';
image.onload = () => { image.onload = () => {
this.iconLoadState.set(iconUrl, 'loaded'); this.iconLoadState.set(iconUrl, 'loaded');
this.refreshPointLayerStyles(); this.requestRefreshPointLayerStyles();
}; };
image.onerror = () => { image.onerror = () => {
this.iconLoadState.set(iconUrl, 'error'); this.iconLoadState.set(iconUrl, 'error');
this.refreshPointLayerStyles(); this.requestRefreshPointLayerStyles();
}; };
image.src = iconUrl; image.src = iconUrl;
@ -756,13 +1128,24 @@ export class MapOl implements MapInterface {
return false; return false;
} }
private requestRefreshPointLayerStyles() {
if (this.pointLayerStyleRefreshFrameId !== null) {
return;
}
this.pointLayerStyleRefreshFrameId = window.requestAnimationFrame(() => {
this.pointLayerStyleRefreshFrameId = null;
this.refreshPointLayerStyles();
});
}
private refreshPointLayerStyles() { private refreshPointLayerStyles() {
this.pointLayerManager.forEachLayer(layer => { this.pointLayerManager.forEachLayer(layer => {
layer.changed(); layer.changed();
}); });
this.requestRefreshPointLabelVisibility(true); this.requestRefreshPointLabelVisibility();
if (this.isBatchPopupMode) { if (this.isBatchPopupMode) {
this.requestUpdateBatchPopups(true); this.requestUpdateBatchPopups();
} }
} }
@ -1063,72 +1446,6 @@ export class MapOl implements MapInterface {
return priority === 1; return priority === 1;
} }
private createPointStyle1(feature: Feature): Style {
const color = (feature.get('iconCode') as string) || '#3399CC';
const labelText = feature.get('titleName') as string;
const buildType = (feature.get('BuildType') as number) ?? 1;
const currentZoom = this.view ? this.view.getZoom() : 4.5;
let dynamicScale = 0.7 + (currentZoom - 4.5) * 0.08;
dynamicScale = Math.max(0.5, Math.min(3.0, dynamicScale));
const fontSize = Math.max(16, Math.min(24, 12 * dynamicScale));
const radius = Math.max(6, Math.min(18, 6 * dynamicScale));
let imageStyle;
if (buildType === 0) {
const canvas = this.createSemiCircleCanvas(radius, color);
imageStyle = new Icon({
img: canvas,
imgSize: [canvas.width, canvas.height],
anchor: [0.5, 0.5]
});
} else {
imageStyle = new Circle({
radius: radius,
fill: new Fill({ color: color }),
stroke: new Stroke({ color: 'rgba(0, 0, 0, 0.5)', width: 1 })
});
}
const styleOptions: any = {
image: imageStyle
};
if (labelText) {
let offsetY = -20 * dynamicScale;
const specialLabels = [
'枕头坝二级',
'老鹰岩二级',
'长洲',
'丹巴',
'玛尔挡',
'班多',
'彭水',
'李家峡',
'ML',
'BDa',
'乌东德',
'里底',
'大华桥',
'巴塘'
];
if (specialLabels.includes(labelText)) {
offsetY = 20 * dynamicScale;
}
styleOptions.text = new Text({
text: labelText,
offsetY: offsetY,
font: `${fontSize}px sans-serif`,
fill: new Fill({ color: '#fff' }),
stroke: new Stroke({ color: 'rgba(0, 0, 0, .9)', width: 2 }),
textAlign: 'center',
declutterMode: 'declutter'
});
}
return new Style(styleOptions);
}
/** /**
* 初始化加载基础图层 * 初始化加载基础图层
* @param layer 图层配置对象 * @param layer 图层配置对象
@ -2167,10 +2484,18 @@ export class MapOl implements MapInterface {
* 移除地图对象，释放资源 * 移除地图对象，释放资源
*/ */
destroy(): void { destroy(): void {
if (this.pointLayerStyleRefreshFrameId !== null) {
cancelAnimationFrame(this.pointLayerStyleRefreshFrameId);
this.pointLayerStyleRefreshFrameId = null;
}
if (this.labelVisibilityRefreshFrameId !== null) { if (this.labelVisibilityRefreshFrameId !== null) {
cancelAnimationFrame(this.labelVisibilityRefreshFrameId); cancelAnimationFrame(this.labelVisibilityRefreshFrameId);
this.labelVisibilityRefreshFrameId = null; this.labelVisibilityRefreshFrameId = null;
} }
if (this.labelVisibilityDebounceTimerId !== null) {
window.clearTimeout(this.labelVisibilityDebounceTimerId);
this.labelVisibilityDebounceTimerId = null;
}
this.removeQueryLayer(); this.removeQueryLayer();
this.regionMaskManager.destroy(); this.regionMaskManager.destroy();

28
frontend/src/components/gis/ol/point-layer-manager.ts
View File

@ -81,7 +81,11 @@ export class PointLayerManager {
if (!this.map) return; if (!this.map) return;
const resolution = this.map.getView().getResolution(); const resolution = this.map.getView().getResolution();
if (currentZoom === undefined || !Number.isFinite(currentZoom) || !resolution) { if (
currentZoom === undefined ||
!Number.isFinite(currentZoom) ||
!resolution
) {
return; return;
} }
const nearbyPointConfig = getNearbyPointConfig(); const nearbyPointConfig = getNearbyPointConfig();
@ -109,7 +113,10 @@ export class PointLayerManager {
return; return;
} }
const sortedFeatures = [...features].sort((left, right) => { const sortedFeatures = [...features].sort((left, right) => {
return Number(left.get('_nearbyPriority') || 0) - Number(right.get('_nearbyPriority') || 0); return (
Number(left.get('_nearbyPriority') || 0) -
Number(right.get('_nearbyPriority') || 0)
);
}); });
const secondaryFeatures = sortedFeatures.filter(feature => { const secondaryFeatures = sortedFeatures.filter(feature => {
const priority = Number(feature.get('_nearbyPriority')); const priority = Number(feature.get('_nearbyPriority'));
@ -132,7 +139,8 @@ export class PointLayerManager {
const groupSecondaryCount = secondaryFeatures.length; const groupSecondaryCount = secondaryFeatures.length;
const baseOffsetPx = const baseOffsetPx =
Number(feature.get('_nearbyExpandOffsetPx')) || autoRule.expandOffsetPx; Number(feature.get('_nearbyExpandOffsetPx')) ||
autoRule.expandOffsetPx;
const ringSize = Math.max(1, layoutRule.ringSize); const ringSize = Math.max(1, layoutRule.ringSize);
const ringIndex = Math.floor(index / ringSize); const ringIndex = Math.floor(index / ringSize);
const ringOffsetIndex = index % ringSize; const ringOffsetIndex = index % ringSize;
@ -156,7 +164,10 @@ export class PointLayerManager {
const expandOffsetPx = const expandOffsetPx =
baseOffsetPx + baseOffsetPx +
ringIndex * ringIndex *
Math.max(layoutRule.ringGapPx, baseOffsetPx * layoutRule.ringGapFactor); Math.max(
layoutRule.ringGapPx,
baseOffsetPx * layoutRule.ringGapFactor
);
const offsetX = Math.cos(expandAngleRad) * expandOffsetPx * resolution; const offsetX = Math.cos(expandAngleRad) * expandOffsetPx * resolution;
const offsetY = Math.sin(expandAngleRad) * expandOffsetPx * resolution; const offsetY = Math.sin(expandAngleRad) * expandOffsetPx * resolution;
@ -452,7 +463,9 @@ export class PointLayerManager {
// 备注：先恢复要素原始坐标，再按缩放阶段决定是否做展开偏移，避免多次缩放后偏移累计。 // 备注：先恢复要素原始坐标，再按缩放阶段决定是否做展开偏移，避免多次缩放后偏移累计。
private resetFeatureToBaseCoordinate(feature: Feature): void { private resetFeatureToBaseCoordinate(feature: Feature): void {
const baseCoordinates = feature.get('_baseCoordinates') as number[] | undefined; const baseCoordinates = feature.get('_baseCoordinates') as
| number[]
| undefined;
const geometry = feature.getGeometry(); const geometry = feature.getGeometry();
if ( if (
!baseCoordinates || !baseCoordinates ||
@ -463,6 +476,9 @@ export class PointLayerManager {
return; return;
} }
(geometry as Point).setCoordinates([baseCoordinates[0], baseCoordinates[1]]); (geometry as Point).setCoordinates([
baseCoordinates[0],
baseCoordinates[1]
]);
} }
} }

2
frontend/src/components/mapFilter/index.vue
View File

@ -203,7 +203,6 @@ watch(
() => route.path, () => route.path,
() => { () => {
mapOrchestrator.resetFilterState(); mapOrchestrator.resetFilterState();
mapOrchestrator.changeEngPointCapacity('all');
searchTimeRange.value = [ searchTimeRange.value = [
dayjs(mapViewStore.searchTimeRange[0]).format('YYYY-MM-DD HH:mm:ss'), dayjs(mapViewStore.searchTimeRange[0]).format('YYYY-MM-DD HH:mm:ss'),
dayjs(mapViewStore.searchTimeRange[1]).format('YYYY-MM-DD HH:mm:ss') dayjs(mapViewStore.searchTimeRange[1]).format('YYYY-MM-DD HH:mm:ss')
@ -219,7 +218,6 @@ watch(
// 备注：时间选择只通过编排器分发，由编排器决定运行态更新和数据重载。 // 备注：时间选择只通过编排器分发，由编排器决定运行态更新和数据重载。
const triggerManualValuesChange = async (val: any) => { const triggerManualValuesChange = async (val: any) => {
console.log('triggerManualValuesChange', val);
const [startTime, endTime] = getTimeRangeByValue(val); const [startTime, endTime] = getTimeRangeByValue(val);
if (!startTime || !endTime) { if (!startTime || !endTime) {

1
frontend/src/components/mapLegend/index.vue
View File

@ -87,7 +87,6 @@ const hasEnvFac = computed(() =>
); );
const legendItemClick = (item: any) => { const legendItemClick = (item: any) => {
console.log(item);
if (item.parentName == '环保设施') return; if (item.parentName == '环保设施') return;
if (item.canBeChecked == 0) { if (item.canBeChecked == 0) {
return; return;

2
frontend/src/layout/components/AppMain.vue
View File

@ -8,9 +8,7 @@ import { useModelStore } from '@/store/modules/model';
import GisView from '@/components/gis/GisView.vue'; import GisView from '@/components/gis/GisView.vue';
const modelStore = useModelStore(); const modelStore = useModelStore();
const tagsViewStore = useTagsViewStore(); const tagsViewStore = useTagsViewStore();
const router = useRoute(); const router = useRoute();
const routeKey = computed(() => router.path + Math.random()); const routeKey = computed(() => router.path + Math.random());
</script> </script>

47
frontend/src/layout/components/Sidebar/index.vue
View File

@ -1,17 +1,28 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, onBeforeMount, onMounted } from "vue"; import { ref, onBeforeMount, onMounted } from 'vue';
import { useRoute, useRouter } from "vue-router"; import { useRoute, useRouter } from 'vue-router';
import { usePermissionStore } from "@/store/modules/permission"; import { useMapStore } from '@/store/modules/map';
import { usePermissionStore } from '@/store/modules/permission';
const mapStore = useMapStore();
const permissionStore = usePermissionStore(); const permissionStore = usePermissionStore();
const menus: any = ref([]); // 主菜单列表 const menus: any = ref([]); // 主菜单列表
const subMenus: any = ref([]); // 子菜单列表 const subMenus: any = ref([]); // 子菜单列表
const activeKey = ref(""); // 主菜单选中项 const activeKey = ref(''); // 主菜单选中项
const subActiveKey = ref(""); // 子菜单选中项 const subActiveKey = ref(''); // 子菜单选中项
const route = useRoute(); const route = useRoute();
const router = useRouter(); const router = useRouter();
const buildPageKeyFromPath = (path?: string) => {
const normalizedPath = path || '';
const parts = normalizedPath.split('/').filter(Boolean);
if (parts.length >= 2) {
return `${parts[0]}_${parts[1]}`;
}
return normalizedPath || '__route-change__';
};
// 主菜单切换 // 主菜单切换
const handleTabChange = (key: string) => { const handleTabChange = (key: string) => {
let data = menus.value.find((item: any) => item.id === key); let data = menus.value.find((item: any) => item.id === key);
@ -19,23 +30,31 @@ const handleTabChange = (key: string) => {
activeKey.value = key; activeKey.value = key;
if (data.children.length > 0) { if (data.children.length > 0) {
subActiveKey.value = data.children[0].id; subActiveKey.value = data.children[0].id;
let subData = subMenus.value.find((item: any) => item.id === subActiveKey.value); let subData = subMenus.value.find(
(item: any) => item.id === subActiveKey.value
);
mapStore.markPendingPageNavigation(
buildPageKeyFromPath(subData?.path || subData?.opturl)
);
router.push(subData.path || subData.opturl); router.push(subData.path || subData.opturl);
} else { } else {
subActiveKey.value = ""; subActiveKey.value = '';
} }
}; };
// 子菜单切换 // 子菜单切换
const handleSubTabChange = (key: string) => { const handleSubTabChange = (key: string) => {
subActiveKey.value = key; subActiveKey.value = key;
let data = subMenus.value.find((item: any) => item.id === key); let data = subMenus.value.find((item: any) => item.id === key);
mapStore.markPendingPageNavigation(
buildPageKeyFromPath(data?.path || data?.opturl)
);
router.push(data.path || data.opturl); router.push(data.path || data.opturl);
}; };
onBeforeMount(() => { onBeforeMount(() => {
permissionStore.routes.map((item: any) => { permissionStore.routes.map((item: any) => {
if (item.meta?.hidden) { if (item.meta?.hidden) {
return ""; return '';
} else { } else {
if (item?.parentid == null) { if (item?.parentid == null) {
menus.value.push(item?.children?.[0]); menus.value.push(item?.children?.[0]);
@ -71,7 +90,11 @@ onMounted(() => {});
></a-tab-pane> ></a-tab-pane>
</a-tabs> </a-tabs>
<div class="sub-menus"> <div class="sub-menus">
<a-tabs v-model:activeKey="subActiveKey" @change="handleSubTabChange" size="small"> <a-tabs
v-model:activeKey="subActiveKey"
@change="handleSubTabChange"
size="small"
>
<a-tab-pane <a-tab-pane
v-for="route in subMenus" v-for="route in subMenus"
:key="route.id" :key="route.id"
@ -82,7 +105,7 @@ onMounted(() => {});
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
@use "@/styles/variables.module.scss" as *; @use '@/styles/variables.module.scss' as *;
.sidebar-container { .sidebar-container {
flex: 1; flex: 1;
@ -130,7 +153,7 @@ onMounted(() => {});
:deep(.ant-tabs-ink-bar) { :deep(.ant-tabs-ink-bar) {
visibility: visible; visibility: visible;
border: none; border: none;
background: url("@/assets/icons/menuActiveBg.svg") no-repeat center 30px; background: url('@/assets/icons/menuActiveBg.svg') no-repeat center 30px;
height: 51px; height: 51px;
} }
} }
@ -154,7 +177,7 @@ onMounted(() => {});
} }
.ant-tabs-ink-bar { .ant-tabs-ink-bar {
background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAFCAYAAACXU8ZrAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABZ0RVh0Q3JlYXRpb24gVGltZQAxMS8wMy8yMrqNQAoAAAAcdEVYdFNvZnR3YXJlAEFkb2JlIEZpcmV3b3JrcyBDUzbovLKMAAAAOklEQVQImWNgQAchkx3QhZhQeEFTExj+MexnCJoyH1mYEUUBwz8kScYFDOtyEhGKMBSgKmTErQChEAA6FRM7O0rIOgAAAABJRU5ErkJggg==") background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAFCAYAAACXU8ZrAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABZ0RVh0Q3JlYXRpb24gVGltZQAxMS8wMy8yMrqNQAoAAAAcdEVYdFNvZnR3YXJlAEFkb2JlIEZpcmV3b3JrcyBDUzbovLKMAAAAOklEQVQImWNgQAchkx3QhZhQeEFTExj+MexnCJoyH1mYEUUBwz8kScYFDOtyEhGKMBSgKmTErQChEAA6FRM7O0rIOgAAAABJRU5ErkJggg==')
no-repeat center bottom; no-repeat center bottom;
border-bottom: 2px solid #005293; border-bottom: 2px solid #005293;
height: 7px; height: 7px;

41
frontend/src/modules/map/application/map-orchestrator.ts
View File

@ -54,6 +54,7 @@ export const useMapOrchestrator = () => {
const mapDataStore = useMapDataStore(); const mapDataStore = useMapDataStore();
const mapViewStore = useMapViewStore(); const mapViewStore = useMapViewStore();
const jidiSelectEventStore = useJidiSelectEventStore(); const jidiSelectEventStore = useJidiSelectEventStore();
let activePageLoadRequestId = 0;
let zoomListenerKey: any = null; let zoomListenerKey: any = null;
let stopBaseSelectionWatch: WatchStopHandle | null = null; let stopBaseSelectionWatch: WatchStopHandle | null = null;
const initializedBaseLayerKeys = new Set<string>(); const initializedBaseLayerKeys = new Set<string>();
@ -116,6 +117,7 @@ export const useMapOrchestrator = () => {
isInitialLoad = false isInitialLoad = false
}: LoadPageOptions) => { }: LoadPageOptions) => {
let backgroundLoadStarted = false; let backgroundLoadStarted = false;
const pageLoadRequestId = ++activePageLoadRequestId;
try { try {
mapDataStore.setLoading(true); mapDataStore.setLoading(true);
@ -146,6 +148,10 @@ export const useMapOrchestrator = () => {
const [{ layerConfig }, { legendOriginal, pageLegend }] = const [{ layerConfig }, { legendOriginal, pageLegend }] =
await Promise.all([layerConfigPromise, legendConfigPromise]); await Promise.all([layerConfigPromise, legendConfigPromise]);
if (pageLoadRequestId !== activePageLoadRequestId) {
return;
}
// 先设置图层数据（更新 checkedLayerKeys），再设置图例数据 // 先设置图层数据（更新 checkedLayerKeys），再设置图例数据
if (layerConfig.length > 0) { if (layerConfig.length > 0) {
mapStore.setLayerData(layerConfig); mapStore.setLayerData(layerConfig);
@ -192,7 +198,8 @@ export const useMapOrchestrator = () => {
const backgroundLoadPromise = isInitialLoad const backgroundLoadPromise = isInitialLoad
? mapStore.loadAllLayerData(layerConfig, checkedKeys, { ? mapStore.loadAllLayerData(layerConfig, checkedKeys, {
pageToken: activePageToken, pageToken: activePageToken,
skipSessionCheck: true skipSessionCheck: true,
pageKey
}) })
: mapStore.loadCurrentPageLayerData(layerConfig, checkedKeys, { : mapStore.loadCurrentPageLayerData(layerConfig, checkedKeys, {
pageToken: activePageToken, pageToken: activePageToken,
@ -205,7 +212,10 @@ export const useMapOrchestrator = () => {
backgroundLoadStarted = true; backgroundLoadStarted = true;
} }
} finally { } finally {
if (!backgroundLoadStarted) { if (
!backgroundLoadStarted &&
pageLoadRequestId === activePageLoadRequestId
) {
mapDataStore.setLoading(false); mapDataStore.setLoading(false);
} }
} }
@ -310,21 +320,21 @@ export const useMapOrchestrator = () => {
await loadPage({ pageKey, isInitialLoad: false }); await loadPage({ pageKey, isInitialLoad: false });
}; };
// 备注：菜单切换前先隐藏旧页面当前可见的点图层，避免旧锚点残留到新页面接口返回之后才消失。 // 备注：菜单切换前只隐藏旧页面当前可见点图层，底图保持连续显示，避免切换时闪烁。
const hideCurrentVisiblePointLayers = () => { const hideCurrentVisibleLayers = () => {
const currentCheckedKeys = mapViewStore.getCheckedLayerKeys(); const currentCheckedKeys = mapViewStore.getCheckedLayerKeys();
currentCheckedKeys.forEach(layerKey => { currentCheckedKeys.forEach(layerKey => {
const layerItem = mapStore.findLayerByKey(mapStore.layerData, layerKey); const layerItem = mapStore.findLayerByKey(mapStore.layerData, layerKey);
if ( if (!layerItem?.key) {
!layerItem?.key ||
layerItem.type !== 'pointMap' ||
!mapClass.hasLayer(layerItem.key)
) {
return; return;
} }
if (layerItem.type === 'pointMap') {
if (mapClass.hasLayer(layerItem.key)) {
mapClass.mdLayerTreeShowOrHidden(layerItem.key, false); mapClass.mdLayerTreeShowOrHidden(layerItem.key, false);
}
}
}); });
}; };
@ -433,16 +443,17 @@ export const useMapOrchestrator = () => {
}; };
// 备注：统一处理菜单切换后的页面重载和动态图层收口，减少页面组件里的分支编排。 // 备注：统一处理菜单切换后的页面重载和动态图层收口，减少页面组件里的分支编排。
const handlePageChange = async (pageKey: string, isHydroMenu: boolean) => { const handlePageChange = (pageKey: string, isHydroMenu: boolean) => {
if (!pageKey) return; if (!pageKey) return Promise.resolve();
const previousPageKey = mapConfigStore.lastLoadOptions?.pageKey || ''; const previousPageKey = mapConfigStore.lastLoadOptions?.pageKey || '';
if (previousPageKey && previousPageKey !== pageKey) { if (previousPageKey && previousPageKey !== pageKey) {
hideCurrentVisiblePointLayers(); hideCurrentVisibleLayers();
mapViewStore.setCheckedLayerKeys([]);
mapStore.setSelectedLegendData();
} }
await reloadPage(pageKey); return reloadPage(pageKey).then(async () => {
const currentZoom = getCurrentZoom(); const currentZoom = getCurrentZoom();
if (isHydroMenu && currentZoom !== undefined && currentZoom >= 12) { if (isHydroMenu && currentZoom !== undefined && currentZoom >= 12) {
await syncHydroDynamicLayers(true); await syncHydroDynamicLayers(true);
@ -450,6 +461,7 @@ export const useMapOrchestrator = () => {
} }
await syncHydroDynamicLayers(false); await syncHydroDynamicLayers(false);
});
}; };
// 备注：统一处理单个图层切换命令，供后续其他入口复用。 // 备注：统一处理单个图层切换命令，供后续其他入口复用。
@ -557,7 +569,6 @@ export const useMapOrchestrator = () => {
const targetPoint = const targetPoint =
mapDataStore.pointData.find(pointMatcher) || mapDataStore.pointData.find(pointMatcher) ||
fallbackPoints.find(pointMatcher); fallbackPoints.find(pointMatcher);
console.log('targetPoint', targetPoint);
if (!targetPoint?.lgtd || !targetPoint?.lttd) return; if (!targetPoint?.lgtd || !targetPoint?.lttd) return;
mapClass.flyTopanto([targetPoint.lgtd, targetPoint.lttd], zoom); mapClass.flyTopanto([targetPoint.lgtd, targetPoint.lttd], zoom);
}; };

1
frontend/src/modules/map/stores/map-config.store.ts
View File

@ -161,7 +161,6 @@ export const useMapConfigStore = defineStore('map-config', () => {
moduleId: options.moduleId, moduleId: options.moduleId,
description: options.description ?? 'true' description: options.description ?? 'true'
}); });
console.log(cloneConfigData(layerRes));
const layerConfig = layerRes?.data?.mapLayerVos || []; const layerConfig = layerRes?.data?.mapLayerVos || [];
setLayerConfigTree(layerConfig); setLayerConfigTree(layerConfig);

29
frontend/src/modules/map/stores/map-data.store.ts
View File

@ -59,10 +59,7 @@ export const useMapDataStore = defineStore('map-data', () => {
// 备注：写入单个图层的锚点缓存，并保留当前是否勾选的状态。 // 备注：写入单个图层的锚点缓存，并保留当前是否勾选的状态。
const setPointLayerCache = (layerKey: string, cache: PointLayerCacheItem) => { const setPointLayerCache = (layerKey: string, cache: PointLayerCacheItem) => {
if (!layerKey) return; if (!layerKey) return;
pointDataCache.value = { pointDataCache.value[layerKey] = cache;
...pointDataCache.value,
[layerKey]: cache
};
}; };
// 备注：只更新缓存中的勾选状态，避免重复覆盖整份锚点数据。 // 备注：只更新缓存中的勾选状态，避免重复覆盖整份锚点数据。
@ -113,13 +110,10 @@ export const useMapDataStore = defineStore('map-data', () => {
// 备注：统一初始化单个图层的加载状态，避免外层重复判空。 // 备注：统一初始化单个图层的加载状态，避免外层重复判空。
const ensureLayerLoadState = (layerKey: string): LayerLoadStatus => { const ensureLayerLoadState = (layerKey: string): LayerLoadStatus => {
if (!layerLoadState.value[layerKey]) { if (!layerLoadState.value[layerKey]) {
layerLoadState.value = { layerLoadState.value[layerKey] = {
...layerLoadState.value,
[layerKey]: {
loading: false, loading: false,
loaded: false, loaded: false,
error: null error: null
}
}; };
} }
return layerLoadState.value[layerKey]; return layerLoadState.value[layerKey];
@ -128,50 +122,39 @@ export const useMapDataStore = defineStore('map-data', () => {
// 备注：标记单个图层进入加载中状态。 // 备注：标记单个图层进入加载中状态。
const setLayerLoading = (layerKey: string) => { const setLayerLoading = (layerKey: string) => {
const current = ensureLayerLoadState(layerKey); const current = ensureLayerLoadState(layerKey);
layerLoadState.value = { layerLoadState.value[layerKey] = {
...layerLoadState.value,
[layerKey]: {
...current, ...current,
loading: true, loading: true,
error: null error: null
}
}; };
}; };
// 备注：标记单个图层加载成功，供后续判断是否已完成首次加载。 // 备注：标记单个图层加载成功，供后续判断是否已完成首次加载。
const setLayerLoaded = (layerKey: string) => { const setLayerLoaded = (layerKey: string) => {
const current = ensureLayerLoadState(layerKey); const current = ensureLayerLoadState(layerKey);
layerLoadState.value = { layerLoadState.value[layerKey] = {
...layerLoadState.value,
[layerKey]: {
...current, ...current,
loading: false, loading: false,
loaded: true, loaded: true,
error: null error: null
}
}; };
}; };
// 备注：标记单个图层加载失败，并记录错误信息。 // 备注：标记单个图层加载失败，并记录错误信息。
const setLayerLoadError = (layerKey: string, error: unknown) => { const setLayerLoadError = (layerKey: string, error: unknown) => {
const current = ensureLayerLoadState(layerKey); const current = ensureLayerLoadState(layerKey);
layerLoadState.value = { layerLoadState.value[layerKey] = {
...layerLoadState.value,
[layerKey]: {
...current, ...current,
loading: false, loading: false,
loaded: false, loaded: false,
error: error instanceof Error ? error.message : String(error) error: error instanceof Error ? error.message : String(error)
}
}; };
}; };
// 备注：清理指定图层的加载状态，供重载场景复用。 // 备注：清理指定图层的加载状态，供重载场景复用。
const clearLayerLoadState = (layerKey: string) => { const clearLayerLoadState = (layerKey: string) => {
if (!layerLoadState.value[layerKey]) return; if (!layerLoadState.value[layerKey]) return;
const nextState = { ...layerLoadState.value }; delete layerLoadState.value[layerKey];
delete nextState[layerKey];
layerLoadState.value = nextState;
}; };
// 备注：整体重置数据缓存 store，供菜单切换或地图销毁时调用。 // 备注：整体重置数据缓存 store，供菜单切换或地图销毁时调用。

310
frontend/src/store/modules/map.ts
View File

@ -14,10 +14,7 @@ import { useMapConfigStore } from '@/modules/map/stores/map-config.store';
import { useMapDataStore } from '@/modules/map/stores/map-data.store'; import { useMapDataStore } from '@/modules/map/stores/map-data.store';
import { useMapViewStore } from '@/modules/map/stores/map-view.store'; import { useMapViewStore } from '@/modules/map/stores/map-view.store';
import request from '@/utils/request'; import request from '@/utils/request';
// import { urlList } from '@/utils/GisUrlList';
const mapClass = MapClass.getInstance(); const mapClass = MapClass.getInstance();
const DEFAULT_LAYER_REQUEST_CONCURRENCY = 4;
const ACTIVE_PAGE_REQUEST_CONCURRENCY = 2;
const ENG_POINT_LAYER_KEY = 'eng_point'; const ENG_POINT_LAYER_KEY = 'eng_point';
const YLFB_POINT_LAYER_KEY = 'ylfb_point'; const YLFB_POINT_LAYER_KEY = 'ylfb_point';
const ENG_POINT_MEDIUM_VISIBLE_ZOOM = 7.5; const ENG_POINT_MEDIUM_VISIBLE_ZOOM = 7.5;
@ -49,24 +46,6 @@ const normalizeCachePayload = (value: any): any => {
return value; return value;
}; };
// const buildUrlListIndex = (items: any[] = []) => {
// const index: Record<string, any[]> = {};
//
// items.forEach(item => {
// [item.url, item.title, item.keyType].forEach(key => {
// if (!key) return;
// if (!index[key]) {
// index[key] = [];
// }
// index[key].push(item);
// });
// });
//
// return index;
// };
//
// const urlListIndex = buildUrlListIndex(urlList);
const isCanceledRequestError = (error: unknown) => { const isCanceledRequestError = (error: unknown) => {
const message = error instanceof Error ? error.message : String(error || ''); const message = error instanceof Error ? error.message : String(error || '');
return ( return (
@ -151,8 +130,7 @@ export const useMapStore = defineStore('map', () => {
getLegendConfigByLayerCode, getLegendConfigByLayerCode,
getLegendConfigByNameEn getLegendConfigByNameEn
} = mapConfigStore; } = mapConfigStore;
const { getPointLayerData, hasPointLayerData, hasValidPointLayerCache } = const { hasPointLayerData, getPointLayerData } = mapDataStore;
mapDataStore;
const { const {
layerConfigTree: layerData, layerConfigTree: layerData,
legendConfigOriginal: legendDataOriginal, legendConfigOriginal: legendDataOriginal,
@ -177,9 +155,20 @@ export const useMapStore = defineStore('map', () => {
} }
>(); >();
const activeLayerRequestKeyMap = new Map<string, string>(); const activeLayerRequestKeyMap = new Map<string, string>();
const backgroundPointLayerCache = new Map<
string,
{
checked: boolean;
data: any[];
cacheKey?: string;
}
>();
let loadSessionSeed = 0; let loadSessionSeed = 0;
let activePageRenderToken = 0; let activePageRenderToken = 0;
let activePageKey = '';
let activePageLayerKeys = new Set<string>(); let activePageLayerKeys = new Set<string>();
let activeLoadingPageToken: number | null = null;
let pendingPageNavigationKey = '';
const normalizeLegendNameEn = mapConfigStore.normalizeLegendNameEn; const normalizeLegendNameEn = mapConfigStore.normalizeLegendNameEn;
@ -209,7 +198,11 @@ export const useMapStore = defineStore('map', () => {
if (!layerKey) return; if (!layerKey) return;
const layerItem = findLayerByKey(layerData.value, layerKey); const layerItem = findLayerByKey(layerData.value, layerKey);
const rawData = layerItem?.data || getPointLayerData(layerKey); syncBackgroundCacheToReactiveStore(layerKey);
const rawData =
Array.isArray(layerItem?.data) && layerItem.data.length > 0
? layerItem.data
: getEffectivePointLayerData(layerKey);
const displayData = filterPointLayerDataForDisplay(layerKey, rawData); const displayData = filterPointLayerDataForDisplay(layerKey, rawData);
const shouldRestoreVisible = const shouldRestoreVisible =
layerItem?.checked === 1 || checkedLayerKeys.value.includes(layerKey); layerItem?.checked === 1 || checkedLayerKeys.value.includes(layerKey);
@ -333,8 +326,57 @@ export const useMapStore = defineStore('map', () => {
return mapViewStore.getCheckedLayerKeys(); return mapViewStore.getCheckedLayerKeys();
}; };
const syncPointDataForFilter = () => { const shouldSyncMergedPointData = (layerKey: string, pageToken?: number) => {
mapDataStore.rebuildPointDataFromCache(); if (!layerKey) return false;
return (
shouldApplyToActivePage(layerKey, pageToken) ||
getRuntimeCheckedLayerKeys().includes(layerKey)
);
};
const getEffectivePointLayerCache = (layerKey: string) => {
const reactiveCache = mapDataStore.getPointLayerCache(layerKey);
if (reactiveCache) {
return reactiveCache;
}
return backgroundPointLayerCache.get(layerKey);
};
const getEffectivePointLayerData = (layerKey: string): any[] => {
const reactiveCache = mapDataStore.getPointLayerCache(layerKey);
if (reactiveCache?.data) {
return reactiveCache.data;
}
return getEffectivePointLayerCache(layerKey)?.data || [];
};
const hasEffectivePointLayerCache = (layerKey: string, cacheKey: string) => {
const cache = getEffectivePointLayerCache(layerKey);
if (!cache || !cacheKey) return false;
return cache.cacheKey === cacheKey && Array.isArray(cache.data);
};
const setBackgroundPointLayerCache = (
layerKey: string,
cache: {
checked: boolean;
data: any[];
cacheKey?: string;
}
) => {
if (!layerKey) return;
backgroundPointLayerCache.set(layerKey, cache);
};
const syncBackgroundCacheToReactiveStore = (layerKey: string) => {
const cache = backgroundPointLayerCache.get(layerKey);
if (!cache) return;
mapDataStore.setPointLayerCache(layerKey, cache);
backgroundPointLayerCache.delete(layerKey);
};
const syncPointDataForFilter = (layerKeys: string[] = []) => {
mapDataStore.rebuildPointDataFromCache(layerKeys);
}; };
const normalizePointLayerItems = (list: any[] = []) => { const normalizePointLayerItems = (list: any[] = []) => {
@ -395,7 +437,6 @@ export const useMapStore = defineStore('map', () => {
mapConfigStore.setLayerConfigTree(data); mapConfigStore.setLayerConfigTree(data);
const nextCheckedLayerKeys = mapConfigStore.extractCheckedLayerKeys(data); const nextCheckedLayerKeys = mapConfigStore.extractCheckedLayerKeys(data);
mapViewStore.setCheckedLayerKeys(nextCheckedLayerKeys); mapViewStore.setCheckedLayerKeys(nextCheckedLayerKeys);
console.log(1);
rebuildLegendRuntimeData(nextCheckedLayerKeys); rebuildLegendRuntimeData(nextCheckedLayerKeys);
}; };
@ -432,14 +473,26 @@ export const useMapStore = defineStore('map', () => {
}; };
const activatePageContext = (pageKey: string, items: any[] = []) => { const activatePageContext = (pageKey: string, items: any[] = []) => {
void pageKey; activePageKey = pageKey;
pendingPageNavigationKey = '';
activePageRenderToken += 1; activePageRenderToken += 1;
activePageLayerKeys = new Set(getAllLayerKeys(items)); activePageLayerKeys = new Set(getAllLayerKeys(items));
return activePageRenderToken; return activePageRenderToken;
}; };
const markPendingPageNavigation = (targetPageKey: string) => {
pendingPageNavigationKey = targetPageKey || '__route-change__';
};
const hasPendingPageNavigationAwayFrom = (pageKey: string) => {
return !!pendingPageNavigationKey && pendingPageNavigationKey !== pageKey;
};
const shouldApplyToActivePage = (layerKey: string, pageToken?: number) => { const shouldApplyToActivePage = (layerKey: string, pageToken?: number) => {
if (!layerKey) return false; if (!layerKey) return false;
if (activePageKey && hasPendingPageNavigationAwayFrom(activePageKey)) {
return false;
}
if (pageToken === undefined) return true; if (pageToken === undefined) return true;
return ( return (
activePageRenderToken === pageToken && activePageLayerKeys.has(layerKey) activePageRenderToken === pageToken && activePageLayerKeys.has(layerKey)
@ -451,27 +504,26 @@ export const useMapStore = defineStore('map', () => {
return activePageRenderToken === pageToken; return activePageRenderToken === pageToken;
}; };
/** const beginPageLoading = (pageToken?: number) => {
* 按指定并发数执行图层加载任务，为当前页请求预留浏览器连接，避免后台预加载阻塞前台切页。 if (typeof pageToken === 'number') {
*/ activeLoadingPageToken = pageToken;
const runLayerLoadQueue = async ( }
tasks: Array<() => Promise<any>>, mapDataStore.setLoading(true);
concurrency: number = DEFAULT_LAYER_REQUEST_CONCURRENCY };
) => {
if (tasks.length === 0) { const finishPageLoading = (pageToken?: number) => {
return []; if (typeof pageToken !== 'number') {
mapDataStore.setLoading(false);
return;
} }
const results: PromiseSettledResult<any>[] = []; if (
const safeConcurrency = Math.max(1, concurrency); activeLoadingPageToken === pageToken &&
activePageRenderToken === pageToken
for (let i = 0; i < tasks.length; i += safeConcurrency) { ) {
const batch = tasks.slice(i, i + safeConcurrency).map(task => task()); activeLoadingPageToken = null;
const batchResults = await Promise.allSettled(batch); mapDataStore.setLoading(false);
results.push(...batchResults);
} }
return results;
}; };
/** /**
@ -485,7 +537,6 @@ export const useMapStore = defineStore('map', () => {
mapViewStore.setLegendCheckedState( mapViewStore.setLegendCheckedState(
buildLegendCheckedState(legendDataOriginal.value, normalizeLegendNameEn) buildLegendCheckedState(legendDataOriginal.value, normalizeLegendNameEn)
); );
console.log(2);
rebuildLegendRuntimeData(checkedLayerKeys.value); rebuildLegendRuntimeData(checkedLayerKeys.value);
}; };
@ -493,7 +544,6 @@ export const useMapStore = defineStore('map', () => {
* 设置选中的图例数据（在图层加载完成后调用） * 设置选中的图例数据（在图层加载完成后调用）
*/ */
const setSelectedLegendData = () => { const setSelectedLegendData = () => {
console.log(3);
rebuildLegendRuntimeData(checkedLayerKeys.value); rebuildLegendRuntimeData(checkedLayerKeys.value);
}; };
@ -541,6 +591,31 @@ export const useMapStore = defineStore('map', () => {
refreshPointLayerDisplayData(layerKey); refreshPointLayerDisplayData(layerKey);
}; };
const applyLoadedPointLayerToMap = (
layer: any,
layerKey: string,
list: any[] = [],
pageToken?: number
) => {
if (!Array.isArray(list)) {
return;
}
layer.data = list;
const isLayerChecked = layer.checked === 1;
if (list.length === 0 || !shouldApplyToActivePage(layerKey, pageToken)) {
return;
}
const displayData = filterPointLayerDataForDisplay(layerKey, list);
mapClass.addInitDataLayer(displayData, layerKey);
if (isLayerChecked) {
restoreLayerLegendVisibility(layerKey);
}
mapClass.mdLayerTreeShowOrHidden(layerKey, isLayerChecked);
};
/** /**
* 图例数据转对象 * 图例数据转对象
*/ */
@ -584,15 +659,14 @@ export const useMapStore = defineStore('map', () => {
} }
// 使用初始化时已加载的数据（存入 layer.data） // 使用初始化时已加载的数据（存入 layer.data）
const cachedData = layer?.data || getPointLayerData(key); const cachedData =
Array.isArray(layer?.data) && layer.data.length > 0
? layer.data
: getPointLayerData(key);
if (cachedData && cachedData.length > 0) { if (cachedData && cachedData.length > 0) {
layer.checked = 1; layer.checked = 1;
const displayData = filterPointLayerDataForDisplay(key, cachedData); const displayData = filterPointLayerDataForDisplay(key, cachedData);
if (!mapClass.hasLayer(key)) {
mapClass.addInitDataLayer(displayData, key); mapClass.addInitDataLayer(displayData, key);
} else {
mapClass.addInitDataLayer(displayData, key);
}
restoreLayerLegendVisibility(key); restoreLayerLegendVisibility(key);
if (mapDataStore.getPointLayerCache(key)) { if (mapDataStore.getPointLayerCache(key)) {
mapDataStore.setPointLayerCacheChecked(key, true); mapDataStore.setPointLayerCacheChecked(key, true);
@ -608,7 +682,6 @@ export const useMapStore = defineStore('map', () => {
* @param isInit - 是否是初始化阶段（初始化时遍历所有图层） * @param isInit - 是否是初始化阶段（初始化时遍历所有图层）
*/ */
const updateLayerData = async (checkKeys: string[], isInit = false) => { const updateLayerData = async (checkKeys: string[], isInit = false) => {
console.log(checkKeys);
if (!isInit) { if (!isInit) {
checkKeys = normalizeCheckedLayerKeys(checkKeys); checkKeys = normalizeCheckedLayerKeys(checkKeys);
} }
@ -691,16 +764,17 @@ export const useMapStore = defineStore('map', () => {
options: { options: {
pageToken?: number; pageToken?: number;
skipSessionCheck?: boolean; skipSessionCheck?: boolean;
concurrency?: number; pageKey?: string;
} = {} } = {}
) => { ) => {
mapDataStore.setLoading(true); beginPageLoading(options.pageToken);
const currentSessionId = options.skipSessionCheck const currentSessionId = options.skipSessionCheck
? undefined ? undefined
: startLoadSession(); : startLoadSession();
const checkedTasks: Array<() => Promise<any>> = []; const checkedTasks: Array<() => Promise<any>> = [];
const uncheckedTasks: Array<() => Promise<any>> = []; const uncheckedTasks: Array<() => Promise<any>> = [];
const processedKeys = new Set<string>(); const processedKeys = new Set<string>();
const debugStart = Date.now();
const processItems = (itemList: any[]) => { const processItems = (itemList: any[]) => {
itemList.forEach(item => { itemList.forEach(item => {
@ -715,7 +789,8 @@ export const useMapStore = defineStore('map', () => {
loadLayerData(item, { loadLayerData(item, {
sessionId: currentSessionId, sessionId: currentSessionId,
pageToken: options.pageToken, pageToken: options.pageToken,
skipSessionCheck: options.skipSessionCheck skipSessionCheck: options.skipSessionCheck,
pageKey: options.pageKey
}); });
if (checkedKeys.includes(item.key)) { if (checkedKeys.includes(item.key)) {
checkedTasks.push(task); checkedTasks.push(task);
@ -733,9 +808,9 @@ export const useMapStore = defineStore('map', () => {
processItems(items); processItems(items);
try { try {
const loadResults = await runLayerLoadQueue( // 首页初始化：所有图层接口一次性并发下发，避免分批串行等待。
[...checkedTasks, ...uncheckedTasks], const loadResults = await Promise.allSettled(
options.concurrency ?? DEFAULT_LAYER_REQUEST_CONCURRENCY [...checkedTasks, ...uncheckedTasks].map(task => task())
); );
const failedResults = loadResults.filter( const failedResults = loadResults.filter(
result => result.status === 'rejected' result => result.status === 'rejected'
@ -756,12 +831,20 @@ export const useMapStore = defineStore('map', () => {
return; return;
} }
if (
options.pageKey &&
hasPendingPageNavigationAwayFrom(options.pageKey)
) {
return;
}
// 确保所有图层的数据都已经缓存到 pointDataCache 和 layer.data // 确保所有图层的数据都已经缓存到 pointDataCache 和 layer.data
const allLayerKeys = getAllLayerKeys(items); const allLayerKeys = getAllLayerKeys(items);
for (const key of allLayerKeys) { for (const key of allLayerKeys) {
const layer = findLayerByKey(items, key); const layer = findLayerByKey(items, key);
if (layer && hasPointLayerData(key)) { if (layer && getEffectivePointLayerData(key).length > 0) {
layer.data = getPointLayerData(key); syncBackgroundCacheToReactiveStore(key);
layer.data = getEffectivePointLayerData(key);
} }
} }
@ -809,7 +892,7 @@ export const useMapStore = defineStore('map', () => {
(options.pageToken === undefined || (options.pageToken === undefined ||
activePageRenderToken === options.pageToken); activePageRenderToken === options.pageToken);
if (shouldFinishLoading) { if (shouldFinishLoading) {
mapDataStore.setLoading(false); finishPageLoading(options.pageToken);
} }
} }
}; };
@ -854,17 +937,18 @@ export const useMapStore = defineStore('map', () => {
processItems(items); processItems(items);
if (tasks.length === 0) { if (tasks.length === 0) {
mapDataStore.setLoading(false); finishPageLoading(options.pageToken);
return; return;
} }
mapDataStore.setLoading(true); beginPageLoading(options.pageToken);
try { try {
await runLayerLoadQueue(tasks, ACTIVE_PAGE_REQUEST_CONCURRENCY); // 菜单切换：仅当前页的勾选图层一次性并发下发，旧请求在后台继续运行。
await Promise.allSettled(tasks.map(task => task()));
} finally { } finally {
if (isActivePageToken(options.pageToken)) { if (isActivePageToken(options.pageToken)) {
mapDataStore.setLoading(false); finishPageLoading(options.pageToken);
} }
} }
}; };
@ -977,7 +1061,6 @@ export const useMapStore = defineStore('map', () => {
normalizedNameEn, normalizedNameEn,
checked checked
); );
console.log(5);
rebuildLegendRuntimeData(checkedLayerKeys.value); rebuildLegendRuntimeData(checkedLayerKeys.value);
applyLegendItemVisibility(legendItem, checked); applyLegendItemVisibility(legendItem, checked);
}; };
@ -996,7 +1079,6 @@ export const useMapStore = defineStore('map', () => {
}); });
mapViewStore.setLegendCheckedState(nextState); mapViewStore.setLegendCheckedState(nextState);
console.log(6);
rebuildLegendRuntimeData(checkedLayerKeys.value); rebuildLegendRuntimeData(checkedLayerKeys.value);
changedLegendItems.forEach(legendItem => changedLegendItems.forEach(legendItem =>
applyLegendItemVisibility(legendItem, checked) applyLegendItemVisibility(legendItem, checked)
@ -1020,12 +1102,14 @@ export const useMapStore = defineStore('map', () => {
sessionId?: number; sessionId?: number;
pageToken?: number; pageToken?: number;
skipSessionCheck?: boolean; skipSessionCheck?: boolean;
pageKey?: string;
} = {} } = {}
) => { ) => {
const { const {
sessionId = loadSessionSeed, sessionId = loadSessionSeed,
pageToken, pageToken,
skipSessionCheck = false skipSessionCheck = false,
pageKey
} = options; } = options;
const { key, url, params = {}, paramJson, anchorParamJson } = layer; const { key, url, params = {}, paramJson, anchorParamJson } = layer;
@ -1039,10 +1123,8 @@ export const useMapStore = defineStore('map', () => {
const layerKey = layer?.key || ''; const layerKey = layer?.key || '';
const voidSttp = 'all';
const ylfbKeys = ['ylfb_point']; const ylfbKeys = ['ylfb_point'];
const timeRangeLayerKeys = ['ef_point']; const timeRangeLayerKeys = ['ef_point'];
const spjkz = ['stinfo_video_point'];
const yearTime = dayjs().subtract(1, 'years'); const yearTime = dayjs().subtract(1, 'years');
@ -1067,15 +1149,6 @@ export const useMapStore = defineStore('map', () => {
value: dayjs(searchTimeRange.value[1]).format('YYYY-MM-DD 23:59:59') value: dayjs(searchTimeRange.value[1]).format('YYYY-MM-DD 23:59:59')
}); });
} }
if (spjkz.includes(layerKey)) {
if (voidSttp !== 'all') {
requestParams.filters.push({
field: 'sttp',
operator: 'in',
value: voidSttp == 'VD_EQ,VD_EQS' ? ['VD_EQ', 'VD_EQS'] : [voidSttp]
});
}
}
if (ylfbKeys.includes(layerKey)) { if (ylfbKeys.includes(layerKey)) {
if (yearTime) { if (yearTime) {
requestParams.filters.push({ requestParams.filters.push({
@ -1128,42 +1201,40 @@ export const useMapStore = defineStore('map', () => {
requestData requestData
}); });
if (hasValidPointLayerCache(key, requestIdentifier)) { if (hasEffectivePointLayerCache(key, requestIdentifier)) {
layer.data = getPointLayerData(key); syncBackgroundCacheToReactiveStore(key);
layer.checked = 0; const cachedList = getEffectivePointLayerData(key);
syncPointDataForFilter(); layer.data = cachedList;
if (!mapClass.hasLayer(key)) { if (shouldSyncMergedPointData(key, pageToken)) {
mapClass.addInitDataLayer( syncPointDataForFilter(getRuntimeCheckedLayerKeys());
filterPointLayerDataForDisplay(key, getPointLayerData(key)),
key
);
mapClass.mdLayerTreeShowOrHidden(key, false);
} }
return layer.data; applyLoadedPointLayerToMap(layer, key, cachedList, pageToken);
} return cachedList;
const previousRequestKey = activeLayerRequestKeyMap.get(key);
if (previousRequestKey && previousRequestKey !== requestIdentifier) {
const previousRequest = inFlightRequestMap.get(previousRequestKey);
previousRequest?.controller.abort();
mapDataStore.clearLayerLoadState(key);
inFlightRequestMap.delete(previousRequestKey);
} }
activeLayerRequestKeyMap.set(key, requestIdentifier);
const existingRequest = inFlightRequestMap.get(requestIdentifier); const existingRequest = inFlightRequestMap.get(requestIdentifier);
if (existingRequest) { if (existingRequest) {
return existingRequest.promise; mapDataStore.setLayerLoading(key);
return existingRequest.promise.then(list => {
if (Array.isArray(list) && list.length > 0) {
if (shouldSyncMergedPointData(key, pageToken)) {
syncPointDataForFilter(getRuntimeCheckedLayerKeys());
}
applyLoadedPointLayerToMap(layer, key, list, pageToken);
}
return list;
});
} }
mapDataStore.setLayerLoading(key); mapDataStore.setLayerLoading(key);
const controller = new AbortController(); const controller = new AbortController();
activeLayerRequestKeyMap.set(key, requestIdentifier);
const requestPromise = (async () => { const requestPromise = (async () => {
try { try {
const response = await request({ const response = await request({
url: '/api' + requestUrl, url: requestUrl,
method: 'post', method: 'post',
data: requestData, data: requestData,
signal: controller.signal signal: controller.signal
@ -1172,8 +1243,7 @@ export const useMapStore = defineStore('map', () => {
if ( if (
controller.signal.aborted || controller.signal.aborted ||
(!skipSessionCheck && !isCurrentLoadSession(sessionId)) || (!skipSessionCheck && !isCurrentLoadSession(sessionId))
activeLayerRequestKeyMap.get(key) !== requestIdentifier
) { ) {
return []; return [];
} }
@ -1202,24 +1272,30 @@ export const useMapStore = defineStore('map', () => {
})) }))
); );
if (activeLayerRequestKeyMap.get(key) !== requestIdentifier) {
return [];
}
const isLayerChecked = layer.checked === 1; const isLayerChecked = layer.checked === 1;
mapDataStore.setPointLayerCache(key, { const cachePayload = {
checked: isLayerChecked, checked: isLayerChecked,
data: list, data: list,
cacheKey: requestIdentifier cacheKey: requestIdentifier
}); };
syncPointDataForFilter(); const shouldDeferToBackgroundCache =
!!pageKey && hasPendingPageNavigationAwayFrom(pageKey);
if (shouldDeferToBackgroundCache) {
setBackgroundPointLayerCache(key, cachePayload);
layer.data = list; layer.data = list;
return list;
}
if (list.length > 0 && shouldApplyToActivePage(key, pageToken)) { mapDataStore.setPointLayerCache(key, cachePayload);
const displayData = filterPointLayerDataForDisplay(key, list); if (shouldSyncMergedPointData(key, pageToken)) {
mapClass.addInitDataLayer(displayData, key); syncPointDataForFilter(getRuntimeCheckedLayerKeys());
if (isLayerChecked) {
restoreLayerLegendVisibility(key);
}
mapClass.mdLayerTreeShowOrHidden(key, isLayerChecked);
} }
applyLoadedPointLayerToMap(layer, key, list, pageToken);
mapDataStore.setLayerLoaded(key); mapDataStore.setLayerLoaded(key);
return list; return list;
@ -1302,9 +1378,6 @@ export const useMapStore = defineStore('map', () => {
} }
const allPointData = mapDataStore.rebuildPointDataFromCache(); const allPointData = mapDataStore.rebuildPointDataFromCache();
console.log(888);
console.log(currentCheckedKeys);
// 更新地图锚点显示 // 更新地图锚点显示
await updateLayerData(currentCheckedKeys, false); await updateLayerData(currentCheckedKeys, false);
} }
@ -1349,6 +1422,7 @@ export const useMapStore = defineStore('map', () => {
normalizeCheckedLayerKeys, normalizeCheckedLayerKeys,
refreshPointLayerDisplayData, refreshPointLayerDisplayData,
activatePageContext, activatePageContext,
markPendingPageNavigation,
searchTimeRange, searchTimeRange,
reloadBySearchTimeRange, reloadBySearchTimeRange,
updateSearchTimeRange updateSearchTimeRange

114
frontend/src/utils/GisUrlList.ts
View File

@ -6,7 +6,7 @@ import dayjs from 'dayjs';
export const urlList = [ export const urlList = [
{ {
url: '/wmp-eng-server/eng/point/GetKendoListCust', url: '/wmp-eng-server/eng/point/GetKendoListCust',
title: '常规水电', title: '常规水电✅️',
params: { params: {
anchoPointState: [{ field: 'anchoPointState', operator: 'isnotnull' }] anchoPointState: [{ field: 'anchoPointState', operator: 'isnotnull' }]
}, },
@ -15,12 +15,12 @@ export const urlList = [
}, },
{ {
url: '/wmp-env-server/sw/getFacilityPointList/GetKendoListCust', url: '/wmp-env-server/sw/getFacilityPointList/GetKendoListCust',
title: '低温水减缓设施', title: '低温水减缓设施✅️',
params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
{ {
url: '/wmp-eng-server/eng/eq/interval/GetKendoListCust', url: '/wmp-eng-server/eng/eq/interval/GetKendoListCust',
title: '生态流量达标率', title: '生态流量达标率✅️',
params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }, params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] },
orders: orders:
'{"baseId":"asc","rvcdStepSort":"asc","siteStepSort":"asc","ennm":"asc"}' '{"baseId":"asc","rvcdStepSort":"asc","siteStepSort":"asc","ennm":"asc"}'
@ -37,7 +37,7 @@ export const urlList = [
// }, // },
// { // {
// url: '/wmp-env-server/env/wq/anchorPoint/GetKendoListCust', // url: '/wmp-env-server/env/wq/anchorPoint/GetKendoListCust',
// title: '自建站', // title: '自建站✅️',
// params: { // params: {
// dtinType: '0', // dtinType: '0',
// ...(window.__lyConfigs?.baseId === "07" ? { sttpCode: "WQ" } : {}), // ...(window.__lyConfigs?.baseId === "07" ? { sttpCode: "WQ" } : {}),
@ -47,17 +47,17 @@ export const urlList = [
// }, // },
{ {
url: '/wmp-env-server/env/wq/anchorPoint/GetKendoListCust', url: '/wmp-env-server/env/wq/anchorPoint/GetKendoListCust',
title: '国家站', title: '国家站✅️',
params: { dtinType: '1', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { dtinType: '1', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
{ {
url: '/wmp-env-server/env/wq/anchorPoint/GetKendoListCust', url: '/wmp-env-server/env/wq/anchorPoint/GetKendoListCust',
title: '人工站', title: '人工站✅️',
params: { dtinType: '2', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { dtinType: '2', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
{ {
url: '/wmp-env-server/env/wq/anchorPoint/GetKendoListCust', url: '/wmp-env-server/env/wq/anchorPoint/GetKendoListCust',
title: '栖息地水质站', title: '栖息地水质站❓不知道',
params: { params: {
fhstcd: [{ field: 'fhstcd', operator: 'isnotnull' }], fhstcd: [{ field: 'fhstcd', operator: 'isnotnull' }],
fhFlag: '1', fhFlag: '1',
@ -67,48 +67,48 @@ export const urlList = [
// { url: getUrl('/wmp-env-server/env/fp/point/GetKendoListCust'), title: '过鱼设施', params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } }, // { url: getUrl('/wmp-env-server/env/fp/point/GetKendoListCust'), title: '过鱼设施', params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } },
{ {
url: '/wmp-eng-server/eng/eq/eqds/GetKendoListCust', url: '/wmp-eng-server/eng/eq/eqds/GetKendoListCust',
title: '生态流量泄放设施', title: '生态流量泄放设施✅️',
params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
{ {
url: '/wmp-env-server/fb/point/GetKendoListCust', url: '/wmp-env-server/fb/point/GetKendoListCust',
title: '鱼类增殖站', title: '鱼类增殖站✅️',
params: { sttp: 'FB', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { sttp: 'FB', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
{ {
url: '/wmp-env-server/env/fhvap/GetKendoListCust', url: '/wmp-env-server/env/fhvap/GetKendoListCust',
title: '珍稀植物园', title: '珍稀植物园✅️',
params: { sttpCode: 'VP', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { sttpCode: 'VP', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
{ {
url: '/wmp-env-server/env/fhvap/GetKendoListCust', url: '/wmp-env-server/env/fhvap/GetKendoListCust',
title: '动物救助站', title: '动物救助站✅️',
params: { sttpCode: 'VA', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { sttpCode: 'VA', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
{ {
url: '/wmp-env-server/fb/point/GetKendoListCust', url: '/wmp-env-server/fb/point/GetKendoListCust',
title: '人工产卵场', title: '人工产卵场✅️',
params: { sttp: 'SG', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { sttp: 'SG', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
{ {
url: '/wmp-env-server/sw/getEngTempPointList/GetKendoListCust', url: '/wmp-env-server/sw/getEngTempPointList/GetKendoListCust',
title: '水温监测断面', title: '水温监测断面✅️',
keyType: 'wt_point', keyType: 'wt_point',
params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
{ {
url: '/wmp-env-server/sw/getEngTempPointList/GetKendoListCust', url: '/wmp-env-server/sw/getEngTempPointList/GetKendoListCust',
title: '自建水温站', title: '自建水温站❓',
params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }], flag: '0' } params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }], flag: '0' }
}, },
{ {
url: '/wmp-env-server/sw/getEngTempPointList/GetKendoListCust', url: '/wmp-env-server/sw/getEngTempPointList/GetKendoListCust',
title: '人工水温站', title: '人工水温站❓',
params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }], flag: '2' } params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }], flag: '2' }
}, },
{ {
url: '/wmp-env-server/sw/getEngTempPointList/GetKendoListCust', url: '/wmp-env-server/sw/getEngTempPointList/GetKendoListCust',
title: '栖息地水温站', title: '栖息地水温站❓',
params: { params: {
lgtd: [{ field: 'lgtd', operator: 'isnotnull' }], lgtd: [{ field: 'lgtd', operator: 'isnotnull' }],
fhstcd: [{ field: 'fhstcd', operator: 'isnotnull' }], fhstcd: [{ field: 'fhstcd', operator: 'isnotnull' }],
@ -117,18 +117,18 @@ export const urlList = [
}, },
{ {
url: '/wmp-env-server/env/fhvap/GetKendoListCust', url: '/wmp-env-server/env/fhvap/GetKendoListCust',
title: '栖息地', title: '栖息地✅️',
params: { sttpCode: 'FH', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { sttpCode: 'FH', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
{ {
url: '/wmp-env-server/env/fhvap/fhPoint/GetKendoListCust', url: '/wmp-env-server/env/fhvap/fhPoint/GetKendoListCust',
title: '水质监测站', title: '水质监测站✅️',
params: { sttpCode: 'WQ', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { sttpCode: 'WQ', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
{ {
url: '/wmp-env-server/env/fhvap/fhPoint/GetKendoListCust', url: '/wmp-env-server/env/fhvap/fhPoint/GetKendoListCust',
title: '水温监测站', title: '水温监测站✅️',
params: { params: {
sttpCode: 'WTRV', sttpCode: 'WTRV',
lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] lgtd: [{ field: 'lgtd', operator: 'isnotnull' }]
@ -136,19 +136,19 @@ export const urlList = [
}, },
{ {
url: '/wmp-env-server/env/fhvap/fhPoint/GetKendoListCust', url: '/wmp-env-server/env/fhvap/fhPoint/GetKendoListCust',
title: '流量监测站', title: '流量监测站✅️',
params: { sttpCode: 'ZQ', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { sttpCode: 'ZQ', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
{ {
url: '/wmp-env-server/env/fhvap/fhPoint/GetKendoListCust', url: '/wmp-env-server/env/fhvap/fhPoint/GetKendoListCust',
title: '视频监控', title: '视频监控✅️',
params: { sttpCode: 'VD', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { sttpCode: 'VD', lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
// { {
// url: '/wmp-env-server/env/vd/aiPoint/GetKendoListCust', url: '/wmp-env-server/env/vd/aiPoint/GetKendoListCust',
// title: 'AI视频监控站', title: 'AI视频监控站 缺失！',
// params: { sttpCode: 'AIVD' } params: { sttpCode: 'AIVD' }
// }, },
// { url: '/wmp-env-server/env/fh/vdpoint/GetKendoListCust', title: '水电站监控视频', keyType: "video_fbfm_point", params: { sttp: 'VD_FBFM', hbrvcd: window.__lyConfigs.wbsCode, lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } }, // { url: '/wmp-env-server/env/fh/vdpoint/GetKendoListCust', title: '水电站监控视频', keyType: "video_fbfm_point", params: { sttp: 'VD_FBFM', hbrvcd: window.__lyConfigs.wbsCode, lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } },
// { url: '/wmp-env-server/env/fh/vdpoint/GetKendoListCust', title: '生态流量监测断面视频', keyType: "video_eqs_point", params: { sttp: 'VD_EQS', hbrvcd: window.__lyConfigs.wbsCode, lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } }, // { url: '/wmp-env-server/env/fh/vdpoint/GetKendoListCust', title: '生态流量监测断面视频', keyType: "video_eqs_point", params: { sttp: 'VD_EQS', hbrvcd: window.__lyConfigs.wbsCode, lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } },
// { url: '/wmp-env-server/env/fh/vdpoint/GetKendoListCust', title: '水质站运行视频', keyType: "video_wq_point", params: { sttp: 'VD_WQ', hbrvcd: window.__lyConfigs.wbsCode, lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } }, // { url: '/wmp-env-server/env/fh/vdpoint/GetKendoListCust', title: '水质站运行视频', keyType: "video_wq_point", params: { sttp: 'VD_WQ', hbrvcd: window.__lyConfigs.wbsCode, lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } },
@ -161,14 +161,18 @@ export const urlList = [
// { // {
// url: getUrl('/wmp-env-server/env/we/point/GetKendoListCust'), // url: getUrl('/wmp-env-server/env/we/point/GetKendoListCust'),
// title: '水生生态调查断面', // title: '水生生态调查断面 ❌️数量不对 真实是338',
// params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }, // params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] },
// orders: '{"siteStepSort":"asc"}' // orders: '{"siteStepSort":"asc"}'
// }, // },
// { url: getUrl('/wmp-env-server/env/we/fishPoint/GetKendoListCust'), title: '鱼类分布', params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } }, // {
// url: getUrl('/wmp-env-server/env/we/fishPoint/GetKendoListCust'),
// title: '鱼类分布 ✅️',
// params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
// },
{ {
url: '/wmp-eng-server/eng/alarmPoint/GetKendoListCust', url: '/wmp-eng-server/eng/alarmPoint/GetKendoListCust',
title: '水电站告警情况', title: '水电站告警情况❌️ 数据不对 真实数据是663',
params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
// { // {
@ -178,12 +182,12 @@ export const urlList = [
// }, // },
{ {
url: '/wmp-env-server/env/fh/zqpoint/GetKendoListCust', url: '/wmp-env-server/env/fh/zqpoint/GetKendoListCust',
title: '国家水文站', title: '国家水文站✅️',
params: { dtinType: 1, lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { dtinType: 1, lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
{ {
url: '/wmp-env-server/env/fh/zqpoint/GetKendoListCust', url: '/wmp-env-server/env/fh/zqpoint/GetKendoListCust',
title: '自建水文站', title: '自建水文站✅️',
params: { dtinType: 0, lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { dtinType: 0, lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
{ {
@ -197,7 +201,7 @@ export const urlList = [
}, },
{ {
url: '/wmp-env-server/env/fh/vdpoint/GetKendoListCust', url: '/wmp-env-server/env/fh/vdpoint/GetKendoListCust',
title: '视频监控站', title: '视频监控站✅️',
params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
}, },
// { // {
@ -267,33 +271,33 @@ export const urlList = [
// }, // },
{ {
url: '/wmp-env-server/env/fp/point/built/GetKendoListCust', url: '/wmp-env-server/env/fp/point/built/GetKendoListCust',
title: '在建过鱼设施-地图锚点', title: '在建过鱼设施-地图锚点 ✅️',
params: { params: {
lgtd: [{ field: 'lgtd', operator: 'isnotnull' }], lgtd: [{ field: 'lgtd', operator: 'isnotnull' }],
bldsttCcode: [{ field: 'bldsttCcode', operator: 'eq', value: '1' }] bldsttCcode: [{ field: 'bldsttCcode', operator: 'eq', value: '1' }]
} }
}, },
// { {
// url: '/wmp-env-server/env/fb/point/built/GetKendoListCust', url: '/wmp-env-server/env/fb/point/built/GetKendoListCust',
// title: '在建鱼类增殖站', title: '在建鱼类增殖站 缺失！',
// params: { params: {
// lgtd: [{ field: 'lgtd', operator: 'isnotnull' }], lgtd: [{ field: 'lgtd', operator: 'isnotnull' }],
// sttpCode: [{ field: 'sttpCode', operator: 'eq', value: 'FB' }], sttpCode: [{ field: 'sttpCode', operator: 'eq', value: 'FB' }],
// bldsttCcode: [{ field: 'bldsttCcode', operator: 'eq', value: '1' }] bldsttCcode: [{ field: 'bldsttCcode', operator: 'eq', value: '1' }]
// } }
// }, },
// { {
// url: '/wmp-env-server/env/fb/point/built/GetKendoListCust', url: '/wmp-env-server/env/fb/point/built/GetKendoListCust',
// title: '在建人工产卵场', title: '在建人工产卵场 缺失！',
// params: { params: {
// lgtd: [{ field: 'lgtd', operator: 'isnotnull' }], lgtd: [{ field: 'lgtd', operator: 'isnotnull' }],
// sttpCode: [{ field: 'sttpCode', operator: 'eq', value: 'SG' }], sttpCode: [{ field: 'sttpCode', operator: 'eq', value: 'SG' }],
// bldsttCcode: [{ field: 'bldsttCcode', operator: 'eq', value: '1' }] bldsttCcode: [{ field: 'bldsttCcode', operator: 'eq', value: '1' }]
// } }
// }, },
{ {
url: '/wmp-env-server/env/fhvap/built/GetKendoListCust', url: '/wmp-env-server/env/fhvap/built/GetKendoListCust',
title: '在建珍稀植物园', title: '在建珍稀植物园✅️',
params: { params: {
lgtd: [{ field: 'lgtd', operator: 'isnotnull' }], lgtd: [{ field: 'lgtd', operator: 'isnotnull' }],
sttpCode: [{ field: 'sttpCode', operator: 'eq', value: 'VP' }], sttpCode: [{ field: 'sttpCode', operator: 'eq', value: 'VP' }],
@ -302,7 +306,7 @@ export const urlList = [
}, },
{ {
url: '/wmp-env-server/env/fhvap/built/GetKendoListCust', url: '/wmp-env-server/env/fhvap/built/GetKendoListCust',
title: '在建动物救助站', title: '在建动物救助站✅️',
params: { params: {
lgtd: [{ field: 'lgtd', operator: 'isnotnull' }], lgtd: [{ field: 'lgtd', operator: 'isnotnull' }],
sttpCode: [{ field: 'sttpCode', operator: 'eq', value: 'VA' }], sttpCode: [{ field: 'sttpCode', operator: 'eq', value: 'VA' }],
@ -326,7 +330,7 @@ export const urlList = [
// }, // },
{ {
url: '/wmp-env-server/env/wva/point/GetKendoListCust', url: '/wmp-env-server/env/wva/point/GetKendoListCust',
title: '野生动物监测', title: '野生动物监测✅️',
params: { params: {
lgtd: [{ field: 'lgtd', operator: 'isnotnull' }], lgtd: [{ field: 'lgtd', operator: 'isnotnull' }],
sttpCode: [{ field: 'sttpCode', operator: 'eq', value: 'WVA' }] sttpCode: [{ field: 'sttpCode', operator: 'eq', value: 'WVA' }]
@ -344,7 +348,7 @@ export const urlList = [
// { url: '/wmp-env-server/te/tet/point/GetTerrestrialAnimal', title: '陆生动物分布', params: { baseId: window?.__lyConfigs?.baseId, lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } }, // { url: '/wmp-env-server/te/tet/point/GetTerrestrialAnimal', title: '陆生动物分布', params: { baseId: window?.__lyConfigs?.baseId, lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } },
{ {
url: '/wmp-env-server/sdFprdR/point/getFprdPointList', url: '/wmp-env-server/sdFprdR/point/getFprdPointList',
title: '鱼类调查装置', title: '鱼类调查装置 对',
params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] } params: { lgtd: [{ field: 'lgtd', operator: 'isnotnull' }] }
} }
]; ];

3
frontend/src/utils/request.ts
View File

@ -54,10 +54,13 @@ service.interceptors.response.use(
(response: any) => { (response: any) => {
const { status, msg } = response; const { status, msg } = response;
if (status === 200) { if (status === 200) {
console.log(response.data);
if (response.data.code == 401) { if (response.data.code == 401) {
message.error(response.data.msg || '请求失败'); message.error(response.data.msg || '请求失败');
setTimeout(() => { setTimeout(() => {
localStorage.clear();
router.push('/login'); router.push('/login');
window.location.href = '/';
}, 1000); }, 1000);
return; return;
} else if (response.data.code == 1) { } else if (response.data.code == 1) {

4
frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue
View File

@ -1,12 +1,10 @@
<script setup lang="ts"> <script setup lang="ts">
import { onMounted, ref } from 'vue'; import { onActivated, onMounted, ref } from 'vue';
import JidiSelectorMod from '@/modules/jidiSelectorMod.vue'; import JidiSelectorMod from '@/modules/jidiSelectorMod.vue';
import RightDrawer from '@/components/RightDrawer/index.vue'; import RightDrawer from '@/components/RightDrawer/index.vue';
import jidiInfoMod from '@/modules/jidiInfoMod/index.vue'; import jidiInfoMod from '@/modules/jidiInfoMod/index.vue';
import shuidianhuangjingjieruMod from '@/modules/shuidianhuangjingjieruMod/index.vue'; import shuidianhuangjingjieruMod from '@/modules/shuidianhuangjingjieruMod/index.vue';
import { useModelStore } from '@/store/modules/model'; import { useModelStore } from '@/store/modules/model';
onMounted(() => {
});
</script> </script>
<template> <template>

17
frontend/src/views/shuiZhiJianCe/shuiHuanJingZhiLiangZhuangKuang.vue
View File

@ -1,16 +1,16 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, watch } from "vue"; import { ref, watch } from 'vue';
import JidiSelectorMod from "@/modules/jidiSelectorMod.vue"; import JidiSelectorMod from '@/modules/jidiSelectorMod.vue';
import RightDrawer from "@/components/RightDrawer/index.vue"; import RightDrawer from '@/components/RightDrawer/index.vue';
import ShuiZhiJianCeGongZuoQingKuang from "@/modules/shuizhijiancegongzuoQK/index.vue" import ShuiZhiJianCeGongZuoQingKuang from '@/modules/shuizhijiancegongzuoQK/index.vue';
import EnvironmentalQuality from "@/modules/EnvironmentalQuality/index.vue" // 环境质量满足度 import EnvironmentalQuality from '@/modules/EnvironmentalQuality/index.vue'; // 环境质量满足度
import { useJidiSelectEventStore } from "@/store/modules/jidiSelectEvent"; import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
import SZYCBH from "@/modules/waterQuality/index.vue" import SZYCBH from '@/modules/waterQuality/index.vue';
const JidiSelectEventStore = useJidiSelectEventStore(); const JidiSelectEventStore = useJidiSelectEventStore();
const wbsCode = ref(''); const wbsCode = ref('');
watch( watch(
() => JidiSelectEventStore.selectedItem, () => JidiSelectEventStore.selectedItem,
(newVal) => { newVal => {
console.log(newVal); console.log(newVal);
// //
wbsCode.value = newVal.wbsCode; wbsCode.value = newVal.wbsCode;
@ -29,7 +29,6 @@ watch(
<ShuiZhiJianCeGongZuoQingKuang /> <ShuiZhiJianCeGongZuoQingKuang />
<EnvironmentalQuality /> <EnvironmentalQuality />
<SZYCBH v-if="wbsCode != 'all'"></SZYCBH> <SZYCBH v-if="wbsCode != 'all'"></SZYCBH>
</RightDrawer> </RightDrawer>
</div> </div>
</div> </div>

10
frontend/src/views/system/map/components/ConfigManagement/ConfigManagementForm.vue
View File

@ -103,7 +103,7 @@
:default-expand-all="false" :default-expand-all="false"
:selectable="false" :selectable="false"
block-node block-node
style="width: 300px" style="width: 400px"
> >
<template #title="{ dataRef }"> <template #title="{ dataRef }">
<!-- 编辑状态：只显示编辑区域 --> <!-- 编辑状态：只显示编辑区域 -->
@ -154,7 +154,11 @@
type="link" type="link"
size="small" size="small"
@click.stop="handleAddChild(dataRef)" @click.stop="handleAddChild(dataRef)"
title="添加子节点" :title="
dataRef.sttpName
? `子级添加-${dataRef.sttpName}`
: '子级添加'
"
> >
<PlusOutlined /> <PlusOutlined />
</a-button> </a-button>
@ -252,7 +256,7 @@
:key="item.stcd" :key="item.stcd"
:value="item.stcd" :value="item.stcd"
> >
{{ item.stnm }} {{ item.stnm }}-{{ item.sttpName }}
</a-select-option> </a-select-option>
</a-select> </a-select>
<a-button <a-button