fix:点击飞行计划弹框，运行监控日志或其他弹框需释放掉，不显示其他弹框

src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/components/airwayList/components/timedTask/index.vue

@@ -6,44 +6,20 @@
       <div class="header__column status">状态</div>
       <div class="header__column flex2">操作</div>
     </div>
-    <div
-      class="timed-task-main"
-      v-loading="loading"
-      element-loading-background="rgba(0, 0, 0, 0.8)"
-    >
-      <div
-        class="row"
-        :class="{ single: i % 2 != 0 }"
-        v-for="(item, i) in taskListAll"
-        :key="item.id"
-      >
+    <div class="timed-task-main" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.8)">
+      <div class="row" :class="{ single: i % 2 != 0 }" v-for="(item, i) in taskListAll" :key="item.id">
         <div class="row__column flex2">
-          <el-tooltip
-            class="item"
-            effect="dark"
-            :content="item.name"
-            placement="top-start"
-          >
+          <el-tooltip class="item" effect="dark" :content="item.name" placement="top-start">
             <span class="f12">{{ item.name }}</span>
           </el-tooltip>
         </div>
         <div class="row__column flex2 col-2">
-          <el-tooltip
-            class="item"
-            effect="dark"
-            :content="item.taskStartTime"
-            placement="top-start"
-          >
+          <el-tooltip class="item" effect="dark" :content="item.taskStartTime" placement="top-start">
             <span class="f9">{{ item.taskStartTime }}</span>
           </el-tooltip>
         </div>
         <div class="row__column status" style="color: rgb(255, 189, 54)">
-          <el-tooltip
-            class="item"
-            effect="dark"
-            :content="item.status"
-            placement="top-start"
-          >
+          <el-tooltip class="item" effect="dark" :content="item.status" placement="top-start">
             <span class="f12">{{ item.status }}</span>
           </el-tooltip>
         </div>
@@ -55,17 +31,14 @@
             <i class="el-icon-date" @click="onOpenPlan(item)"></i>
           </el-tooltip>
           <el-tooltip content="编辑" placement="top" v>
-            <i
-              class="el-icon-edit"
-              @click="onOpenEdit(item)"
-              v-if="item.status !== '执行中' && item.status !== '已完成'"
-            ></i>
+            <i class="el-icon-edit" @click="onOpenEdit(item)" v-if="item.status !== '执行中' && item.status !== '已完成'"></i>
           </el-tooltip>
           <!-- <el-tooltip content="开关" placement="top">
             <i class="el-icon-turn-off"></i>
           </el-tooltip> -->
           <el-tooltip content="删除" placement="top">
-            <i v-if="item.status !== '执行中' && item.status !== '已完成'" class="el-icon-delete" @click="onDelAirway(item)"></i>
+            <i v-if="item.status !== '执行中' && item.status !== '已完成'" class="el-icon-delete"
+              @click="onDelAirway(item)"></i>
           </el-tooltip>
         </div>
       </div>
@@ -74,18 +47,9 @@
       <div class="task-add__btn" @click="showFlightPlan = true">创建定时任务</div>
     </div>-->
 
-    <FlightPlan
-      v-if="showFlightPlan"
-      :taskId="selectedTask.id"
-      :taskList="taskListAll"
-      @close="showFlightPlan = false"
-    >
+    <FlightPlan v-if="showFlightPlan" :taskId="selectedTask.id" :taskList="taskListAll" @close="showFlightPlan = false">
     </FlightPlan>
-    <FlightEdit
-      v-if="showFlightEdit"
-      :task="selectedTask"
-      @close="showFlightEdit = false"
-    ></FlightEdit>
+    <FlightEdit v-if="showFlightEdit" :task="selectedTask" @close="showFlightEdit = false"></FlightEdit>
   </div>
 </template>
 
@@ -140,6 +104,24 @@ export default {
         this.getTaskList();
       },
     },
