fix:接管记录字段更改

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

@@ -21,7 +21,6 @@
           ></el-date-picker>
         <el-form-item label="任务库：" prop="taskId">
           {{ task.name }}
-        </el-select>
         </el-form-item>
         <el-form-item label="航线名称：" prop="airwayId">
           {{ task.airwayName }}
@@ -91,7 +90,8 @@ export default {
           id: this.task.id
         }
         if(this.task.taskType == 1){
-          params.taskStartTime = params.taskEndTime = Moment(this.form.time).valueOf();
+          params.taskStartTime =  Moment(this.form.time).valueOf();
+          params.taskEndTime =null
         } else {
           params.taskStartTime = Moment(this.form.time[0]).valueOf();
           params.taskEndTime = Moment(this.form.time[1]).valueOf();

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

@@ -30,7 +30,7 @@
           <el-tooltip content="计划安排" placement="top">
             <i class="el-icon-date" @click="onOpenPlan(item)"></i>
           </el-tooltip>
-          <el-tooltip content="编辑" placement="top" v-if="item.taskStatus == 1 || item.taskStatus == 11">
+          <el-tooltip content="编辑" placement="top" >
             <i class="el-icon-edit" @click="onOpenEdit(item)"></i>
           </el-tooltip>
           <!-- <el-tooltip content="开关" placement="top">

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

@@ -16,7 +16,8 @@
          </div>
           </template>
         </el-table-column>
-        <el-table-column label="当前控制单位" align="center" prop="takeUserName"></el-table-column>
+        <el-table-column label="当前控制单位" align="center" prop="userDeptName"></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-buttonclas @click="onExit(scope.row)" type="text" class="color-aqua cp" size="small" v-if="scope.row.takeStats">退出接管</el-buttonclas>
@@ -59,11 +60,13 @@ export default {
   },
   methods: {
     async init() {
+      console.log(this.uav,'this.uav');
+      
       let res = await Control_API.getTakeRecord({
         deviceType: this.hangar ? 2 : 1,
         pageNo: this.page.pageNo,
         pageSize: this.page.pageSize,
-        deviceId : this.uav? this.uav?.deviceId:this.hangar?.deviceId
+        deviceId : this.hangar? this.hangar?.deviceId:this.uav?.deviceId
       });
       this.list.splice(0, this.list.length, ...res.data?.list??[])
       // this.list = res.data;
@@ -92,7 +95,7 @@ export default {
 
 <style lang="scss" scoped>
 .dialog1027::v-deep {
-  width: 700px;
+  width: 750px;
   position: absolute !important;
   left: 50%;
   top: calc(100% + 25px);