diff --git a/src/component/common/LoadingPoints.vue b/src/component/common/LoadingPoints.vue index b4a69b1..896eecf 100644 --- a/src/component/common/LoadingPoints.vue +++ b/src/component/common/LoadingPoints.vue @@ -24,7 +24,7 @@ onMounted(() => { // 加载点 - const ids: string[] = pointsHandle.addPoints( + const result: { ids: string[]; names: string[] } = pointsHandle.addPoints( props.basePoints, props.getDisasterIcon, props.prefix, @@ -34,7 +34,7 @@ // 记录id useLoadingResourceStore().addLoadingResource( props.loadingResourceField!, - ids + result ); }); diff --git a/src/component/map/AdministrativeDivision.vue b/src/component/map/AdministrativeDivision.vue index 64ad336..8b9e3c4 100644 --- a/src/component/map/AdministrativeDivision.vue +++ b/src/component/map/AdministrativeDivision.vue @@ -47,7 +47,7 @@ // 记录行政区划id useLoadingResourceStore().addLoadingResource( LoadingResource.ADMINISTRATIVE_DIVISION, - areasId + { ids: areasId, names: [] } // 此处name不进行记录 ); }); diff --git a/src/component/rain-earthquake/basic/HiddenPointComponent.vue b/src/component/rain-earthquake/basic/HiddenPointComponent.vue index b656d84..5d65edd 100644 --- a/src/component/rain-earthquake/basic/HiddenPointComponent.vue +++ b/src/component/rain-earthquake/basic/HiddenPointComponent.vue @@ -108,14 +108,14 @@ CesiumUtilsSingleton.batchShowPrimitives( useLoadingResourceStore().getLoadingResource( LoadingResource.HIDDEN_DANGER_POINT - ) + ).ids ); } else { // 隐藏隐患点 CesiumUtilsSingleton.batchHidePrimitives( useLoadingResourceStore().getLoadingResource( LoadingResource.HIDDEN_DANGER_POINT - ) + ).ids ); } } diff --git a/src/component/rain-earthquake/basic/RiskPointComponent.vue b/src/component/rain-earthquake/basic/RiskPointComponent.vue index c38041e..3fdea0e 100644 --- a/src/component/rain-earthquake/basic/RiskPointComponent.vue +++ b/src/component/rain-earthquake/basic/RiskPointComponent.vue @@ -98,13 +98,13 @@ CesiumUtilsSingleton.batchShowPrimitives( useLoadingResourceStore().getLoadingResource( LoadingResource.RISK_POINT - ) + ).ids ); } else { CesiumUtilsSingleton.batchHidePrimitives( useLoadingResourceStore().getLoadingResource( LoadingResource.RISK_POINT - ) + ).ids ); } } diff --git a/src/component/rain-earthquake/detail-panels/BridgeComponent.vue b/src/component/rain-earthquake/detail-panels/BridgeComponent.vue index a0bc250..15d8133 100644 --- a/src/component/rain-earthquake/detail-panels/BridgeComponent.vue +++ b/src/component/rain-earthquake/detail-panels/BridgeComponent.vue @@ -3,9 +3,7 @@