fix:

1. 修正航点动作参数
2. 右侧控制栏的窗口不随控制栏一起关闭
3. 视图库机载\视频\多选功能\转存\删除功能
4. MMC_Gimbal_ZT60R挂载适配文件更新
5. 键盘控制功能

iframe/src/App.vue

@@ -66,6 +66,7 @@ export default {
      * 给父窗口发送消息
      */
     postTop(data) {
+      console.log('iframe postMessage', data);
       window.top.postMessage(
         {
           module: "MMCFlightControlCenter",

src/components/MMCFlightControlCenter/api/modules/viewLibrary.js

@@ -27,4 +27,12 @@ export default class ViewLibrary {
       params,
     });
   }
+
+  static delete(params) {
+    return request({
+      url: "/admin-api/data/view-library/delete",
+      method: "delete",
+      params,
+    });
+  }
 }

src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/components/airwayList/components/normalTask/components/airwayEdit/components/actions/index.vue

@@ -58,7 +58,7 @@
     </div>
     <div class="rm-rp-btns">
       <div class="rm-rp-btn" v-hover @click="$emit('close')">取消</div>
-      <div class="rm-rp-btn save" v-hover @click="$emit('save', selectActions1)">保存</div>
+      <div class="rm-rp-btn save" v-hover @click="onSave">保存</div>
     </div>
   </div>
 </template>
@@ -133,9 +133,27 @@ export default {
       selectActions1: [], //选中的动作
     };
   },
-  created(){
+  created() {
     this.selectActions1 = JSON.parse(JSON.stringify(this.selectActions));
+    this.selectActions1.some((item) => {
+      if (item.label === "悬停") {
+        item.param1 /= 1000; // 毫秒转秒
+        return true;
       }
+    });
+  },
+  methods: {
+    onSave() {
+      let actions = JSON.parse(JSON.stringify(this.selectActions1));
+      actions.some((item) => {
+        if (item.label === "悬停") {
+          item.param1 *= 1000; // 秒转毫秒
+          return true;
+        }
+      });
+      this.$emit("save", actions);
+    },
+  },
 };
 </script>
 

src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlBottom/components/keyControl/index.vue

@@ -147,7 +147,7 @@
   </div>
 </template>
 <script>
-import * as mountCtrlList from "../../../../../../../mount/utils.js";
+import * as mountCtrlList from "../../../../../../../../../MMCMount/utils.js";
 import { mapState } from "vuex";
 export default {
   data() {

src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlLeft/components/airwayList/components/airwayEdit/components/actions/index.vue

@@ -58,7 +58,7 @@
     </div>
     <div class="rm-rp-btns">
       <div class="rm-rp-btn" v-hover @click="$emit('close')">取消</div>
-      <div class="rm-rp-btn save" v-hover @click="$emit('save', selectActions1)">保存</div>
+      <div class="rm-rp-btn save" v-hover @click="onSave">保存</div>
     </div>
   </div>
 </template>
@@ -133,9 +133,27 @@ export default {
       selectActions1: [], //选中的动作
     };
   },
-  created(){
+  created() {
     this.selectActions1 = JSON.parse(JSON.stringify(this.selectActions));
+    this.selectActions1.some((item) => {
+      if (item.label === "悬停") {
+        item.param1 /= 1000; // 毫秒转秒
+        return true;
       }
+    });
+  },
+  methods: {
+    onSave() {
+      let actions = JSON.parse(JSON.stringify(this.selectActions1));
+      actions.some((item) => {
+        if (item.label === "悬停") {
+          item.param1 *= 1000; // 秒转毫秒
+          return true;
+        }
+      });
+      this.$emit("save", actions);
+    },
+  },
 };
 </script>
 

src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlLeft/components/airwayList/index.vue

@@ -74,6 +74,7 @@ export default {
             polyline: airway,
             id: airway.id,
           });
+          console.log("选中的航线", this.selectedAirway);
         } catch (e) {
           console.log("绘制航线失败", e);
         }
