diff --git a/packages/screen/src/views/DisasterManagement/DisasterDetail/WaterDisasterDetailPC.vue b/packages/screen/src/views/DisasterManagement/DisasterDetail/WaterDisasterDetailPC.vue index a37db99..35b348b 100644 --- a/packages/screen/src/views/DisasterManagement/DisasterDetail/WaterDisasterDetailPC.vue +++ b/packages/screen/src/views/DisasterManagement/DisasterDetail/WaterDisasterDetailPC.vue @@ -132,7 +132,7 @@ {{ detailData.event?.needsRecovery ? '是' : '否' }} - +
恢复重建预估费用: {{ detailData.event?.estimatedRecoveryCost ? detailData.event.estimatedRecoveryCost + '万元' : '-' }} @@ -195,21 +195,21 @@ -
+
已投入机械: - {{ report.investedMachinery }} + {{ report.investedMachinery ? report.investedMachinery + '台/班' : '-'}}
-
+
已投入人力: - {{ report.investedManpower }} + {{ report.investedManpower ? report.investedManpower + '人次' : '-'}}
-
+
已投入资金: - {{ report.investedFunds }} + {{ report.investedFunds ? report.investedFunds + '万元' : '-'}}
@@ -469,6 +469,10 @@ onMounted(() => { margin-top: 10px; } + &.margin { + margin-top: 10px; + } + .info-label { white-space: nowrap; flex-shrink: 0; diff --git a/packages/screen/src/views/DisasterManagement/DisasterDetail/WaterDisasterLossListDetailPC.vue b/packages/screen/src/views/DisasterManagement/DisasterDetail/WaterDisasterLossListDetailPC.vue index aad82ff..8867d1f 100644 --- a/packages/screen/src/views/DisasterManagement/DisasterDetail/WaterDisasterLossListDetailPC.vue +++ b/packages/screen/src/views/DisasterManagement/DisasterDetail/WaterDisasterLossListDetailPC.vue @@ -71,7 +71,6 @@ onMounted(async () => { \ No newline at end of file diff --git a/packages/screen/src/views/DisasterManagement/DisasterReport/WaterDisasterLossListPC.vue b/packages/screen/src/views/DisasterManagement/DisasterReport/WaterDisasterLossListPC.vue index cf01934..18a3ad8 100644 --- a/packages/screen/src/views/DisasterManagement/DisasterReport/WaterDisasterLossListPC.vue +++ b/packages/screen/src/views/DisasterManagement/DisasterReport/WaterDisasterLossListPC.vue @@ -1,14 +1,21 @@ @@ -32,9 +39,17 @@ const props = defineProps({ }) const getValue = (config) => { - const value = props.modelValue.find((v) => v.lossTypeId === config.lossTypeId) - if (value == null) props.modelValue.push({ ...config }) - return value?.totalAmount || 0 + const item = getValueItem(config) + return item?.totalAmount || 0 +} + +const getValueItem = (config) => { + let item = props.modelValue.find((v) => v.lossTypeId === config.lossTypeId) + if (item == null) { + item = { ...config } + props.modelValue.push(item) + } + return item } const configs = ref([]) diff --git a/packages/screen/src/views/DisasterManagement/DisasterReport/WaterDisasterReportPC.vue b/packages/screen/src/views/DisasterManagement/DisasterReport/WaterDisasterReportPC.vue index d37522d..ff3ec07 100644 --- a/packages/screen/src/views/DisasterManagement/DisasterReport/WaterDisasterReportPC.vue +++ b/packages/screen/src/views/DisasterManagement/DisasterReport/WaterDisasterReportPC.vue @@ -37,8 +37,7 @@ - - + @@ -46,12 +45,7 @@ - - - - - - + @@ -59,8 +53,7 @@ - - + @@ -70,19 +63,15 @@ - - + - - - - - - + + + @@ -126,7 +115,7 @@ - + @@ -135,20 +124,19 @@ - + - - + + + + - - - - - + + @@ -156,7 +144,7 @@ - + @@ -193,15 +181,15 @@ - - + + - - + + @@ -213,7 +201,7 @@ - + @@ -315,13 +303,6 @@ - - - - - - - @@ -330,14 +311,13 @@ - - + - +