merge

src/views/demo/workmanagement/workplan/components/createWorkPlan.vue

@@ -319,39 +319,39 @@
     checkedDronePort: {
       type: Object,
     },
-    formData: {
-      type: Object,
-      default: () => ({
-        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: '0959e6bf-918f-4465-9708-d2da2cd3fcf3',
-      }),
+    "formData":{
+        type:Object,
+        default: ()=>({
+            "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
+        })
     },
     editMode: {
       type: String,
@@ -392,7 +392,7 @@
     uploadedFileCount: 0,
     flightId: null,
     reason: null,
-    externalTaskId: '0959e6bf-918f-4465-9708-d2da2cd3fcf3',
+    externalTaskId: null,
   });
 
   // 获取workspace
@@ -541,44 +541,47 @@
     submitForm.value = props.formData;
   }
 
-  watch(
-    () => props.formData,
-    (newVal, oldVal) => {
-      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: '0959e6bf-918f-4465-9708-d2da2cd3fcf3',
-        };
-      }
+
+
+
+watch(
+    ()=> props.formData,
+    (newVal,oldVal)=>{
+        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,