@@ -137,7 +138,7 @@ export default {
         callback: (res) => {
           this.airwayList = res?.records || [];
           this.$nextTick(() => {
-            if(id){
+            if (id) {
               this.selectedAirwayId = id;
             }
           });

src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/components/controlList/index.vue

 <template>
-  <div class="nset_control_box dialog1027">
+  <div>
+    <div class="nset_control_box dialog1027" v-if="show">
       <div class="dialog-header">
         <img class="dialog-header__icon" src="../../assets/images/mount_head.png" />
         <div class="dialog-header__title">操作区域</div>
@@ -102,6 +103,7 @@
           </div>
         </div>
       </el-dialog>
+    </div>
     <Logger v-if="showLogger" @close="showLogger = false"></Logger>
   </div>
 </template>
@@ -122,6 +124,10 @@ const Bus = new Vue();
 export default {
   components: { SymbolIcon, Logger },
   props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
     ModeStatus: {
       type: String,
       default: () => "",

src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/components/mount/index.vue

 <template>
   <div class="mountBox">
+    <div class="main" v-if="show">
       <div v-if="mountList.length > 0" class="list">
         <div
           class="mount-item pr mt6"
@@ -15,6 +16,7 @@
           </div>
         </div>
       </div>
+    </div>
     <template v-if="selectMount">
       <component
         :is="selectMount.gimbalName"
@@ -44,6 +46,10 @@ export default {
     ...mountComponents,
   },
   props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
     uavMountsPayload: {
       type: Array,
       default: () => [],
@@ -62,11 +68,11 @@ export default {
       "mountList",
       "airlineId",
       "selectMount",
-      "uavRealTimeData"
+      "uavRealTimeData",
     ]),
-    nxNormal(){
-      return this.uavRealTimeData?.healthData?.NX?.warningLevel === 'NORMAL';
-    }
+    nxNormal() {
+      return this.uavRealTimeData?.healthData?.NX?.warningLevel === "NORMAL";
+    },
   },
   created() {},
   mounted() {},
@@ -107,16 +113,19 @@ export default {
 </script>
 <style scoped lang="scss">
 .mountBox {
-  background: #222222;
-  box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
-  border-radius: 10px;
   position: absolute;
   // top: -152px;
   top: 63px;
   right: 65px;
+
+  .main {
+    background: #222222;
+    box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
+    border-radius: 10px;
     min-width: 142px;
     height: 48px;
     padding: 0 5px;
+  }
 
   .list {
     display: flex;
@@ -141,5 +150,11 @@ export default {
       }
     }
   }
+
+  .mount-panel {
+    position: absolute;
+    top: 50px;
+    right: 0;
+  }
 }
 </style>

src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/components/viewLib/mock.js

@@ -2,11 +2,11 @@ export default [
   {
     date: '2024-8-13',
     imgList: [
-      'http://gips3.baidu.com/it/u=3886271102,3123389489&fm=3028&app=3028&f=JPEG&fmt=auto?w=1280&h=960',
-      2,
-      3,
-      4,
-      5
+      'https://live.mmcuav.cn/live/D_XIANGDAO.m3u8',
+      'https://live.mmcuav.cn/live/D_XIANGDAO1.m3u8',
+      'https://live.mmcuav.cn/live/D_XIANGDAO2.m3u8',
+      'https://live.mmcuav.cn/live/D_XIANGDAO3.m3u8',
+      'https://live.mmcuav.cn/live/D_XIANGDAO4.m3u8'
     ]
   }
 ]
\ No newline at end of file

src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/index.vue

@@ -51,11 +51,11 @@
       @clearId="$emit('clearId')"
       @closeIconShow="iconShow = false"
       @exit="showControlList = false"
-      v-if="showControlList"
+      :show="showControlList"
       :isHangar="isHangar"
     ></ControlList>
     <Health v-if="showHealth" @exit="showHealth = false"></Health>
-    <Mount v-if="showMount"></Mount>
+    <Mount :show="showMount"></Mount>
     <!-- 喊话器 -->
     <MMCGimbalP1
       class="PagerP1"

src/components/MMCFlightControlCenter/components/uavApplications/components/player/components/livenvr/index.vue

@@ -98,7 +98,7 @@ export default {
     },
   },
   mounted() {
-    window.player = this;
+    // window.player = this;
   },
   methods: {
     init(flag) {

src/components/MMCMount/utils.js

@@ -1513,3 +1513,5 @@ export const MMC_Gimbal_Z33N = {
     return buff;
   }
 };
+
+export * from './MMC_Gimbal_ZT60R/js/index.js';
\ No newline at end of file