From 9651a62caa79f7d8e95287b12ccd40c155f482f1 Mon Sep 17 00:00:00 2001
From: Bingkun Li <bkunlee@outlook.com>
Date: Mon, 26 Jan 2026 14:19:17 +0800
Subject: [PATCH] Update frontend code, add executing job list selecting

---
 .../skyeye/jm/controller/JmJobController.java |   5 +
 .../zhangy/skyeye/jm/mapper/JmJobMapper.java  |   5 +
 .../skyeye/jm/service/JmJobService.java       |   5 +
 .../jm/service/impl/JmJobServiceImpl.java     |   8 +
 .../resources/mapping/jm/JmJobMapping.xml     |  15 +
 frontend/Skyeye-sys-ui/src/api/task.js        |  12 +-
 frontend/Skyeye-sys-ui/src/api/user.js        |  15 +
 .../src/components/dt-scene/index.scss        |   5 +-
 .../src/layout/components/header-nav/index.js |   2 +-
 frontend/Skyeye-sys-ui/src/permission.js      |  46 +-
 frontend/Skyeye-sys-ui/src/store/getters.js   |   2 +
 .../Skyeye-sys-ui/src/store/modules/app.js    |   2 +-
 .../Skyeye-sys-ui/src/store/modules/dict.js   |  50 +-
 frontend/Skyeye-sys-ui/src/styles/index.scss  |   1 +
 .../home/components/device1-manage/index.js   |  10 +-
 .../home/components/device1-manage/index.scss |   5 +
 .../home/components/device1-manage/index.vue  | 123 +--
 .../home/components/pictures-list/index.js    |  23 +-
 .../home/components/pictures-list/index.vue   |   4 +-
 .../home/components/task-manage/index.js      | 806 ++++++++++--------
 .../home/components/task-manage/index.scss    |  14 +-
 .../home/components/task-manage/index.vue     |  72 +-
 .../home/components/task-manage/lineTarget.js |  39 +-
 .../home/components/twin-situation/index.js   |  18 +-
 .../views/home/components/user-list/index.js  |  97 ++-
 .../home/components/user-list/index.scss      |  15 +-
 .../views/home/components/user-list/index.vue |  86 +-
 .../Skyeye-sys-ui/src/views/home/index.js     |   7 +-
 .../Skyeye-sys-ui/src/views/login/index.vue   |   1 +
 29 files changed, 898 insertions(+), 595 deletions(-)

diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/controller/JmJobController.java b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/controller/JmJobController.java
index de5b623..d53ad0c 100644
--- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/controller/JmJobController.java
+++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/controller/JmJobController.java
@@ -54,6 +54,11 @@ public class JmJobController {
     public Object selectList(@Valid @RequestBody JmJobQueryDTO param) {
         return jobService.selectList(param);
     }
+
+    @RequestMapping("/execJobs")
+    public Object selectExecJobs(@Valid @RequestBody JmJobQueryDTO param) {
+        return jobService.selectExecJobs(param);
+    }
     
     /** 
      * 查询详情
diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/mapper/JmJobMapper.java b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/mapper/JmJobMapper.java
index 392e3fc..6fb76ba 100644
--- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/mapper/JmJobMapper.java
+++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/mapper/JmJobMapper.java
@@ -22,6 +22,11 @@ public interface JmJobMapper {
      * 列表查询
      */
     List<JmJobDTO> selectList(JmJobQueryDTO param);
+
+    /**
+     * 查询执行中的job
+     */
+    List<JmJobDTO> selectExecJobs(JmJobQueryDTO param);
     
     /** 
      * 按主键查询
diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/JmJobService.java b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/JmJobService.java
index 6c9e2e4..9cd34bd 100644
--- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/JmJobService.java
+++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/JmJobService.java
@@ -21,6 +21,11 @@ public interface JmJobService {
      * 列表查询
      */
     List<JmJobDTO> selectList(JmJobQueryDTO param);
+
+    /**
+     * 查找正在执行的job
+     */
+    List<JmJobDTO> selectExecJobs(JmJobQueryDTO param);
     
     /** 
      * 按主键查询
diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobServiceImpl.java b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobServiceImpl.java
index 594fd46..f606576 100644
--- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobServiceImpl.java
+++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobServiceImpl.java
@@ -113,6 +113,14 @@ public class JmJobServiceImpl implements JmJobService {
         return list;
     }
 
+    @Override
+    public List<JmJobDTO> selectExecJobs(JmJobQueryDTO param)
+    {
+        List<JmJobDTO> list = jobMapper.selectExecJobs(param);
+        loadDetail(param.getUavId(), list);
+        return list;
+    }
+
     private void loadDetail(Long uavId, List<JmJobDTO> list) {
         if (ObjectUtil.isEmpty(list)) {
             return;
diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/mapping/jm/JmJobMapping.xml b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/mapping/jm/JmJobMapping.xml
index d78244e..7e89e02 100644
--- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/mapping/jm/JmJobMapping.xml
+++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/mapping/jm/JmJobMapping.xml
@@ -48,6 +48,21 @@
         order by j.create_time desc
     </select>
 
+    <select id="selectExecJobs" resultType="com.zhangy.skyeye.jm.dto.JmJobDTO">
+        <include refid="selectSql"/>
+        where j.status = '1'
+        <if test="type != null and type == 1">
+            and j.status in ('1', '3')
+        </if>
+        <if test="uavId != null">
+            and exists (select 1 from jm_job_uav ju where j.id = ju.job_id and ju.uav_id = #{uavId})
+        </if>
+        <if test="payloadId != null">
+            and exists (select 1 from jm_job_payload jp where j.id = jp.job_id and jp.payload_id = #{payloadId})
+        </if>
+        order by j.create_time desc
+    </select>
+
     <select id="selectInfo" resultType="com.zhangy.skyeye.jm.dto.JmJobDTO">
         select
             j.id,
diff --git a/frontend/Skyeye-sys-ui/src/api/task.js b/frontend/Skyeye-sys-ui/src/api/task.js
index b266283..a05fa23 100644
--- a/frontend/Skyeye-sys-ui/src/api/task.js
+++ b/frontend/Skyeye-sys-ui/src/api/task.js
@@ -17,12 +17,15 @@ export const getUavCurrentHeight = params =>
 // 获取任务列表
 export const getTaskListData = params =>
   req('post', '/sar/job/list', params)
+// 获取执行中的任务列表
+export const getExecJobs = params =>
+  req('post', '/sar/job/execJobs', params)
 // 新增任务
 export const addTaskFast = params =>
   req('post', '/sar/job/save', params)
 // 预览任务
 export const previewTaskFast = params =>
-  req('post', 'ktkx/UavPlanning/SAR', params)
+  req('post', '/jm/plan/airline', params)
 // 编辑任务
 export const editTaskFast = params =>
   req('post', '/sar/job/save', params)
@@ -41,6 +44,9 @@ export const deleteTaskItem = params =>
 // 查询任务详情
 export const getTaskItemDetail = params =>
   req('get', '/sar/job/detail', params)
+// 查询任务编辑详情
+export const getTaskEditItemDetail = params =>
+  req('get', '/sar/job/info', params)
 // 查询无人机列表
 export const getUavListData = params =>
   req('post', '/skyeye/uav/list', params)
@@ -74,3 +80,7 @@ export const deletePictureItem = params =>
 // ai识别
 export const pictureAiCheck = params =>
   req('post', '/sar/image/identify', params)
+
+// 开机
+export const changePayloadRadarOpenState = params =>
+  req('post', '/sar/control/send', params)
diff --git a/frontend/Skyeye-sys-ui/src/api/user.js b/frontend/Skyeye-sys-ui/src/api/user.js
index 6ba180a..7036b54 100644
--- a/frontend/Skyeye-sys-ui/src/api/user.js
+++ b/frontend/Skyeye-sys-ui/src/api/user.js
@@ -40,3 +40,18 @@ export const getWeatherInfo = params => req('get', '/weather/info', params)
 // 获取字典接口
 export const getAllDictType = params =>
   req('get', '/dict/list', params)
+
+
+// #region 新增user表接口
+export const userList = params =>
+  req('post', '/user/list', params)
+// 删除
+export const userRemove = params =>
+  req('post', '/user/remove', params)
+// 保存信息
+export const userSave = params =>
+  req('post', '/user/save', params)
+// 更新
+export const userUpdate = params =>
+  req('post', '/user/update', params)
+//#endregion
diff --git a/frontend/Skyeye-sys-ui/src/components/dt-scene/index.scss b/frontend/Skyeye-sys-ui/src/components/dt-scene/index.scss
index 2d494eb..ca4f59b 100644
--- a/frontend/Skyeye-sys-ui/src/components/dt-scene/index.scss
+++ b/frontend/Skyeye-sys-ui/src/components/dt-scene/index.scss
@@ -11,11 +11,12 @@
     height: 100%;
     position: absolute;
   }
+
   #cesium-split {
     position: absolute;
     left: 50%;
     top: 0;
-    background-color: red;
+    background-color: #ffffff;
     width: 4px;
     height: 100%;
     cursor: ew-resize;
@@ -33,10 +34,12 @@
     ::v-deep .dt-card__content {
       padding: 0;
     }
+
     .timeline-content {
       display: flex;
       justify-content: flex-start;
       position: relative;
+
       .timeline-contain {
         flex: 1;
       }
diff --git a/frontend/Skyeye-sys-ui/src/layout/components/header-nav/index.js b/frontend/Skyeye-sys-ui/src/layout/components/header-nav/index.js
index 53f4f16..d49409a 100644
--- a/frontend/Skyeye-sys-ui/src/layout/components/header-nav/index.js
+++ b/frontend/Skyeye-sys-ui/src/layout/components/header-nav/index.js
@@ -164,7 +164,7 @@ export default {
     //   console.log('刷新自己取', localStorage.getItem('userId'), localStorage.getItem('username'))
     // }
     if (this.username !== 'admin') {
-      // this.menus[3].show = false
+      this.menus[3].show = false
     }
   },
   methods: {
diff --git a/frontend/Skyeye-sys-ui/src/permission.js b/frontend/Skyeye-sys-ui/src/permission.js
index c0e09e6..c7cf00a 100644
--- a/frontend/Skyeye-sys-ui/src/permission.js
+++ b/frontend/Skyeye-sys-ui/src/permission.js
@@ -9,30 +9,30 @@ const whiteList = ['/login'] // 本地测试保留login
 
 router.beforeEach(async (to, from, next) => {
   // 启动进度条
-  NProgress.start()
+  // NProgress.start()
   // 确定用户是否已登录
-  const hasToken = getToken()
-  if (hasToken) {
-    if (to.path === '/login') {
-      // 如果已登录，则重定向到主页
-      next({ path: '/' })
-      NProgress.done()
-    } else {
-      NProgress.done()
-      next()
-    }
-  } else {
-    /* 没有 token */
-    if (whiteList.indexOf(to.path) !== -1) {
-      // 在免费登录白名单，直接去
-      next()
-    } else {
-      // 没有访问权限的其他页面被重定向到登录页面。
-      next(`/login?redirect=${to.path}`)
-      NProgress.done()
-    }
-  }
-  // next()
+  // const hasToken = getToken()
+  // if (hasToken) {
+  //   if (to.path === '/login') {
+  //     // 如果已登录，则重定向到主页
+  //     next({ path: '/' })
+  //     NProgress.done()
+  //   } else {
+  //     NProgress.done()
+  //     next()
+  //   }
+  // } else {
+  //   /* 没有 token */
+  //   if (whiteList.indexOf(to.path) !== -1) {
+  //     // 在免费登录白名单，直接去
+  //     next()
+  //   } else {
+  //     // 没有访问权限的其他页面被重定向到登录页面。
+  //     next(`/login?redirect=${to.path}`)
+  //     NProgress.done()
+  //   }
+  // }
+  next()
 
   // 跳转页面时，取消上一个页面的请求
   if (window.__axiosCancelTokenArr) {
diff --git a/frontend/Skyeye-sys-ui/src/store/getters.js b/frontend/Skyeye-sys-ui/src/store/getters.js
index 0eb3ca6..7e2bceb 100644
--- a/frontend/Skyeye-sys-ui/src/store/getters.js
+++ b/frontend/Skyeye-sys-ui/src/store/getters.js
@@ -52,5 +52,7 @@ const getters = {
   jobModeOptions: state => state.dict.jobModeOptions,
   polarization: state => state.dict.polarization,
   polarizationOptions: state => state.dict.polarizationOptions,
+  sarImageMode: state => state.dict.sarImageMode,
+  sarImageModeOptions: state => state.dict.sarImageModeOptions,
 }
 export default getters
diff --git a/frontend/Skyeye-sys-ui/src/store/modules/app.js b/frontend/Skyeye-sys-ui/src/store/modules/app.js
index 99e546e..9587ced 100644
--- a/frontend/Skyeye-sys-ui/src/store/modules/app.js
+++ b/frontend/Skyeye-sys-ui/src/store/modules/app.js
@@ -15,7 +15,7 @@ const state = {
   duringPlay: false,
   menuExpand: false, // 侧边工具栏是否展开
   theme: 'light',
-  menusChose: '2'
+  menusChose: '1'
 }
 
 const mutations = {
diff --git a/frontend/Skyeye-sys-ui/src/store/modules/dict.js b/frontend/Skyeye-sys-ui/src/store/modules/dict.js
index 12f8c6d..3db2b31 100644
--- a/frontend/Skyeye-sys-ui/src/store/modules/dict.js
+++ b/frontend/Skyeye-sys-ui/src/store/modules/dict.js
@@ -13,9 +13,9 @@ const state = {
   taskFlightModeOptions: [],
   jobStatus: {},
   jobStatusOptions: [],
-  sarResolution:{},
+  sarResolution: {},
   sarResolutionOptions: [],
-  detectType:{},
+  detectType: {},
   jobMode: {},
   jobModeOptions: [
     {
@@ -29,6 +29,8 @@ const state = {
   ],
   polarization: {},
   polarizationOptions: {},
+  sarImageMode: {},
+  sarImageModeOptions: []
 }
 
 const mutations = {
@@ -90,7 +92,12 @@ const mutations = {
   SET_POLARIZATION_OPTIONS: (state, info) => {
     state.polarizationOptions = info
   },
-
+  SET_SAR_IMAGE_MODE: (state, info) => {
+    state.sarImageMode = info
+  },
+  SET_SAR_IMAGE_MODE_OPTIONS: (state, info) => {
+    state.sarImageModeOptions = info
+  },
 }
 const actions = {
   getDict({ commit }) {
@@ -103,66 +110,74 @@ const actions = {
           let imuStatusOptions = []
           let enableStatus = {}
           let enableStatusOptions = []
-          let successStatus= {}
+          let successStatus = {}
           let successStatusOptions = []
-          let sarWorkStatus= {}
+          let sarWorkStatus = {}
           let sarWorkStatusOptions = []
-          let taskFlightMode= {}
+          let taskFlightMode = {}
           let taskFlightModeOptions = []
-          let jobStatus= {}
+          let jobStatus = {}
           let jobStatusOptions = []
-          let sarResolution= {}
+          let sarResolution = {}
           let sarResolutionOptions = []
           let detectType = {}
           let jobMode = {}
           let jobModeOptions = []
           let polarization = {}
           let polarizationOptions = []
+          let sarImageMode = {}
+          let sarImageModeOptions = []
 
           res.data.data.forEach(item => {
             switch (item.dictType) {
               case 'imu_status':
                 imuStatus[item.dictValue] = item.dictLabel
-                imuStatusOptions.push({label: item.dictLabel, value: item.dictValue})
+                imuStatusOptions.push({ label: item.dictLabel, value: item.dictValue })
                 break
               case 'enable_status':
                 enableStatus[item.dictValue] = item.dictLabel
-                enableStatusOptions.push({label: item.dictLabel, value: item.dictValue})
+                enableStatusOptions.push({ label: item.dictLabel, value: item.dictValue })
                 break
               case 'success_status':
                 successStatus[item.dictValue] = item.dictLabel
-                successStatusOptions.push({label: item.dictLabel, value: item.dictValue})
+                successStatusOptions.push({ label: item.dictLabel, value: item.dictValue })
                 break
               case 'sar_work_status':
                 sarWorkStatus[item.dictValue] = item.dictLabel
-                sarWorkStatusOptions.push({label: item.dictLabel, value: item.dictValue})
+                sarWorkStatusOptions.push({ label: item.dictLabel, value: item.dictValue })
                 break
               case 'task_flight_mode':
                 taskFlightMode[item.dictValue] = item.dictLabel
-                taskFlightModeOptions.push({label: item.dictLabel, value: item.dictValue})
+                taskFlightModeOptions.push({ label: item.dictLabel, value: item.dictValue })
                 break
               case 'job_status':
                 jobStatus[item.dictValue] = item.dictLabel
-                jobStatusOptions.push({label: item.dictLabel, value: item.dictValue})
+                jobStatusOptions.push({ label: item.dictLabel, value: item.dictValue })
                 break
               case 'sar_resolution':
                 sarResolution[item.dictValue] = item.dictLabel
-                sarResolutionOptions.push({label: item.dictLabel, value: item.dictValue})
+                sarResolutionOptions.push({ label: item.dictLabel, value: item.dictValue })
                 break
               case 'py_detect_type':
                 detectType[item.dictValue] = item.dictLabel
                 break
               case 'job_mode':
                 jobMode[item.dictValue] = item.dictLabel
-                jobModeOptions.push({label: item.dictLabel, value: item.dictValue})
+                jobModeOptions.push({ label: item.dictLabel, value: item.dictValue })
                 break
               case 'sar_polarization':
                 polarization[item.dictValue] = item.dictLabel
-                polarizationOptions.push({label: item.dictLabel, value: item.dictValue})
+                polarizationOptions.push({ label: item.dictLabel, value: item.dictValue })
+                break
+              case 'sar_image_mode':
+                sarImageMode[item.dictValue] = item.dictLabel
+                sarImageModeOptions.push({ label: item.dictLabel, value: item.dictValue })
                 break
 
             }
           })
+          commit('SET_SAR_IMAGE_MODE', sarImageMode)
+          commit('SET_SAR_IMAGE_MODE_OPTIONS', sarImageModeOptions)
           // 适配机场类型
           commit('SET_IMU_STATUS', imuStatus)
           commit('SET_IMU_STATUS_OPTIONS', imuStatusOptions)
@@ -192,6 +207,7 @@ const actions = {
           // 极化方式
           commit('SET_POLARIZATION', polarization)
           commit('SET_POLARIZATION_OPTIONS', polarizationOptions)
+          commit('SET_POLARIZATION_OPTIONS', sarImageModeOptions)
           resolve()
         } else {
           this.$message.error(res.data.message)
diff --git a/frontend/Skyeye-sys-ui/src/styles/index.scss b/frontend/Skyeye-sys-ui/src/styles/index.scss
index ae67a6e..5a97ac3 100644
--- a/frontend/Skyeye-sys-ui/src/styles/index.scss
+++ b/frontend/Skyeye-sys-ui/src/styles/index.scss
@@ -1506,6 +1506,7 @@ input[type="number"] {
   }
 }
 
+
 .query-form {
   .el-form-item {
     margin-bottom: 0 !important;
diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.js b/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.js
index 0164734..dfa1ecd 100644
--- a/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.js
+++ b/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.js
@@ -35,11 +35,11 @@ export default {
     return {
       visibleLocale: false,
       deviceData: [
-        {
-          name: '无人机1',
-          num: 'M3127',
-          location: '112.3423242,45.2312324'
-        }
+        // {
+        //   name: '无人机1',
+        //   num: 'M3127',
+        //   location: '112.3423242,45.2312324'
+        // }
       ],
       device: {
         visible: false,
diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.scss b/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.scss
index 387d303..d0e3a3b 100644
--- a/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.scss
+++ b/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.scss
@@ -305,3 +305,8 @@
   top: $--icon-mode-larger-card-top;
   transition: 0.2s ease-in-out;
 }
+
+::v-deep .el-icon-plus {
+  position: relative;
+  top: 2px;
+}
diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.vue b/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.vue
index 0950968..726c2b9 100644
--- a/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.vue
+++ b/frontend/Skyeye-sys-ui/src/views/home/components/device1-manage/index.vue
@@ -25,10 +25,7 @@
           ></el-input>
         </el-form-item> -->
         <el-form-item label="">
-          <el-select
-            v-model="queryForm.type"
-            popper-class="select-light"
-          >
+          <el-select v-model="queryForm.type" popper-class="select-light">
             <el-option
               v-for="item in deviceTypes"
               :key="item.value"
@@ -78,14 +75,20 @@
         ></i>
       </div>
     </div> -->
-    <el-table v-if="isShowTable" :data="deviceData" stripe style="width: 100%">
+    <el-table
+      v-if="isShowTable"
+      :data="deviceData"
+      stripe
+      style="width: 100%"
+      height="100%"
+    >
       <template v-if="queryForm.type === 'payload'">
         <el-table-column prop="name" label="雷达名称"> </el-table-column>
         <el-table-column prop="type" label="雷达类型"> </el-table-column>
         <el-table-column prop="ip" label="IP"> </el-table-column>
       </template>
-       <template v-else>
-         <el-table-column prop="name" label="无人机名称"> </el-table-column>
+      <template v-else>
+        <el-table-column prop="name" label="无人机名称"> </el-table-column>
         <el-table-column prop="code" label="无人机码"> </el-table-column>
         <el-table-column prop="ip" label="IP"> </el-table-column>
         <el-table-column prop="createTime" label="创建时间"> </el-table-column>
@@ -128,60 +131,60 @@
           label-width="110px"
           class="change-password-form"
         >
-        <template v-if="queryForm.type === 'uav'">
-          <el-form-item label="无人机名称" prop="name1">
-            <el-input
-              v-model="device.form.name1"
-              placeholder="请输入无人机名称"
-              clearable
-              size="mini"
-            ></el-input>
-          </el-form-item>
+          <template v-if="queryForm.type === 'uav'">
+            <el-form-item label="无人机名称" prop="name1">
+              <el-input
+                v-model="device.form.name1"
+                placeholder="请输入无人机名称"
+                clearable
+                size="mini"
+              ></el-input>
+            </el-form-item>
 
-          <el-form-item label="无人机码" prop="code">
-            <el-input
-              v-model="device.form.code"
-              placeholder="请输入无人机码"
-              clearable
-              size="mini"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="IP" prop="ip1">
-            <el-input
-              v-model="device.form.ip1"
-              placeholder="请输入无人机IP"
-              clearable
-              size="mini"
-            ></el-input>
-          </el-form-item>
-        </template>
-         <template v-else>
-          <el-form-item label="雷达名称" prop="name2">
-            <el-input
-              v-model="device.form.name2"
-              placeholder="请输入雷达名称"
-              clearable
-              size="mini"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="雷达类型" prop="type">
-            <el-input
-              v-model="device.form.type"
-              placeholder="请输入雷达类型"
-              clearable
-              size="mini"
-              disabled
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="IP" prop="ip2">
-            <el-input
-              v-model="device.form.ip2"
-              placeholder="请输入雷达IP"
-              clearable
-              size="mini"
-            ></el-input>
-          </el-form-item>
-        </template>
+            <el-form-item label="无人机码" prop="code">
+              <el-input
+                v-model="device.form.code"
+                placeholder="请输入无人机码"
+                clearable
+                size="mini"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="IP" prop="ip1">
+              <el-input
+                v-model="device.form.ip1"
+                placeholder="请输入无人机IP"
+                clearable
+                size="mini"
+              ></el-input>
+            </el-form-item>
+          </template>
+          <template v-else>
+            <el-form-item label="雷达名称" prop="name2">
+              <el-input
+                v-model="device.form.name2"
+                placeholder="请输入雷达名称"
+                clearable
+                size="mini"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="雷达类型" prop="type">
+              <el-input
+                v-model="device.form.type"
+                placeholder="请输入雷达类型"
+                clearable
+                size="mini"
+                disabled
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="IP" prop="ip2">
+              <el-input
+                v-model="device.form.ip2"
+                placeholder="请输入雷达IP"
+                clearable
+                size="mini"
+              ></el-input>
+            </el-form-item>
+          </template>
         </el-form>
       </div>
       <div class="btns" slot="footer">
diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/pictures-list/index.js b/frontend/Skyeye-sys-ui/src/views/home/components/pictures-list/index.js
index 144934d..b9d480f 100644
--- a/frontend/Skyeye-sys-ui/src/views/home/components/pictures-list/index.js
+++ b/frontend/Skyeye-sys-ui/src/views/home/components/pictures-list/index.js
@@ -29,16 +29,17 @@ export default {
       uploadPictureInfo: {
         visible: false
       },
-      pictureData: [{
-        id: 1,
-        jobName: '任务1',
-        createTime: '2012-02-18 12：00:00'
-      },
-      {
-        id: 2,
-        jobName: '任务2',
-        createTime: '2012-02-18 12：00:00'
-      }
+      pictureData: [
+        //   {
+        //   id: 1,
+        //   jobName: '任务1',
+        //   createTime: '2012-02-18 12：00:00'
+        // },
+        // {
+        //   id: 2,
+        //   jobName: '任务2',
+        //   createTime: '2012-02-18 12：00:00'
+        // }
       ],
       page: {
         size: 20,
@@ -123,7 +124,7 @@ export default {
         if (res.data.code === 200) {
           console.log('图片分页', res.data.data)
           let data = res.data.data.records
-          // this.pictureData = data
+          this.pictureData = data
           this.page.total = res.data.data.total
         } else {
           this.$message.error(res.data.message)
diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/pictures-list/index.vue b/frontend/Skyeye-sys-ui/src/views/home/components/pictures-list/index.vue
index faeb995..77f1899 100644
--- a/frontend/Skyeye-sys-ui/src/views/home/components/pictures-list/index.vue
+++ b/frontend/Skyeye-sys-ui/src/views/home/components/pictures-list/index.vue
@@ -44,13 +44,13 @@
                 <div class="pic-time">拍摄时间：{{ item.createTime }}</div>
               </div>
               <div class="pic-command">
-                <el-tooltip effect="dark" content="修改名称" placement="left">
+                <el-tooltip effect="dark" content="修改名称" placement="top">
                   <i
                     class="el-icon-edit-outline"
                     @click.stop="editPictureName(item)"
                   ></i>
                 </el-tooltip>
-                <el-tooltip effect="dark" content="删除" placement="right">
+                <el-tooltip effect="dark" content="删除" placement="top">
                   <i
                     class="el-icon-close delete-task"
                     @click.stop="deletePicture(item)"
diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.js b/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.js
index 47c6495..2eb548f 100644
--- a/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.js
+++ b/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.js
@@ -1,5 +1,4 @@
 import { lodLayer, viewer } from '@/components/dt-scene/index.vue'
-
 // 新增空间态势统计
 
 // 台风列表
@@ -14,10 +13,11 @@ import { getUnionId } from '@/utils'
 import { AreaPlotManager } from '@/utils/area-plot-manager'
 import {
   addTaskFast,
-  deleteTaskItem, editTaskName, getLoaderEnabledList,
-  getTaskListData, getUavCurrentHeight, getUavEnabledListData,
-  reRunTask,
+  deleteTaskItem, editTaskName, getLoaderEnabledList, getTaskEditItemDetail,
+  getTaskListData, getUavCurrentHeight, getUavEnabledListData, previewTaskFast,
+  reRunTask
 } from '@/api/task'
+import LinePlot from './line-plot'
 import LineTarget from './lineTarget'
 import axios from 'axios'
 
@@ -53,18 +53,18 @@ export default {
       taskList: {
         visible: true,
         data: [
-          {
-            id: 1,
-            executeIcon: 'ri-dv-line',
-            executeName: '无人机1',
-            typeIcon: 'el-icon-camera',
-            name: '拍照任务',
-            uavCompletion: 30,
-            isFinish: false,
-            taskProgressName: '30%',
-            executeClass: '2',
-            taskTime: '2024-12-28 14:00:00'
-          },
+          // {
+          //   id: 1,
+          //   executeIcon: 'ri-dv-line',
+          //   executeName: '无人机1',
+          //   typeIcon: 'el-icon-camera',
+          //   name: '拍照任务',
+          //   uavCompletion: 30,
+          //   isFinish: false,
+          //   taskProgressName: '30%',
+          //   executeClass: '2',
+          //   taskTime: '2024-12-28 14:00:00'
+          // },
         ]
       },
       taskForm: {
@@ -99,6 +99,7 @@ export default {
         waveAngle: 20,
         waveRotation: 20,
         autoFocus: 0,
+        imageMode: '0',
         moto: 0,
         // startPoint: {
         //   lon: undefined,
@@ -115,6 +116,7 @@ export default {
         startAltitude: [{ required: true, message: '请输入起飞点高度', trigger: 'blur' }],
         imageLight: [{ required: true, message: '请输入图片亮度', trigger: 'blur' }],
         mode: [{ required: true, message: '请选择飞行模式', trigger: 'change' }],
+        imageMode: [{ required: true, message: '请选择成像模式', trigger: 'change' }],
         targetList: [{ required: true, message: '请选择区域', trigger: 'change' }],
         uav: [{ required: true, message: '请选择无人机', trigger: 'change' }],
         loader: [{ required: true, message: '请选择载荷', trigger: 'change' }],
@@ -209,18 +211,26 @@ export default {
           direction: 1, //侧视方向
           polarization: '0', //极化方式
         },
-        '0.2': {
-          width: 777.1751307, // y 方向幅宽
+        '0.15': {
+          width: 2597.873969, // y 方向幅宽
           length: 0.1, // x 方向幅宽
-          theta: 70.91580209, // 下视角
+          theta: 83.1449936, // 下视角
+          reserved: 100, //预留距离 (m)
+          direction: 1, //侧视方向
+          polarization: '0', //极化方式
+        },
+        '0.2': {
+          width: 2597.87396, // y 方向幅宽
+          length: 0.1, // x 方向幅宽
+          theta: 83.1449936, // 下视角
           reserved: 100, //预留距离 (m)
           direction: 1, //侧视方向
           polarization: '0', //极化方式
         },
         '0.3': {
-          width: 2025.600568, // y 方向幅宽
+          width: 4200.426476, // y 方向幅宽
           length: 0.1, // x 方向幅宽
-          theta: 80.12850849, // 下视角
+          theta: 85.0964241, // 下视角
           reserved: 100, //预留距离 (m)
           direction: 1, //侧视方向
           polarization: '0', //极化方式
@@ -248,6 +258,22 @@ export default {
           reserved: 100, //预留距离 (m)
           direction: 1, //侧视方向
           polarization: '0', //极化方式
+        },
+        '10': {
+          width: 6808.414439, // y 方向幅宽
+          length: 0.1, // x 方向幅宽
+          theta: 86.56482716, // 下视角
+          reserved: 100, //预留距离 (m)
+          direction: 1, //侧视方向
+          polarization: '0', //极化方式
+        },
+        'gmti': {
+          width: 6808.414439, // y 方向幅宽
+          length: 0.1, // x 方向幅宽
+          theta: 86.56482716, // 下视角
+          reserved: 100, //预留距离 (m)
+          direction: 1, //侧视方向
+          polarization: '0', //极化方式
         }
       },
       heightModeOptions: [
@@ -275,14 +301,19 @@ export default {
             maxDistance: 1760,
             defaultAngle: 70.91580209,
           },
+          '0.15': {
+            minDistance: 105,
+            maxDistance: 5000,
+            defaultAngle: 70.91580209,
+          },
           '0.2': {
             minDistance: 105,
-            maxDistance: 3461,
+            maxDistance: 5000,
             defaultAngle: 80.12850849,
           },
           '0.3': {
             minDistance: 105,
-            maxDistance: 5000,
+            maxDistance: 7000,
             defaultAngle: 83.14499366,
           },
           '1': {
@@ -294,6 +325,16 @@ export default {
             minDistance: 105,
             maxDistance: 5000,
             defaultAngle: 83.14499366,
+          },
+          '10': {
+            minDistance: 105,
+            maxDistance: 10000,
+            defaultAngle: 82.14499366,
+          },
+          'gmti': {
+            minDistance: 105,
+            maxDistance: 10000,
+            defaultAngle: 82.14499366,
           }
         },
         {
@@ -304,14 +345,19 @@ export default {
             maxDistance: 1192,
             defaultAngle: 62.52119039,
           },
+          '0.15': {
+            minDistance: 105,
+            maxDistance: 5000,
+            defaultAngle: 62.52119039,
+          },
           '0.2': {
             minDistance: 105,
-            maxDistance: 2325,
+            maxDistance: 5000,
             defaultAngle: 75.41290323,
           },
           '0.3': {
             minDistance: 105,
-            maxDistance: 4591,
+            maxDistance: 7000,
             defaultAngle: 82.53841873,
           },
           '1': {
@@ -323,6 +369,16 @@ export default {
             minDistance: 105,
             maxDistance: 5000,
             defaultAngle: 83.14499366,
+          },
+          '10': {
+            minDistance: 105,
+            maxDistance: 10000,
+            defaultAngle: 82.14499366,
+          },
+          'gmti': {
+            minDistance: 105,
+            maxDistance: 10000,
+            defaultAngle: 82.14499366,
           }
         },
         {
@@ -333,14 +389,19 @@ export default {
             maxDistance: 910,
             defaultAngle: 55.07020714,
           },
+          '0.15': {
+            minDistance: 105,
+            maxDistance: 5000,
+            defaultAngle: 55.07020714,
+          },
           '0.2': {
             minDistance: 105,
-            maxDistance: 1760,
+            maxDistance: 5000,
             defaultAngle: 70.91580209,
           },
           '0.3': {
             minDistance: 105,
-            maxDistance: 3461,
+            maxDistance: 7000,
             defaultAngle: 80.12850849,
           },
           '1': {
@@ -352,6 +413,16 @@ export default {
             minDistance: 105,
             maxDistance: 5000,
             defaultAngle: 83.14499366,
+          },
+          '10': {
+            minDistance: 105,
+            maxDistance: 10000,
+            defaultAngle: 82.14499366,
+          },
+          'gmti': {
+            minDistance: 105,
+            maxDistance: 10000,
+            defaultAngle: 82.14499366,
           }
         }
       ],
@@ -391,6 +462,16 @@ export default {
         height: undefined
       },
       previewLoading: false,
+      imageModeOptions: [
+        {
+          label: '条带',
+          value: 0
+        },
+        {
+          label: 'GMTI',
+          value: 4
+        }
+      ],
       focusOptions: [
         {
           label: '否',
@@ -424,6 +505,7 @@ export default {
       'jobStatus',
       'polarization',
       'polarizationOptions',
+      'sarImageModeOptions',
     ]),
     isIconModeLarge() {
       return this.iconMode === ICON_MODE.LARGE
@@ -642,6 +724,16 @@ export default {
         }
       })
     },
+    copyTask(info) {
+      getTaskEditItemDetail({ jobId: info.id }).then(res => {
+        if (res.data.code === 200) {
+          console.log('编辑详情', res.data.data)
+          this.editTask(JSON.parse(res.data.data))
+        } else {
+          this.$message.error(res.data.message)
+        }
+      })
+    },
     editTaskName(info) {
       this.editName.visible = false
       this.editName.loading = false
@@ -715,115 +807,62 @@ export default {
      * @param info
      */
     editTask(info) {
-      console.log('编辑任务信息', info)
-      if (info.status + '' !== '2') return
-      let mode = info.mode + ''
+      console.log('复制信息', info)
+      // 移除所有线
+      this.removeAllAirline()
+      // 移除预览
+      this.removePreviewLine()
       this.taskForm.visible = false
-      this.form = {
-        id: info.id,
-        startAltitude: info.startAltitude,
-        imageLight: info.imageLight,
-        imageBit: info.imageBit,
-        headingDiff: info.headingDiff,
-        autoFocus: info.autoFocus,
-        moto: info.moto,
-        targetChoose: mode === '1' ? '点' : '多边形',
-        loaderType: 'SAR',
-        name: info.name,
-        polarization: info.polarization,
-        heightMode: 1,
-        mode: mode,
-        flyHeight: info.uavList[0]?.height,
-        initSpeed: info.uavList[0]?.speed,
-        targetList: [],
-        ratio: info.uavList[0]?.payloadList[0]?.resolution,
-        loader: info.uavList[0]?.payloadList[0]?.payloadId,
-        uav: info.uavList[0]?.uavId,
-        routepoints: [],
-        startPoint: {
-          lon: info.uavList[0]?.startLon,
-          lat: info.uavList[0]?.startLat,
-        },
-        endPoint: {
-          lon: info.uavList[0]?.endLon,
-          lat: info.uavList[0]?.endLat,
-        }
-      }
+
+      this.form = info
+      this.form.name = info.name + '-copy'
+      this.form.id = undefined
+
+      this.calculateLimit()
+      this.getUavList()
+      this.getLoaderData()
+      // TODO 临时
+      // this.onLoaderTypeChange('SAR')
+      viewer.cesiumViewer.scene.globe.depthTestAgainstTerrain = this.form.mode === '3'
       this.taskForm.visible = true
+      if (theViewerTools) {
+        theViewerTools.destroy()
+        theViewerTools = null
+      }
       theViewerTools = new AreaPlotManager(viewer)
       theViewerTools.initPlot(this.theCallback)
-      if (typeof this.form.startPoint.lon === 'number' && typeof this.form.startPoint.lat === 'number') {
-        let newPosition = DT.Cesium.Cartesian3.fromDegrees(this.form.startPoint.lon, this.form.startPoint.lat)
-        startPoint = viewer.entities.add({
-          position: newPosition,
-          label: {
-            text: '航线起点',
-            font: '12px sans-serif',
-            disableDepthTestDistance: 10000,
-            horizontalOrigin: DT.Cesium.HorizontalOrigin.LEFT,
-            verticalOrigin: DT.Cesium.VerticalOrigin.CENTER,
-            pixelOffset: new DT.Cesium.Cartesian2(10, 0),
-            showBackground: true,
-            backgroundColor: DT.Cesium.Color.BLACK.withAlpha(0.7),
-            backgroundPadding: new DT.Cesium.Cartesian2(5, 3),
-          },
-          point: {
-            pixelSize: 8,
-            color: DT.Cesium.Color.WHITE,
-            disableDepthTestDistance: 10000,
-          }
-        })
-      } if (typeof this.form.endPoint.lon === 'number' && typeof this.form.endPoint.lat === 'number') {
-        let newPosition = DT.Cesium.Cartesian3.fromDegrees(this.form.endPoint.lon, this.form.endPoint.lat)
-        endPoint = viewer.entities.add({
-          position: newPosition,
-          label: {
-            text: '航线终点',
-            font: '12px sans-serif',
-            disableDepthTestDistance: 10000,
-            horizontalOrigin: DT.Cesium.HorizontalOrigin.LEFT,
-            verticalOrigin: DT.Cesium.VerticalOrigin.CENTER,
-            pixelOffset: new DT.Cesium.Cartesian2(10, 0),
-            showBackground: true,
-            backgroundColor: DT.Cesium.Color.BLACK.withAlpha(0.7),
-            backgroundPadding: new DT.Cesium.Cartesian2(5, 3),
-          },
-          point: {
-            pixelSize: 8,
-            color: DT.Cesium.Color.WHITE,
-            disableDepthTestDistance: 10000,
-          }
-        })
-      }
-      if (mode === '1') {
-        if (info.pointList.length > 0) {
-          let toPush = {
-            groupTargetId: getUnionId(),
-            targetName: '点1',
-            targetType: 1,
-            areaType: 2,
-            boundary: [[info.pointList[0].longitude, info.pointList[0].latitude],]
-          }
-          theViewerTools.restoreEntity(toPush)
-          this.form.targetList.push(toPush)
+      this.$nextTick(() => {
+        if (this.$refs.form && this.form.mode === '1') {
+          this.$refs.form.validateField('targetList')
         }
+      })
 
-      } else {
-        if (info.pointList.length > 0) {
-          let boundary = []
-          info.pointList.forEach(item => {
-            boundary.push([item.longitude, item.latitude])
+      switch (this.form.mode) {
+        case '1':
+          // 快速模式
+          this.form.targetList.forEach(item => {
+            theViewerTools.restoreEntity(item)
           })
-          let toPush = {
-            groupTargetId: getUnionId(),
-            targetName: '多边形1',
-            targetType: 4,
-            areaType: 2,
-            boundary: boundary
-          }
-          theViewerTools.restoreEntity(toPush)
-          this.form.targetList.push(toPush)
-        }
+          break
+        case '2':
+          break
+        case '3':
+          // 航线创建
+          this.form.airlineList.forEach(item => {
+            let arr = new LineTarget({
+              viewer: viewer,
+              id: item.id,
+              endCallback: this.airlineEndCallback,
+              baseHeight: this.form.flyHeight,
+              angle: this.form.waveAngle,
+              // rotation: this.form.theta * this.form.direction,
+              rotation: this.form.theta,
+              name: item.name,
+            })
+            airlineCollection[item.id] = arr
+            arr.restoreTarget(item)
+          })
+          break
       }
     },
     openAddForm() {
@@ -834,6 +873,7 @@ export default {
         imageBit: 0,
         headingDiff: 0,
         autoFocus: 0,
+        imageMode: '0',
         moto: 0,
         targetChoose: undefined,
         loaderType: undefined,
@@ -841,7 +881,8 @@ export default {
         polarization: '0',
         name: '',
         airlineList: [],
-        ratio: 0.1,
+        // ratio: this.sarResolutionOptions[0].value,
+        ratio: 0.2,
         heightMode: 1,
         mode: '1',
         width: undefined,
@@ -863,12 +904,155 @@ export default {
       // this.onLoaderTypeChange('SAR')
 
       this.taskForm.visible = true
+      if (theViewerTools) {
+        theViewerTools.destroy()
+        theViewerTools = null
+      }
       theViewerTools = new AreaPlotManager(viewer)
       theViewerTools.initPlot(this.theCallback)
       console.log('船舰了吗', theViewerTools)
     },
 
 
+    resetForm() {
+      this.taskForm.show = false
+      this.taskForm.visible = false
+      this.removeAllAirline()
+      this.removePreviewLine()
+      this.form = {
+        id: '',
+        startAltitude: undefined,
+        imageLight: undefined,
+        imageBit: 0,
+        headingDiff: 0,
+        autoFocus: 0,
+        imageMode: '0',
+        moto: 0,
+        targetChoose: undefined,
+        loaderType: undefined,
+        airlineList: [],
+        direction: 1,
+        polarization: '0',
+        name: '',
+        ratio: this.sarResolutionOptions[0].value,
+        heightMode: 1,
+        mode: '1',
+        width: undefined,
+        theta: 70.91580209,
+        flyHeight: 300,
+        initSpeed: 10,
+        targetList: [],
+        loader: undefined,
+        uav: undefined,
+        routepoints: [],
+        waveAngle: 20,
+        waveRotation: 20,
+      }
+      this.calculateLimit()
+      this.getUavList()
+      // TODO 临时
+      this.onLoaderTypeChange('SAR')
+      this.$nextTick(() => {
+        this.taskForm.visible = true
+        this.taskForm.show = true
+        if (theViewerTools) {
+          theViewerTools.destroy()
+          theViewerTools = null
+        }
+        theViewerTools = new AreaPlotManager(viewer)
+        theViewerTools.initPlot(this.theCallback)
+      })
+    },
+    submit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          let params = JSON.parse(JSON.stringify(this.form))
+          let pointList = []
+          params.targetList.forEach(item => {
+            let arr = []
+            item.boundary.forEach(child => {
+              arr.push({
+                longitude: child[0],
+                latitude: child[1],
+              })
+            })
+            pointList.push(arr)
+          })
+          params.airlineList.forEach((item, index) => {
+            if (item.boundaryLonLat) {
+              pointList.push(item.boundaryLonLat)
+            }
+          })
+
+          let info = {
+            info1: JSON.stringify(this.form),
+            id: params.id,
+            name: params.name,
+            mode: params.mode,
+            pointList: pointList,
+            startAltitude: params.startAltitude,
+            imageLight: parseFloat(params.imageLight),
+            headingDiff: parseFloat(params.headingDiff),
+            imageBit: parseFloat(params.imageBit),
+            targetType: params.targetChoose === '点' ? '1' : '2',
+            imageMode: params.imageMode,
+            uavList: [
+              {
+                uavId: params.uav,
+                // startLon: params.startPoint.lon,
+                // startLat: params.startPoint.lat,
+                // endLon: params.endPoint.lon,
+                // endLat: params.endPoint.lat,
+                speed: params.initSpeed,
+                height: params.flyHeight,
+                resolution: params.ratio,
+                startAltitude: params.startAltitude,
+                payloadList: [{
+                  payloadId: params.loader,
+                  resolution: params.ratio,
+                  width: params.width,
+                  length: this.form.imageMode === '4' ? this.ratioMap.gmti.length : this.ratioMap[params.ratio].length,
+                  theta: params.theta,
+                  reserved: this.form.imageMode === '4' ? this.ratioMap.gmti.reserved : this.ratioMap[params.ratio].reserved,
+                  direction: params.direction,
+                  polarization: params.polarization,
+                  autoFocus: params.autoFocus,
+                  imageMode: params.imageMode,
+                  moto: params.moto,
+                  imageLight: parseFloat(params.imageLight),
+                  imageBit: parseFloat(params.imageBit),
+                  headingDiff: parseFloat(params.headingDiff),
+                }],
+                airlineList: params.airlineList
+              }
+            ]
+          }
+
+          if (info.id) {
+            addTaskFast(info).then(res => {
+              if (res.data.code === 200) {
+                this.$message.success('新增任务任务成功')
+                this.taskForm.visible = false
+                this.getList()
+              } else {
+                this.$message.error(res.data.message)
+              }
+            })
+          } else {
+            addTaskFast(info).then(res => {
+              if (res.data.code === 200) {
+                this.$message.success('新增任务任务成功')
+                // this.taskForm.visible = false
+                this.resetForm()
+                this.getList()
+              } else {
+                this.$message.error(res.data.message)
+              }
+            })
+          }
+        }
+      })
+    },
 
 
     /*************************任务编辑相关*************************/
@@ -922,6 +1106,13 @@ export default {
           break
       }
     },
+    getDrawTargetDisabled(info) {
+      if (this.form.imageMode === '1') {
+        return info.value === '多边形'
+      } else {
+        return false
+      }
+    },
     createLine() {
 
     },
@@ -1017,6 +1208,32 @@ export default {
       this.duringDraw = true
       this.startDraw(this.form.targetChoose)
     },
+    theCallback(targetName, targetType, areaType, data) {
+      this.duringDraw = false
+      let result = data
+
+      if (targetType === 3) {
+        let minLon = Math.min(data[0][0], data[1][0])
+        let minLat = Math.min(data[0][1], data[1][1])
+        let maxLon = Math.max(data[0][0], data[1][0])
+        let maxLat = Math.max(data[0][1], data[1][1])
+        result = [
+          [minLon, minLat],
+          [maxLon, minLat],
+          [maxLon, maxLat],
+          [minLon, maxLat],
+          [minLon, minLat]
+        ]
+      }
+      this.form.targetList.push({
+        groupTargetId: getUnionId(),
+        targetName,
+        targetType,
+        areaType,
+        boundary: result
+      })
+      this.endDraw()
+    },
 
     // 航线创建
     /**
@@ -1109,37 +1326,7 @@ export default {
 
     //#endregion
 
-    theCallback(targetName, targetType, areaType, data) {
-      this.duringDraw = false
-      let result = data
 
-      if (targetType === 3) {
-        let minLon = Math.min(data[0][0], data[1][0])
-        let minLat = Math.min(data[0][1], data[1][1])
-        let maxLon = Math.max(data[0][0], data[1][0])
-        let maxLat = Math.max(data[0][1], data[1][1])
-        result = [
-          [minLon, minLat],
-          [maxLon, minLat],
-          [maxLon, maxLat],
-          [minLon, maxLat],
-          [minLon, minLat]
-        ]
-      }
-      this.form.targetList.push({
-        groupTargetId: getUnionId(),
-        targetName,
-        targetType,
-        areaType,
-        boundary: result
-      })
-      console.log('绘制边界线', result)
-      console.log('绘制边界线targetType', targetType)
-      console.log('绘制边界线areaType', areaType)
-      console.log('绘制边界线targetName', targetName)
-      console.log('绘制边界线targetName', targetName)
-      this.endDraw()
-    },
     theCallback2(targetName, targetType, areaType, data) {
       let result = JSON.parse(JSON.stringify(data))
       switch (this.addRegion.currentSelfDrawType) {
@@ -1270,35 +1457,67 @@ export default {
       }
       return cartesian
     },
+    onImageModeChange(value) {
+      switch (this.form.imageMode) {
+        case '0':
+          // 条带
+          if (this.form.ratio === '10') {
+            this.form.ratio = this.sarResolutionOptions[0].value
+          }
+          break;
+        case '1':
+          // 聚束模式
+          if (this.form.ratio === '10') {
+            this.form.ratio = this.sarResolutionOptions[0].value
+          }
+          if (this.form.mode === '1') {
+            if (this.form.targetChoose === '多边形') {
+              this.onModeChange('1')
+              this.form.targetChoose = '点'
+            }
+          } else {
+            this.form.mode = '1'
+            this.onModeChange('1')
+          }
+          break;
+        case '4':
+          // gmti
+          this.form.ratio = '10'
+          break;
+      }
+      this.calculateLimit()
+    },
+    getRatioDisabled(value, index) {
+      if (this.form.imageMode !== '4') {
+        return value.value === '10'
+      } else {
+        return value.value !== '10'
+      }
+    },
     calculateLimit() {
       if (this.form.ratio && this.form.initSpeed) {
         let findIndex = this.calculateMap.findIndex(item => this.form.initSpeed > item.minSpeed && this.form.initSpeed <= item.maxSpeed)
         if (this.form.initSpeed === 5) {
           findIndex = 0
         }
-        console.log(1111, findIndex, find)
-        console.log('求变化', this.lastLimitUpdate.index === findIndex && this.lastLimitUpdate.ratio === this.form.ratio)
         if (findIndex !== -1) {
           let find = this.calculateMap[findIndex]
           if (this.lastLimitUpdate.index === findIndex && this.lastLimitUpdate.ratio === this.form.ratio) {
             // return
           }
-          let info = find[this.form.ratio]
+          let info = this.form.imageMode === '4' ? find.gmt : find[this.form.ratio]
           this.form.theta = info.defaultAngle
           this.lastLimitUpdate.index = findIndex
           this.lastLimitUpdate.ratio = this.form.ratio
           this.minDistance = Math.max(info.minDistance, this.form.flyHeight / Math.cos(Math.PI / 18))
           this.maxDistance = info.maxDistance
-
-          console.log('最小距离', this.minDistance)
-          console.log('最大距离', this.maxDistance)
           this.calculateWidth()
         }
       }
     },
     calculateHeightLimit() {
       let find = this.calculateMap[this.lastLimitUpdate.index]
-      let info = find[this.form.ratio]
+      let info = this.form.imageMode === '4' ? find.gmti : find[this.form.ratio]
       this.minDistance = Math.max(info.minDistance, this.form.flyHeight / Math.cos(Math.PI / 18))
       this.maxDistance = info.maxDistance
       this.calculateWidth()
@@ -1315,23 +1534,17 @@ export default {
 
       this.maxAngle = Math.round((angleMax - 1.2) * 10) / 10
       this.minAngle = Math.round((angleMin + 1.2) * 10) / 10
-      console.log('最大最小下视角', this.maxAngle, this.minAngle)
       if (this.form.theta > this.maxAngle || this.form.theta < this.minAngle) {
         this.form.theta = Math.round((this.maxAngle + this.minAngle) * 100 / 2) / 100
       }
-      console.log('飞行高度', this.form.flyHeight)
-      console.log('下视角', this.form.theta)
       let maxWaveAngle = Math.min(this.maxAngle - this.form.theta, this.form.theta - this.minAngle)
       maxWaveAngle = Math.min(maxWaveAngle + 1.2, 13)
       maxWaveAngle = Math.ceil(maxWaveAngle * 100) / 100
       this.maxWaveAngle = maxWaveAngle
-      console.log('计算前波束角', this.form.waveAngle)
 
-      console.log('最小最大波束角', this.maxWaveAngle, this.minWaveAngle)
       if (this.form.waveAngle > this.maxWaveAngle || this.form.waveAngle < this.minWaveAngle) {
         this.form.waveAngle = this.maxWaveAngle
       }
-      console.log('计算后波束角', this.form.waveAngle)
       let width = 2 * (this.form.flyHeight * Math.tan(this.form.theta * Math.PI / 180) - this.form.flyHeight * Math.tan((this.form.theta - this.form.waveAngle) * Math.PI / 180))
       width = Math.round(width * 1000000) / 1000000
       this.form.width = width
@@ -1344,7 +1557,12 @@ export default {
       this.updateSceneAirline()
     },
     handleRatioChange(value) {
-      let info = this.ratioMap[value]
+      let info
+      if (this.form.imageMode === '4') {
+        info = this.ratioMap.gmti
+      } else {
+        info = this.ratioMap[value]
+      }
       this.form.width = info.width
       this.form.theta = info.theta
     },
@@ -1426,7 +1644,6 @@ export default {
       airlineCollection = {}
     },
     handleDirectionChange(value) {
-      console.log('测试方向', typeof value, this.form.theta * value)
       for (let key in airlineCollection) {
         if (airlineCollection[key]) {
           let rotation = this.form.theta * value
@@ -1442,53 +1659,13 @@ export default {
     },
     //#endregion
 
-    resetForm() {
-      this.taskForm.show = false
-      this.taskForm.visible = false
-      this.removeAllAirline()
-      this.removePreviewLine()
-      this.form = {
-        id: '',
-        startAltitude: undefined,
-        imageLight: undefined,
-        imageBit: 0,
-        headingDiff: 0,
-        autoFocus: 0,
-        moto: 0,
-        targetChoose: undefined,
-        loaderType: undefined,
-        airlineList: [],
-        direction: 1,
-        polarization: '0',
-        name: '',
-        ratio: 0.1,
-        heightMode: 1,
-        mode: '1',
-        width: undefined,
-        theta: 70.91580209,
-        flyHeight: 300,
-        initSpeed: 10,
-        targetList: [],
-        loader: undefined,
-        uav: undefined,
-        routepoints: [],
-        waveAngle: 20,
-        waveRotation: 20,
-      }
-      this.calculateLimit()
-      this.getUavList()
-      // TODO 临时
-      this.onLoaderTypeChange('SAR')
-      this.$nextTick(() => {
-        this.taskForm.visible = true
-        this.taskForm.show = true
-        theViewerTools = new AreaPlotManager(viewer)
-        theViewerTools.initPlot(this.theCallback)
-      })
-    },
-    submit() {
+
+
+    //#region 预览
+    previewLine() {
       this.$refs.form.validate((valid) => {
         if (valid) {
+          this.removePreviewLine()
           let params = JSON.parse(JSON.stringify(this.form))
           let pointList = []
           params.targetList.forEach(item => {
@@ -1507,24 +1684,7 @@ export default {
             }
           })
           console.log('提交航线', params.airlineList)
-          /*if (params.mode === '1' || params.mode === '2') {
-            params.targetList.forEach(item => {
-              item.boundary.forEach(child => {
-                pointList.push({
-                  longitude: child[0],
-                  latitude: child[1],
-                })
-              })
-            })
-          }
-          if (params.mode === '3') {
-            params.routepoints.forEach(route => {
-              pointList.push({
-                longitude: route.longitude,
-                latitude: route.latitude,
-              })
-            })
-          }*/
+
           let info = {
             id: params.id,
             name: params.name,
@@ -1534,6 +1694,8 @@ export default {
             imageLight: parseFloat(params.imageLight),
             headingDiff: parseFloat(params.headingDiff),
             imageBit: parseFloat(params.imageBit),
+            targetType: params.targetChoose === '点' ? '1' : '2',
+            imageMode: params.imageMode,
             uavList: [
               {
                 uavId: params.uav,
@@ -1549,12 +1711,13 @@ export default {
                   payloadId: params.loader,
                   resolution: params.ratio,
                   width: params.width,
-                  length: this.ratioMap[params.ratio].length,
+                  length: this.form.imageMode === '4' ? this.ratioMap.gmti.length : this.ratioMap[params.ratio].length,
                   theta: params.theta,
-                  reserved: this.ratioMap[params.ratio].reserved,
+                  reserved: this.form.imageMode === '4' ? this.ratioMap.gmti.reserved : this.ratioMap[params.ratio].reserved,
                   direction: params.direction,
                   polarization: params.polarization,
                   autoFocus: params.autoFocus,
+                  imageMode: params.imageMode,
                   moto: params.moto,
                   imageLight: parseFloat(params.imageLight),
                   imageBit: parseFloat(params.imageBit),
@@ -1564,118 +1727,91 @@ export default {
               }
             ]
           }
-          // if (params.airlineList.length > 0) {
-          //   info.airlineList = params.airlineList
-          // }
-          console.log('任务创建提交', info)
-          if (info.id) {
-            addTaskFast(info).then(res => {
-              if (res.data.code === 200) {
-                console.log('新增任务任务成功')
-                this.$message.success('新增任务任务成功')
-                this.taskForm.visible = false
-                this.getList()
-              } else {
-                this.$message.error(res.data.message)
-              }
-            })
-          } else {
-            addTaskFast(info).then(res => {
-              if (res.data.code === 200) {
-                console.log('新增任务任务成功')
-                this.$message.success('新增任务任务成功')
-                // this.taskForm.visible = false
-                this.resetForm()
-                this.getList()
-              } else {
-                this.$message.error(res.data.message)
-              }
-            })
-          }
-        }
-      })
-    },
-    previewLine() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          this.removePreviewLine()
-          let params = JSON.parse(JSON.stringify(this.form))
-          let pointList = []
-          params.targetList.forEach((item, index) => {
-            let arr = []
-            item.boundary.forEach(child => {
-              arr.push([child[0], child[1]])
-            })
-            pointList.push({
-              type: params.targetChoose === '点' ? 'point' : 'region',
-              coords: arr,
-              valid_TYPES: [
-                'region',
-                'line',
-                'point'
-              ],
-              id: index
-            })
-          })
-          console.log('提交航线', params.airlineList)
-          let info = {
-            optimize: false,
-            targets: pointList,
-            uavs: [
-              {
-                id: params.uav,
-                constraint: {
-                  endurance: 1000000.0,
-                  height: params.flyHeight
-                },
-                start_coord: [this.currentUavInfo.longitude, this.currentUavInfo.latitude],
-                end_coord: [this.currentUavInfo.longitude, this.currentUavInfo.latitude],
-                payload: {
-                  type: 'SAR',
-                  width: params.width,
-                  length: this.ratioMap[params.ratio].length,
-                  theta: params.theta,
-                  direction: params.direction,
-                  reserved_distance: this.ratioMap[params.ratio].reserved,
-                  valid_DIRECTIONS: ['left', 'right'],
-                },
-
-              }
-            ]
-          }
-          console.log('任务预览提交', info)
           this.previewLoading = true
-          axios.post(window.config.arithmeticPath, info).then(res => {
-            console.log('预览返回', res)
-
-            if (res.status === 200) {
+          previewTaskFast(info).then(res => {
+            this.previewLoading = false
+            if (res.data.code === 200) {
               let data = res.data.data
               for (let key in data) {
                 this.addPreviewLine(data[key], key)
               }
+              this.$message.success('获取航线成功！')
             } else {
               this.$message.error(res.data.message)
             }
+          }).catch(err => {
             this.previewLoading = false
-          }).catch(
-            this.previewLoading = false
-          )
-          // previewTaskFast(info).then(res => {
+          })
+
+          // let params = JSON.parse(JSON.stringify(this.form))
+          // let pointList = []
+          // params.targetList.forEach((item, index) => {
+          //   let arr = []
+          //   item.boundary.forEach(child => {
+          //     arr.push([child[0], child[1]])
+          //   })
+          //   pointList.push({
+          //     type: params.targetChoose === '点' ? 'point' : 'region',
+          //     coords: arr,
+          //     valid_TYPES: [
+          //       'region',
+          //       'line',
+          //       'point'
+          //     ],
+          //     id: index
+          //   })
+          // })
+          // console.log('提交航线', params.airlineList)
+          // let info = {
+          //   optimize: false,
+          //   targets: pointList,
+          //   uavs: [
+          //     {
+          //       id: params.uav,
+          //       constraint: {
+          //         endurance: 1000000.0,
+          //         height: params.flyHeight
+          //       },
+          //       start_coord: [this.currentUavInfo.longitude,  this.currentUavInfo.latitude],
+          //       end_coord: [this.currentUavInfo.longitude,  this.currentUavInfo.latitude],
+          //       payload: {
+          //         type: 'SAR',
+          //         width: params.width,
+          //         length: this.form.imageMode === 0 ? this.ratioMap[params.ratio].length : this.ratioMap.gmti.length,
+          //         theta: params.theta,
+          //         direction: params.direction,
+          //         reserved_distance: this.form.imageMode === 0 ? this.ratioMap[params.ratio].reserved : this.ratioMap.gmti.reserved,
+          //         valid_DIRECTIONS: [ 'left', 'right'],
+          //       },
+          //
+          //     }
+          //   ]
+          // }
+          // console.log('任务预览提交', info)
+          // this.previewLoading = true
+          // axios.post(window.config.arithmeticPath, info).then(res => {
           //   console.log('预览返回', res)
-          //   if (res.data.code === 200) {
-          //     console.log('预览返回', res.data.data)
-          //     this.addPreviewLine(res.data.data)
+          //
+          //   if (res.status === 200) {
+          //     let data = res.data.data
+          //     for (let key in data) {
+          //       this.addPreviewLine(data[key], key)
+          //     }
           //   } else {
           //     this.$message.error(res.data.message)
           //   }
-          // })
+          //   this.previewLoading = false
+          // }).catch(
+          //   this.previewLoading = false
+          // )
+
         }
       })
     },
     addPreviewLine(data, parentId) {
       data.forEach((item, index) => {
-        let startPosition = DT.Cesium.Cartesian3.fromDegrees(...item.flight_start)
-        let endPosition = DT.Cesium.Cartesian3.fromDegrees(...item.flight_end)
+        let startPosition = DT.Cesium.Cartesian3.fromDegrees(item.startLon, item.startLat, item.startHeight)
+        let endPosition = DT.Cesium.Cartesian3.fromDegrees(item.endLon, item.endLat, item.endHeight)
         let entity = viewer.entities.add({
           position: startPosition,
           label: {
@@ -1705,13 +1841,13 @@ export default {
       })
       previewEntities = []
     },
+    //#endregion
 
     //#region 航线详情
     openTaskLineDetail(info) {
       this.taskLineDetail.visible = false
       let find = taskListResource.find(item => item.id === info.id)
 
-      console.log('信息', find)
       if (find && find.uavList) {
         let line = []
         find.uavList.forEach(item => {
diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.scss b/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.scss
index 80b203d..ecbb5f9 100644
--- a/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.scss
+++ b/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.scss
@@ -171,12 +171,12 @@
       }
 
       .right-part {
-        width: 40px;
+        width: 60px;
         height: 100%;
         display: flex;
-        flex-direction: column;
-        justify-content: center;
+        justify-content: space-between;
         align-items: center;
+        padding: 0 5px;
 
         >i {
           font-size: 14px;
@@ -543,4 +543,12 @@
   ::v-deep .right-content {
     display: flex;
   }
+
+  ::v-deep input {
+    background-color: #00000052;
+  }
+
+  ::v-deep select {
+    background-color: #00000052;
+  }
 }
diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.vue b/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.vue
index ffa1eac..0cba2d8 100644
--- a/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.vue
+++ b/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/index.vue
@@ -15,7 +15,7 @@
       >
         <template v-slot:header>
           <span class="remote-header">
-            <i class="ri-task-line"></i>
+            <i class="ri-function-add-line"></i>
             任务列表
           </span>
         </template>
@@ -36,7 +36,10 @@
                 ></span>
                 <span class="task-execute">{{ item.name }}</span>
               </div>
-              <div class="task-info" :style="{color:dealStatusColor(item.statusName)}">
+              <div
+                class="task-info"
+                :style="{ color: dealStatusColor(item.statusName) }"
+              >
                 {{ item.statusName }}
                 <!--              <i class="el-icon-camera"></i>-->
                 <!--              <span class="task-name">{{ item.name }}</span>-->
@@ -56,13 +59,16 @@
               <!--              <i class="ri-repeat-line" @click.stop="reRunTask(item)"></i>-->
 
               <!--            </el-tooltip>-->
-              <el-tooltip effect="dark" content="修改名称" placement="right">
+              <el-tooltip effect="dark" content="修改名称" placement="top">
                 <i
                   class="el-icon-edit-outline"
                   @click.stop="editTaskName(item)"
                 ></i>
               </el-tooltip>
-              <el-tooltip effect="dark" content="删除" placement="right">
+              <el-tooltip effect="dark" content="复制" placement="top">
+                <i class="ri-file-copy-2-line" @click.stop="copyTask(item)"></i>
+              </el-tooltip>
+              <el-tooltip effect="dark" content="删除" placement="top">
                 <i
                   class="el-icon-close delete-task"
                   @click.stop="deleteTask(item)"
@@ -104,6 +110,7 @@
           </el-form-item>
           <el-form-item prop="mode" label="飞行模式">
             <el-select
+              popper-class="form-light"
               size="small"
               :disabled="duringDraw || airlineCreateInfo.during"
               @change="onModeChange"
@@ -124,12 +131,14 @@
           >
             <div class="form-item-command">
               <el-select
+                popper-class="form-light"
                 size="small"
                 :disabled="duringDraw"
                 v-model="form.targetChoose"
               >
                 <el-option
                   v-for="item in drawOptions"
+                  :disabled="getDrawTargetDisabled(item)"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -169,6 +178,7 @@
                 >
                   <span>{{ item.name }}</span>
                   <el-select
+                    popper-class="form-light"
                     size="mini"
                     @change="
                       (value) => handleSelfDirectionChange(value, item, index)
@@ -239,7 +249,11 @@
         </div>-->
 
           <el-form-item prop="uav" label="无人机">
-            <el-select size="small" v-model="form.uav">
+            <el-select
+              popper-class="form-light"
+              size="small"
+              v-model="form.uav"
+            >
               <el-option
                 v-for="item in uavOptions"
                 :key="item.id"
@@ -264,7 +278,11 @@
           <!--          </el-select>-->
           <!--        </el-form-item>-->
           <el-form-item prop="loader" label="载荷">
-            <el-select size="small" v-model="form.loader">
+            <el-select
+              popper-class="form-light"
+              size="small"
+              v-model="form.loader"
+            >
               <el-option
                 v-for="item in loaderOptions"
                 :key="item.id"
@@ -305,12 +323,29 @@
           </el-form-item>
           <el-form-item prop="ratio" label="分辨率">
             <el-select
+              popper-class="form-light"
               size="small"
               @change="calculateLimit"
               v-model="form.ratio"
             >
               <el-option
                 v-for="item in sarResolutionOptions"
+                :disabled="getRatioDisabled(item, index)"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="成像模式" prop="imageMode">
+            <el-select
+              popper-class="form-light"
+              size="small"
+              v-model="form.imageMode"
+              @change="onImageModeChange"
+            >
+              <el-option
+                v-for="item in sarImageModeOptions"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -360,7 +395,11 @@
               ></el-input-number>
             </el-form-item>
             <el-form-item label="自动聚焦">
-              <el-select size="small" v-model="form.autoFocus">
+              <el-select
+                popper-class="form-light"
+                size="small"
+                v-model="form.autoFocus"
+              >
                 <el-option
                   v-for="item in focusOptions"
                   :key="item.value"
@@ -370,7 +409,11 @@
               </el-select>
             </el-form-item>
             <el-form-item label="运动补偿">
-              <el-select size="small" v-model="form.moto">
+              <el-select
+                popper-class="form-light"
+                size="small"
+                v-model="form.moto"
+              >
                 <el-option
                   v-for="item in motoOptions"
                   :key="item.value"
@@ -388,13 +431,18 @@
               ></el-input-number>
             </el-form-item>
             <el-form-item label="图像位数">
-              <el-select size="small" v-model="form.imageBit">
+              <el-select
+                popper-class="form-light"
+                size="small"
+                v-model="form.imageBit"
+              >
                 <el-option label="8bit" :value="0"></el-option>
                 <el-option label="16bit" :value="1"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="侧视方向" v-if="form.mode !== '3'">
               <el-select
+                popper-class="form-light"
                 size="small"
                 @change="handleDirectionChange"
                 v-model="form.direction"
@@ -408,7 +456,11 @@
               </el-select>
             </el-form-item>
             <el-form-item label="极化方式">
-              <el-select size="small" v-model="form.polarization">
+              <el-select
+                popper-class="form-light"
+                size="small"
+                v-model="form.polarization"
+              >
                 <el-option
                   v-for="item in polarizationOptions"
                   :key="item.value"
diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/lineTarget.js b/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/lineTarget.js
index 4e61f8e..156c7a7 100644
--- a/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/lineTarget.js
+++ b/frontend/Skyeye-sys-ui/src/views/home/components/task-manage/lineTarget.js
@@ -107,11 +107,9 @@ export default class LineTarget {
     DT.Cesium.Cartesian3.multiplyByScalar(endToStartDirection, distanceOne + distanceTwo, flyToStart)
     DT.Cesium.Cartesian3.add(openToStart, this.positions[0], openToStart)
     DT.Cesium.Cartesian3.add(flyToStart, this.positions[0], flyToStart)
-    // console.log('开机点', openToStart)
 
     // let cat1 = DT.Cesium.Cartographic.fromCartesian(openToStart)
     // let cat2 = DT.Cesium.Cartographic.fromCartesian(flyToStart)
-    // console.log('开机点高度', cat1.height , cat2.height)
     // 求关机点
     let startToEndDirection = new DT.Cesium.Cartesian3(1, 0, 0)
     DT.Cesium.Cartesian3.subtract(this.positions[1], this.positions[0], startToEndDirection)
@@ -122,7 +120,6 @@ export default class LineTarget {
     DT.Cesium.Cartesian3.multiplyByScalar(startToEndDirection, distanceOne + distanceTwo, flyToEnd)
     DT.Cesium.Cartesian3.add(openToEnd, this.positions[1], openToEnd)
     DT.Cesium.Cartesian3.add(flyToEnd, this.positions[1], flyToEnd)
-    // console.log('关机点', openToEnd)
 
     // 求成像区域中心经度，成像区域中心维度
     let boundaryLonLat = []
@@ -154,7 +151,6 @@ export default class LineTarget {
       let center = [lon / 4, lat / 4] // 中心点坐标
 
       let center2 = [(centerLonLat[0].longitude + centerLonLat[1].longitude) / 2, (centerLonLat[0].latitude + centerLonLat[1].latitude) / 2] // 中心点坐标
-      // console.log('中心区域', center)
 
       let areaEndCenter = DT.Cesium.Cartesian3.fromDegrees(
         (boundaryLonLat[0].longitude + boundaryLonLat[1].longitude) / 2,
@@ -180,7 +176,6 @@ export default class LineTarget {
       let groundOpenToStart2 = new DT.Cesium.Cartesian3() // 开机点
       DT.Cesium.Cartesian3.multiplyByScalar(groundEndToStartDirection2, distanceTwo, groundOpenToStart2)
       DT.Cesium.Cartesian3.add(groundOpenToStart2, areaStartCenter2, groundOpenToStart2)
-      // console.log('地面开机', groundOpenToStart)
 
       // 求地面关机点
       // let groundStartToEndDirection = new DT.Cesium.Cartesian3(1, 0, 0)
@@ -189,20 +184,15 @@ export default class LineTarget {
       // let groundOpenToEnd = new DT.Cesium.Cartesian3() // 开机点
       // DT.Cesium.Cartesian3.multiplyByScalar(groundStartToEndDirection, distanceTwo, groundOpenToEnd)
       // DT.Cesium.Cartesian3.add(groundOpenToEnd, areaEndCenter, groundOpenToEnd)
-      // console.log('地面关机', groundOpenToEnd)
       // 成像区域幅宽和方位长度
       let width = DT.Cesium.Cartesian3.distance(this.wave.crossPositions[0], this.wave.crossPositions[1])
       let width2 = DT.Cesium.Cartesian3.distance(this.wave.crossPositions[0], this.wave.centerPositions[0]) * 2
       let length = DT.Cesium.Cartesian3.distance(this.wave.crossPositions[1], this.wave.crossPositions[2])
-      // console.log('幅宽', width, length)
       // 轴向角度
       let point1 = turf.point([centerLonLat[0].longitude, centerLonLat[0].latitude]);
       let point2 = turf.point([centerLonLat[1].longitude, centerLonLat[1].latitude]);
       let bearing = turf.bearing(point1, point2) + 180
-      // console.log('角度12', bearing)
-      // console.log('高度123', this.viewer.cesiumViewer.terrainProvider)
       // DT.Cesium.sampleTerrainMostDetailed(this.viewer.cesiumViewer.terrainProvider, [DT.Cesium.Cartographic.fromDegrees(center[0], center[1])]).then(res => {
-      //   console.log('海拔', res)
       // })
       let startCat = DT.Cesium.Cartographic.fromCartesian(flyToStart)
       let endCat = DT.Cesium.Cartographic.fromCartesian(flyToEnd)
@@ -240,9 +230,6 @@ export default class LineTarget {
         boundaryLonLat: boundaryLonLat,
         direction: this.rotation > 0 ? 1 : -1,
       }
-      console.log('下视角', this.rotation)
-      console.log('擦地角', 90 - Math.abs(this.rotation))
-      console.log('最后参数', info)
       if (this.showTemp) {
         this.tempCollection.forEach(temp => {
           viewer.entities.remove(temp)
@@ -485,6 +472,19 @@ export default class LineTarget {
 
   }
 
+  restoreTarget(info) {
+    let startPosition = DT.Cesium.Cartesian3.fromDegrees(info.flightStartLon, info.flightStartLat, info.flightStartHeight)
+    let endPosition = DT.Cesium.Cartesian3.fromDegrees(info.flightEndLon, info.flightEndLat, info.flightEndHeight)
+    this.positions = [startPosition, endPosition]
+    this.createMark(startPosition, true)
+    this.createMark(endPosition, false)
+    this.createPolyline()
+    this.addUav()
+    this.addWave()
+    this.addMoveHandler()
+  }
+
+
   createMark(position, start = true) {
     let cat = DT.Cesium.Cartographic.fromCartesian(position)
     let lon = Math.round(DT.Cesium.Math.toDegrees(cat.longitude) * 10000000000000) / 10000000000000
@@ -573,7 +573,6 @@ export default class LineTarget {
         shadows: DT.Cesium.ShadowMode.DISABLED
       },
     })
-    console.log('加载的无人机', this.uavEntity)
   }
   changeWaveAngle(value) {
     this.angle = value
@@ -633,9 +632,6 @@ export default class LineTarget {
     if (this.rotation < 0) {
       modifyAngle = 0 - modifyAngle
     }
-    console.log('旋转角度和波束半角', this.rotation, this.angle)
-    console.log('距离', distanceOne, distanceTwo, distanceThree, angleOne)
-    console.log('修正角度', modifyAngle)
     this.wave = new LineWave({color: DT.Cesium.Color.RED,viewer: this.viewer, startPosition: this.positions[0], endPosition: this.positions[1], angle: this.angle - Math.abs(modifyAngle/2), rotation: this.rotation- modifyAngle/2, offsetAngle: modifyAngle/2 })
     this.viewer.primitives.add(this.wave.primitive)
     this.viewer.entities.add(this.wave.crossLine)
@@ -774,7 +770,6 @@ export default class LineTarget {
       let result = new DT.Cesium.Cartesian3()
       DT.Cesium.Cartesian3.lerp(cartesian, this.viewer.cesiumViewer.camera.positionWC, ratio, result)
       // let cat = DT.Cesium.Cartographic.fromCartesian(result)
-      // console.log('拾取的位置相机', cat.height )
       return result
     }
 
@@ -836,10 +831,6 @@ export class LineWave {
     this.bottomHorizontalLength = Math.tan(halfAngleRadians) * this.length
     this.bottomVerticalLength = this.lineLength
     this.offsetAngle = options.offsetAngle ? options.offsetAngle : 0
-    console.log('角度是啥', this.angle)
-    console.log('旋转是啥', this.rotation)
-    console.log('修正是啥', this.offsetAngle)
-    console.log('旋转+修正是啥', this.offsetAngle + this.rotation)
     this.createWave()
     this.createEdge()
   }
@@ -894,9 +885,7 @@ export class LineWave {
 
 
     let que = DT.Tool.calculateQuaternionFromV1ToV2(this.startPosition, this.endPosition)
-    console.log('角度', this.rotation)
     let rotationQuaternion = DT.Cesium.Quaternion.fromAxisAngle(DT.Cesium.Cartesian3.UNIT_X, this.rotation * Math.PI / 180)
-    console.log('四元数', rotationQuaternion)
     let combineQuaternion = new DT.Cesium.Quaternion()
     DT.Cesium.Quaternion.multiply(que, rotationQuaternion, combineQuaternion)
     let rotation = DT.Cesium.Matrix4.fromTranslationQuaternionRotationScale(this.middlePosition, combineQuaternion, DT.Cesium.Cartesian3.ONE)
@@ -938,7 +927,6 @@ export class LineWave {
     let que = DT.Tool.calculateQuaternionFromV1ToV2(this.startPosition, this.endPosition)
     let rotationQuaternion = DT.Cesium.Quaternion.fromAxisAngle(DT.Cesium.Cartesian3.UNIT_X, this.rotation * Math.PI / 180)
     let rotationQuaternionCenter = DT.Cesium.Quaternion.fromAxisAngle(DT.Cesium.Cartesian3.UNIT_X, (this.rotation + this.offsetAngle) * Math.PI / 180)
-    // console.log('四元数计算角度', this.rotation + this.offsetAngle)
     let combineQuaternion = new DT.Cesium.Quaternion()
     let combineQuaternionCenter = new DT.Cesium.Quaternion()
     DT.Cesium.Quaternion.multiply(que, rotationQuaternion, combineQuaternion)
@@ -1001,7 +989,6 @@ export class LineWave {
     DT.Cesium.Cartesian3.clone(start, ray.origin);
     DT.Cesium.Cartesian3.subtract(end, start, ray.direction);
     let position = this.viewer.cesiumViewer.scene.globe.pick(ray, this.viewer.cesiumViewer.scene)
-    console.log('交点', position)
     return position
   }
   findCrossPoint(start, end) {
diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.js b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.js
index 2a2e90d..7732bcf 100644
--- a/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.js
+++ b/frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.js
@@ -20,6 +20,7 @@ import {
   getRadarListData,
   getTaskItemDetail,
   getTaskListData,
+  getExecJobs,
   getUavListData,
   reRunTask, stopTaskFly
 } from '@/api/task'
@@ -91,12 +92,14 @@ export default {
       },
       taskList: {
         visible: true,
-        data: [{
-          status: 1,
-          name: '巡查任务',
-          statusName: '巡查中',
-          beginTime: '2026-01-23 12:14:45'
-        }]
+        data: [
+          //{
+          // status: 1,
+          // name: '巡查任务',
+          // statusName: '巡查中',
+          // beginTime: '2026-01-23 12:14:45'
+          //}
+      ]
       },
       weatherInfo2: {
         visible: true,
@@ -1069,7 +1072,8 @@ export default {
     },
 
     getTaskList() {
-      getTaskListData({ type: 2, orders: [{ column: 'begin_time', asc: false }] }).then(res => {
+      // getTaskListData({ type: 2, orders: [{ column: 'begin_time', asc: false }] }).then(res => {
+        getExecJobs({ type: 2, orders: [{ column: 'begin_time', asc: false }] }).then(res => {
         if (res.data.code === 200) {
           console.log('任务列表', res.data.data)
           let data = res.data.data
diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/user-list/index.js b/frontend/Skyeye-sys-ui/src/views/home/components/user-list/index.js
index 8dbe018..4a45159 100644
--- a/frontend/Skyeye-sys-ui/src/views/home/components/user-list/index.js
+++ b/frontend/Skyeye-sys-ui/src/views/home/components/user-list/index.js
@@ -5,7 +5,8 @@ import {
 import PicturesUpload from '../pictures-upload/index.vue'
 import RightSlide from '@/components/RightSlide.vue'
 import LeftSlide from '@/components/LeftSlide.vue'
-
+import { userRemove, userList, userUpdate, userSave } from '@/api/user'
+import md5 from 'js-md5'
 let taskListResource = []
 export default {
   name: 'TwinSituation',
@@ -19,27 +20,39 @@ export default {
     LeftSlide,
   },
   data() {
+    const cfPsdRule = (rule, value, callback) => {
+      if (value === '' || typeof value === 'undefined') {
+        callback(new Error('请再次输入密码'))
+      } else if (value !== this.user.form.password) {
+        callback(new Error('两次输入密码不一致!'))
+      } else {
+        callback()
+      }
+    }
     return {
       visibleLocale: false,
-      deviceData: [
-        {
-          name: '无人机1',
-          num: 'M3127',
-          location: '112.3423242,45.2312324'
-        }
+      userData: [
+        // {
+        //   name: '无人机1',
+        //   num: 'M3127',
+        //   location: '112.3423242,45.2312324'
+        // }
       ],
-      device: {
+      user: {
         visible: false,
-        form: {},
+        form: {
+          account: ''
+        },
         rules: {
-          deviceName: [
-            { required: true, message: '请输入设备名称', trigger: 'blur' }
+          account: [
+            { required: true, message: '请输入用户名称', trigger: 'blur' }
           ],
-          num: [
-            { required: true, message: '请输入设备编号', trigger: 'blur' }
+          password: [
+            { required: true, message: '请输入用户密码', trigger: 'blur' }
           ],
-          location: [
-            { required: true, message: '请输入设备位置', trigger: 'blur' }
+          confirmPassword: [
+            { required: true, message: '请再次输入密码', trigger: 'blur' },
+            { required: true, validator: cfPsdRule, trigger: 'blur' },
           ],
         }
       },
@@ -64,41 +77,61 @@ export default {
     },
   },
   created() {
+    this.userPage()
   },
   mounted() {
   },
   beforeDestroy() {
   },
   methods: {
-    addDevice() {
-      this.device.visible = true
+    userPage() {
+      userList().then(res => {
+        this.userData = res.data.data
+      })
     },
-    editDevice(form) {
-      this.device.visible = true
-      this.device.form = form
+    addUser() {
+      this.user.visible = true
     },
-    detailDevice() {
-      this.device.visible = true
-      this.device.form = form
+    editUser(form) {
+      this.user.visible = true
+      this.user.form.account = form.account
     },
     close() {
       this.$refs.form.resetFields()
-      this.device.visible = false
+      this.user.visible = false
     },
-    submitDevice() {
-      this.$refs.form.validate((valid) => {
-        console.log(valid, 3333333);
-
-      })
+    async submitUser() {
+      const valid = await this.$refs.form.validate(valid)
+      if (!valid) return
+      delete this.user.form.confirmPassword
+      const form = { ...this.user.form }
+      form.password = md5(form.password)
+      if (form.id) {
+        userUpdate(this.user.form).then(res => {
+          this.$message.success('更新用户成功')
+          this.userPage()
+          this.close()
+        })
+      } else {
+        userSave(form).then(res => {
+          this.$message.success('新增用户成功')
+          this.userPage()
+          this.close()
+        })
+      }
     },
-    async deleteDevice() {
-      const bool = await this.$confirm('确认要永久删除该设备吗?', '提示', {
+    async deleteUser(row) {
+      const bool = await this.$confirm('确认要永久删除该用户吗?', '提示', {
         customClass: 'confirm-light',
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       })
-      console.log(bool, 333);
+      if (!bool) return
+      userRemove([row.id]).then(res => {
+        this.$message.success('删除用户成功')
+        this.userPage()
+      })
 
     },
     //#region 无人机详情代码
diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/user-list/index.scss b/frontend/Skyeye-sys-ui/src/views/home/components/user-list/index.scss
index 387d303..9ca71c3 100644
--- a/frontend/Skyeye-sys-ui/src/views/home/components/user-list/index.scss
+++ b/frontend/Skyeye-sys-ui/src/views/home/components/user-list/index.scss
@@ -110,7 +110,7 @@
         }
       }
 
-      >.device-name {
+      >.user-name {
         display: inline-block;
         width: 110px;
         height: 40px;
@@ -175,7 +175,7 @@
         }
       }
 
-      .device-location {
+      .user-location {
         color: $--color-text-1;
         font-size: 14px;
         display: flex;
@@ -190,14 +190,14 @@
         }
       }
 
-      .device-lock {
+      .user-lock {
         font-size: 18px;
         color: #ffff00;
         cursor: pointer;
       }
     }
 
-    .device-status {
+    .user-status {
       width: 8px;
       height: 8px;
       display: inline-block;
@@ -280,7 +280,7 @@
         box-sizing: border-box;
       }
 
-      .uav-item .device-name {
+      .uav-item .user-name {
         width: 100px;
       }
 
@@ -305,3 +305,8 @@
   top: $--icon-mode-larger-card-top;
   transition: 0.2s ease-in-out;
 }
+
+::v-deep .el-icon-plus {
+  position: relative;
+  top: 2px;
+}
diff --git a/frontend/Skyeye-sys-ui/src/views/home/components/user-list/index.vue b/frontend/Skyeye-sys-ui/src/views/home/components/user-list/index.vue
index 35839a2..7e6e603 100644
--- a/frontend/Skyeye-sys-ui/src/views/home/components/user-list/index.vue
+++ b/frontend/Skyeye-sys-ui/src/views/home/components/user-list/index.vue
@@ -2,15 +2,13 @@
   <!--  资源列表  -->
   <dt-card
     class="resource-list card-light"
-    icon="iconfont icon-left_icon_remote"
-    title="可用资源"
     :visible.sync="visibleLocale"
     :scroll="false"
     :showClose="false"
     :showDivider="false"
   >
     <template v-slot:header>
-      <el-form
+      <!-- <el-form
         class="query-form"
         :model="queryForm"
         inline
@@ -24,35 +22,21 @@
             clearable
           ></el-input>
         </el-form-item>
-        <!-- <el-form-item label="设备类型">
-          <el-select
-            v-model="queryForm.name"
-            placeholder="请输入设备类型"
-            popper-class="select-light"
-            clearable
-          >
-            <el-option
-              v-for="item in deviceTypes"
-              :key="item.value"
-              :value="item.value"
-              :label="item.label"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item class="query-btn">
           <el-button>查询</el-button>
         </el-form-item>
-      </el-form>
+      </el-form> -->
     </template>
     <template v-slot:command>
-      <el-button size="mini" icon="el-icon-plus" @click="addDevice"
+      <el-button size="mini" icon="el-icon-plus" @click="addUser"
         >新增用户</el-button
       >
     </template>
-    <el-table :data="deviceData" style="width: 100%">
-      <el-table-column prop="name" label="用户名称"> </el-table-column>
-      <el-table-column prop="num" label="手机号"> </el-table-column>
-      <el-table-column prop="location" label="邮箱"> </el-table-column>
+    <el-table :data="userData" style="width: 100%" height="100%">
+      <el-table-column prop="id" label="ID"> </el-table-column>
+      <el-table-column prop="account" label="用户名称"> </el-table-column>
+      <!-- <el-table-column prop="updateTime" label="更新时间"> </el-table-column> -->
+      <!-- <el-table-column prop="location" label="账号状态"> </el-table-column> -->
       <el-table-column label="操作" width="200">
         <template slot-scope="scope">
           <el-button
@@ -60,29 +44,22 @@
             icon="el-icon-edit"
             size="mini"
             circle
-            @click="editDevice(scope.row)"
-          ></el-button>
-          <el-button
-            type="info"
-            icon="ri-file-line"
-            size="mini"
-            circle
-            @click="detailDevice(scope.row)"
+            @click="editUser(scope.row)"
           ></el-button>
           <el-button
             type="danger"
             icon="el-icon-delete"
             size="mini"
             circle
-            @click="deleteDevice(scope.row)"
+            @click="deleteUser(scope.row)"
           ></el-button>
         </template>
       </el-table-column>
     </el-table>
     <dt-dialog
       class="dialog-light"
-      :title="device.form.deviceId ? '编辑用户' : '新增用户'"
-      :visible.sync="device.visible"
+      :title="user.form.userId ? '编辑用户' : '新增用户'"
+      :visible.sync="user.visible"
       top="20vh"
       width="22%"
       append-to-body
@@ -91,43 +68,48 @@
       <div>
         <el-form
           ref="form"
-          :model="device.form"
-          :rules="device.rules"
+          :model="user.form"
+          :rules="user.rules"
           label-position="right"
           label-width="110px"
           class="change-password-form"
         >
-          <el-form-item label="用户名称" prop="deviceName">
+          <el-form-item label="用户名称" prop="account">
             <el-input
-              v-model="device.form.deviceName"
+              name="account"
+              autocomplete="account"
+              v-model="user.form.account"
               placeholder="请输入用户名称"
               clearable
               size="mini"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="用户密码" prop="password">
+            <el-input
+              name="password"
+              autocomplete="new-password"
+              v-model="user.form.password"
+              placeholder="请输入用户密码"
+              clearable
+              size="mini"
               show-password
             ></el-input>
           </el-form-item>
-
-          <el-form-item label="手机号" prop="num">
+          <el-form-item label="确认密码" prop="confirmPassword">
             <el-input
-              v-model="device.form.num"
-              placeholder="请输入用户手机号"
-              clearable
-              size="mini"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="邮箱" prop="location">
-            <el-input
-              v-model="device.form.location"
-              placeholder="请输入用户邮箱"
+              v-model="user.form.confirmPassword"
+              placeholder="请再次输入密码"
               clearable
               size="mini"
+              show-password
             ></el-input>
           </el-form-item>
         </el-form>
       </div>
       <div class="btns" slot="footer">
         <el-button @click="close" size="mini">取 消</el-button>
-        <el-button type="primary" size="mini" @click="submitDevice"
+        <el-button type="primary" size="mini" @click="submitUser"
           >确 定</el-button
         >
       </div>
diff --git a/frontend/Skyeye-sys-ui/src/views/home/index.js b/frontend/Skyeye-sys-ui/src/views/home/index.js
index c5b93e8..e8956ed 100644
--- a/frontend/Skyeye-sys-ui/src/views/home/index.js
+++ b/frontend/Skyeye-sys-ui/src/views/home/index.js
@@ -477,7 +477,7 @@ export default {
   watch: {
     menusChose: {
       handler: function (nv) {
-        console.log(nv, 33333333333);
+        window.localStorage.setItem('menusChose', nv)
         switch (nv) {
           case '1':
             this.menus.situation.active = true
@@ -516,7 +516,6 @@ export default {
             break;
         }
       },
-      immediate: true
     },
     // viewMode(nv) {
     //   this.sendMessageByBroadcastChannel({ type: 'viewMode', form: 'home', value: nv })
@@ -538,6 +537,8 @@ export default {
     // },
   },
   created() {
+    const menusChose = window.localStorage.getItem('menusChose')
+    this.SET_MENUS_CHOSE(menusChose)
     // this.init()
     // this.getResourceData()
     // 获取字典
@@ -625,7 +626,7 @@ export default {
       'SET_MAP_TYPE',
       'SET_SPLIT_VISIBLE',
     ]),
-    ...mapMutations('app', ['SET_THEME']),
+    ...mapMutations('app', ['SET_THEME', 'SET_MENUS_CHOSE']),
     ...mapActions('dict', ['getDict']),
     // 工具栏操作
     toggleTools(tool) {
diff --git a/frontend/Skyeye-sys-ui/src/views/login/index.vue b/frontend/Skyeye-sys-ui/src/views/login/index.vue
index 26167a6..6930c42 100644
--- a/frontend/Skyeye-sys-ui/src/views/login/index.vue
+++ b/frontend/Skyeye-sys-ui/src/views/login/index.vue
@@ -197,6 +197,7 @@ export default {
                 path: this.redirect || '/',
                 query: this.otherQuery,
               })
+              window.localStorage.setItem('menusChose', '1')
               console.log(this.$router, 'this.$router')
               this.loading = false
             })