diff --git a/packages/mobile/src/components/SearchInput.vue b/packages/mobile/src/components/SearchInput.vue index 24807ad..f64bd1c 100644 --- a/packages/mobile/src/components/SearchInput.vue +++ b/packages/mobile/src/components/SearchInput.vue @@ -7,6 +7,7 @@ class="inner-input" v-model="modelValue" :placeholder="placeholder" + @input="search" /> { + clearTimeout(timer) + timer = setTimeout(() => { + emit('search', modelValue.value) + }, 1000) +} + // 清空输入框 const clearInput = () => { modelValue.value = '' + emit('search', modelValue.value) } diff --git a/packages/mobile/src/views/DisasterManagement/DisasterReport.vue b/packages/mobile/src/views/DisasterManagement/DisasterReport.vue index bf40546..bb68164 100644 --- a/packages/mobile/src/views/DisasterManagement/DisasterReport.vue +++ b/packages/mobile/src/views/DisasterManagement/DisasterReport.vue @@ -36,8 +36,8 @@ const route = useRoute() const isContinue = computed(() => route.query.isContinue) const title = computed(() => { - const label = route.query.eventType === 'ice' ? '冰毁' : '水毁' - if(!isContinue) return `${label}填报` + const label = eventType.value === 'ice' ? '冰毁' : '水毁' + if(!isContinue.value) return `${label}填报` return `${label}续报` }) diff --git a/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisaster.vue b/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisaster.vue index de71b29..28bdc8f 100644 --- a/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisaster.vue +++ b/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisaster.vue @@ -46,22 +46,24 @@ - + @@ -155,7 +157,7 @@ import { request } from '@shared/utils/request'; import { useOptions } from '@shared/composables/useOptions'; import DisasterFileUpload from '../components/DisasterFileUpload.vue'; import { showToast, showFailToast, showLoadingToast, showSuccessToast } from 'vant'; -import { formatDate } from '@shared/utils' +import { formatDate } from '@shared/utils'; const route = useRoute(); const { options } = useOptions(); @@ -222,17 +224,16 @@ const calibrateTime = isShowToast => { }; const validate = () => { - return true -} + return true; +}; -const submitting = ref(false) +const submitting = ref(false); const handleSubmit = async () => { // 验证表单 if (!validate()) return; submitting.value = true; try { - // 添加事件类型和站点信息 const submitData = { ...formData.value, @@ -262,7 +263,7 @@ const handleSubmit = async () => { } else { // 提交成功后返回列表页 setTimeout(() => { - if(isContinue) router.go(-1) + if (isContinue) router.go(-1); else router.replace('/disasterManagement'); }, 500); } @@ -276,7 +277,7 @@ const handleSubmit = async () => { submitting.value = false; } }; -const detailData = ref(null) +const detailData = ref(null); const getDisasterDetail = async () => { const id = route.query.id; if (!id) { @@ -295,12 +296,12 @@ const getDisasterDetail = async () => { if (result?.data) { const data = result.data; - data.reportList = undefined - data.report = {} - data.yhzMaterialList = [] - data.fileList = [] + data.reportList = undefined; + data.report = {}; + data.yhzMaterialList = []; + data.fileList = []; detailData.value = data; - formData.value = data + formData.value = data; } else { ElMessage.warning(result.message || '获取详情失败'); } diff --git a/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisasterDetail copy.vue b/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisasterDetail copy.vue deleted file mode 100644 index ad9c349..0000000 --- a/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisasterDetail copy.vue +++ /dev/null @@ -1,535 +0,0 @@ - - - - - diff --git a/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisasterDetail.vue b/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisasterDetail.vue index ad9c349..93abaf6 100644 --- a/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisasterDetail.vue +++ b/packages/mobile/src/views/DisasterManagement/IceDisaster/IceDisasterDetail.vue @@ -19,39 +19,16 @@ 冰毁事件 - +
- 路况类别: - {{ detailData.roadConditionType || '-' }} + 所属服务站: + {{ detailData.event?.stationName || '-' }}
- +
- 是否阻断: - {{ detailData.event?.isBlocked ? '是' : '否' }} -
- - -
- 抢险进度: - {{ detailData.event?.repairProgress || '-' }} -
- - - - -
- 水毁处数: - {{ detailData.event?.damageCount || 0 }} -
- - -
- 阻断里程: - {{ detailData.event?.blockedMileage ? detailData.event.blockedMileage + '公里' : '-' }} + 线路编号: + {{ detailData.routeNo || '-' }}
@@ -60,18 +37,18 @@ {{ detailData.occurTime || '-' }} - -
- 线路编号: - {{ detailData.routeNo || '-' }} -
-
- 地点路线: + 路况位置: {{ detailData.occurLocation || '-' }}
+ +
+ 发生地点: + {{ detailData.event?.occurLocation || '-' }} +
+
起点桩号: @@ -83,54 +60,6 @@ 止点桩号: {{ detailData.event?.endStakeNo || '-' }}
- - -
- 路况位置: - {{ detailData.event?.blockedPointName || detailData.occurLocation || '-' }} -
- - -
- 阻断点小地名: - {{ detailData.event?.blockedPointName || '-' }} -
- - -
- 上报区县: - {{ detailData.event?.district || '-' }} -
- - -
- 是否恢复重建: - {{ detailData.event?.needsRecovery ? '是' : '否' }} -
- - -
- 恢复重建预估费用: - {{ detailData.event?.estimatedRecoveryCost ? detailData.event.estimatedRecoveryCost + '万元' : '-' }} -
- - -
- 联系人: - {{ detailData.event?.contactPerson || '-' }} -
- - -
- 联系电话: - {{ detailData.event?.contactPhone || '-' }} -
- - -
- 填报单位: - {{ detailData.event?.reporterUnit || '-' }} -
@@ -139,21 +68,28 @@
{{ report?.title }} - {{ report.reporterName || '-' }} {{ report.reportTime || '-' }} + + {{ report.reporterName || '-' }} {{ report.reportTime || '-' }} +
处置措施: {{ report.disposalMeasures || '-' }}
-