From a08695997fb8fca35c1d933537bd71a6e9bc6419 Mon Sep 17 00:00:00 2001
From: niedongsheng <605973111@qq.com>
Date: Fri, 24 Apr 2026 17:13:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=81=BE=E6=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IceDisasterContinueReportPC.vue | 56 ++++++++++---------
.../WaterDisasterContinueReportPC.vue | 47 ++++++++--------
2 files changed, 53 insertions(+), 50 deletions(-)
diff --git a/packages/screen/src/views/DisasterManagement/IceDisasterDetail/IceDisasterContinueReportPC.vue b/packages/screen/src/views/DisasterManagement/IceDisasterDetail/IceDisasterContinueReportPC.vue
index 6c78ed5..d8bba00 100644
--- a/packages/screen/src/views/DisasterManagement/IceDisasterDetail/IceDisasterContinueReportPC.vue
+++ b/packages/screen/src/views/DisasterManagement/IceDisasterDetail/IceDisasterContinueReportPC.vue
@@ -9,13 +9,13 @@
-
+
-
+
-
+
万元
-
+
人次
-
+
台/班
@@ -85,7 +85,6 @@
追加记录
- 解除事件
@@ -137,6 +136,18 @@ const validate = () => {
ElMessage.warning('请选择预计恢复时间')
return false
}
+ if (form.report.inputFunds === null || form.report.inputFunds === undefined || form.report.inputFunds === '') {
+ ElMessage.warning('请填写投入资金')
+ return false
+ }
+ if (form.report.inputManpower === null || form.report.inputManpower === undefined || form.report.inputManpower === '') {
+ ElMessage.warning('请填写投入人力')
+ return false
+ }
+ if (form.report.inputEquipment === null || form.report.inputEquipment === undefined || form.report.inputEquipment === '') {
+ ElMessage.warning('请填写投入设备')
+ return false
+ }
if (!form.report.siteDescription) {
ElMessage.warning('请填写现场情况描述')
return false
@@ -182,15 +193,26 @@ const handleAddSubmit = async () => {
}
try {
+ let apiUrl = '/snow-ops-platform/event/dispose'
+ if (formData.value.report?.disposalMeasures === '正常通行') {
+ apiUrl = '/snow-ops-platform/event/release'
+ }
+
const res = await request({
- url: '/snow-ops-platform/event/dispose',
+ url: apiUrl,
method: 'post',
data: getFormData()
})
if (res?.code === '00000') {
ElMessage.success('提交成功')
- emit('refresh')
+ if (apiUrl === '/snow-ops-platform/event/release') {
+ setTimeout(() => {
+ router.replace({ path: '/iceDisasterDetail', query: { id: formData.value.event.id } })
+ }, 500)
+ } else {
+ emit('refresh')
+ }
} else {
ElMessage.error(res?.message || '提交失败')
}
@@ -200,24 +222,6 @@ const handleAddSubmit = async () => {
}
}
-const handleCompleteSubmit = async () => {
- const res = await request({
- url: '/snow-ops-platform/event/release',
- method: 'post',
- data: {
- ...formData.value
- }
- })
- if (res?.code === '00000') {
- ElMessage.success('提交成功')
- setTimeout(()=>{
- router.replace({ path: '/iceDisasterDetail', query: { id: formData.value.event.id } })
- }, 500)
- } else {
- ElMessage.error(res.message)
- }
-}
-
defineExpose({
validate,
initFormData,
diff --git a/packages/screen/src/views/DisasterManagement/WaterDisasterDetail/WaterDisasterContinueReportPC.vue b/packages/screen/src/views/DisasterManagement/WaterDisasterDetail/WaterDisasterContinueReportPC.vue
index b003613..6c704c1 100644
--- a/packages/screen/src/views/DisasterManagement/WaterDisasterDetail/WaterDisasterContinueReportPC.vue
+++ b/packages/screen/src/views/DisasterManagement/WaterDisasterDetail/WaterDisasterContinueReportPC.vue
@@ -12,7 +12,7 @@
-
+
@@ -22,7 +22,7 @@
-
+
追加记录
- 解除事件
@@ -243,6 +242,14 @@ const calibrateTime = () => {
// 表单验证
const validate = () => {
+ if (!formData.value.report?.disposalMeasures) {
+ ElMessage.warning('请选择处理措施')
+ return false
+ }
+ if (!formData.value.report?.expectRecoverTime) {
+ ElMessage.warning('请选择预计恢复时间')
+ return false
+ }
return true
}
@@ -273,16 +280,26 @@ const handleAddSubmit = async () => {
// 可以在这里添加站点信息等其他数据
}
+ let apiUrl = '/snow-ops-platform/water-damage/dispose'
+ if (formData.value.report?.disposalMeasures === '正常通行') {
+ apiUrl = '/snow-ops-platform/water-damage/release'
+ }
+
const res = await request({
- url: '/snow-ops-platform/water-damage/dispose',
+ url: apiUrl,
method: 'post',
data: submitData
})
if (res?.code === '00000') {
ElMessage.success('提交成功')
-
- emit('refresh')
+ if (apiUrl === '/snow-ops-platform/water-damage/release') {
+ setTimeout(() => {
+ router.replace({ path: '/waterDisasterDetail', query: { id: formData.value.event.id } })
+ }, 500)
+ } else {
+ emit('refresh')
+ }
} else {
ElMessage.error(res.message)
}
@@ -293,24 +310,6 @@ const handleAddSubmit = async () => {
}
}
-const handleCompleteSubmit = async () => {
- const res = await request({
- url: '/snow-ops-platform/water-damage/release',
- method: 'post',
- data: {
- ...formData.value
- }
- })
- if (res?.code === '00000') {
- ElMessage.success('提交成功')
- setTimeout(()=>{
- router.replace({ path: '/waterDisasterDetail', query: { id: formData.value.event.id } })
- }, 500)
- } else {
- ElMessage.error(res.message)
- }
-}
-
// 暴露方法给父组件
defineExpose({
validate,