合并分支 'v4' 到 'v4_master'

机库标题需去掉无人机字段，与实际标题保持一致【ID1005060】

查看合并请求 !4

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/hangar/components/controlPanel/components/controlLeft/components/player/inner/index.vue

@@ -17,7 +17,8 @@ export default {
   computed: {
     ...mapState("MMCFlightControlCenter/hangar", ["hangar"]),
     name() {
-      return `${this.hangar?.name || ""}机库无人机`;
+      return `${this.hangar?.name || ""}机库`
+      // return `${this.hangar?.name || ""}机库无人机`;
     },
     url() {
       let find = this.hangar?.streamConfiguration

src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/components/player/outer/index.vue

@@ -17,7 +17,8 @@ export default {
   computed: {
     ...mapState("MMCFlightControlCenter/hangar", ["hangar"]),
     name() {
-      return `${this.hangar?.name || ""}机库无人机`;
+      return `${this.hangar?.name || ""}机库`;
+      // return `${this.hangar?.name || ""}机库无人机`;
     },
     url() {
       let find = this.hangar?.streamConfiguration

src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/components/player/uav/index.vue

@@ -41,7 +41,8 @@ export default {
     ]),
     ...mapState("MMCFlightControlCenter/uav", ["uav"]),
     name() {
-      return `${this.hangar?.name || ""}机库无人机`;
+      return `${this.hangar?.name || ""}机库`;
+      // return `${this.hangar?.name || ""}机库无人机`;
     },
     label() {
       return this.hangar?.uav?.organizationName || "";

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,