diff --git a/src/views/demo/workmanagement/airlinemanagement/index.vue b/src/views/demo/workmanagement/airlinemanagement/index.vue index 5faeb51..9551ad7 100644 --- a/src/views/demo/workmanagement/airlinemanagement/index.vue +++ b/src/views/demo/workmanagement/airlinemanagement/index.vue @@ -17,7 +17,7 @@
@@ -27,9 +27,8 @@ - \ No newline at end of file diff --git a/src/views/demo/workmanagement/workplan/components/createWorkPlan.vue b/src/views/demo/workmanagement/workplan/components/createWorkPlan.vue index 05aa2ab..1253a00 100644 --- a/src/views/demo/workmanagement/workplan/components/createWorkPlan.vue +++ b/src/views/demo/workmanagement/workplan/components/createWorkPlan.vue @@ -420,7 +420,41 @@ if(props.formData){ watch( ()=> props.formData, (newVal,oldVal)=>{ - submitForm.value = newVal; + if(newVal){ + submitForm.value = newVal; + }else{ + submitForm.value = { + "id": null, + "taskName": null, + "taskType": 0, + "taskAirLineName": null, + "taskDronePortName": null, + "taskDronePort": null, + "taskAirLine": null, + "returnAltitude": 20, + "lossOfControlAction": 1, + "continuationMode": 0, + "aiInspection": null, + "status": 0, + "periodicFormula": null, + "airLineId": null, + "createId": 0, + "createTime": "", + "waylinePrecisionType": 0, + "scheduledStartTime": "", + "scheduledEndTime": "", + "executeTime": "", + "completedTime": "", + "planExecuteDuration": 0, + "actualExecuteDuration": 0, + "workspaceId": null, + "expectedFileCount": 0, + "uploadedFileCount": 0, + "flightId": null, + "reason": null, + "externalTaskId": null, + }; + } }, { deep:true diff --git a/src/views/demo/workmanagement/workplan/components/importAirLine.vue b/src/views/demo/workmanagement/workplan/components/importAirLine.vue index 0ea5b77..628d553 100644 --- a/src/views/demo/workmanagement/workplan/components/importAirLine.vue +++ b/src/views/demo/workmanagement/workplan/components/importAirLine.vue @@ -67,7 +67,7 @@ import { getAirLineList,uploadXmlFile,deleteAirLine,addAirLine,getListAirLineFolder,deleteAirLineFolder,createAirLineFolder} from '@/api/sys/workplan'; import { Modal, message } from 'ant-design-vue'; - const emit = defineEmits(["checkAriLine","cancle","createAirLine"]) + const emit = defineEmits(["checkAriLine","cancle","createAirLine","importSuccess"]) const props = defineProps(["currentFolder"]) @@ -276,24 +276,25 @@ let res = await uploadXmlFile(props.currentFolder,formData); - if(res){ + if(res){ - submitForm.value.wpml = res.path; - submitForm.value.folder = props.currentFolder + submitForm.value.wpml = res.path; + submitForm.value.folder = props.currentFolder - let addAirLineRes =await addAirLine(submitForm.value); + let addAirLineRes =await addAirLine(submitForm.value); - if(addAirLineRes){ - fileList.value = []; - message.success("操作成功!"); - emit("cancle"); - }else{ - message.error("操作失败!"); - } - - }else{ - message.error("操作失败!"); - } + if(addAirLineRes){ + fileList.value = []; + message.success("操作成功!"); + emit("cancle"); + emit("importSuccess") + }else{ + message.error("操作失败!"); + } + + }else{ + message.error("操作失败!"); + } } diff --git a/src/views/demo/workmanagement/workplan/components/planList.vue b/src/views/demo/workmanagement/workplan/components/planList.vue index fc2ab38..333dcb8 100644 --- a/src/views/demo/workmanagement/workplan/components/planList.vue +++ b/src/views/demo/workmanagement/workplan/components/planList.vue @@ -63,7 +63,7 @@ 编辑 --> -