fix:

1. 删除任务限制重复
2. 运行监控日志状态
3. 接管记录补充

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

@@ -13,15 +13,6 @@ class Control_API {
     });
   }
 
-  // 获取无人机列表
-  static getUavDataList(params) {
-    return request({
-      url: "/dms/uav/page",
-      method: "get",
-      params,
-    });
-  }
-
   // 获取航线列表
   static getUavRouteList(params) {
     return request({
@@ -32,40 +23,6 @@ class Control_API {
     });
   }
 
-  // 获取架次号
-  static getFlightSortic({ taskId, deviceHardId }) {
-    return request({
-      url: `/tss/task/getFlightSortic/${taskId}/${deviceHardId}`,
-      method: "get",
-    });
-  }
-
-  // 无人机详情
-  static uavDetail(params) {
-    return request({
-      url: `/dms/uav/detail/${params.id}`,
-      method: "get",
-    });
-  }
-
-  // 飞行日志
-  static getFlightLog(data) {
-    return request({
-      url: `/dms/sortie/flightLog`,
-      method: "post",
-      data,
-    });
-  }
-
-  // 保存图片
-  static addPhoto(data) {
-    return request({
-      url: `/dms/sortie-image/add`,
-      method: "post",
-      data,
-    });
-  }
-
   static uploadFile(data){
     return request({
       url: `/admin-api/infra/file/upload`,
@@ -73,29 +30,6 @@ class Control_API {
       data,
     });
   }
-  // 保存AI图片
-  // static addAiPhoto(data) {
-  //   return request({
-  //     url: `/dms/sortie-image/addAi`,
-  //     method: "post",
-  //     data
-  //   });
-  // }
-  // 获取所有机构列表
-  static getAllOrg() {
-    return request({
-      url: `/crm/organization/tree`,
-      method: "get",
-    });
-  }
-  // 获取所有无人机操作日志
-  static getUavAllLog(params) {
-    return request_uav({
-      url: `/api/log/selectUavCmdLikeList`,
-      method: "get",
-      params,
-    });
-  }
   // 获取1小时短时天气预报
   static getUavShortForEcast(params) {
     return request_uav({
@@ -112,84 +46,9 @@ class Control_API {
       params,
     });
   }
-  // 获取树结构-鹰巢
-  static getUavNestList(params) {
-    return request({
-      url: `/dms/nest/getNestList`,
-      method: "get",
-      params,
-    });
-  }
-  // 获取任务库列表
-  static getTaskList(data) {
-    return request({
-      url: `/tss/task/list`,
-      method: "post",
-      data,
-    });
-  }
-  // 获取任务库内的任务详情
-  static getTaskDetails(params) {
-    return request({
-      url: `/tss/task/${params.id}`,
-      method: "get",
-    });
-  }
-  // 鹰巢-定时，周期自启动
-  static startUavNest = (data) =>
-    request({
-      url: "/tss/task/start",
-      method: "POST",
-      data,
-    });
-  //   鹰巢-运行日志
-  static getUavNestLog = (params) =>
-    request_uav({
-      url: `api/log/selectProcessLikeList`,
-      method: "get",
-      params,
-    });
-
-  // 获取架次列表
-  static getSortie(params) {
-    return request({
-      url: "/dms/sortie/page",
-      method: "get",
-      params,
-    });
-  }
-  // 获取架次图片列表
-  static getSortieImage(params) {
-    return request({
-      url: "/dms/sortie-image/page",
-      method: "get",
-      params,
-    });
-  }
-  // 获取架次视频列表
-  static getSortieVideo(params) {
-    return request({
-      url: "/dms/sortie/history-video",
-      method: "get",
-      params,
-    });
-  }
-  // 导出成果
-  static getExportToWordForSortie(params) {
-    return request({
-      headers: {
-        "Content-Type": "application/x-www-form-urlencoded",
-      },
-      responseType: "blob",
-      url: `/dms/sortie/export-word`,
-      method: "GET",
-      params,
-    });
-  }
   // 接管无人机
   static setUavControlOn(params) {
     return request({
-      // url: `/dms/uav/takeOver/${params.id}`,
       url: `/admin-api/uas/device/controlUav`,
       method: 'post',
       params
@@ -228,6 +87,15 @@ class Control_API {
     });
   }
 
+  // 获得接管记录
+  static getTakeRecord(params){
+    return request({
+      url: `/admin-api/uas/device/getTakeRecord`,
+      method: "get",
+      params
+    }); 
+  }
+
 }
 
 export default Control_API;

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

@@ -6,7 +6,7 @@
     </div>
     <div class="dialog-content">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="执行日期" prop="date" required>
+        <el-form-item label="执行日期" prop="date">
           <el-date-picker
             v-model="form.date"
             type="daterange"
@@ -19,7 +19,7 @@
             :picker-options="pickerOptions"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="执行时间" prop="time" required>
+        <el-form-item label="执行时间" prop="time">
           <el-time-picker
             is-range
             v-model="form.time"
@@ -32,7 +32,7 @@
             value-format="HH:mm:ss"
           ></el-time-picker>
         </el-form-item>
-        <el-form-item label="航线名称" required>
+        <el-form-item label="航线名称" prop="airwayId">
           <el-select v-model="form.airwayId" size="mini" popper-class="mmc" style="width:100%">
             <el-option :label="item.name" :value="item.id" v-for="(item, index) in airwayList"></el-option>
           </el-select>

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

@@ -131,18 +131,22 @@ export default {
     },
     async onDelAirway(item) {
       try {
+        if (item.loading) {
+          return;
+        }
         await this.$confirm("请确认是否删除该任务?", "安全确认", {
           cancelButtonText: "取消",
           confirmButtonText: "确定",
           customClass: "uav_controlPane",
           showClose: false,
         });
+        item.loading = true;
         this.rootNode.$emit("taskDel", {
           task: item,
           type: 3, // 1: 日常任务 2: 定时任务 3:周期任务
           callback: () => {
             this.getTaskList();
-          }
+          },
         });
       } catch (e) {
         console.log(e);
@@ -151,9 +155,9 @@ export default {
     onTaskAddClose() {
       this.showTaskAdd = false;
     },
-    onAddDone(){
+    onAddDone() {
       this.getTaskList();
-    }
+    },
   },
 };
 </script>
@@ -228,6 +232,10 @@ export default {
 
           .icon {
             cursor: pointer;
+
+            &.loading {
+              opacity: 0.5;
+            }
           }
         }
       }

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

@@ -14,7 +14,12 @@
           </el-tooltip>
         </div>
         <div class="row__column flex2">
-          <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>{{item.taskStartTime}}</span>
           </el-tooltip>
         </div>
@@ -127,18 +132,22 @@ export default {
     },
     async onDelAirway(item) {
       try {
+        if (item.loading) {
+          return;
+        }
         await this.$confirm("请确认是否删除该任务?", "安全确认", {
           cancelButtonText: "取消",
           confirmButtonText: "确定",
           customClass: "uav_controlPane",
           showClose: false,
         });
+        item.loading = true;
         this.rootNode.$emit("taskDel", {
           task: item,
           type: 2, // 1: 日常任务 2: 定时任务 3:周期任务
           callback: () => {
             this.getTaskList();
-          }
+          },
         });
       } catch (e) {
         console.log(e);
@@ -147,9 +156,9 @@ export default {
     onTaskAddClose() {
       this.showTaskAdd = false;
     },
-    onAddDone(){
+    onAddDone() {
       this.getTaskList();
-    }
+    },
   },
 };
 </script>
@@ -224,6 +233,10 @@ export default {
 
           .icon {
             cursor: pointer;
+
+            &.loading {
+              opacity: 0.5;
+            }
           }
         }
       }

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

@@ -4,7 +4,7 @@
       <div class="title">
         <img src="../../../../../../../../assets/images/mount_head.png" />
         <div class="dialog-header__title">运行监控日志</div>
-        <div effect="dark" class="status">{{ getprocessStatus(hangarRealTimeData.processStatus) }}</div>
+        <div effect="dark" class="status">{{ getProcessStatus(hangarRealTimeData.processStatus) }}</div>
       </div>
       <div style="display: flex">
         <div class="icon-box" @click="onClear">
@@ -153,7 +153,7 @@ export default {
         },
       });
     },
