diff --git a/packages/screen/src/router/index.js b/packages/screen/src/router/index.js
index a0d10b3..5f04191 100644
--- a/packages/screen/src/router/index.js
+++ b/packages/screen/src/router/index.js
@@ -261,6 +261,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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 事件类型:
+ 冰雪事件
+
+
+
+
+ 路况类别:
+ {{ detailData.roadConditionType || '-' }}
+
+
+
+
+ 是否阻断:
+ {{ detailData.event?.isBlocked ? '是' : '否' }}
+
+
+
+
+
+
+
+ 抢险进度:
+ {{ detailData.event?.repairProgress || '-' }}
+
+
+
+
+ 处理措施:
+ {{ getBaseDisposalMeasures() }}
+
+
+
+
+ 水毁处数:
+ {{ detailData.event?.damageCount || 0 }}
+
+
+
+
+
+
+
+ 阻断里程:
+ {{ detailData.event?.blockedMileage ? detailData.event.blockedMileage + '公里' : '-' }}
+
+
+
+
+
+
+
+ 地点路线:
+ {{ detailData.occurLocation || '-' }}
+
+
+
+
+ 起点桩号:
+ {{ detailData.event?.startStakeNo || '-' }}
+
+
+
+
+ 止点桩号:
+ {{ detailData.event?.endStakeNo || '-' }}
+
+
+
+
+
+
+
+ 路况位置:
+ {{ detailData.event?.blockedPointName || detailData.occurLocation || '-' }}
+
+
+
+
+ 阻断点小地名:
+ {{ detailData.event?.blockedPointName || '-' }}
+
+
+
+
+
+
+
+ 所属区县:
+ {{ detailData.event?.district || '-' }}
+
+
+
+
+ 发生时间:
+ {{ detailData.occurTime || '-' }}
+
+
+
+
+
+
+
+ 是否恢复重建:
+ {{ detailData.event?.needsRecovery ? '是' : '否' }}
+
+
+
+
+ 恢复重建预估费用:
+ {{ detailData.event?.estimatedRecoveryCost ? detailData.event.estimatedRecoveryCost + '万元' : '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 现场描述:
+ {{ report.siteDescription || '-' }}
+
+
+ 处置措施:
+ {{ report.disposalMeasures || '-' }}
+
+
+ 实际恢复时间:
+ {{ report.actualRecoverTime || '-' }}
+
+
+ 预计恢复时间:
+ {{ report.expectRecoverTime || '-' }}
+
+
+
+ 填报人:
+ {{ report.reporterName ? report.reporterName : '-' }}
+
+
+
+ 联系电话:
+ {{ report.phone ? report.phone : '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 投入机械:
+ {{ report.investedMachinery ? report.investedMachinery + '台/班' : '-'}}
+
+
+
+
+ 投入人力:
+ {{ report.investedManpower ? report.investedManpower + '人次' : '-'}}
+
+
+
+
+ 投入资金:
+ {{ report.investedFunds ? report.investedFunds + '万元' : '-'}}
+
+
+
+
+
+
+ {{ report.showDetail ? '点击关闭详情' : '点击查看详情' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@