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

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

@@ -49,7 +49,7 @@ class Control_API {
   // 接管无人机
   static setUavControlOn(params) {
     return request({
-      url: `/admin-api/uas/device/controlUav`,
+      url: `/admin-api/uas/device-take/controlUav`,
       method: 'post',
       params
     });
@@ -57,7 +57,7 @@ class Control_API {
   // 强制接管无人机
   static setUavControlOnForce(params) {
     return request({
-      url: `/admin-api/uas/device/forceControlUav`,
+      url: `/admin-api/uas/device-take/forceControlUav`,
       method: 'post',
       params
     });
@@ -65,7 +65,7 @@ class Control_API {
   // 解除无人机控制
   static setUavControlOff(params) {
     return request({
-      url: `/admin-api/uas/device/quitControlUav`,
+      url: `/admin-api/uas/device-take/quitControlUav`,
       method: 'post',
       params
     });
@@ -90,7 +90,7 @@ class Control_API {
   // 获得接管记录
   static getTakeRecord(params){
     return request({
-      url: `/admin-api/uas/device/device-take`,
+      url: `/admin-api/uas/device-take/getTakeRecord`,
       method: "get",
       params
     }); 

src/components/MMCFlightControlCenter/components/hangar/components/list/index.vue

@@ -28,7 +28,7 @@
     </div>
     <div class="cpt-observe-nest-list">
       <template v-if="list && list.length">
-        <Item v-for="item in list" :key="item.id" :data="item" />
+        <Item v-for="item in list" :key="item.id" :data="item" @refresh="getList" />
       </template>
     </div>
     <!-- 未进入机库或者进入机库后列表是展开的情况下，才显示收纳按钮 -->

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

@@ -212,9 +212,11 @@ export default {
       let data = null;
       let num = 0;
       document.addEventListener("keydown", (event) => {
+        this.keycode = event.key;
         this.clickControl(event);
       });
       document.addEventListener("keyup", (event) => {
+        this.keycode = '';
         this.stopGimbal();
       });
     },
@@ -265,6 +267,7 @@ export default {
     clickControl(event) {
       console.log(event.key);
       let data = null;
+      this.keycode = event.key;
       //return
       if (this.enable) {
         this.enable = false;
@@ -328,6 +331,7 @@ export default {
       }
     },
     cancelControl() {
+      this.keycode = '';
       this.stopGimbal();
     },
   },

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

@@ -23,6 +23,7 @@
         v-if="selectMount"
         class="mount-panel"
         :keyFlag="nxNormal"
+        :payload_data="selectMountPayload"
         @directive="mountDirective"
         @take_photo="mountTakePhoto"
         @record="mountRecord"
@@ -33,7 +34,7 @@
 </template>
 <script>
 // import API from "@/api";
-import { mapState } from "vuex";
+import { mapState, mapGetters } from "vuex";
 import mount from "../../../../../../../../../MMCMount";
 // 所有的挂载组件
 const mountComponents = {};
@@ -72,6 +73,7 @@ export default {
       "uavRealTimeData",
       "isQingLiu",
     ]),
+    ...mapGetters("MMCFlightControlCenter/uav", ["selectMountPayload"]),
     nxNormal() {
       return this.uavRealTimeData?.healthData?.NX?.warningLevel === "NORMAL";
     },
@@ -117,10 +119,14 @@ export default {
      */
     mountRecord(streamData) {
       console.log("挂载录像", streamData);
+      let recordControl =
+        streamData.data.data.status ||
+        streamData.data.data.recordControl ||
+        false;
       this.$store.dispatch("MMCFlightControlCenter/uav/videoTranscribe", {
-        recordControl: streamData.data.data.status || streamData.data.data.recordControl || false,
+        recordControl: recordControl,
         callback: () => {
-          if (streamData.data.data.recordControl) {
+          if (recordControl) {
             this.$message.success(`录像开始`);
           } else {
             this.$message.success(`录像结束`);

src/components/MMCFlightControlCenter/components/uavApplications/components/uavList/components/list/components/item/index.vue

@@ -173,7 +173,6 @@ export default {
           });
           if (res.code === 0) {
             this.$message.success(`已退出接管${uav.name}`);
-            this.$set(uav, 'currentOperator', false);  //不等待接口结果直接修改状态
             this.$emit("refresh");
           }
         } catch (e) {}
@@ -194,7 +193,6 @@ export default {
           });
           if (res.code === 0) {
             this.$message.success(`请开始操作${uav.name}`);
-            this.$set(uav, 'currentOperator', true);  //不等待接口结果直接修改状态
             this.$emit("refresh");
           }
         } catch (e) {}

src/components/MMCFlightControlCenter/store/uav.js

@@ -212,7 +212,7 @@ const state = {
       mountId: 12,
     }, */
   ], // 挂载列表
-  selectMount: null, // 选中的挂载
+  selectMount: null, // 选中的挂载,payload数据是固定的,不会实时更新,实时更新使用selectMountPayload
   showPlayer: false, //显示播放器
   showPanel: false, //显示数据面板
   isQingLiu: null, // 当前视频播放的是否为清流
@@ -422,6 +422,18 @@ const actions = {
             }
           });
           commit("setState", { key: "mountList", value: [...state.mountList] });
+        } else {
+          // 更新挂载数据
+          let mountList = state.mountList.map((item) => {
+            if (item.mountId === type259.mountId) {
+              return {
+                ...item,
+                ...type259
+              };
+            }
+            return item;
+          });
+          commit("setState", { key: "mountList", value: mountList });
         }
       }
     } else {
@@ -1363,12 +1375,33 @@ const actions = {
   },
 };
 
+const getters = {
+  /**
+   * 选中挂载的实时数据
+   */
+  selectMountPayload(state) {
+    if (state.selectMount) {
+      let find = state.mountList.find(
+        (item) => item.mountId === state.selectMount.mountId
+      );
+      if (find) {
+        return find.payload;
+      } else {
+        throw Error("选中的挂载不在挂载列表中!");
+      }
+    } else {
+      return null;
+    }
+  },
+};
+
 export default {
   namespaced: true,
   name: "uav",
   state,
   mutations,
   actions,
+  getters,
 };
 
 /**

src/components/MMCMount/index.js

@@ -110,7 +110,7 @@ export default {
     },
     // ZT60R高清相机
     {
-      title: "高清变焦相机ZT60R",
+      title: "高清变焦相机Z60R",
       icon: pngZT60R,
       name: "MMC_Gimbal_Z60R",
       type: [1, 2, 3, 4, 5, 6, 8],