diff --git a/packages/mobile/src/views/DisasterManagement/DisasterManagement.vue b/packages/mobile/src/views/DisasterManagement/DisasterManagement.vue index 5ec26b1..68720bb 100644 --- a/packages/mobile/src/views/DisasterManagement/DisasterManagement.vue +++ b/packages/mobile/src/views/DisasterManagement/DisasterManagement.vue @@ -212,7 +212,7 @@ const handleClickItem = (item) => { } if (item.disasterType === 'ICE_SNOW') { router.push({ - name: 'IceEventDetail', + path: '/iceDisasterDetail', query: { id: item.relationId } diff --git a/packages/mobile/src/views/DisasterManagement/DisasterReport.vue b/packages/mobile/src/views/DisasterManagement/DisasterReport.vue index 981a6d2..ad6f3d6 100644 --- a/packages/mobile/src/views/DisasterManagement/DisasterReport.vue +++ b/packages/mobile/src/views/DisasterManagement/DisasterReport.vue @@ -26,7 +26,7 @@ import PageContainer from '@/components/PageContainer.vue' import CurrentSite from '@/components/CurrentSite.vue' import PanelItem from '@/components/PanelItem.vue' import WaterDisaster from './WaterDisaster/WaterDisaster.vue' -import IceDisaster from './IceDisaster.vue' +import IceDisaster from './IceDisaster/IceDisaster.vue' import { request } from '@shared/utils/request' const router = useRouter() @@ -38,7 +38,7 @@ const isContinue = computed(() => route.query.isContinue) const title = ref(!isContinue ? '灾毁填报' : '灾毁续报') // 事件类型 -const eventType = ref('water') +const eventType = ref(route.query.eventType ? route.query.eventType : 'water') const eventTypeOptions = [ { label: '水毁灾害', diff --git a/packages/mobile/src/views/DisasterManagement/IceDisaster.vue b/packages/mobile/src/views/DisasterManagement/IceDisaster.vue deleted file mode 100644 index c682a73..0000000 --- a/packages/mobile/src/views/DisasterManagement/IceDisaster.vue +++ /dev/null @@ -1,601 +0,0 @@ - - - - - diff --git a/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisasterDetail copy.vue b/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisasterDetail copy.vue new file mode 100644 index 0000000..ad9c349 --- /dev/null +++ b/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisasterDetail copy.vue @@ -0,0 +1,535 @@ + + + + + diff --git a/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisasterDetail.vue b/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisasterDetail.vue new file mode 100644 index 0000000..ad9c349 --- /dev/null +++ b/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisasterDetail.vue @@ -0,0 +1,535 @@ + + + + + diff --git a/packages/mobile/src/views/DisasterManagement/WaterDisaster/WaterDisaster.vue b/packages/mobile/src/views/DisasterManagement/WaterDisaster/WaterDisaster.vue index 000242d..9f3cb21 100644 --- a/packages/mobile/src/views/DisasterManagement/WaterDisaster/WaterDisaster.vue +++ b/packages/mobile/src/views/DisasterManagement/WaterDisaster/WaterDisaster.vue @@ -161,7 +161,7 @@ import PanelItem from '@/components/PanelItem.vue' import BasePicker from '@/components/BasePicker.vue' import BaseDatePicker from '@/components/BaseDatePicker.vue' import RoadRoutesPicker from '../RoadRoutesPicker.vue' -import LossList from './LossList.vue' +import LossList from './components/LossList.vue' import { useRouter, useRoute } from 'vue-router' import { request } from '@shared/utils/request' import { useOptions } from '@shared/composables/useOptions' diff --git a/packages/mobile/src/views/DisasterManagement/WaterDisasterDetail.vue b/packages/mobile/src/views/DisasterManagement/WaterDisaster/WaterDisasterDetail.vue similarity index 99% rename from packages/mobile/src/views/DisasterManagement/WaterDisasterDetail.vue rename to packages/mobile/src/views/DisasterManagement/WaterDisaster/WaterDisasterDetail.vue index 3ac6b69..2e306ec 100644 --- a/packages/mobile/src/views/DisasterManagement/WaterDisasterDetail.vue +++ b/packages/mobile/src/views/DisasterManagement/WaterDisaster/WaterDisasterDetail.vue @@ -1,5 +1,5 @@