+
+
+ 现场描述：
+ {{ report.siteDescription || '-' }}
+
+
+ 处置措施：
+ {{ report.disposalMeasures || '-' }}
+
+
+ 路产损失：
+ {{ report.totalLossAmount ? report.totalLossAmount + '万元' : '-' }}
+
+
+ 实际恢复时间：
+ {{ report.actualRecoverTime || '-' }}
+
+
+ 预计恢复时间：
+ {{ report.expectRecoverTime || '-' }}
+
-
-
- 处置情况：
- {{ formatDisposalMeasures(report.disposalMeasures) || '-' }}
-
-
- 塌方及损失：
- {{ getLossDescription(report) }}
-
-
- 路产损失：
- {{ report.totalLossAmount ? report.totalLossAmount + '万元' : '-' }}
-
-
- 有无车辆滞留：
- {{ getVehicleStrandedText(report) }}
-
-
- 滞留车辆：
- {{ report.strandedVehicleCount || 0 }}辆
-
-
- 预计恢复时间：
- {{ report.expectRecoverTime || '-' }}
-
-
- 实际恢复时间：
- {{ report.actualRecoverTime || '-' }}
-
-
- 现场描述：
- {{ report.siteDescription || '-' }}
-
+
+ 填报人：
+ {{ report.reporterName ? report.reporterName : '-' }}
+
-
-
-
附件：
-
-
-
- {{ file.fileName }}
-
+
+ 联系电话：
+ {{ report.phone ? report.phone : '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 其它损失描述：
+ {{ '未对接' }}
+
+
+
+
+
+
+ 已投入机械：
+ {{ report.investedMachinery }}
+
+
+
+
+ 已投入人力：
+ {{ report.investedManpower }}
+
+
+
+
+ 已投入资金：
+ {{ report.investedFunds }}
+
+
+
+
+
+
+ {{ report.showDetail ? '点击关闭详情' : '点击查看详情' }}
+
@@ -276,6 +256,8 @@ import { ElMessage } from 'element-plus'
import { ArrowLeft, Picture, VideoCamera } from '@element-plus/icons-vue'
import ContinueReport from './ContinueReport.vue'
import { request } from '@shared/utils/request'
+import LossListDetail from './LossListDetail.vue'
+import FileUpload from '@/component/FileUpload/FileUpload.vue'
import mockData from '../DisasterReport/waterMockJson.json'
const router = useRouter()
@@ -307,10 +289,16 @@ const continueReport = ref(null)
const allReports = computed(() => {
const reports =
detailData.value.report?.map((item, index) => {
- item.title = index === 0 ? '首报' : '续报' + index
+ if (index === detailData.value.report.length - 1) {
+ item.title = '首报'
+ } else {
+ item.title = '续报' + (detailData.value.report.length - 1 - index)
+ }
+ console.log(detailData.value.report.length - 1, ' ', index, ' -', item.title)
return item
}) || []
- return reports.reverse()
+ return reports
+ // return reports.reverse()
})
// 是否有填报数据
@@ -328,14 +316,20 @@ const getEventStatusType = () => {
return eventStatus.value === 1 ? 'success' : 'danger'
}
+const getBaseDisposalMeasures = () => {
+ const firstItem = allReports.value[0]
+ if (!firstItem) return '-'
+ return formatDisposalMeasures(firstItem.disposalMeasures || '') || '-'
+}
+
// 格式化处置措施
const formatDisposalMeasures = (measures) => {
if (!measures) return ''
const measureMap = {
- halfClose: '半幅封闭',
- fullClose: '全副封闭',
- bypass: '便道通行',
- normal: '正常通行'
+ 半幅封闭: '半幅封闭',
+ 全副封闭: '全副封闭',
+ 便道通行: '便道通行',
+ 正常通行: '正常通行'
}
return measures
.split(',')
@@ -381,6 +375,7 @@ const getDisasterDetail = async () => {
if (result?.data) {
const data = result.data
+ console.log('🚀 ~ getDisasterDetail ~ data:', data)
detailData.value = {
event: data.event || null,
report: data.report || [],
@@ -397,7 +392,7 @@ const getDisasterDetail = async () => {
const newFormData = {
...data,
lossList: null,
- report: mockData.report,
+ report: route.query.mock ? mockData.report : {},
fileList: null
}
continueReport.value?.initFormData(newFormData)
@@ -416,25 +411,6 @@ const handleClickBack = () => {
router.push('/disasterManagement')
}
-// 续报
-const handleContinueReport = () => {
- router.push({
- path: '/disasterReport',
- query: {
- id: route.query.id,
- eventId: detailData.value.event?.id,
- isContinue: 'true'
- }
- })
-}
-
-// 预览附件
-const previewFile = (file) => {
- if (file.fileUrl) {
- window.open(file.fileUrl, '_blank')
- }
-}
-
onMounted(() => {
getDisasterDetail()
})
@@ -502,8 +478,12 @@ onMounted(() => {
align-items: flex-start;
line-height: 1.5;
+ & + .info-item {
+ margin-top: 10px;
+ }
+
.info-label {
- width: 120px;
+ white-space: nowrap;
flex-shrink: 0;
color: #909399;
font-size: 14px;
@@ -612,7 +592,26 @@ onMounted(() => {
margin-right: 10px;
}
.right-panel {
- width: 400px;
+ width: 300px;
}
+}
+.content-wrapper {
+ display: flex;
+ flex-direction: column;
+}
+.basic-info-wrapper {
+ display: flex;
+}
+.detal-info-wrapper {
+ margin-top: 10px;
+ border-top: 1px solid #efefef;
+ padding-top: 10px;
+}
+.info-list {
+ flex: 1;
+ overflow: hidden;
+}
+.file-list {
+
}
diff --git a/packages/screen/src/views/DisasterManagement/DisasterManagement.vue b/packages/screen/src/views/DisasterManagement/DisasterManagement.vue
index 68edc96..700557d 100644
--- a/packages/screen/src/views/DisasterManagement/DisasterManagement.vue
+++ b/packages/screen/src/views/DisasterManagement/DisasterManagement.vue
@@ -22,9 +22,8 @@
-
-
-
+
+
@@ -87,20 +86,25 @@
{{ scope.$index + 1 }}
-
+
-
-
+
+
-
- {{ row.isBlocked || '—' }}
+
+ {{ row.blocked === true ? '是' : row.blocked === false ? '否' : '—' }}
-
+
+
+ 冰雪灾害
+ 水毁灾害
+
+
@@ -109,20 +113,20 @@
-
+
- 查看
+
—
- 播放
+
—
@@ -148,6 +152,9 @@
/>