From c0a2472521ffd5d9114740d2baf06284f8da701e Mon Sep 17 00:00:00 2001 From: niedongsheng <605973111@qq.com> Date: Wed, 15 Apr 2026 14:22:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=86=B0=E9=9B=AA=E7=81=BE=E5=AE=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/screen/src/router/index.js | 8 + .../DisasterManagementPC.vue | 18 +- .../IceDisasterContinueReportPC.vue | 449 +++++++++++++ .../IceDisasterDetail/IceDisasterDetailPC.vue | 606 ++++++++++++++++++ .../IceDisasterReport/IceDisasterReportPC.vue | 1 - .../WaterDisasterContinueReportPC.vue | 2 +- .../WaterDisasterDetailPC.vue | 4 +- 7 files changed, 1080 insertions(+), 8 deletions(-) create mode 100644 packages/screen/src/views/DisasterManagement/IceDisasterDetail/IceDisasterContinueReportPC.vue create mode 100644 packages/screen/src/views/DisasterManagement/IceDisasterDetail/IceDisasterDetailPC.vue diff --git a/packages/screen/src/router/index.js b/packages/screen/src/router/index.js index bb0541e..5a73afc 100644 --- a/packages/screen/src/router/index.js +++ b/packages/screen/src/router/index.js @@ -251,6 +251,14 @@ const routes = [ breadcrumb: true } }, + { + path: '/iceDisasterDetail', + component: () => import('../views/DisasterManagement/IceDisasterDetail/IceDisasterDetailPC.vue'), + meta: { + title: '冰雪灾害详情', + breadcrumb: true + } + }, { path: '/waterDisasterReport', component: () => import('../views/DisasterManagement/WaterDisasterReport/WaterDisasterReportPC.vue'), diff --git a/packages/screen/src/views/DisasterManagement/DisasterManagementPC.vue b/packages/screen/src/views/DisasterManagement/DisasterManagementPC.vue index 107af41..1168264 100644 --- a/packages/screen/src/views/DisasterManagement/DisasterManagementPC.vue +++ b/packages/screen/src/views/DisasterManagement/DisasterManagementPC.vue @@ -221,8 +221,8 @@ const buildQueryParams = () => { } if (dateRange.value && dateRange.value.length === 2) { - params.startTime = dateRange.value[0] + " 00:00:00" - params.endTime = dateRange.value[1] + " 23:59:59" + params.startTime = dateRange.value[0] + ' 00:00:00' + params.endTime = dateRange.value[1] + ' 23:59:59' } // 过滤空字符串或null的参数 @@ -319,12 +319,22 @@ const resetFilters = () => { // 查看详情 const handleDetail = (row) => { - router.push({ path: '/waterDisasterDetail', query: { id: row.id } }) + if (row.disasterType == 'WATER_DAMAGE') { + router.push({ path: '/waterDisasterDetail', query: { id: row.id } }) + } + if (row.disasterType == 'ICE_SNOW') { + router.push({ path: '/iceDisasterDetail', query: { id: row.id } }) + } } // 编辑 const handleEdit = (row) => { - router.push({ path: '/waterDisasterDetail', query: { id: row.id, mode: 'edit' } }) + if (row.disasterType == 'WATER_DAMAGE') { + router.push({ path: '/waterDisasterDetail', query: { id: row.id, mode: 'edit' } }) + } + if (row.disasterType == 'ICE_SNOW') { + router.push({ path: '/iceDisasterDetail', query: { id: row.id, mode: 'edit' } }) + } } // 新增跳转 diff --git a/packages/screen/src/views/DisasterManagement/IceDisasterDetail/IceDisasterContinueReportPC.vue b/packages/screen/src/views/DisasterManagement/IceDisasterDetail/IceDisasterContinueReportPC.vue new file mode 100644 index 0000000..a031a06 --- /dev/null +++ b/packages/screen/src/views/DisasterManagement/IceDisasterDetail/IceDisasterContinueReportPC.vue @@ -0,0 +1,449 @@ + + + + + diff --git a/packages/screen/src/views/DisasterManagement/IceDisasterDetail/IceDisasterDetailPC.vue b/packages/screen/src/views/DisasterManagement/IceDisasterDetail/IceDisasterDetailPC.vue new file mode 100644 index 0000000..751cdfc --- /dev/null +++ b/packages/screen/src/views/DisasterManagement/IceDisasterDetail/IceDisasterDetailPC.vue @@ -0,0 +1,606 @@ + + + + + diff --git a/packages/screen/src/views/DisasterManagement/IceDisasterReport/IceDisasterReportPC.vue b/packages/screen/src/views/DisasterManagement/IceDisasterReport/IceDisasterReportPC.vue index dcb71bd..243d343 100644 --- a/packages/screen/src/views/DisasterManagement/IceDisasterReport/IceDisasterReportPC.vue +++ b/packages/screen/src/views/DisasterManagement/IceDisasterReport/IceDisasterReportPC.vue @@ -328,7 +328,6 @@ import { useRouter, useRoute } from 'vue-router' import { ElMessage } from 'element-plus' import { Plus, Upload } from '@element-plus/icons-vue' import { request } from '@/utils/request' -import LossList from './WaterDisasterLossListPC.vue' import BlockItem from '@/component/BlockItem.vue' import FileUpload from '@/component/FileUpload/FileUpload.vue' import { useOptions } from '@shared/composables/useOptions' diff --git a/packages/screen/src/views/DisasterManagement/WaterDisasterDetail/WaterDisasterContinueReportPC.vue b/packages/screen/src/views/DisasterManagement/WaterDisasterDetail/WaterDisasterContinueReportPC.vue index 7da218e..a031a06 100644 --- a/packages/screen/src/views/DisasterManagement/WaterDisasterDetail/WaterDisasterContinueReportPC.vue +++ b/packages/screen/src/views/DisasterManagement/WaterDisasterDetail/WaterDisasterContinueReportPC.vue @@ -138,7 +138,7 @@ import { ref, reactive, watch, computed } from 'vue' import { ElMessage } from 'element-plus' import { request } from '@shared/utils/request' -import LossList from '../DisasterReport/WaterDisasterLossListPC.vue' +import LossList from '../WaterDisasterReport/WaterDisasterLossListPC.vue' // Props 定义 const props = defineProps({ diff --git a/packages/screen/src/views/DisasterManagement/WaterDisasterDetail/WaterDisasterDetailPC.vue b/packages/screen/src/views/DisasterManagement/WaterDisasterDetail/WaterDisasterDetailPC.vue index 2460f40..736ca85 100644 --- a/packages/screen/src/views/DisasterManagement/WaterDisasterDetail/WaterDisasterDetailPC.vue +++ b/packages/screen/src/views/DisasterManagement/WaterDisasterDetail/WaterDisasterDetailPC.vue @@ -4,7 +4,7 @@