diff --git a/src/component/common/LoadingPoints.vue b/src/component/common/LoadingPoints.vue index 13098a7..6e6d83f 100644 --- a/src/component/common/LoadingPoints.vue +++ b/src/component/common/LoadingPoints.vue @@ -22,6 +22,8 @@ // 点处理钩子 const pointsHandle = usePointsHandle(); + const useLoadingResource = useLoadingResourceStore(); + onMounted(() => { // 加载点 const result: { ids: string[]; info: Record[] } = @@ -33,10 +35,7 @@ ); // 记录id - useLoadingResourceStore().addLoadingResource( - props.loadingResourceField!, - result - ); + useLoadingResource.addLoadingResource(props.loadingResourceField!, result); }); diff --git a/src/component/map/AdministrativeDivision.vue b/src/component/map/AdministrativeDivision.vue index 506d5a8..b39d7df 100644 --- a/src/component/map/AdministrativeDivision.vue +++ b/src/component/map/AdministrativeDivision.vue @@ -16,6 +16,9 @@ const { areas, areasId, areasColor, areaTransparency, labelTransparency } = useAdministrativeDivision(); + const useStatus = useStatusStore(); + const useLoadingResource = useLoadingResourceStore(); + onMounted(async () => { // 构建批量添加配置数组 const layerConfigs = areasId.map((id, index) => ({ @@ -45,7 +48,7 @@ await CesiumUtilsSingleton.batchAddGeoJsonLayers(layerConfigs); // 记录行政区划id - useLoadingResourceStore().addLoadingResource( + useLoadingResource.addLoadingResource( LoadingResource.ADMINISTRATIVE_DIVISION, { ids: areasId, info: [] } // 此处info不进行记录 ); @@ -53,7 +56,7 @@ // 监听显示状态改变 watch( - () => useStatusStore().mapLayers.showAdministrativeDivision.show, + () => useStatus.mapLayers.showAdministrativeDivision.show, (newValue: boolean) => { if (newValue) { CesiumUtilsSingleton.batchShowGeoJsonLayers(areasId); diff --git a/src/component/map/MapComponent.vue b/src/component/map/MapComponent.vue index e787039..b7b6c04 100644 --- a/src/component/map/MapComponent.vue +++ b/src/component/map/MapComponent.vue @@ -4,8 +4,8 @@ @@ -24,8 +24,17 @@ import { useMap } from '@/hooks/map/useMap'; import { useScene } from '@/hooks/useScene'; + const { resetScene } = useScene(); + const { + registerAndClickOnTheListener, + registerAScrollListener, + automaticallyAdjustThePerspective, + prohibitedEvents, + } = useMap(); + const useStatus = useStatusStore(); + onBeforeMount(() => { - useScene().resetScene(); + resetScene(); }); onMounted(async () => { @@ -43,19 +52,19 @@ }); // 设置状态 - useStatusStore().appLoadingCompleted = true; + useStatus.appLoadingCompleted = true; // 注册全局点击监听器 - useMap().registerAndClickOnTheListener(); + registerAndClickOnTheListener(); // 注册全局滚轮监听器 - useMap().registerAScrollListener(); + registerAScrollListener(); // 当行政区超出页面时,自动拉回视角 - useMap().automaticallyAdjustThePerspective(); + automaticallyAdjustThePerspective(); // 禁止事件 - useMap().prohibitedEvents(); + prohibitedEvents(); // 默认视角 CesiumUtilsSingleton.viewToTarget( diff --git a/src/component/rain-earthquake/BasicComponent.vue b/src/component/rain-earthquake/BasicComponent.vue index a54a449..a87eea3 100644 --- a/src/component/rain-earthquake/BasicComponent.vue +++ b/src/component/rain-earthquake/BasicComponent.vue @@ -9,40 +9,40 @@ @@ -52,16 +52,16 @@ @@ -69,8 +69,8 @@ @@ -87,6 +87,8 @@ import RainfallGridComponent from '@/component/rain-earthquake/detail-panels/RainfallGridComponent.vue'; import { useStatusStore } from '@/stores/useStatusStore'; + const useStatus = useStatusStore(); + // 获取父组件传递德数据 const props = defineProps<{ disasterType: DisasterType; diff --git a/src/component/rain-earthquake/ControlShowComponent.vue b/src/component/rain-earthquake/ControlShowComponent.vue index e1212b1..bf6a5fc 100644 --- a/src/component/rain-earthquake/ControlShowComponent.vue +++ b/src/component/rain-earthquake/ControlShowComponent.vue @@ -1,7 +1,7 @@ @@ -125,6 +125,8 @@ import BridgeComponent from '@/component/rain-earthquake/detail-panels/BridgeComponent.vue'; import ReservoirComponent from '@/component/rain-earthquake/detail-panels/ReservoirComponent.vue'; import SubwayStationComponent from '@/component/rain-earthquake/detail-panels/SubwayStationComponent.vue'; + + const useStatus = useStatusStore(); diff --git a/src/component/rain-earthquake/DisasterChainPointComponent.vue b/src/component/rain-earthquake/DisasterChainPointComponent.vue index 0f8ce10..37d265c 100644 --- a/src/component/rain-earthquake/DisasterChainPointComponent.vue +++ b/src/component/rain-earthquake/DisasterChainPointComponent.vue @@ -6,15 +6,15 @@ type="primary" @click="changeStatus" circle - :title="`${useStatusStore().uiComponents.disasterChainPointShow.show ? '关闭' : '打开'}灾害链影响点列表`" + :title="`${useStatus.uiComponents.disasterChainPointShow.show ? '关闭' : '打开'}灾害链影响点列表`" >{{ - useStatusStore().uiComponents.disasterChainPointShow.show ? '-' : '+' + useStatus.uiComponents.disasterChainPointShow.show ? '-' : '+' }}
灾害链影响点列表 @@ -84,6 +84,8 @@ import type { PaginationType } from '@/types/common/PaginationType'; import { ref, watch, computed, type Ref } from 'vue'; + const useStatus = useStatusStore(); + // 接收父组件的参数 const props = defineProps<{ selectOptions: { label: string; value: PointType }[]; @@ -124,8 +126,8 @@ // 切换面板显示状态 const changeStatus = () => { - useStatusStore().uiComponents.disasterChainPointShow.show = - !useStatusStore().uiComponents.disasterChainPointShow.show; + useStatus.uiComponents.disasterChainPointShow.show = + !useStatus.uiComponents.disasterChainPointShow.show; }; // 上一页 diff --git a/src/component/rain-earthquake/FunctionComponent.vue b/src/component/rain-earthquake/FunctionComponent.vue index b05a93c..ed1cbd0 100644 --- a/src/component/rain-earthquake/FunctionComponent.vue +++ b/src/component/rain-earthquake/FunctionComponent.vue @@ -2,8 +2,8 @@ @@ -11,6 +11,8 @@ diff --git a/src/component/rain-earthquake/LeftButtonComponent.vue b/src/component/rain-earthquake/LeftButtonComponent.vue index e47f9b8..6fef51f 100644 --- a/src/component/rain-earthquake/LeftButtonComponent.vue +++ b/src/component/rain-earthquake/LeftButtonComponent.vue @@ -1,9 +1,9 @@