Merge branch 'v4_master'

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-take/controlUav`,
+      url: `/admin-api/uas/device-take/updateCurrentOperator`,
       method: 'post',
       params
     });

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

@@ -107,6 +107,7 @@ export default {
       console.log("getTaskList", this.taskListAll);
       this.rootNode.$emit("taskListGet", {
         pageNo: 1,
+        taskStatus: 11,//筛选掉审核未通过的
         pageSize: 100,
         type: 3, // 1: 日常任务 2: 定时任务 3:周期任务
         hangar: this.hangar,

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

@@ -112,6 +112,7 @@ export default {
       this.rootNode.$emit("taskListGet", {
         pageNo: 1,
         pageSize: 100,
+        taskStatus: 11,//筛选掉审核未通过的
         type: 2, // 1: 日常任务 2: 定时任务 3:周期任务
         hangar: this.hangar,
         callback: (res) => {

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

@@ -30,7 +30,7 @@
     <ControlList @clearId="$emit('clearId')" @closeIconShow="iconShow = false" @exit="showControlList = false"
       :show="showControlList" :isHangar="isHangar"></ControlList>
     <Health v-if="showHealth" @exit="showHealth = false"></Health>
-    <Mount v-if="showMount"  :isHangar="isHangar" :show="showMount"></Mount>
+    <Mount v-if="showMount" :isHangar="isHangar" :show="showMount"></Mount>
     <!-- 喊话器 -->
     <MMCGimbalP1 class="PagerP1" v-show="showMMCGimbalP1" ref="MMCGimbalP1" @close="showMMCGimbalP1 = false" />
     <MountController @webscoketFn="(data) => fun(data)" v-if="uav && uav.deviceId" ref="MountControllerRef" />
@@ -80,7 +80,7 @@ export default {
   },
   computed: {
     ...mapState("MMCFlightControlCenter", ["showAirwayEdit"]),
-    ...mapState("MMCFlightControlCenter/uav", ["uav", "airlineData"]),
+    ...mapState("MMCFlightControlCenter/uav", ["uav", "airlineData",'uavRealTimeData']),
   },
   watch: {
     // 打开航线编辑时关闭所有窗口
@@ -96,6 +96,23 @@ export default {
     }
   },
   methods: {
+    network() {
+      let { uavRealTimeData } = this;
+      let name = null;
+      if (uavRealTimeData && uavRealTimeData.link) {
+        for (let i = 0; i < uavRealTimeData.link.length; i++) {
+          const k = uavRealTimeData.link[i];
+          if (k.priority == 2 && k.using) {
+            return "专网";
+          } else if (k.priority == 3 && k.using) {
+            return "公网";
+          } else if (k.priority == 1 && k.using) {
+            return "图传";
+          }
+        }
+      }
+      return name || "离线";
+    },
     /**
  * 接管判断, 机库模块中不需要判断接管
  */
@@ -128,8 +145,9 @@ export default {
     /**
      * 切换展示
      */
-   async onSwitchShow(key) {
-      if (key == 'showHealth' && !this?.uav?.isOnline) {
+    async onSwitchShow(key) {
+      let networkType = this.network()
+      if (key == 'showHealth' && networkType == '离线') {
         return this.$message.info('无人机不在线!');
       }
       // 判断是否已接管

src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlTop/components/takeOverRecords.vue

@@ -11,17 +11,19 @@
         <el-table-column :label="`${hangar ? '机库' : '无人机'}所属单位`" align="center" prop="deviceDeptName"></el-table-column>
         <el-table-column label="接管状态" align="center" prop="takeStats">
           <template slot-scope="scope">
-            {{scope.row.takeStats ? '接管中' : '未接管'}}
+         <div :class="scope.row.takeStats ?'color-aqua':'color-tomato'">
+          {{scope.row.takeStats ? '接管中' : '未接管'}}
+         </div>
           </template>
         </el-table-column>
         <el-table-column label="当前控制单位" align="center" prop="takeUserName"></el-table-column>
         <el-table-column label="操作" align="center" prop="name">
           <template slot-scope="scope">
-            <el-button @click="onExit(scope.row)" type="text" size="small" v-if="scope.row.takeStats">退出接管</el-button>
+            <el-buttonclas @click="onExit(scope.row)" type="text" class="color-aqua" size="small" v-if="scope.row.takeStats">退出接管</el-buttonclas>
           </template>
         </el-table-column>
-      </el-table>
-    </div>
+      </el-table>  
+    </div>  
     <el-pagination
       layout="prev, pager, next"
       :total="page.total"
@@ -105,4 +107,12 @@ export default {
     }
   }
 }
+.dialog-content{
+  .color-aqua{
+    color: aqua;
+  }
+  .color-tomato{
+    color: #ff993f;
+  }
+}
 </style>
\ No newline at end of file

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

@@ -53,7 +53,7 @@
         <img :src="gpsImg" />
       </el-tooltip>
       <!-- 搜星数 -->
-      <el-tooltip class="item" effect="dark" content="搜星数" placement="bottom">
+      <el-tooltip class="item " effect="dark" content="搜星数" placement="bottom">
         <div>
           <img src="./assets/images/satellite.png" />
           <div class="s-count">{{ satelliteCount }}</div>