From 299b1c7bbbf717dbb98e1be2d4e9ac893583febe Mon Sep 17 00:00:00 2001 From: niedongsheng <605973111@qq.com> Date: Fri, 17 Apr 2026 09:21:59 +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 --- .../WaterDisaster/WaterDisaster.vue | 1 - .../WaterDisasterDetail.vue | 6 - .../waterDisasterFormData.json | 1 - .../src/component/DynamicForm/DynamicForm.vue | 2 +- packages/screen/src/directive/index.js | 5 + .../src/directive/permission/hasPermi.js | 27 + packages/screen/src/store/userStore.js | 13 + .../IceDisasterContinueReportPC.vue | 2 - .../IceDisasterDetail/IceDisasterDetailPC.vue | 64 +- .../IceDisasterDetail/detailConfig.js | 111 --- .../IceDisasterReport/IceDisasterReportPC.vue | 792 +++++------------- .../IceDisasterReport/useIceDisasterReport.js | 336 ++++++++ .../WaterDisasterContinueReportPC.vue | 2 - .../WaterDisasterLossListPC.vue | 5 + .../WaterDisasterReportPC.vue | 729 +++++----------- .../WaterDisasterReport/copy.vue | 742 ++++++++++++++++ .../useWaterDisasterReport.js | 292 +++++++ .../WaterDisasterReport/waterMockJson.json | 1 - .../components/MaterialList.vue | 170 ++++ .../components/RoadRoutesSelect.vue | 2 +- .../components/YHZSelect.vue | 253 ++++++ packages/shared/composables/useOptions.js | 6 + 22 files changed, 2346 insertions(+), 1216 deletions(-) create mode 100644 packages/screen/src/directive/index.js create mode 100644 packages/screen/src/directive/permission/hasPermi.js create mode 100644 packages/screen/src/store/userStore.js delete mode 100644 packages/screen/src/views/DisasterManagement/IceDisasterDetail/detailConfig.js create mode 100644 packages/screen/src/views/DisasterManagement/IceDisasterReport/useIceDisasterReport.js create mode 100644 packages/screen/src/views/DisasterManagement/WaterDisasterReport/copy.vue create mode 100644 packages/screen/src/views/DisasterManagement/WaterDisasterReport/useWaterDisasterReport.js create mode 100644 packages/screen/src/views/DisasterManagement/components/MaterialList.vue create mode 100644 packages/screen/src/views/DisasterManagement/components/YHZSelect.vue diff --git a/packages/mobile/src/views/DisasterManagement/WaterDisaster/WaterDisaster.vue b/packages/mobile/src/views/DisasterManagement/WaterDisaster/WaterDisaster.vue index 6ec2805..6baae9e 100644 --- a/packages/mobile/src/views/DisasterManagement/WaterDisaster/WaterDisaster.vue +++ b/packages/mobile/src/views/DisasterManagement/WaterDisaster/WaterDisaster.vue @@ -190,7 +190,6 @@ const formData = ref({ district: '', // 上报区县 endStakeNo: '', // 止点桩号 estimatedRecoveryCost: '', // 恢复重建预估费用 - inspectionMileage: '', // 巡查里程 isBlocked: '', // 是否阻断 needsRecovery: '', // 是否需要恢复重建 repairProgress: '', // 抢险进度 diff --git a/packages/mobile/src/views/DisasterManagement/WaterDisasterDetail.vue b/packages/mobile/src/views/DisasterManagement/WaterDisasterDetail.vue index 3a321bd..3ac6b69 100644 --- a/packages/mobile/src/views/DisasterManagement/WaterDisasterDetail.vue +++ b/packages/mobile/src/views/DisasterManagement/WaterDisasterDetail.vue @@ -102,12 +102,6 @@ {{ detailData.event?.district || '-' }} - -
- 巡查里程： - {{ detailData.event?.inspectionMileage ? detailData.event.inspectionMileage + '公里' : '-' }} -
-
是否恢复重建： diff --git a/packages/mobile/src/views/DisasterManagement/waterDisasterFormData.json b/packages/mobile/src/views/DisasterManagement/waterDisasterFormData.json index 03532ea..61153f4 100644 --- a/packages/mobile/src/views/DisasterManagement/waterDisasterFormData.json +++ b/packages/mobile/src/views/DisasterManagement/waterDisasterFormData.json @@ -12,7 +12,6 @@ "district": "武侯区", "endStakeNo": "K2251+200", "estimatedRecoveryCost": 120.5, - "inspectionMileage": 25.6, "isBlocked": true, "needsRecovery": true, "repairProgress": "抢险中", diff --git a/packages/screen/src/component/DynamicForm/DynamicForm.vue b/packages/screen/src/component/DynamicForm/DynamicForm.vue index c0991e5..d919656 100644 --- a/packages/screen/src/component/DynamicForm/DynamicForm.vue +++ b/packages/screen/src/component/DynamicForm/DynamicForm.vue @@ -8,7 +8,7 @@
+ + diff --git a/packages/screen/src/views/DisasterManagement/WaterDisasterReport/useWaterDisasterReport.js b/packages/screen/src/views/DisasterManagement/WaterDisasterReport/useWaterDisasterReport.js new file mode 100644 index 0000000..84e36a8 --- /dev/null +++ b/packages/screen/src/views/DisasterManagement/WaterDisasterReport/useWaterDisasterReport.js @@ -0,0 +1,292 @@ +import { computed, onMounted, reactive, ref } from 'vue' +import { useRoute, useRouter } from 'vue-router' +import { ElMessage } from 'element-plus' +import { request } from '@/utils/request' +import { useOptions } from '@shared/composables/useOptions' +import mockData from './waterMockJson.json' + +const DEFAULT_REPORTER_UNIT = '万州区公路中心' + +const createDefaultFormData = () => ({ + occurLocation: '', + occurTime: '', + roadConditionType: '', + routeNo: '', + event: { + blockedMileage: null, + blockedPointName: '', + contactPerson: '', + contactPhone: '', + damageCount: null, + district: '', + endStakeLatitude: null, + endStakeLongitude: null, + endStakeNo: '', + estimatedRecoveryCost: null, + isBlocked: null, + latitude: null, + longitude: null, + needsRecovery: null, + repairProgress: '抢险中', + reportSite: '', + reporterUnit: DEFAULT_REPORTER_UNIT, + serviceStationId: '', + startStakeLatitude: null, + startStakeLongitude: null, + startStakeNo: '' + }, + report: { + actualRecoverTime: '', + damagedVehicleCount: null, + deadCount: null, + disposalMeasures: '', + expectRecoverTime: '', + injuredCount: null, + investedFunds: null, + investedMachinery: null, + investedManpower: null, + remark: '', + siteDescription: '', + strandedPersonCount: null, + strandedVehicleCount: null, + totalLossAmount: null + }, + lossList: [], + fileList: [] +}) + +const mergeFormData = (source = {}) => { + const defaults = createDefaultFormData() + const merged = { + ...defaults, + ...source, + event: { + ...defaults.event, + ...(source.event || {}) + }, + report: { + ...defaults.report, + ...(source.report || {}) + }, + lossList: Array.isArray(source.lossList) ? source.lossList : defaults.lossList, + fileList: Array.isArray(source.fileList) ? source.fileList : defaults.fileList + } + + if (!merged.event.reporterUnit) { + merged.event.reporterUnit = DEFAULT_REPORTER_UNIT + } + if (!merged.event.repairProgress) { + merged.event.repairProgress = '抢险中' + } + if (!merged.event.serviceStationId && merged.event.reportSite) { + merged.event.serviceStationId = merged.event.reportSite + } + + return merged +} + +export const useWaterDisasterReport = () => { + const router = useRouter() + const route = useRoute() + const { options, getAreaOptions } = useOptions() + + const formRef = ref(null) + const submitting = ref(false) + const eventType = ref('水毁事件') + const filterForm = reactive({ + routeType: '' + }) + const formData = reactive(createDefaultFormData()) + + const routeTypeLabel = computed(() => { + const matched = options.value.roadType?.find((item) => item.value === filterForm.routeType) + return matched?.label || '国省道' + }) + + const showEstimatedRecoveryCost = computed(() => formData.event.needsRecovery === true) + + const formRules = { + 'event.contactPerson': [{ required: true, message: '请输入联系人员', trigger: 'blur' }], + 'event.contactPhone': [ + { required: true, message: '请输入联系电话', trigger: 'blur' }, + { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的联系电话', trigger: 'blur' } + ], + 'event.serviceStationId': [{ required: true, message: '请选择填报站点', trigger: 'change' }], + occurTime: [{ required: true, message: '请选择发生时间', trigger: 'change' }], + roadConditionType: [{ required: true, message: '请选择路况类别', trigger: 'change' }], + 'event.repairProgress': [{ required: true, message: '请选择抢险进度', trigger: 'change' }], + 'event.isBlocked': [{ required: true, message: '请选择是否阻断', trigger: 'change' }], + 'event.blockedMileage': [{ required: true, message: '请输入受灾里程', trigger: 'blur' }], + 'event.damageCount': [{ required: true, message: '请输入水毁处数', trigger: 'blur' }], + 'event.district': [{ required: true, message: '请选择所属区县', trigger: 'change' }], + routeNo: [{ required: true, message: '请选择线路编号', trigger: 'change' }], + occurLocation: [{ required: true, message: '请输入路况位置', trigger: 'blur' }], + 'event.blockedPointName': [{ required: true, message: '请输入阻断点小地名', trigger: 'blur' }], + 'event.startStakeNo': [{ required: true, message: '请输入起点桩号', trigger: 'blur' }], + 'event.startStakeLongitude': [{ required: true, message: '请输入起点桩经度', trigger: 'blur' }], + 'event.startStakeLatitude': [{ required: true, message: '请输入起点桩纬度', trigger: 'blur' }], + 'event.endStakeNo': [{ required: true, message: '请输入止点桩号', trigger: 'blur' }], + 'event.endStakeLongitude': [{ required: true, message: '请输入止点桩经度', trigger: 'blur' }], + 'event.endStakeLatitude': [{ required: true, message: '请输入止点桩纬度', trigger: 'blur' }], + 'report.disposalMeasures': [{ required: true, message: '请选择处置措施', trigger: 'change' }], + 'report.expectRecoverTime': [{ required: true, message: '请选择预计恢复时间', trigger: 'change' }], + 'event.needsRecovery': [{ required: true, message: '请选择是否需要恢复重建', trigger: 'change' }], + 'event.estimatedRecoveryCost': [ + { + validator: (_rule, value, callback) => { + if (showEstimatedRecoveryCost.value && (value === '' || value === null || value === undefined)) { + callback(new Error('请输入恢复重建预估费用')) + return + } + callback() + }, + trigger: 'blur' + } + ] + } + + const initFormData = (data = {}) => { + Object.assign(formData, mergeFormData(data)) + } + + const handleEventTypeChange = (value) => { + if (value === '冰雪事件') { + router.replace({ path: '/iceDisasterReport' }) + } + } + + const handleDistrictChange = () => { + // formData.routeNo = '' + // formData.occurLocation = '' + // formData.event.startStakeNo = '' + // formData.event.endStakeNo = '' + } + + const parsePointValue = (point) => { + if (!point) { + return { longitude: null, latitude: null } + } + + if (Array.isArray(point) && point.length >= 2) { + return { + longitude: point[0] ?? null, + latitude: point[1] ?? null + } + } + + if (typeof point === 'string') { + try { + const parsed = JSON.parse(point) + if (Array.isArray(parsed) && parsed.length >= 2) { + return { + longitude: parsed[0] ?? null, + latitude: parsed[1] ?? null + } + } + } catch (_error) { + return { longitude: null, latitude: null } + } + } + + return { longitude: null, latitude: null } + } + + const handleRouteNoChange = (item = {}) => { + formData.routeNo = item.routeCode + formData.event.startStakeNo = item.startStakeNo + formData.event.endStakeNo = item.endStakeNo + + const startPoint = parsePointValue(item.startPoint) + const endPoint = parsePointValue(item.endPoint) + + formData.event.startStakeLongitude = startPoint.longitude + formData.event.startStakeLatitude = startPoint.latitude + formData.event.endStakeLongitude = endPoint.longitude + formData.event.endStakeLatitude = endPoint.latitude + } + + const buildSubmitData = () => { + const payload = mergeFormData(formData) + if (!payload.event.reportSite && payload.event.serviceStationId) { + payload.event.reportSite = payload.event.serviceStationId + } + + return payload + } + + const getFormData = () => buildSubmitData() + + const validate = async () => { + if (!formRef.value) { + return false + } + + try { + await formRef.value.validate() + return true + } catch (_error) { + ElMessage.warning('请完善表单信息') + return false + } + } + + const handleSubmit = async () => { + if (!(await validate())) { + return + } + + submitting.value = true + try { + const res = await request({ + url: '/snow-ops-platform/water-damage/addOrUpdate', + method: 'post', + data: buildSubmitData() + }) + + if (res?.code === '00000') { + ElMessage.success('提交成功') + setTimeout(() => { + router.replace('/disasterManagement') + }, 500) + } else { + ElMessage.error(res?.message || '提交失败') + } + } catch (error) { + console.error('提交失败:', error) + ElMessage.error('提交失败，请重试') + } finally { + submitting.value = false + } + } + + + const handleBack = () => { + router.back() + } + + onMounted(async () => { + await getAreaOptions() + + initFormData(route.query.mock ? mockData : {}) + }) + + return { + eventType, + filterForm, + formData, + formRef, + formRules, + handleBack, + handleDistrictChange, + handleEventTypeChange, + handleRouteNoChange, + handleSubmit, + initFormData, + getFormData, + options, + routeTypeLabel, + showEstimatedRecoveryCost, + submitting, + validate + } +} diff --git a/packages/screen/src/views/DisasterManagement/WaterDisasterReport/waterMockJson.json b/packages/screen/src/views/DisasterManagement/WaterDisasterReport/waterMockJson.json index b4b555f..a69aea3 100644 --- a/packages/screen/src/views/DisasterManagement/WaterDisasterReport/waterMockJson.json +++ b/packages/screen/src/views/DisasterManagement/WaterDisasterReport/waterMockJson.json @@ -12,7 +12,6 @@ "district": "武侯区", "endStakeNo": "K2251+200", "estimatedRecoveryCost": 120.5, - "inspectionMileage": 25.6, "isBlocked": true, "needsRecovery": true, "repairProgress": "抢险中", diff --git a/packages/screen/src/views/DisasterManagement/components/MaterialList.vue b/packages/screen/src/views/DisasterManagement/components/MaterialList.vue new file mode 100644 index 0000000..429f788 --- /dev/null +++ b/packages/screen/src/views/DisasterManagement/components/MaterialList.vue @@ -0,0 +1,170 @@ + + + + + diff --git a/packages/screen/src/views/DisasterManagement/components/RoadRoutesSelect.vue b/packages/screen/src/views/DisasterManagement/components/RoadRoutesSelect.vue index 9fc1342..030ea7a 100644 --- a/packages/screen/src/views/DisasterManagement/components/RoadRoutesSelect.vue +++ b/packages/screen/src/views/DisasterManagement/components/RoadRoutesSelect.vue @@ -6,7 +6,7 @@ - +
已选择地点路线：{{ tempSelectedItem?.routeCode }}
diff --git a/packages/screen/src/views/DisasterManagement/components/YHZSelect.vue b/packages/screen/src/views/DisasterManagement/components/YHZSelect.vue new file mode 100644 index 0000000..b74bc6c --- /dev/null +++ b/packages/screen/src/views/DisasterManagement/components/YHZSelect.vue @@ -0,0 +1,253 @@ + + + + + \ No newline at end of file diff --git a/packages/shared/composables/useOptions.js b/packages/shared/composables/useOptions.js index d50d0bc..a1a3c09 100644 --- a/packages/shared/composables/useOptions.js +++ b/packages/shared/composables/useOptions.js @@ -48,6 +48,12 @@ export function useOptions() { { label: '限制通行', value: '限制通行' } ] + // 冰灾 处理措施 + options.value['iceDisposalMeasures'] = [ + { label: '封闭交通', value: '封闭交通' }, + { label: '限速通行', value: '限速通行' }, + ] + // 路线类型 options.value['roadType'] = [ { label: '国道', value: 'G' },