合并分支 'liangqidong-test' 到 'v4'

接管记录接口入参添加deviceId字段以及数据显示逻辑优化

查看合并请求 !1

iframe/src/App.vue

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

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

@@ -50,6 +50,7 @@ export default {
   },
   computed: {
     ...mapState("MMCFlightControlCenter/hangar", ["hangar"]),
+    ...mapState("MMCFlightControlCenter/uav", ["uav"]),
   },
   mounted() {
     this.init();
@@ -60,8 +61,10 @@ export default {
         deviceType: this.hangar ? 2 : 1,
         pageNo: this.page.pageNo,
         pageSize: this.page.pageSize,
+        deviceId : this.uav?.deviceId
       });
-      this.list = res.data;
+      this.list.splice(0, this.list.length, ...res.data?.list??[])
+      // this.list = res.data;
       console.log("接管记录", this.list);
     },
     onExit(item) {