diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RouteWaypointsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RouteWaypointsController.java
new file mode 100644
index 0000000..cf9be8f
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RouteWaypointsController.java
@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.RouteWaypoints;
+import com.ruoyi.system.service.IRouteWaypointsService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 航线具体航点明细Controller
+ * 
+ * @author ruoyi
+ * @date 2026-01-21
+ */
+@RestController
+@RequestMapping("/system/waypoints")
+public class RouteWaypointsController extends BaseController
+{
+    @Autowired
+    private IRouteWaypointsService routeWaypointsService;
+
+    /**
+     * 查询航线具体航点明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:waypoints:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(RouteWaypoints routeWaypoints)
+    {
+        startPage();
+        List<RouteWaypoints> list = routeWaypointsService.selectRouteWaypointsList(routeWaypoints);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出航线具体航点明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:waypoints:export')")
+    @Log(title = "航线具体航点明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, RouteWaypoints routeWaypoints)
+    {
+        List<RouteWaypoints> list = routeWaypointsService.selectRouteWaypointsList(routeWaypoints);
+        ExcelUtil<RouteWaypoints> util = new ExcelUtil<RouteWaypoints>(RouteWaypoints.class);
+        util.exportExcel(response, list, "航线具体航点明细数据");
+    }
+
+    /**
+     * 获取航线具体航点明细详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:waypoints:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(routeWaypointsService.selectRouteWaypointsById(id));
+    }
+
+    /**
+     * 新增航线具体航点明细
+     */
+    @PreAuthorize("@ss.hasPermi('system:waypoints:add')")
+    @Log(title = "航线具体航点明细", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody RouteWaypoints routeWaypoints)
+    {
+        return toAjax(routeWaypointsService.insertRouteWaypoints(routeWaypoints));
+    }
+
+    /**
+     * 修改航线具体航点明细
+     */
+    @PreAuthorize("@ss.hasPermi('system:waypoints:edit')")
+    @Log(title = "航线具体航点明细", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody RouteWaypoints routeWaypoints)
+    {
+        return toAjax(routeWaypointsService.updateRouteWaypoints(routeWaypoints));
+    }
+
+    /**
+     * 删除航线具体航点明细
+     */
+    @PreAuthorize("@ss.hasPermi('system:waypoints:remove')")
+    @Log(title = "航线具体航点明细", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(routeWaypointsService.deleteRouteWaypointsByIds(ids));
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RouteWaypoints.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RouteWaypoints.java
new file mode 100644
index 0000000..f8349fc
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RouteWaypoints.java
@@ -0,0 +1,194 @@
+package com.ruoyi.system.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 航线具体航点明细对象 route_waypoints
+ * 
+ * @author ruoyi
+ * @date 2026-01-21
+ */
+public class RouteWaypoints extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 航点ID */
+    private Long id;
+
+    /** 所属航线ID (关联 routes.id) */
+    @Excel(name = "所属航线ID (关联 routes.id)")
+    private Long routeId;
+
+    /** 航点名称 (如: WP1) */
+    @Excel(name = "航点名称 (如: WP1)")
+    private String name;
+
+    /** 航点顺序 (从1开始递增) */
+    @Excel(name = "航点顺序 (从1开始递增)")
+    private Long seq;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private BigDecimal lat;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private BigDecimal lng;
+
+    /** 高度 (米) */
+    @Excel(name = "高度 (米)")
+    private Long alt;
+
+    /** 速度 (km/h) */
+    @Excel(name = "速度 (km/h)")
+    private Long speed;
+
+    /** 起始时间 (如: K+00:40:00) */
+    @Excel(name = "起始时间 (如: K+00:40:00)")
+    private String startTime;
+
+    /** 转弯角度 (用于计算转弯半径) */
+    @Excel(name = "转弯角度 (用于计算转弯半径)")
+    private Long turnAngle;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public void setRouteId(Long routeId) 
+    {
+        this.routeId = routeId;
+    }
+
+    public Long getRouteId() 
+    {
+        return routeId;
+    }
+
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+
+    public void setSeq(Long seq) 
+    {
+        this.seq = seq;
+    }
+
+    public Long getSeq() 
+    {
+        return seq;
+    }
+
+    public void setLat(BigDecimal lat) 
+    {
+        this.lat = lat;
+    }
+
+    public BigDecimal getLat() 
+    {
+        return lat;
+    }
+
+    public void setLng(BigDecimal lng) 
+    {
+        this.lng = lng;
+    }
+
+    public BigDecimal getLng() 
+    {
+        return lng;
+    }
+
+    public void setAlt(Long alt) 
+    {
+        this.alt = alt;
+    }
+
+    public Long getAlt() 
+    {
+        return alt;
+    }
+
+    public void setSpeed(Long speed) 
+    {
+        this.speed = speed;
+    }
+
+    public Long getSpeed() 
+    {
+        return speed;
+    }
+
+    public void setStartTime(String startTime) 
+    {
+        this.startTime = startTime;
+    }
+
+    public String getStartTime() 
+    {
+        return startTime;
+    }
+
+    public void setTurnAngle(Long turnAngle) 
+    {
+        this.turnAngle = turnAngle;
+    }
+
+    public Long getTurnAngle() 
+    {
+        return turnAngle;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("routeId", getRouteId())
+            .append("name", getName())
+            .append("seq", getSeq())
+            .append("lat", getLat())
+            .append("lng", getLng())
+            .append("alt", getAlt())
+            .append("speed", getSpeed())
+            .append("startTime", getStartTime())
+            .append("turnAngle", getTurnAngle())
+            .toString();
+    }
+
+    /** * 获取转弯半径 (该字段不在数据库中，仅用于逻辑计算)
+     * 公式: R = V^2 / (g * tan(θ))
+     */
+    public Double getTurnRadius()
+    {
+        //  安全校验：如果角度为0、速度为null，半径视为0
+        if (this.turnAngle == null || this.turnAngle == 0 || this.speed == null) {
+            return 0.0;
+        }
+        // 单位换算：速度从 km/h 转为 m/s
+        double v_mps = this.speed / 3.6;
+        // 单位换算：角度从 度(Degree) 转为 弧度(Radians)
+        double radians = Math.toRadians(this.turnAngle.doubleValue());
+        // 重力加速度 g
+        double g = 9.8;
+        // 计算半径
+        double radius = (v_mps * v_mps) / (g * Math.tan(radians));
+
+        return radius;
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Routes.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Routes.java
index 20d61e6..d1055b2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Routes.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Routes.java
@@ -5,108 +5,105 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 实体部署与航线对象 routes
- * 
+ *
  * @author ruoyi
  * @date 2026-01-14
  */
-public class Routes extends BaseEntity
-{
+public class Routes extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 路由ID */
+    /**
+     * 路由ID
+     */
     private Long id;
 
-    /** 归属方案ID */
+    /**
+     * 归属方案ID
+     */
     @Excel(name = "归属方案ID")
     private Long scenarioId;
 
-    /** 使用的是库里哪个平台 (关联 platform_lib.id) */
+    /**
+     * 使用的是库里哪个平台 (关联 platform_lib.id)
+     */
     @Excel(name = "使用的是库里哪个平台 (关联 platform_lib.id)")
     private Long platformId;
 
-    /** 名称 (如: 猎鹰01) */
+    /**
+     * 名称 (如: 猎鹰01)
+     */
     @Excel(name = "名称 (如: 猎鹰01)")
     private String callSign;
 
-    /** 实例属性JSON: 覆盖库里的默认值 (如当前初始油量, 挂载配置) */
+    /**
+     * 实例属性JSON: 覆盖库里的默认值 (如当前初始油量, 挂载配置)
+     */
     @Excel(name = "实例属性JSON: 覆盖库里的默认值 (如当前初始油量, 挂载配置)")
     private String attributes;
 
-    /** 航点数据JSON数组: [{seq, k_offset, lat, lng, alt, speed, action...}] */
-    @Excel(name = "航点数据JSON数组: [{seq, k_offset, lat, lng, alt, speed, action...}]")
-    private String waypoints;
+    private List<RouteWaypoints> waypoints;
 
-    public void setId(Long id) 
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
 
-    public void setScenarioId(Long scenarioId) 
-    {
+    public void setScenarioId(Long scenarioId) {
         this.scenarioId = scenarioId;
     }
 
-    public Long getScenarioId() 
-    {
+    public Long getScenarioId() {
         return scenarioId;
     }
 
-    public void setPlatformId(Long platformId) 
-    {
+    public void setPlatformId(Long platformId) {
         this.platformId = platformId;
     }
 
-    public Long getPlatformId() 
-    {
+    public Long getPlatformId() {
         return platformId;
     }
 
-    public void setCallSign(String callSign) 
-    {
+    public void setCallSign(String callSign) {
         this.callSign = callSign;
     }
 
-    public String getCallSign() 
-    {
+    public String getCallSign() {
         return callSign;
     }
 
-    public void setAttributes(String attributes) 
-    {
+    public void setAttributes(String attributes) {
         this.attributes = attributes;
     }
 
-    public String getAttributes() 
-    {
+    public String getAttributes() {
         return attributes;
     }
 
-    public void setWaypoints(String waypoints) 
-    {
-        this.waypoints = waypoints;
+    public List<RouteWaypoints> getWaypoints() {
+        return waypoints;
     }
 
-    public String getWaypoints() 
-    {
-        return waypoints;
+    public void setWaypoints(List<RouteWaypoints> waypoints) {
+        this.waypoints = waypoints;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("scenarioId", getScenarioId())
-            .append("platformId", getPlatformId())
-            .append("callSign", getCallSign())
-            .append("attributes", getAttributes())
-            .append("waypoints", getWaypoints())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("scenarioId", getScenarioId())
+                .append("platformId", getPlatformId())
+                .append("callSign", getCallSign())
+                .append("attributes", getAttributes())
+                .append("waypoints", getWaypoints())
+                .toString();
     }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RouteWaypointsMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RouteWaypointsMapper.java
new file mode 100644
index 0000000..2e77e10
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RouteWaypointsMapper.java
@@ -0,0 +1,64 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.RouteWaypoints;
+
+/**
+ * 航线具体航点明细Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2026-01-21
+ */
+public interface RouteWaypointsMapper 
+{
+    /**
+     * 查询航线具体航点明细
+     * 
+     * @param id 航线具体航点明细主键
+     * @return 航线具体航点明细
+     */
+    public RouteWaypoints selectRouteWaypointsById(Long id);
+
+    /**
+     * 查询航线具体航点明细列表
+     * 
+     * @param routeWaypoints 航线具体航点明细
+     * @return 航线具体航点明细集合
+     */
+    public List<RouteWaypoints> selectRouteWaypointsList(RouteWaypoints routeWaypoints);
+
+    /** 查询指定航线下最大的序号 */
+    public Integer selectMaxSeqByRouteId(Long routeId);
+
+    /**
+     * 新增航线具体航点明细
+     * 
+     * @param routeWaypoints 航线具体航点明细
+     * @return 结果
+     */
+    public int insertRouteWaypoints(RouteWaypoints routeWaypoints);
+
+    /**
+     * 修改航线具体航点明细
+     * 
+     * @param routeWaypoints 航线具体航点明细
+     * @return 结果
+     */
+    public int updateRouteWaypoints(RouteWaypoints routeWaypoints);
+
+    /**
+     * 删除航线具体航点明细
+     * 
+     * @param id 航线具体航点明细主键
+     * @return 结果
+     */
+    public int deleteRouteWaypointsById(Long id);
+
+    /**
+     * 批量删除航线具体航点明细
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRouteWaypointsByIds(Long[] ids);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRouteWaypointsService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRouteWaypointsService.java
new file mode 100644
index 0000000..fc046e8
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRouteWaypointsService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.RouteWaypoints;
+
+/**
+ * 航线具体航点明细Service接口
+ * 
+ * @author ruoyi
+ * @date 2026-01-21
+ */
+public interface IRouteWaypointsService 
+{
+    /**
+     * 查询航线具体航点明细
+     * 
+     * @param id 航线具体航点明细主键
+     * @return 航线具体航点明细
+     */
+    public RouteWaypoints selectRouteWaypointsById(Long id);
+
+    /**
+     * 查询航线具体航点明细列表
+     * 
+     * @param routeWaypoints 航线具体航点明细
+     * @return 航线具体航点明细集合
+     */
+    public List<RouteWaypoints> selectRouteWaypointsList(RouteWaypoints routeWaypoints);
+
+    /**
+     * 新增航线具体航点明细
+     * 
+     * @param routeWaypoints 航线具体航点明细
+     * @return 结果
+     */
+    public int insertRouteWaypoints(RouteWaypoints routeWaypoints);
+
+    /**
+     * 修改航线具体航点明细
+     * 
+     * @param routeWaypoints 航线具体航点明细
+     * @return 结果
+     */
+    public int updateRouteWaypoints(RouteWaypoints routeWaypoints);
+
+    /**
+     * 批量删除航线具体航点明细
+     * 
+     * @param ids 需要删除的航线具体航点明细主键集合
+     * @return 结果
+     */
+    public int deleteRouteWaypointsByIds(Long[] ids);
+
+    /**
+     * 删除航线具体航点明细信息
+     * 
+     * @param id 航线具体航点明细主键
+     * @return 结果
+     */
+    public int deleteRouteWaypointsById(Long id);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RouteWaypointsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RouteWaypointsServiceImpl.java
new file mode 100644
index 0000000..fbc0848
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RouteWaypointsServiceImpl.java
@@ -0,0 +1,104 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.RouteWaypointsMapper;
+import com.ruoyi.system.domain.RouteWaypoints;
+import com.ruoyi.system.service.IRouteWaypointsService;
+
+/**
+ * 航线具体航点明细Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2026-01-21
+ */
+@Service
+public class RouteWaypointsServiceImpl implements IRouteWaypointsService 
+{
+    @Autowired
+    private RouteWaypointsMapper routeWaypointsMapper;
+
+    /**
+     * 查询航线具体航点明细
+     * 
+     * @param id 航线具体航点明细主键
+     * @return 航线具体航点明细
+     */
+    @Override
+    public RouteWaypoints selectRouteWaypointsById(Long id)
+    {
+        return routeWaypointsMapper.selectRouteWaypointsById(id);
+    }
+
+    /**
+     * 查询航线具体航点明细列表
+     * 
+     * @param routeWaypoints 航线具体航点明细
+     * @return 航线具体航点明细
+     */
+    @Override
+    public List<RouteWaypoints> selectRouteWaypointsList(RouteWaypoints routeWaypoints)
+    {
+        return routeWaypointsMapper.selectRouteWaypointsList(routeWaypoints);
+    }
+
+    /**
+     * 新增航线具体航点明细
+     * 
+     * @param routeWaypoints 航线具体航点明细
+     * @return 结果
+     */
+    @Override
+    public int insertRouteWaypoints(RouteWaypoints routeWaypoints)
+    {
+        // 1. 获取该航线当前的最高序号
+        Integer maxSeq = routeWaypointsMapper.selectMaxSeqByRouteId(routeWaypoints.getRouteId());
+
+        // 2. 如果是第一条，序号为1；否则在最大值基础上 +1
+        if (maxSeq == null) {
+            routeWaypoints.setSeq(1L);
+        } else {
+            routeWaypoints.setSeq((long) (maxSeq + 1));
+        }
+
+        // 3. 执行若依生成的原始插入方法
+        return routeWaypointsMapper.insertRouteWaypoints(routeWaypoints);
+    }
+
+    /**
+     * 修改航线具体航点明细
+     * 
+     * @param routeWaypoints 航线具体航点明细
+     * @return 结果
+     */
+    @Override
+    public int updateRouteWaypoints(RouteWaypoints routeWaypoints)
+    {
+        return routeWaypointsMapper.updateRouteWaypoints(routeWaypoints);
+    }
+
+    /**
+     * 批量删除航线具体航点明细
+     * 
+     * @param ids 需要删除的航线具体航点明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRouteWaypointsByIds(Long[] ids)
+    {
+        return routeWaypointsMapper.deleteRouteWaypointsByIds(ids);
+    }
+
+    /**
+     * 删除航线具体航点明细信息
+     * 
+     * @param id 航线具体航点明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRouteWaypointsById(Long id)
+    {
+        return routeWaypointsMapper.deleteRouteWaypointsById(id);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RoutesServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RoutesServiceImpl.java
index 13295dd..93b1ded 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RoutesServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RoutesServiceImpl.java
@@ -1,11 +1,15 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.RouteWaypoints;
+import com.ruoyi.system.service.IRouteWaypointsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.RoutesMapper;
 import com.ruoyi.system.domain.Routes;
 import com.ruoyi.system.service.IRoutesService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 实体部署与航线Service业务层处理
@@ -19,6 +23,9 @@ public class RoutesServiceImpl implements IRoutesService
     @Autowired
     private RoutesMapper routesMapper;
 
+    @Autowired
+    private IRouteWaypointsService routeWaypointsService;
+
     /**
      * 查询实体部署与航线
      * 
@@ -50,9 +57,26 @@ public class RoutesServiceImpl implements IRoutesService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertRoutes(Routes routes)
     {
-        return routesMapper.insertRoutes(routes);
+        // 保存航线主体，MyBatis 会回填自增 ID 到 routes.id
+        int route = routesMapper.insertRoutes(routes);
+
+        // 从 routes 对象中拿到刚才手动添加的 List
+        List<RouteWaypoints> waypointList = routes.getWaypoints();
+
+        if (waypointList != null && !waypointList.isEmpty())
+        {
+            for (RouteWaypoints waypoint : waypointList)
+            {
+                // 将刚生成的航线 ID 绑定到每个航点上
+                waypoint.setRouteId(routes.getId());
+                // 调用航点 Service，触发seq字段的自动递增逻辑
+                routeWaypointsService.insertRouteWaypoints(waypoint);
+            }
+        }
+        return route;
     }
 
     /**
diff --git a/ruoyi-system/src/main/resources/mapper/system/RouteWaypointsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RouteWaypointsMapper.xml
new file mode 100644
index 0000000..f6209fb
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/RouteWaypointsMapper.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.RouteWaypointsMapper">
+    
+    <resultMap type="RouteWaypoints" id="RouteWaypointsResult">
+        <result property="id"    column="id"    />
+        <result property="routeId"    column="route_id"    />
+        <result property="name"    column="name"    />
+        <result property="seq"    column="seq"    />
+        <result property="lat"    column="lat"    />
+        <result property="lng"    column="lng"    />
+        <result property="alt"    column="alt"    />
+        <result property="speed"    column="speed"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="turnAngle"    column="turn_angle"    />
+    </resultMap>
+
+    <sql id="selectRouteWaypointsVo">
+        select id, route_id, name, seq, lat, lng, alt, speed, start_time, turn_angle from route_waypoints
+    </sql>
+
+    <select id="selectRouteWaypointsList" parameterType="RouteWaypoints" resultMap="RouteWaypointsResult">
+        <include refid="selectRouteWaypointsVo"/>
+        <where>  
+            <if test="routeId != null "> and route_id = #{routeId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="seq != null "> and seq = #{seq}</if>
+            <if test="lat != null "> and lat = #{lat}</if>
+            <if test="lng != null "> and lng = #{lng}</if>
+            <if test="alt != null "> and alt = #{alt}</if>
+            <if test="speed != null "> and speed = #{speed}</if>
+            <if test="startTime != null  and startTime != ''"> and start_time = #{startTime}</if>
+            <if test="turnAngle != null "> and turn_angle = #{turnAngle}</if>
+        </where>
+    </select>
+    
+    <select id="selectRouteWaypointsById" parameterType="Long" resultMap="RouteWaypointsResult">
+        <include refid="selectRouteWaypointsVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectMaxSeqByRouteId" parameterType="Long" resultType="Integer">
+        select max(seq) from ry.route_waypoints where route_id = #{routeId}
+    </select>
+
+    <insert id="insertRouteWaypoints" parameterType="RouteWaypoints" useGeneratedKeys="true" keyProperty="id">
+        insert into route_waypoints
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="routeId != null">route_id,</if>
+            <if test="name != null">name,</if>
+            <if test="seq != null">seq,</if>
+            <if test="lat != null">lat,</if>
+            <if test="lng != null">lng,</if>
+            <if test="alt != null">alt,</if>
+            <if test="speed != null">speed,</if>
+            <if test="startTime != null and startTime != ''">start_time,</if>
+            <if test="turnAngle != null">turn_angle,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="routeId != null">#{routeId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="seq != null">#{seq},</if>
+            <if test="lat != null">#{lat},</if>
+            <if test="lng != null">#{lng},</if>
+            <if test="alt != null">#{alt},</if>
+            <if test="speed != null">#{speed},</if>
+            <if test="startTime != null and startTime != ''">#{startTime},</if>
+            <if test="turnAngle != null">#{turnAngle},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRouteWaypoints" parameterType="RouteWaypoints">
+        update route_waypoints
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="routeId != null">route_id = #{routeId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="seq != null">seq = #{seq},</if>
+            <if test="lat != null">lat = #{lat},</if>
+            <if test="lng != null">lng = #{lng},</if>
+            <if test="alt != null">alt = #{alt},</if>
+            <if test="speed != null">speed = #{speed},</if>
+            <if test="startTime != null and startTime != ''">start_time = #{startTime},</if>
+            <if test="turnAngle != null">turn_angle = #{turnAngle},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRouteWaypointsById" parameterType="Long">
+        delete from route_waypoints where id = #{id}
+    </delete>
+
+    <delete id="deleteRouteWaypointsByIds" parameterType="String">
+        delete from route_waypoints where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/RoutesMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RoutesMapper.xml
index 934bfb1..e51edf9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/RoutesMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/RoutesMapper.xml
@@ -10,11 +10,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="platformId"    column="platform_id"    />
         <result property="callSign"    column="call_sign"    />
         <result property="attributes"    column="attributes"    />
-        <result property="waypoints"    column="waypoints"    />
     </resultMap>
 
     <sql id="selectRoutesVo">
-        select id, scenario_id, platform_id, call_sign, attributes, waypoints from routes
+        select id, scenario_id, platform_id, call_sign, attributes from routes
     </sql>
 
     <select id="selectRoutesList" parameterType="Routes" resultMap="RoutesResult">
@@ -24,7 +23,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="platformId != null "> and platform_id = #{platformId}</if>
             <if test="callSign != null  and callSign != ''"> and call_sign = #{callSign}</if>
             <if test="attributes != null  and attributes != ''"> and attributes = #{attributes}</if>
-            <if test="waypoints != null  and waypoints != ''"> and waypoints = #{waypoints}</if>
         </where>
     </select>
     
@@ -40,14 +38,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="platformId != null">platform_id,</if>
             <if test="callSign != null and callSign != ''">call_sign,</if>
             <if test="attributes != null and attributes != ''">attributes,</if>
-            <if test="waypoints != null and waypoints != ''">waypoints,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="scenarioId != null">#{scenarioId},</if>
             <if test="platformId != null">#{platformId},</if>
             <if test="callSign != null and callSign != ''">#{callSign},</if>
             <if test="attributes != null and attributes != ''">#{attributes},</if>
-            <if test="waypoints != null and waypoints != ''">#{waypoints},</if>
          </trim>
     </insert>
 
@@ -58,7 +54,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="platformId != null">platform_id = #{platformId},</if>
             <if test="callSign != null and callSign != ''">call_sign = #{callSign},</if>
             <if test="attributes != null and attributes != ''">attributes = #{attributes},</if>
-            <if test="waypoints != null and waypoints != ''">waypoints = #{waypoints},</if>
         </trim>
         where id = #{id}
     </update>
diff --git a/ruoyi-ui/src/api/system/waypoints.js b/ruoyi-ui/src/api/system/waypoints.js
new file mode 100644
index 0000000..551e122
--- /dev/null
+++ b/ruoyi-ui/src/api/system/waypoints.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询航线具体航点明细列表
+export function listWaypoints(query) {
+  return request({
+    url: '/system/waypoints/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询航线具体航点明细详细
+export function getWaypoints(id) {
+  return request({
+    url: '/system/waypoints/' + id,
+    method: 'get'
+  })
+}
+
+// 新增航线具体航点明细
+export function addWaypoints(data) {
+  return request({
+    url: '/system/waypoints',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改航线具体航点明细
+export function updateWaypoints(data) {
+  return request({
+    url: '/system/waypoints',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除航线具体航点明细
+export function delWaypoints(id) {
+  return request({
+    url: '/system/waypoints/' + id,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue
index fecb74a..e17cf32 100644
--- a/ruoyi-ui/src/views/cesiumMap/index.vue
+++ b/ruoyi-ui/src/views/cesiumMap/index.vue
@@ -12,6 +12,7 @@
       @import-data="importData"
       @locate="handleLocate"
     />
+
     <measurement-panel
       v-if="measurementResult"
       :result="measurementResult"
@@ -19,6 +20,7 @@
     />
   </div>
 </template>
+
 <script>
 import * as Cesium from 'cesium'
 import 'cesium/Build/Cesium/Widgets/widgets.css'
@@ -55,6 +57,7 @@ export default {
     return {
       viewer: null,
       scaleBar: null,
+
       // 绘制相关
       drawingMode: null, // 'point', 'line', 'polygon', 'rectangle', 'circle'
       drawingHandler: null,
@@ -63,12 +66,15 @@ export default {
       drawingPoints: [],
       drawingStartPoint: null,
       isDrawing: false,
+
       // 实体管理
       allEntities: [], // 所有绘制的实体
       entityCounter: 0,
       selectedEntity: null, // 当前选中的实体
+
       // 测量结果
       measurementResult: null,
+
       // 默认样式
       defaultStyles: {
         point: { color: '#FF0000', size: 12 },
@@ -88,9 +94,11 @@ export default {
     // this.initMap()
     this.checkCesiumLoaded()
   },
+
   beforeDestroy() {
     this.destroyViewer()
   },
+
   methods: {
     checkCesiumLoaded() {
       if (typeof Cesium === 'undefined') {
@@ -112,6 +120,7 @@ export default {
         // 确保 Cesium 已加载
         Cesium.buildModuleUrl.setBaseUrl(window.CESIUM_BASE_URL)
         Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJjN2MzMmE5OS01NGU3LTQzOGQtYjdjZi1mNGIwZTFjZjQ0NmEiLCJpZCI6MTQ0MDc2LCJpYXQiOjE2ODU3NjY1OTN9.iCmFY-5WNdvyAT-EO2j-unrFm4ZN9J6aSuB2wElQZ-I'
+
         this.viewer = new Cesium.Viewer('cesiumViewer', {
           animation: false,
           fullscreenButton: false,
@@ -130,9 +139,11 @@ export default {
           terrainProvider: new Cesium.EllipsoidTerrainProvider(),
           baseLayer: false
         })
+
         this.viewer.cesiumWidget.creditContainer.style.display = "none"
         this.loadOfflineMap()
         this.setup2DConstraints()
+
         this.viewer.camera.setView({
           destination: Cesium.Cartesian3.fromDegrees(116.3974, 39.9093, 5000000),
           orientation: {
@@ -141,8 +152,10 @@ export default {
             roll: 0
           }
         })
+
         this.initScaleBar()
         console.log('Cesium离线二维地图已加载')
+
       } catch (error) {
         console.error('地图错误:', error)
         // 如果Cesium加载失败，显示错误信息
@@ -186,39 +199,47 @@ export default {
         `;
       }
     },
+
     setup2DConstraints() {
       const scene = this.viewer.scene
       const controller = scene.screenSpaceCameraController
+
       controller.enableTilt = false
       controller.enableRotate = false
       controller.enableLook = false
       scene.screenSpaceCameraController.maximumPitch = 0
       scene.screenSpaceCameraController.minimumPitch = 0
     },
+
     loadOfflineMap() {
-      this.viewer.imageryLayers.removeAll()
-      try {
-        // 修改部分：将原来的 ArcGIS 卫星图替换为高德矢量行政图
-        const administrativeMap = new Cesium.UrlTemplateImageryProvider({
-          // 高德地图矢量瓦片服务（纯 2D 行政图风格）
-          url: 'https://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-          minimumLevel: 0,
-          maximumLevel: 18,
-          // 高德不需要专门的 TilingScheme，默认即可，或者使用 WebMercator
-          tilingScheme: new Cesium.WebMercatorTilingScheme()
-        })
-        this.viewer.imageryLayers.addImageryProvider(administrativeMap)
-        // 如果需要叠加路网或注记，可以在这里再 add 一个图层
-      } catch (error) {
-        console.error('加载地图失败:', error)
-        this.showGridLayer()
-      }
-    },
+  this.viewer.imageryLayers.removeAll()
+  try {
+    // 修改部分：将原来的 ArcGIS 卫星图替换为高德矢量行政图
+    const administrativeMap = new Cesium.UrlTemplateImageryProvider({
+      // 高德地图矢量瓦片服务（纯 2D 行政图风格）
+      url: 'https://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+      minimumLevel: 0,
+      maximumLevel: 18,
+      // 高德不需要专门的 TilingScheme，默认即可，或者使用 WebMercator
+      tilingScheme: new Cesium.WebMercatorTilingScheme()
+    })
+
+    this.viewer.imageryLayers.addImageryProvider(administrativeMap)
+
+    // 如果需要叠加路网或注记，可以在这里再 add 一个图层
+
+  } catch (error) {
+    console.error('加载地图失败:', error)
+    this.showGridLayer()
+  }
+},
+
     showGridLayer() {
       const gridProvider = new Cesium.GridImageryProvider()
       this.viewer.imageryLayers.addImageryProvider(gridProvider)
       this.addCoordinateLabels()
     },
+
     addCoordinateLabels() {
       for (let lon = -180; lon <= 180; lon += 30) {
         for (let lat = -90; lat <= 90; lat += 30) {
@@ -238,7 +259,9 @@ export default {
         }
       }
     },
+
     // ================== 绘制功能 ==================
+
     toggleDrawing(mode) {
       if (this.drawingMode === mode) {
         // 停止当前绘制
@@ -249,17 +272,21 @@ export default {
         if (this.drawingMode) {
           this.stopDrawing()
         }
+
         // 开始新的绘制
         this.drawingMode = mode
         this.startDrawing(mode)
       }
     },
+
     startDrawing(mode) {
       this.stopDrawing()
       this.drawingPoints = []
       this.drawingStartPoint = null
       this.isDrawing = true
+
       this.drawingHandler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas)
+
       // 根据模式设置不同的鼠标样式和事件
       switch(mode) {
         case 'point':
@@ -278,26 +305,32 @@ export default {
           this.startCircleDrawing()
           break
       }
+
       this.viewer.scene.canvas.style.cursor = 'crosshair'
       console.log(`开始绘制 ${this.getTypeName(mode)}`)
     },
+
     stopDrawing() {
       if (this.drawingHandler) {
         this.drawingHandler.destroy();
         this.drawingHandler = null;
       }
+
       if (this.tempEntity) {
         this.viewer.entities.remove(this.tempEntity);
         this.tempEntity = null;
       }
+
       // 确保也清理预览实体
       if (this.tempPreviewEntity) {
         this.viewer.entities.remove(this.tempPreviewEntity);
         this.tempPreviewEntity = null;
       }
+
       this.drawingPoints = [];
       this.drawingStartPoint = null;
       this.isDrawing = false;
+
       this.viewer.scene.canvas.style.cursor = 'default';
     },
     // ********************************************************************
@@ -311,17 +344,20 @@ export default {
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
     },
+
     // 绘制线
     // 绘制线
     startLineDrawing() {
       this.drawingPoints = [];
       // 记录当前鼠标的实时位置
       let activeCursorPosition = null;
+
       // 清除可能存在的旧实体
       if (this.tempEntity) this.viewer.entities.remove(this.tempEntity);
       if (this.tempPreviewEntity) this.viewer.entities.remove(this.tempPreviewEntity);
       this.tempEntity = null;
       this.tempPreviewEntity = null;
+
       // 1. 鼠标移动事件：仅更新坐标变量，不操作实体
       this.drawingHandler.setInputAction((movement) => {
         const newPosition = this.getClickPosition(movement.endPosition);
@@ -329,14 +365,17 @@ export default {
           activeCursorPosition = newPosition;
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+
       // 2. 鼠标点击事件：确定点位
       this.drawingHandler.setInputAction((click) => {
         const position = this.getClickPosition(click.position);
         if (position) {
           this.drawingPoints.push(position);
+
           // === 第一步：点击第一个点后，立即创建“动态虚线” ===
           if (this.drawingPoints.length === 1) {
             activeCursorPosition = position; // 初始化鼠标位置
+
             // 创建预览虚线（只创建这一次，之后它会自动随数据更新）
             this.tempPreviewEntity = this.viewer.entities.add({
               polyline: {
@@ -378,6 +417,7 @@ export default {
           }
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+
       // 3. 右键完成绘制
       this.drawingHandler.setInputAction(() => {
         // 完成绘制前，移除那条动态虚线
@@ -385,15 +425,18 @@ export default {
           this.viewer.entities.remove(this.tempPreviewEntity);
           this.tempPreviewEntity = null;
         }
+
         if (this.drawingPoints.length > 1) {
           this.finishLineDrawing();
         } else {
           this.cancelDrawing();
         }
+
         // 重置局部变量
         activeCursorPosition = null;
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     },
+
     finishLineDrawing() {
       // 将预览线段转换为最终线段
       if (this.drawingPoints.length > 1) {
@@ -402,14 +445,17 @@ export default {
           this.viewer.entities.remove(this.tempPreviewEntity);
           this.tempPreviewEntity = null;
         }
+
         // 创建最终的实线实体
         const entity = this.addLineEntity([...this.drawingPoints]);
+
         // 计算长度
         const length = this.calculateLineLength([...this.drawingPoints]);
         this.measurementResult = {
           distance: length,
           type: 'line'
         };
+
         this.stopDrawing();
         return entity;
       } else {
@@ -417,16 +463,19 @@ export default {
         return null;
       }
     },
+
     // 绘制多边形
     startPolygonDrawing() {
       this.drawingPoints = [];
       let activeCursorPosition = null; // 存储鼠标实时位置
+
       // 1. 清理旧实体
       // 移除之前可能遗留的实体，确保干净的画布
       if (this.tempEntity) this.viewer.entities.remove(this.tempEntity);
       if (this.tempPreviewEntity) this.viewer.entities.remove(this.tempPreviewEntity);
       this.tempEntity = null;
       this.tempPreviewEntity = null;
+
       // 2. 鼠标移动事件：只负责更新坐标变量，不涉及繁重的绘图逻辑
       this.drawingHandler.setInputAction((movement) => {
         const newPosition = this.getClickPosition(movement.endPosition);
@@ -434,14 +483,17 @@ export default {
           activeCursorPosition = newPosition;
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+
       // 3. 鼠标点击事件：添加关键点
       this.drawingHandler.setInputAction((click) => {
         const position = this.getClickPosition(click.position);
         if (position) {
           this.drawingPoints.push(position);
+
           // === 关键逻辑：点击第一个点时，创建唯一的“动态多边形” ===
           if (this.drawingPoints.length === 1) {
             activeCursorPosition = position; // 初始化鼠标位置
+
             this.tempEntity = this.viewer.entities.add({
               // --- 填充面配置 ---
               polygon: {
@@ -480,6 +532,7 @@ export default {
           }
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+
       // 4. 右键完成绘制
       this.drawingHandler.setInputAction(() => {
         if (this.drawingPoints.length >= 3) {
@@ -487,30 +540,37 @@ export default {
         } else {
           this.cancelDrawing(); // 点数不够则取消
         }
+
         // 重置状态
         activeCursorPosition = null;
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     },
+
     finishPolygonDrawing() {
       const positions = [...this.drawingPoints]
       const entity = this.addPolygonEntity(positions)
+
       // 计算面积
       const area = this.calculatePolygonArea(positions)
       this.measurementResult = {
         area: area,
         type: 'polygon'
       }
+
       this.stopDrawing()
       return entity
     },
+
     // 绘制矩形（优化版：两点定矩形，实时预览）
     startRectangleDrawing() {
       this.drawingPoints = []; // 存储起点和终点
       let activeCursorPosition = null; // 实时鼠标位置
       let startPoint = null; // 记录起点
+
       // 1. 清理旧实体
       if (this.tempEntity) this.viewer.entities.remove(this.tempEntity);
       this.tempEntity = null;
+
       // 2. 鼠标移动事件：更新鼠标位置
       this.drawingHandler.setInputAction((movement) => {
         const newPosition = this.getClickPosition(movement.endPosition);
@@ -518,6 +578,7 @@ export default {
           activeCursorPosition = newPosition;
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+
       // 3. 鼠标点击事件
       this.drawingHandler.setInputAction((click) => {
         const position = this.getClickPosition(click.position);
@@ -527,6 +588,7 @@ export default {
             startPoint = position;
             this.drawingPoints.push(startPoint);
             activeCursorPosition = startPoint; // 初始化鼠标位置
+
             // 创建动态预览矩形
             this.tempEntity = this.viewer.entities.add({
               rectangle: {
@@ -552,24 +614,29 @@ export default {
             this.drawingPoints.push(position);
             // 停止监听鼠标移动，因为形状已确定
             activeCursorPosition = null;
+
             // 调用完成逻辑
             this.finishRectangleDrawing();
           }
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+
       // 4. 右键取消
       this.drawingHandler.setInputAction(() => {
         this.cancelDrawing();
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     },
+
     finishRectangleDrawing() {
       // 1. 获取最终的矩形范围对象
       const rect = Cesium.Rectangle.fromCartesianArray(this.drawingPoints);
+
       // 2. 移除动态预览的临时实体
       if (this.tempEntity) {
         this.viewer.entities.remove(this.tempEntity);
         this.tempEntity = null;
       }
+
       // 3. 创建最终显示的静态实体
       const finalEntity = this.viewer.entities.add({
         id: 'rectangle-' + new Date().getTime(), // 给个唯一ID
@@ -582,41 +649,52 @@ export default {
           clampToGround: true
         }
       });
+
       // 4. 记录到实体列表
       this.allEntities.push(finalEntity);
+
       // 5. 计算并显示面积
       const area = this.calculateRectangleArea(rect);
       this.measurementResult = {
         area: area,
         type: 'rectangle'
       };
+
       // 6. 重置状态
       this.stopDrawing();
     },
+
     // 计算矩形面积（辅助方法）
     calculateRectangleArea(rectangle) {
       // 获取地球椭球体对象
       const ellipsoid = this.viewer.scene.globe.ellipsoid;
+
       // 方法一：使用 Cesium 几何管道计算（更精确，但需要特定模块支持）
       // const geometry = new Cesium.RectangleGeometry({ rectangle: rectangle });
       // const geometryInstance = Cesium.RectangleGeometry.createGeometry(geometry);
       // ...比较复杂
+
       // 方法二：使用采样估算（简单且足够精确）
       // 获取矩形的四个角（弧度）
       const west = rectangle.west;
       const south = rectangle.south;
       const east = rectangle.east;
       const north = rectangle.north;
+
       // 计算中心点的纬度
       const centerLat = (south + north) / 2;
+
       // 计算宽度（东西向距离）：使用余弦定理校正纬度影响
       // 地球半径约为 6378137 米
       const R = 6378137;
       const width = (east - west) * R * Math.cos(centerLat);
+
       // 计算高度（南北向距离）
       const height = (north - south) * R;
+
       // 面积 = 宽 * 高
       const area = Math.abs(width * height);
+
       return area;
     },
     // 绘制圆形
@@ -624,9 +702,11 @@ export default {
       this.drawingPoints = []; // 存储圆心
       let activeCursorPosition = null; // 实时鼠标位置
       let centerPoint = null; // 圆心坐标
+
       // 1. 清理旧实体
       if (this.tempEntity) this.viewer.entities.remove(this.tempEntity);
       this.tempEntity = null;
+
       // 2. 鼠标移动事件
       this.drawingHandler.setInputAction((movement) => {
         const newPosition = this.getClickPosition(movement.endPosition);
@@ -634,6 +714,7 @@ export default {
           activeCursorPosition = newPosition;
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+
       // 3. 鼠标点击事件
       this.drawingHandler.setInputAction((click) => {
         const position = this.getClickPosition(click.position);
@@ -643,6 +724,7 @@ export default {
             centerPoint = position;
             this.drawingPoints.push(centerPoint);
             activeCursorPosition = centerPoint;
+
             // 创建动态预览圆形
             this.tempEntity = this.viewer.entities.add({
               position: centerPoint, // 圆心固定
@@ -674,25 +756,31 @@ export default {
             // 记录边缘点（虽然圆只需要圆心和半径，但记录下来方便后续处理）
             this.drawingPoints.push(position);
             activeCursorPosition = null; // 停止动态更新
+
             // 传递边缘点位置去结束绘制
             this.finishCircleDrawing(position);
           }
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+
       // 4. 右键取消
       this.drawingHandler.setInputAction(() => {
         this.cancelDrawing();
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     },
+
     finishCircleDrawing(edgePosition) {
       const centerPoint = this.drawingPoints[0];
+
       // 1. 计算最终半径
       const radius = Cesium.Cartesian3.distance(centerPoint, edgePosition);
+
       // 2. 移除动态预览实体
       if (this.tempEntity) {
         this.viewer.entities.remove(this.tempEntity);
         this.tempEntity = null;
       }
+
       // 3. 创建最终显示的静态实体
       const finalEntity = this.viewer.entities.add({
         id: 'circle-' + new Date().getTime(),
@@ -706,23 +794,30 @@ export default {
           outlineWidth: 2
         }
       });
+
       // 4. 记录实体
       this.allEntities.push(finalEntity);
+
       // 5. 计算面积 (π * r²) 并显示
       // 半径单位是米，面积单位是平方米
       const area = Math.PI * Math.pow(radius, 2);
+
       this.measurementResult = {
         radius: radius, // 也可以额外显示半径
         area: area,
         type: 'circle'
       };
+
       // 6. 结束绘制状态
       this.stopDrawing();
     },
+
     // ================== 实体创建方法 ==================
+
     addPointEntity(lat, lng) {
       this.entityCounter++
       const id = `point_${this.entityCounter}`
+
       const entity = this.viewer.entities.add({
         id: id,
         name: `点 ${this.entityCounter}`,
@@ -744,6 +839,7 @@ export default {
           horizontalOrigin: Cesium.HorizontalOrigin.CENTER
         }
       })
+
       const entityData = {
         id,
         type: 'point',
@@ -754,17 +850,22 @@ export default {
         size: this.defaultStyles.point.size,
         label: `点 ${this.entityCounter}`
       }
+
       this.allEntities.push(entityData)
+
       // 添加点击事件
       entity.clickHandler = (e) => {
         this.selectEntity(entityData)
         e.stopPropagation()
       }
+
       return entityData
     },
+
     addLineEntity(positions) {
       this.entityCounter++
       const id = `line_${this.entityCounter}`
+
       const entity = this.viewer.entities.add({
         id: id,
         name: `线 ${this.entityCounter}`,
@@ -775,6 +876,7 @@ export default {
           clampToGround: true
         }
       })
+
       const entityData = {
         id,
         type: 'line',
@@ -785,18 +887,24 @@ export default {
         width: this.defaultStyles.line.width,
         label: `线 ${this.entityCounter}`
       }
+
       this.allEntities.push(entityData)
+
       entity.clickHandler = (e) => {
         this.selectEntity(entityData)
         e.stopPropagation()
       }
+
       return entityData
     },
+
     addPolygonEntity(positions) {
       this.entityCounter++
       const id = `polygon_${this.entityCounter}`
+
       // 闭合多边形
       const polygonPositions = [...positions, positions[0]]
+
       const entity = this.viewer.entities.add({
         id: id,
         name: `面 ${this.entityCounter}`,
@@ -809,6 +917,7 @@ export default {
           outlineWidth: this.defaultStyles.polygon.width
         }
       })
+
       const entityData = {
         id,
         type: 'polygon',
@@ -820,42 +929,51 @@ export default {
         width: this.defaultStyles.polygon.width,
         label: `面 ${this.entityCounter}`
       }
+
       this.allEntities.push(entityData)
+
       entity.clickHandler = (e) => {
         this.selectEntity(entityData)
         e.stopPropagation()
       }
+
       return entityData
     },
+
     addRectangleEntity(coordinates) {
-      this.entityCounter++
-      const id = `rectangle_${this.entityCounter}`
-      const entity = this.viewer.entities.add({
-        id: id,
-        name: `矩形 ${this.entityCounter}`,
-        rectangle: {
-          coordinates: coordinates,
-          material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color)
-            .withAlpha(this.defaultStyles.rectangle.opacity),
-          outline: true,
-          outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color),
-          outlineWidth: this.defaultStyles.rectangle.width
-        }
-      })
-      // 【重要修改】直接把 entity 推入数组，修复清除功能的 bug
-      this.allEntities.push(entity)
-      return entity
-    },
+  this.entityCounter++
+  const id = `rectangle_${this.entityCounter}`
+
+  const entity = this.viewer.entities.add({
+    id: id,
+    name: `矩形 ${this.entityCounter}`,
+    rectangle: {
+      coordinates: coordinates,
+      material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color)
+        .withAlpha(this.defaultStyles.rectangle.opacity),
+      outline: true,
+      outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color),
+      outlineWidth: this.defaultStyles.rectangle.width
+    }
+  })
+
+  // 【重要修改】直接把 entity 推入数组，修复清除功能的 bug
+  this.allEntities.push(entity)
+
+  return entity
+},
     addCircleEntity(center, radius) {
       // 确保半径有效
       const validRadius = Math.max(radius, 1)
 
       this.entityCounter++
       const id = `circle_${this.entityCounter}`
+
       const entity = this.viewer.entities.add({
         id: id,
         name: `圆形 ${this.entityCounter}`,
         position: center, // 圆心位置
+
         // 【优化】使用 ellipse (椭圆) 绘制圆形
         ellipse: {
           semiMinorAxis: validRadius, // 半短轴 = 半径
@@ -867,15 +985,20 @@ export default {
           outlineWidth: this.defaultStyles.circle.width
         }
       })
+
       // 【重要修改】直接把 entity 推入数组
       this.allEntities.push(entity)
+
       return entity
     },
+
     // ================== 工具方法 ==================
+
     getClickPosition(pixelPosition) {
       const cartesian = this.viewer.camera.pickEllipsoid(pixelPosition, this.viewer.scene.globe.ellipsoid)
       return cartesian
     },
+
     cartesianToLatLng(cartesian) {
       const cartographic = Cesium.Cartographic.fromCartesian(cartesian)
       return {
@@ -883,9 +1006,11 @@ export default {
         lng: Cesium.Math.toDegrees(cartographic.longitude)
       }
     },
+
     calculateRectangle(start, end) {
       const startLL = this.cartesianToLatLng(start)
       const endLL = this.cartesianToLatLng(end)
+
       return Cesium.Rectangle.fromDegrees(
         Math.min(startLL.lng, endLL.lng),
         Math.min(startLL.lat, endLL.lat),
@@ -893,17 +1018,22 @@ export default {
         Math.max(startLL.lat, endLL.lat)
       )
     },
+
     calculateCircle(center, radius, segments) {
       const positions = []
       const centerLL = Cesium.Cartographic.fromCartesian(center)
+
       for (let i = 0; i < segments; i++) {
         const angle = (i / segments) * Math.PI * 2
         const lat = centerLL.latitude + (radius / 6378137) * Math.sin(angle)
         const lon = centerLL.longitude + (radius / 6378137) * Math.cos(angle) / Math.cos(centerLL.latitude)
+
         positions.push(Cesium.Cartesian3.fromRadians(lon, lat))
       }
+
       return positions
     },
+
     calculateLineLength(positions) {
       let totalLength = 0
       for (let i = 0; i < positions.length - 1; i++) {
@@ -911,19 +1041,25 @@ export default {
       }
       return totalLength
     },
+
     calculatePolygonArea(positions) {
       if (positions.length < 3) return 0
+
       let area = 0
       const n = positions.length
+
       for (let i = 0; i < n; i++) {
         const j = (i + 1) % n
         const p1 = Cesium.Cartographic.fromCartesian(positions[i])
         const p2 = Cesium.Cartographic.fromCartesian(positions[j])
+
         area += p1.longitude * p2.latitude - p2.longitude * p1.latitude
       }
+
       area = Math.abs(area) * 6378137 * 6378137 / 2
       return area
     },
+
     calculateRectangleArea(coordinates) {
       const rect = coordinates.getValue ? coordinates.getValue() : coordinates
       const width = Cesium.Cartesian3.distance(
@@ -934,11 +1070,15 @@ export default {
         Cesium.Cartesian3.fromRadians(rect.west, rect.north),
         Cesium.Cartesian3.fromRadians(rect.west, rect.south)
       )
+
       return width * height
     },
+
     // ================== 实体管理 ==================
+
     selectEntity(entity) {
       this.selectedEntity = entity
+
       // 居中显示
       if (entity.type === 'point') {
         this.viewer.camera.flyTo({
@@ -955,10 +1095,13 @@ export default {
         })
       }
     },
+
     updateEntityStyle() {
       if (!this.selectedEntity || !this.selectedEntity.entity) return
+
       const entity = this.selectedEntity.entity
       const data = this.selectedEntity
+
       switch(data.type) {
         case 'point':
           entity.point.color = Cesium.Color.fromCssColorString(data.color)
@@ -985,76 +1128,91 @@ export default {
           break
       }
     },
+
     updateEntityLabel() {
       if (!this.selectedEntity || !this.selectedEntity.entity) return
+
       const entity = this.selectedEntity.entity
       entity.name = this.selectedEntity.label
+
       // 如果是点，更新标签
       if (this.selectedEntity.type === 'point') {
         entity.label.text = this.selectedEntity.label
       }
     },
+
     deleteSelectedEntity() {
       if (this.selectedEntity) {
         this.removeEntity(this.selectedEntity.id)
         this.selectedEntity = null
       }
     },
+
     removeEntity(id) {
       const index = this.allEntities.findIndex(e => e.id === id)
       if (index > -1) {
         const entity = this.allEntities[index]
+
         // 从地图中移除
         if (entity.entity) {
           this.viewer.entities.remove(entity.entity)
         }
+
         // 从数组中移除
         this.allEntities.splice(index, 1)
+
         // 如果删除的是选中的实体，清空选中状态
         if (this.selectedEntity && this.selectedEntity.id === id) {
           this.selectedEntity = null
         }
       }
     },
+
     clearAll() {
-      // 1. 检查数组是否有内容
-      if (this.allEntities && this.allEntities.length > 0) {
-        // 2. 遍历每一个对象进行删除
-        this.allEntities.forEach(item => {
-          try {
-            // 情况 A: 数组里存的是原生的 Cesium Entity (点、线通常是这种情况)
-            if (item instanceof Cesium.Entity) {
-              this.viewer.entities.remove(item);
-            }
-            // 情况 B: 数组里存的是包装对象 (你的矩形、圆可能是这种 { entity: ... })
-            else if (item.entity && item.entity instanceof Cesium.Entity) {
-              this.viewer.entities.remove(item.entity);
-            }
-            // 情况 C: 兜底方案，尝试通过 ID 删除
-            else if (item.id) {
-              this.viewer.entities.removeById(item.id);
-            }
-          } catch (e) {
-            console.warn('删除实体失败:', e);
-          }
-        });
-      }
-      // 3. 清空数组
-      this.allEntities = [];
-      // 4. 清理可能残留的绘制过程中的临时图形
-      if (this.tempEntity) {
-        this.viewer.entities.remove(this.tempEntity);
-        this.tempEntity = null;
-      }
-      if (this.tempPreviewEntity) {
-        this.viewer.entities.remove(this.tempPreviewEntity);
-        this.tempPreviewEntity = null;
+  // 1. 检查数组是否有内容
+  if (this.allEntities && this.allEntities.length > 0) {
+
+    // 2. 遍历每一个对象进行删除
+    this.allEntities.forEach(item => {
+      try {
+        // 情况 A: 数组里存的是原生的 Cesium Entity (点、线通常是这种情况)
+        if (item instanceof Cesium.Entity) {
+          this.viewer.entities.remove(item);
+        }
+        // 情况 B: 数组里存的是包装对象 (你的矩形、圆可能是这种 { entity: ... })
+        else if (item.entity && item.entity instanceof Cesium.Entity) {
+          this.viewer.entities.remove(item.entity);
+        }
+        // 情况 C: 兜底方案，尝试通过 ID 删除
+        else if (item.id) {
+          this.viewer.entities.removeById(item.id);
+        }
+      } catch (e) {
+        console.warn('删除实体失败:', e);
       }
-      // 5. 重置其他状态（如测量面板、绘制状态）
-      this.measurementResult = null;
-      this.stopDrawing();
-    },
+    });
+  }
+
+  // 3. 清空数组
+  this.allEntities = [];
+
+  // 4. 清理可能残留的绘制过程中的临时图形
+  if (this.tempEntity) {
+    this.viewer.entities.remove(this.tempEntity);
+    this.tempEntity = null;
+  }
+  if (this.tempPreviewEntity) {
+    this.viewer.entities.remove(this.tempPreviewEntity);
+    this.tempPreviewEntity = null;
+  }
+
+  // 5. 重置其他状态（如测量面板、绘制状态）
+  this.measurementResult = null;
+  this.stopDrawing();
+},
+
     // ================== 其他方法 ==================
+
     getTypeName(type) {
       const names = {
         point: '点',
@@ -1065,6 +1223,7 @@ export default {
       }
       return names[type] || type
     },
+
     exportData() {
       const data = {
         version: '1.0',
@@ -1087,6 +1246,7 @@ export default {
           }
         }))
       }
+
       const blob = new Blob([JSON.stringify(data, null, 2)], { type: 'application/json' })
       const url = URL.createObjectURL(blob)
       const a = document.createElement('a')
@@ -1094,8 +1254,10 @@ export default {
       a.download = `cesium-drawing-${new Date().toISOString().slice(0, 10)}.json`
       a.click()
       URL.revokeObjectURL(url)
+
       console.log('数据已导出', data)
     },
+
     importData() {
       const input = document.createElement('input')
       input.type = 'file'
@@ -1103,6 +1265,7 @@ export default {
       input.onchange = (e) => {
         const file = e.target.files[0]
         if (!file) return
+
         const reader = new FileReader()
         reader.onload = (event) => {
           try {
@@ -1125,9 +1288,11 @@ export default {
       }
       input.click()
     },
+
     importEntity(entityData) {
       let entity
       const color = entityData.color || '#008aff'
+
       switch (entityData.type) {
         case 'point':
           entity = this.viewer.entities.add({
@@ -1150,6 +1315,7 @@ export default {
             }
           })
           break
+
         case 'line':
           const linePositions = entityData.data.points.map(p => Cesium.Cartesian3.fromDegrees(p.lng, p.lat))
           entity = this.viewer.entities.add({
@@ -1170,6 +1336,7 @@ export default {
             }
           })
           break
+
         case 'polygon':
           const polygonPositions = entityData.data.points.map(p => Cesium.Cartesian3.fromDegrees(p.lng, p.lat))
           entity = this.viewer.entities.add({
@@ -1191,6 +1358,7 @@ export default {
             }
           })
           break
+
         case 'rectangle':
           const rectCoords = entityData.data.coordinates
           entity = this.viewer.entities.add({
@@ -1212,6 +1380,7 @@ export default {
             }
           })
           break
+
         case 'circle':
           // 检查半径是否有效
           const radius = entityData.data.radius || 1000
@@ -1242,6 +1411,7 @@ export default {
           })
           break
       }
+
       if (entity) {
         this.allEntities.push({
           id: entity.id,
@@ -1252,6 +1422,7 @@ export default {
         })
       }
     },
+
     handleLocate() {
       const h = this.$createElement
       this.$msgbox({
@@ -1293,6 +1464,7 @@ export default {
             const latInput = instance.$el.querySelector('input[placeholder="例如 39.90"]')
             const lng = parseFloat(lngInput.value)
             const lat = parseFloat(latInput.value)
+
             if (!lng || !lat || isNaN(lng) || isNaN(lat)) {
               this.$message.error('请输入有效的经度和纬度！')
               return
@@ -1301,6 +1473,7 @@ export default {
               this.$message.error('经纬度超出有效范围！')
               return
             }
+
             if (this.viewer) {
               this.viewer.camera.flyTo({
                 destination: Cesium.Cartesian3.fromDegrees(lng, lat, 5000),
@@ -1376,3 +1549,4 @@ export default {
   display: none !important;
 }
 </style>
+
diff --git a/ruoyi-ui/src/views/system/waypoints/index.vue b/ruoyi-ui/src/views/system/waypoints/index.vue
new file mode 100644
index 0000000..73c53fd
--- /dev/null
+++ b/ruoyi-ui/src/views/system/waypoints/index.vue
@@ -0,0 +1,381 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="所属航线ID (关联 routes.id)" prop="routeId">
+        <el-input
+          v-model="queryParams.routeId"
+          placeholder="请输入所属航线ID (关联 routes.id)"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="航点名称 (如: WP1)" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入航点名称 (如: WP1)"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="航点顺序 (从1开始递增)" prop="seq">
+        <el-input
+          v-model="queryParams.seq"
+          placeholder="请输入航点顺序 (从1开始递增)"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="纬度" prop="lat">
+        <el-input
+          v-model="queryParams.lat"
+          placeholder="请输入纬度"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="经度" prop="lng">
+        <el-input
+          v-model="queryParams.lng"
+          placeholder="请输入经度"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="高度 (米)" prop="alt">
+        <el-input
+          v-model="queryParams.alt"
+          placeholder="请输入高度 (米)"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="速度 (km/h)" prop="speed">
+        <el-input
+          v-model="queryParams.speed"
+          placeholder="请输入速度 (km/h)"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="起始时间 (如: K+00:40:00)" prop="startTime">
+        <el-input
+          v-model="queryParams.startTime"
+          placeholder="请输入起始时间 (如: K+00:40:00)"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="转弯角度 (用于计算转弯半径)" prop="turnAngle">
+        <el-input
+          v-model="queryParams.turnAngle"
+          placeholder="请输入转弯角度 (用于计算转弯半径)"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:waypoints:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:waypoints:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:waypoints:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:waypoints:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="waypointsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="航点ID" align="center" prop="id" />
+      <el-table-column label="所属航线ID (关联 routes.id)" align="center" prop="routeId" />
+      <el-table-column label="航点名称 (如: WP1)" align="center" prop="name" />
+      <el-table-column label="航点顺序 (从1开始递增)" align="center" prop="seq" />
+      <el-table-column label="纬度" align="center" prop="lat" />
+      <el-table-column label="经度" align="center" prop="lng" />
+      <el-table-column label="高度 (米)" align="center" prop="alt" />
+      <el-table-column label="速度 (km/h)" align="center" prop="speed" />
+      <el-table-column label="起始时间 (如: K+00:40:00)" align="center" prop="startTime" />
+      <el-table-column label="转弯角度 (用于计算转弯半径)" align="center" prop="turnAngle" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:waypoints:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:waypoints:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改航线具体航点明细对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="所属航线ID (关联 routes.id)" prop="routeId">
+          <el-input v-model="form.routeId" placeholder="请输入所属航线ID (关联 routes.id)" />
+        </el-form-item>
+        <el-form-item label="航点名称 (如: WP1)" prop="name">
+          <el-input v-model="form.name" placeholder="请输入航点名称 (如: WP1)" />
+        </el-form-item>
+        <el-form-item label="航点顺序 (从1开始递增)" prop="seq">
+          <el-input v-model="form.seq" placeholder="请输入航点顺序 (从1开始递增)" />
+        </el-form-item>
+        <el-form-item label="纬度" prop="lat">
+          <el-input v-model="form.lat" placeholder="请输入纬度" />
+        </el-form-item>
+        <el-form-item label="经度" prop="lng">
+          <el-input v-model="form.lng" placeholder="请输入经度" />
+        </el-form-item>
+        <el-form-item label="高度 (米)" prop="alt">
+          <el-input v-model="form.alt" placeholder="请输入高度 (米)" />
+        </el-form-item>
+        <el-form-item label="速度 (km/h)" prop="speed">
+          <el-input v-model="form.speed" placeholder="请输入速度 (km/h)" />
+        </el-form-item>
+        <el-form-item label="起始时间 (如: K+00:40:00)" prop="startTime">
+          <el-input v-model="form.startTime" placeholder="请输入起始时间 (如: K+00:40:00)" />
+        </el-form-item>
+        <el-form-item label="转弯角度 (用于计算转弯半径)" prop="turnAngle">
+          <el-input v-model="form.turnAngle" placeholder="请输入转弯角度 (用于计算转弯半径)" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listWaypoints, getWaypoints, delWaypoints, addWaypoints, updateWaypoints } from "@/api/system/waypoints"
+
+export default {
+  name: "Waypoints",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 航线具体航点明细表格数据
+      waypointsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        routeId: null,
+        name: null,
+        seq: null,
+        lat: null,
+        lng: null,
+        alt: null,
+        speed: null,
+        startTime: null,
+        turnAngle: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        routeId: [
+          { required: true, message: "所属航线ID (关联 routes.id)不能为空", trigger: "blur" }
+        ],
+        seq: [
+          { required: true, message: "航点顺序 (从1开始递增)不能为空", trigger: "blur" }
+        ],
+        lat: [
+          { required: true, message: "纬度不能为空", trigger: "blur" }
+        ],
+        lng: [
+          { required: true, message: "经度不能为空", trigger: "blur" }
+        ],
+        alt: [
+          { required: true, message: "高度 (米)不能为空", trigger: "blur" }
+        ],
+        speed: [
+          { required: true, message: "速度 (km/h)不能为空", trigger: "blur" }
+        ],
+        startTime: [
+          { required: true, message: "起始时间 (如: K+00:40:00)不能为空", trigger: "blur" }
+        ],
+        turnAngle: [
+          { required: true, message: "转弯角度 (用于计算转弯半径)不能为空", trigger: "blur" }
+        ]
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询航线具体航点明细列表 */
+    getList() {
+      this.loading = true
+      listWaypoints(this.queryParams).then(response => {
+        this.waypointsList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        routeId: null,
+        name: null,
+        seq: null,
+        lat: null,
+        lng: null,
+        alt: null,
+        speed: null,
+        startTime: null,
+        turnAngle: null
+      }
+      this.resetForm("form")
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = "添加航线具体航点明细"
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getWaypoints(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = "修改航线具体航点明细"
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateWaypoints(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功")
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addWaypoints(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功")
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除航线具体航点明细编号为"' + ids + '"的数据项？').then(function() {
+        return delWaypoints(ids)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("删除成功")
+      }).catch(() => {})
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/waypoints/export', {
+        ...this.queryParams
+      }, `waypoints_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>