-    getprocessStatus(val) {
+    getProcessStatus(val) {
       let title = "";
       if (val == 0) {
         title = "待机中";
@@ -175,6 +175,10 @@ export default {
         title = "正在执行电池检查流程";
       } else if (val == 9) {
         title = "正在执行关仓流程";
+      } else if (val == 10) {
+        title = "正在执行回中器操作";
+      } else if (val == 99) {
+        title = "正在执行飞行任务";
       } else {
         title = "暂无";
       }

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

@@ -7,13 +7,13 @@
     </div>
     <div class="dialog-content">
       <el-table :data="list">
-        <el-table-column label="无人机名称" align="center" prop="name"></el-table-column>
-        <el-table-column label="无人机所属单位" align="center" prop="name"></el-table-column>
-        <el-table-column label="接管状态" align="center" prop="name"></el-table-column>
-        <el-table-column label="当前控制单位" align="center" prop="name"></el-table-column>
+        <el-table-column label="无人机名称" align="center" prop="deviceName"></el-table-column>
+        <el-table-column label="无人机所属单位" align="center" prop="deviceDeptName"></el-table-column>
+        <el-table-column label="接管状态" align="center" prop="takeStats"></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" type="text" size="small">退出接管</el-button>
+            <el-button @click="onExit(scope.row)" type="text" size="small">退出接管</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -22,6 +22,8 @@
 </template>
 
 <script>
+import { Control_API } from "../../../../../../../api";
+
 export default {
   name: "TakeOverRecords",
   data() {
@@ -29,8 +31,30 @@ export default {
       list: [],
     };
   },
+  mounted() {
+    this.init();
+  },
   methods: {
-    onExit() {},
+    async init() {
+      let res = await Control_API.getTakeRecord({});
+      this.list = res.data;
+      console.log('接管记录', this.list);
+    },
+    onExit(item) {
+      this.$confirm("确认退出该用户接管?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(async () => {
+        await Control_API.setUavControlOff({
+          deviceId: item.deviceId,
+        });
+        this.$message({
+          type: "success",
+          message: "操作完成",
+        });
+      });
+    },
   },
 };
 </script>