diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 1497224..7d9907c 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -23,13 +23,16 @@
请上传 + + - - 的文件 +
+
@@ -66,64 +69,38 @@ /> - - - - - - {{ dict.label }} - - - - - - - - - - - - - - - - - - - + + + + + + + + +
- - - + { const confirm = () => { proxy.$refs["formRef"].validate(async (valid) => { if (valid) { + if (!form.value.lat || !form.value.lon) { + proxy.$modal.msgWarning("请先落点至地图上!"); + return; + } form.value.zzjg = filterArray(form.value.zzjg, "join"); form.value.dflx = filterArray(form.value.dflx, "join"); form.value.zyxt = filterArray(form.value.zyxt, "join"); @@ -268,8 +241,8 @@ const confirm = () => { await intruderyj(form.value); proxy.$modal.msgSuccess(`${props.title}成功`); } - if(form.value.status === 1){ - await updateyj(form.value) + if (form.value.status === 1) { + await updateyj(form.value); proxy.$modal.msgSuccess(`编辑成功`); } } else { @@ -294,10 +267,8 @@ const getInfo = async (val) => { console.log(props.id, visible.value); const res = await getyjById(props.id); res.data.zzjg = res.data.zzjg.split(",").map((item) => parseInt(item)); - res.data.zyxt = filterArray(res.data.zyxt); res.data.dflx = filterArray(res.data.dflx); - form.value = res.data; if (form.value.lat && form.value.lon && mapData) { nextTick(() => { @@ -438,8 +409,6 @@ const handleMapClick = (longitude, latitude) => { const isPositiveDecimal = (num) => { return typeof num === "number" && num >= 0 && !Number.isInteger(num); }; - - diff --git a/src/views/emergency/workOrder/index.vue b/src/views/emergency/workOrder/index.vue index ae98494..4fab59a 100644 --- a/src/views/emergency/workOrder/index.vue +++ b/src/views/emergency/workOrder/index.vue @@ -8,7 +8,7 @@ label-width="68px" class="search-form" > - + - + - + + + - - - +