Merge branch 'v4' of ssh://git.mmcuav.cn:8222/root/mmc-stl-vue2 into v4

iframe/src/App.vue

@@ -83,7 +83,7 @@ export default {
     eventHandler() {
       window.addEventListener("message", (event) => {
         if (event.data.module === "MMCFlightControlCenter") {
-          console.log("iframe收到数据", event);
+          console.log("iframe收到数据", event.data);
           this.paramHandler(event.data);
           this.callbackHandler(event.data);
           this.logHandler(event.data);

src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlTop/components/takeOverRecords.vue

@@ -61,7 +61,7 @@ export default {
         deviceType: this.hangar ? 2 : 1,
         pageNo: this.page.pageNo,
         pageSize: this.page.pageSize,
-        deviceId : this.uav?.deviceId
+        deviceId : this.uav? this.uav?.deviceId:this.hangar?.deviceId
       });
       this.list.splice(0, this.list.length, ...res.data?.list??[])
       // this.list = res.data;

src/components/MMCFlightControlCenter/store/uav.js

@@ -1198,7 +1198,7 @@ const actions = {
             taskID: data.taskID,
             videoID: 1,
             name: data.name,
-            dbID: data.dbID,
+            // dbID: data.dbID,
           },
         },
         type: 528,