+    showFlightEdit: {
+      handler(val) {
+        if (!val && !this.showFlightPlan) {
+          this.changeflyLogStatus(false)
+        }else{
+          this.changeflyLogStatus(true)
+        }
+      }
+    },
+    showFlightPlan: {
+      handler(val) {
+        if (!val&&!this.showFlightEdit) {
+          this.changeflyLogStatus(false)
+        } else  {
+          this.changeflyLogStatus(true)
+        }
+      }
+    }
   },
   created() {
     this.timeHandle = setInterval(() => {
@@ -155,6 +137,13 @@ export default {
       "createAirwayEntities",
       "clearAirwayEntities",
     ]),
+    // 改变飞行日志弹框状态
+    changeflyLogStatus(falg) {
+      this.$store.commit("MMCFlightControlCenter/setState", {
+        key: "flyLogStatus",
+        value: falg,
+      });
+    },
     /**
      * 更新任务列表
      */
@@ -224,13 +213,17 @@ export default {
     onOpenPlan(item) {
       this.selectedTask = item;
       this.showFlightPlan = true;
+      this.showFlightEdit = false;
+      this.changeflyLogStatus(false)
     },
     /**
      * 打开飞行编辑
      */
     onOpenEdit(item) {
       this.selectedTask = item;
+      this.showFlightPlan = false;
       this.showFlightEdit = true;
+      this.changeflyLogStatus(false)
     },
   },
 };

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

 <template>
-  <ControlRight
-    ref="controlRight"
-    isHangar
-    @switchCallback="showHangar = false; showMonitor = false;"
-  >
-    <div
-      slot="hangar"
-      class="control-item"
-      :class="showHangar ? 'active' : ''"
-      @click="onSwitchShow('showHangar')"
-    >
+  <ControlRight ref="controlRight" isHangar @switchCallback="showHangar = false; showMonitor = false;">
+    <div slot="hangar" class="control-item" :class="showHangar ? 'active' : ''" @click="onSwitchShow('showHangar')">
       <img src="./assets/images/hangar.svg" />
       <span class="dib">机库</span>
     </div>
@@ -21,25 +12,16 @@
           <span class="dialog-header__close" @click="showHangar = false;">关闭</span>
         </div>
         <div class="hangar-ctrl-list">
-          <div
-            class="hangar-ctrl-item"
-            v-for="(item, i) in ctrlList"
-            :key="i"
-            @click="onClickCMD(i)"
-          >
+          <div class="hangar-ctrl-item" v-for="(item, i) in ctrlList" :key="i" @click="onClickCMD(i)">
             <SymbolIcon v-if="item.icon" :icon="item.icon" class="hangar-ctrl-item__icon" />
             <img v-else :src="item.img" class="hangar-ctrl-item__icon" />
-            <div class="hangar-ctrl-item__title">{{item.label}}</div>
+            <div class="hangar-ctrl-item__title">{{ item.label }}</div>
           </div>
         </div>
       </div>
       <Logger class="logger" @exit="showLogger = false" v-if="showLogger"></Logger>
-      <HangarMonitor
-        :uavMsg="uavRealTimeData.msg"
-        :weatherStation="hangarRealTimeData.weatherStation"
-        :hangarData="hangarRealTimeData"
-        v-if="showMonitor"
-      ></HangarMonitor>
+      <HangarMonitor :uavMsg="uavRealTimeData.msg" :weatherStation="hangarRealTimeData.weatherStation"
+        :hangarData="hangarRealTimeData" v-if="showMonitor"></HangarMonitor>
     </div>
   </ControlRight>
 </template>
@@ -120,11 +102,21 @@ export default {
     };
   },
   computed: {
-    ...mapState("MMCFlightControlCenter", ["showAirwayEdit"]),
+    ...mapState("MMCFlightControlCenter", ["showAirwayEdit", "flyLogStatus"]),
     ...mapState("MMCFlightControlCenter/uav", ["uavRealTimeData"]),
     ...mapState("MMCFlightControlCenter/hangar", ["hangarRealTimeData"]),
   },
   watch: {
+    flyLogStatus: {
+      handler(val) {
+          if (val) {
+            this.showLogger = false
+          } else {
+            this.showLogger = true
+          }
+      },
+      immediate: true,
+    },
     // 打开航线编辑时关闭所有窗口
     showAirwayEdit(newVal) {
       if (newVal) {
@@ -150,7 +142,7 @@ export default {
      * 切换展示
      */
     async onSwitchShow(key) {
-      if(!await this.isTakeOver()){
+      if (!await this.isTakeOver()) {
         this.$message.warning("请先接管设备");
         return;
       }
@@ -163,7 +155,7 @@ export default {
      * @param {number} i this.ctrlList被点击元素的索引
      */
     async onClickCMD(i) {
-      if(!await this.isTakeOver()){
+      if (!await this.isTakeOver()) {
         this.$message.warning("请先接管设备");
         return;
       }
@@ -221,8 +213,7 @@ export default {
     justify-content: space-between;
     height: 32px;
 
-    .hangar-ctrl-header__title {
-    }
+    .hangar-ctrl-header__title {}
 
     .hangar-ctrl-header__close {
       font-size: 14px;
@@ -234,6 +225,7 @@ export default {
       align-items: center;
     }
   }
+
   .hangar-ctrl-list {
     box-sizing: border-box;
     padding: 8px 16px 14px;

src/components/MMCFlightControlCenter/store/index.js

@@ -7,6 +7,7 @@ import { Utils } from "../lib/cesium";
 export default {
   namespaced: true,
   state: {
+    flyLogStatus: false, //飞行日志状态
     devMode: false, //开发模式, 使用开发环境接口
     token: "", //登录token
     TenantId: "", //租户id