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

iframe/src/App.vue

@@ -9,6 +9,7 @@
     :useSTLAirway="useSTLAirway"
     :useTimedTask="useTimedTask"
     :useTask="useTask"
+    :showVideoPanel="showVideoPanel"
     @tokenInvalid="dispatchEvent('tokenInvalid')"
     @refreshToken="dispatchEvent('refreshToken', $event)"
     @uavChange="dispatchEvent('uavChange', $event)"
@@ -55,6 +56,7 @@ export default {
       taskListGetCB: null, //获取任务数据回调
       useTask: false, //使用任务进行航线选择
       callbackList: {},
+      showVideoPanel: false, //无人机是否展示视频面板
     };
   },
   computed: {},

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

@@ -74,7 +74,7 @@
             </div>
           </div>
           <div class="device-fns">
-            <div
+            <div v-if="showVideoPanel"
               class="iconfont icon-luxiang_xianxing"
               :class="{ active: uav && device.deviceId === uav.deviceId && uav.showPlayer }"
               title="视频"
@@ -158,6 +158,7 @@ export default {
       "userInfo",
       "showAirwayEdit",
       "deptId",
+      'showVideoPanel',
     ]),
   },
   watch: {

src/components/MMCFlightControlCenter/index.vue

@@ -75,6 +75,12 @@ export default {
       type: Boolean,
       default: false,
     },
+    //使用视频面板
+    showVideoPanel:{
+      type: Boolean,
+      default: false,
+    },
+
     userInfo: {
       type: Object,
       default() {
@@ -194,6 +200,17 @@ export default {
         });
       },
     },
+    showVideoPanel: {
+      immediate: true,
+      handler(newVal) {
+        this.$store.commit("MMCFlightControlCenter/setState", {
+          key: "showVideoPanel",
+          value: newVal,
+        });
+      },
+    },
+
+
   },
   beforeCreate() {
     crashMonitor({

src/components/MMCFlightControlCenter/store/index.js

@@ -43,6 +43,7 @@ export default {
     useSTLAirway: true, //是否使用标准航线库
     useTimedTask: false, //是否使用定时任务
     useTask: false, //使用任务进行航线选择
+    showVideoPanel: false, //显示视频面板
     baseUrl: '',  //api请求的base url
     wsUrl: '',  //websocket的url
     mqttUrl: '', //无人机的mqtt地址