diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoomPlatformIconController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoomPlatformIconController.java
new file mode 100644
index 0000000..4af5fca
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoomPlatformIconController.java
@@ -0,0 +1,64 @@
+package com.ruoyi.web.controller;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.RoomPlatformIcon;
+import com.ruoyi.system.service.IRoomPlatformIconService;
+
+/**
+ * 房间地图平台图标Controller
+ */
+@RestController
+@RequestMapping("/system/roomPlatformIcon")
+public class RoomPlatformIconController extends BaseController {
+
+    @Autowired
+    private IRoomPlatformIconService roomPlatformIconService;
+
+    /**
+     * 按房间ID查询该房间下所有地图平台图标（不分页）
+     */
+    @PreAuthorize("@ss.hasPermi('system:roomPlatformIcon:list')")
+    @GetMapping("/list")
+    public AjaxResult list(@RequestParam Long roomId) {
+        List<RoomPlatformIcon> list = roomPlatformIconService.selectListByRoomId(roomId);
+        return success(list);
+    }
+
+    /**
+     * 新增
+     */
+    @PreAuthorize("@ss.hasPermi('system:roomPlatformIcon:add')")
+    @Log(title = "房间地图平台图标", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody RoomPlatformIcon roomPlatformIcon) {
+        int rows = roomPlatformIconService.insert(roomPlatformIcon);
+        return rows > 0 ? success(roomPlatformIcon) : error("新增失败");
+    }
+
+    /**
+     * 修改（位置/朝向/缩放）
+     */
+    @PreAuthorize("@ss.hasPermi('system:roomPlatformIcon:edit')")
+    @Log(title = "房间地图平台图标", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody RoomPlatformIcon roomPlatformIcon) {
+        return toAjax(roomPlatformIconService.update(roomPlatformIcon));
+    }
+
+    /**
+     * 删除
+     */
+    @PreAuthorize("@ss.hasPermi('system:roomPlatformIcon:remove')")
+    @Log(title = "房间地图平台图标", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable Long id) {
+        return toAjax(roomPlatformIconService.deleteById(id));
+    }
+}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 037db5c..0e75200 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -13,9 +13,9 @@ spring:
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -39,7 +39,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -58,4 +58,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
\ No newline at end of file
+                        multi-statement-allow: true
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RoomPlatformIcon.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RoomPlatformIcon.java
new file mode 100644
index 0000000..319298d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RoomPlatformIcon.java
@@ -0,0 +1,57 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 房间地图平台图标对象 room_platform_icon
+ */
+public class RoomPlatformIcon extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "主键")
+    private Long id;
+    @Excel(name = "房间ID")
+    private Long roomId;
+    @Excel(name = "平台库ID")
+    private Long platformId;
+    @Excel(name = "平台名称快照")
+    private String platformName;
+    @Excel(name = "平台类型快照")
+    private String platformType;
+    @Excel(name = "图标URL快照")
+    private String iconUrl;
+    @Excel(name = "经度")
+    private Double lng;
+    @Excel(name = "纬度")
+    private Double lat;
+    @Excel(name = "朝向(度)")
+    private Double heading;
+    @Excel(name = "图标缩放")
+    private Double iconScale;
+    @Excel(name = "排序")
+    private Integer sortOrder;
+
+    public void setId(Long id) { this.id = id; }
+    public Long getId() { return id; }
+    public void setRoomId(Long roomId) { this.roomId = roomId; }
+    public Long getRoomId() { return roomId; }
+    public void setPlatformId(Long platformId) { this.platformId = platformId; }
+    public Long getPlatformId() { return platformId; }
+    public void setPlatformName(String platformName) { this.platformName = platformName; }
+    public String getPlatformName() { return platformName; }
+    public void setPlatformType(String platformType) { this.platformType = platformType; }
+    public String getPlatformType() { return platformType; }
+    public void setIconUrl(String iconUrl) { this.iconUrl = iconUrl; }
+    public String getIconUrl() { return iconUrl; }
+    public void setLng(Double lng) { this.lng = lng; }
+    public Double getLng() { return lng; }
+    public void setLat(Double lat) { this.lat = lat; }
+    public Double getLat() { return lat; }
+    public void setHeading(Double heading) { this.heading = heading; }
+    public Double getHeading() { return heading; }
+    public void setIconScale(Double iconScale) { this.iconScale = iconScale; }
+    public Double getIconScale() { return iconScale; }
+    public void setSortOrder(Integer sortOrder) { this.sortOrder = sortOrder; }
+    public Integer getSortOrder() { return sortOrder; }
+}
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
index 45bc77e..b2aea1b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RouteWaypoints.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RouteWaypoints.java
@@ -55,6 +55,20 @@ public class RouteWaypoints extends BaseEntity
     @Excel(name = "转弯角度 (用于计算转弯半径)")
     private Double turnAngle;
 
+    /** 航点类型: normal-普通, hold_circle-圆形盘旋, hold_ellipse-椭圆盘旋 */
+    @Excel(name = "航点类型")
+    private String pointType;
+
+    /** 盘旋参数JSON: 圆(radius,clockwise) 椭圆(semiMajor,semiMinor,headingDeg,clockwise) */
+    @Excel(name = "盘旋参数")
+    private String holdParams;
+
+    /** 航点标签文字大小(px)，用于地图显示 */
+    private Integer labelFontSize;
+
+    /** 航点标签文字颜色(如 #333333)，用于地图显示 */
+    private String labelColor;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -155,6 +169,38 @@ public class RouteWaypoints extends BaseEntity
         return turnAngle;
     }
 
+    public void setPointType(String pointType) {
+        this.pointType = pointType;
+    }
+
+    public String getPointType() {
+        return pointType;
+    }
+
+    public void setHoldParams(String holdParams) {
+        this.holdParams = holdParams;
+    }
+
+    public String getHoldParams() {
+        return holdParams;
+    }
+
+    public void setLabelFontSize(Integer labelFontSize) {
+        this.labelFontSize = labelFontSize;
+    }
+
+    public Integer getLabelFontSize() {
+        return labelFontSize;
+    }
+
+    public void setLabelColor(String labelColor) {
+        this.labelColor = labelColor;
+    }
+
+    public String getLabelColor() {
+        return labelColor;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -168,6 +214,10 @@ public class RouteWaypoints extends BaseEntity
             .append("speed", getSpeed())
             .append("startTime", getStartTime())
             .append("turnAngle", getTurnAngle())
+            .append("pointType", getPointType())
+            .append("holdParams", getHoldParams())
+            .append("labelFontSize", getLabelFontSize())
+            .append("labelColor", getLabelColor())
             .toString();
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RoomPlatformIconMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RoomPlatformIconMapper.java
new file mode 100644
index 0000000..e6ffa3e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RoomPlatformIconMapper.java
@@ -0,0 +1,22 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.RoomPlatformIcon;
+
+/**
+ * 房间地图平台图标Mapper接口
+ */
+public interface RoomPlatformIconMapper {
+
+    RoomPlatformIcon selectRoomPlatformIconById(Long id);
+
+    List<RoomPlatformIcon> selectRoomPlatformIconList(RoomPlatformIcon roomPlatformIcon);
+
+    int insertRoomPlatformIcon(RoomPlatformIcon roomPlatformIcon);
+
+    int updateRoomPlatformIcon(RoomPlatformIcon roomPlatformIcon);
+
+    int deleteRoomPlatformIconById(Long id);
+
+    int deleteRoomPlatformIconByRoomId(Long roomId);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRoomPlatformIconService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRoomPlatformIconService.java
new file mode 100644
index 0000000..9c7f7f8
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRoomPlatformIconService.java
@@ -0,0 +1,20 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.RoomPlatformIcon;
+
+/**
+ * 房间地图平台图标Service接口
+ */
+public interface IRoomPlatformIconService {
+
+    List<RoomPlatformIcon> selectListByRoomId(Long roomId);
+
+    RoomPlatformIcon selectById(Long id);
+
+    int insert(RoomPlatformIcon roomPlatformIcon);
+
+    int update(RoomPlatformIcon roomPlatformIcon);
+
+    int deleteById(Long id);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RoomPlatformIconServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RoomPlatformIconServiceImpl.java
new file mode 100644
index 0000000..4cfea80
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RoomPlatformIconServiceImpl.java
@@ -0,0 +1,50 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.Date;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.RoomPlatformIconMapper;
+import com.ruoyi.system.domain.RoomPlatformIcon;
+import com.ruoyi.system.service.IRoomPlatformIconService;
+
+/**
+ * 房间地图平台图标Service业务层
+ */
+@Service
+public class RoomPlatformIconServiceImpl implements IRoomPlatformIconService {
+
+    @Autowired
+    private RoomPlatformIconMapper roomPlatformIconMapper;
+
+    @Override
+    public List<RoomPlatformIcon> selectListByRoomId(Long roomId) {
+        RoomPlatformIcon query = new RoomPlatformIcon();
+        query.setRoomId(roomId);
+        return roomPlatformIconMapper.selectRoomPlatformIconList(query);
+    }
+
+    @Override
+    public RoomPlatformIcon selectById(Long id) {
+        return roomPlatformIconMapper.selectRoomPlatformIconById(id);
+    }
+
+    @Override
+    public int insert(RoomPlatformIcon roomPlatformIcon) {
+        Date now = new Date();
+        roomPlatformIcon.setCreateTime(now);
+        roomPlatformIcon.setUpdateTime(now);
+        return roomPlatformIconMapper.insertRoomPlatformIcon(roomPlatformIcon);
+    }
+
+    @Override
+    public int update(RoomPlatformIcon roomPlatformIcon) {
+        roomPlatformIcon.setUpdateTime(new Date());
+        return roomPlatformIconMapper.updateRoomPlatformIcon(roomPlatformIcon);
+    }
+
+    @Override
+    public int deleteById(Long id) {
+        return roomPlatformIconMapper.deleteRoomPlatformIconById(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
index 63be94c..75c5ea1 100644
--- 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
@@ -62,6 +62,14 @@ public class RouteWaypointsServiceImpl implements IRouteWaypointsService
             routeWaypoints.setSeq((long) (maxSeq + 1));
         }
 
+        // 2.5 地图标签默认值：字号 14、颜色 #333333（微软雅黑、不加粗）
+        if (routeWaypoints.getLabelFontSize() == null) {
+            routeWaypoints.setLabelFontSize(14);
+        }
+        if (routeWaypoints.getLabelColor() == null || routeWaypoints.getLabelColor().isEmpty()) {
+            routeWaypoints.setLabelColor("#333333");
+        }
+
         // 3. 执行若依生成的原始插入方法
         return routeWaypointsMapper.insertRouteWaypoints(routeWaypoints);
     }
diff --git a/ruoyi-system/src/main/resources/mapper/system/RoomPlatformIconMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RoomPlatformIconMapper.xml
new file mode 100644
index 0000000..286db42
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/RoomPlatformIconMapper.xml
@@ -0,0 +1,95 @@
+<?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.RoomPlatformIconMapper">
+
+    <resultMap type="com.ruoyi.system.domain.RoomPlatformIcon" id="RoomPlatformIconResult">
+        <result property="id"           column="id"           />
+        <result property="roomId"       column="room_id"      />
+        <result property="platformId"   column="platform_id"  />
+        <result property="platformName" column="platform_name"/>
+        <result property="platformType" column="platform_type"/>
+        <result property="iconUrl"      column="icon_url"    />
+        <result property="lng"          column="lng"         />
+        <result property="lat"          column="lat"         />
+        <result property="heading"      column="heading"     />
+        <result property="iconScale"    column="icon_scale"  />
+        <result property="sortOrder"    column="sort_order"  />
+        <result property="createTime"   column="create_time" />
+        <result property="updateTime"   column="update_time" />
+    </resultMap>
+
+    <sql id="selectRoomPlatformIconVo">
+        select id, room_id, platform_id, platform_name, platform_type, icon_url,
+               lng, lat, heading, icon_scale, sort_order, create_time, update_time
+        from room_platform_icon
+    </sql>
+
+    <select id="selectRoomPlatformIconList" resultMap="RoomPlatformIconResult">
+        <include refid="selectRoomPlatformIconVo"/>
+        <where>
+            <if test="roomId != null"> and room_id = #{roomId}</if>
+            <if test="platformId != null"> and platform_id = #{platformId}</if>
+        </where>
+        order by sort_order asc, id asc
+    </select>
+
+    <select id="selectRoomPlatformIconById" resultMap="RoomPlatformIconResult">
+        <include refid="selectRoomPlatformIconVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertRoomPlatformIcon" parameterType="com.ruoyi.system.domain.RoomPlatformIcon" useGeneratedKeys="true" keyProperty="id">
+        insert into room_platform_icon
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="roomId != null">room_id,</if>
+            <if test="platformId != null">platform_id,</if>
+            <if test="platformName != null">platform_name,</if>
+            <if test="platformType != null">platform_type,</if>
+            <if test="iconUrl != null">icon_url,</if>
+            <if test="lng != null">lng,</if>
+            <if test="lat != null">lat,</if>
+            <if test="heading != null">heading,</if>
+            <if test="iconScale != null">icon_scale,</if>
+            <if test="sortOrder != null">sort_order,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="roomId != null">#{roomId},</if>
+            <if test="platformId != null">#{platformId},</if>
+            <if test="platformName != null">#{platformName},</if>
+            <if test="platformType != null">#{platformType},</if>
+            <if test="iconUrl != null">#{iconUrl},</if>
+            <if test="lng != null">#{lng},</if>
+            <if test="lat != null">#{lat},</if>
+            <if test="heading != null">#{heading},</if>
+            <if test="iconScale != null">#{iconScale},</if>
+            <if test="sortOrder != null">#{sortOrder},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateRoomPlatformIcon" parameterType="com.ruoyi.system.domain.RoomPlatformIcon">
+        update room_platform_icon
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="lng != null">lng = #{lng},</if>
+            <if test="lat != null">lat = #{lat},</if>
+            <if test="heading != null">heading = #{heading},</if>
+            <if test="iconScale != null">icon_scale = #{iconScale},</if>
+            <if test="sortOrder != null">sort_order = #{sortOrder},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRoomPlatformIconById" parameterType="Long">
+        delete from room_platform_icon where id = #{id}
+    </delete>
+
+    <delete id="deleteRoomPlatformIconByRoomId" parameterType="Long">
+        delete from room_platform_icon where room_id = #{roomId}
+    </delete>
+</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/RouteWaypointsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RouteWaypointsMapper.xml
index 7ccc118..a484b4d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/RouteWaypointsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/RouteWaypointsMapper.xml
@@ -15,10 +15,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="speed"    column="speed"    />
         <result property="startTime"    column="start_time"    />
         <result property="turnAngle"    column="turn_angle"    />
+        <result property="pointType"    column="point_type"    />
+        <result property="holdParams"    column="hold_params"    />
+        <result property="labelFontSize"    column="label_font_size"    />
+        <result property="labelColor"    column="label_color"    />
     </resultMap>
 
     <sql id="selectRouteWaypointsVo">
-        select id, route_id, name, seq, lat, lng, alt, speed, start_time, turn_angle from route_waypoints
+        select id, route_id, name, seq, lat, lng, alt, speed, start_time, turn_angle, point_type, hold_params, label_font_size, label_color from route_waypoints
     </sql>
 
     <select id="selectRouteWaypointsList" parameterType="RouteWaypoints" resultMap="RouteWaypointsResult">
@@ -33,6 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+            <if test="pointType != null and pointType != ''"> and point_type = #{pointType}</if>
+            <if test="holdParams != null and holdParams != ''"> and hold_params = #{holdParams}</if>
         </where>
     </select>
     
@@ -57,6 +63,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="speed != null">speed,</if>
             <if test="startTime != null and startTime != ''">start_time,</if>
             <if test="turnAngle != null">turn_angle,</if>
+            <if test="pointType != null and pointType != ''">point_type,</if>
+            <if test="holdParams != null">hold_params,</if>
+            <if test="labelFontSize != null">label_font_size,</if>
+            <if test="labelColor != null">label_color,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="routeId != null">#{routeId},</if>
@@ -68,6 +78,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="speed != null">#{speed},</if>
             <if test="startTime != null and startTime != ''">#{startTime},</if>
             <if test="turnAngle != null">#{turnAngle},</if>
+            <if test="pointType != null and pointType != ''">#{pointType},</if>
+            <if test="holdParams != null">#{holdParams},</if>
+            <if test="labelFontSize != null">#{labelFontSize},</if>
+            <if test="labelColor != null">#{labelColor},</if>
          </trim>
     </insert>
 
@@ -83,6 +97,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+            <if test="pointType != null">point_type = #{pointType},</if>
+            <if test="holdParams != null">hold_params = #{holdParams},</if>
+            <if test="labelFontSize != null">label_font_size = #{labelFontSize},</if>
+            <if test="labelColor != null">label_color = #{labelColor},</if>
         </trim>
         where id = #{id}
     </update>
diff --git a/ruoyi-ui/src/api/system/roomPlatformIcon.js b/ruoyi-ui/src/api/system/roomPlatformIcon.js
new file mode 100644
index 0000000..d160f78
--- /dev/null
+++ b/ruoyi-ui/src/api/system/roomPlatformIcon.js
@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+/** 按房间ID查询该房间下所有地图平台图标 */
+export function listByRoomId(roomId) {
+  return request({
+    url: '/system/roomPlatformIcon/list',
+    method: 'get',
+    params: { roomId }
+  })
+}
+
+/** 新增房间地图平台图标 */
+export function addRoomPlatformIcon(data) {
+  return request({
+    url: '/system/roomPlatformIcon',
+    method: 'post',
+    data
+  })
+}
+
+/** 修改房间地图平台图标（位置/朝向/缩放） */
+export function updateRoomPlatformIcon(data) {
+  return request({
+    url: '/system/roomPlatformIcon',
+    method: 'put',
+    data
+  })
+}
+
+/** 删除房间地图平台图标 */
+export function delRoomPlatformIcon(id) {
+  return request({
+    url: '/system/roomPlatformIcon/' + id,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/assets/icons/svg/screenshot.svg b/ruoyi-ui/src/assets/icons/svg/screenshot.svg
new file mode 100644
index 0000000..bc07916
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/svg/screenshot.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1770597640836" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4973" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M835.3 250.9v522.3H188.7V250.9h646.6m49.8-49.8H138.9v621.8H885V201.1h0.1z" p-id="4974"></path><path d="M138.9 101.6v99.5H64.3v49.8H188.7V101.6zM885.1 922.4v-99.5h74.6v-49.8H835.3v149.3zM511 705.4H297.5c-7.8 0-20.4-2.9-23.3-7.8-2.9-4.9 1.9-16.5 5.8-23.3 26.2-39.8 53.4-79.6 79.6-119.4 8.7-12.6 17.5-13.6 31.1-7.8 44.6 21.4 90.3 42.7 135.9 64.1 12.6 5.8 28.1 1.9 35.9-9.7 24.3-37.9 49.5-74.7 75.7-111.6 4.9-6.8 13.6-17.5 20.4-17.5 7.8 0 13.6 12.6 16.5 20.4 24.3 60.2 47.6 121.3 70.9 181.5 9.7 25.2 5.8 31.1-23.3 31.1H511z m-78.6-298c0 29.1-25.2 52.4-54.4 51.4-29.1-1-51.4-23.3-51.4-51.4 0-29.1 24.3-52.4 54.4-51.4 27.1 0.9 51.4 24.2 51.4 51.4z" p-id="4975"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js
index fbe062f..57a7351 100644
--- a/ruoyi-ui/src/lang/en.js
+++ b/ruoyi-ui/src/lang/en.js
@@ -77,6 +77,7 @@ export default {
     },
     info: {
       roomCode: 'Room Code',
+      roomName: 'Room Name',
       onlineCount: 'Online Count',
       combatTime: 'Combat Time',
       astroTime: 'Astro Time',
diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js
index 4e1cd4d..ece9c1f 100644
--- a/ruoyi-ui/src/lang/zh.js
+++ b/ruoyi-ui/src/lang/zh.js
@@ -77,6 +77,7 @@ export default {
     },
     info: {
       roomCode: '房间编号',
+      roomName: '房间名称',
       onlineCount: '在线人数',
       combatTime: '作战时间',
       astroTime: '天文时间',
diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js
index 9dc7480..f89b765 100644
--- a/ruoyi-ui/src/permission.js
+++ b/ruoyi-ui/src/permission.js
@@ -28,20 +28,37 @@ router.beforeEach((to, from, next) => {
     } else {
       if (store.getters.roles.length === 0) {
         isRelogin.show = true
+        // 超时保护：若 getInfo/getRouters 长时间不返回则关闭加载条并提示，避免页面一直白屏
+        const timeoutMs = 15000
+        const timeoutId = setTimeout(() => {
+          if (store.getters.roles.length === 0) {
+            isRelogin.show = false
+            NProgress.done()
+            Message.error('获取用户信息超时，请确认后端服务已启动（默认 8080 端口）')
+            store.dispatch('LogOut').then(() => {
+              next(`/login?redirect=${encodeURIComponent(to.fullPath)}`)
+            })
+          }
+        }, timeoutMs)
+        const clearTimeoutAndNext = () => {
+          clearTimeout(timeoutId)
+        }
         // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetInfo').then(() => {
+          clearTimeoutAndNext()
           isRelogin.show = false
           store.dispatch('GenerateRoutes').then(accessRoutes => {
-            // 根据roles权限生成可访问的路由表
-            router.addRoutes(accessRoutes) // 动态添加可访问路由表
-            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+            router.addRoutes(accessRoutes)
+            next({ ...to, replace: true })
           })
         }).catch(err => {
-            store.dispatch('LogOut').then(() => {
-              Message.error(err)
-              next({ path: '/' })
-            })
+          clearTimeoutAndNext()
+          isRelogin.show = false
+          store.dispatch('LogOut').then(() => {
+            Message.error(err || '获取用户信息失败')
+            next({ path: '/' })
           })
+        })
       } else {
         next()
       }
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 0e68209..1015974 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -87,7 +87,7 @@ export const constantRoutes = [
   {
     path: '',
     component: Layout,
-    redirect: 'index',
+    redirect: '/selectRoom',
     children: [
       {
         path: 'index',
diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js
index b549ef0..f21d328 100644
--- a/ruoyi-ui/src/store/modules/permission.js
+++ b/ruoyi-ui/src/store/modules/permission.js
@@ -52,9 +52,18 @@ const permission = {
   }
 }
 
+// 确保路由必有 path，避免 [vue-router] "path" is required 报错（后端菜单 path 为空时）
+function ensureRoutePath(route, fallback) {
+  const id = route.menuId || route.id || route.name || ('menu-' + Math.random().toString(36).slice(2, 9))
+  if (route.path === undefined || route.path === null || (typeof route.path === 'string' && route.path.trim() === '')) {
+    route.path = fallback || ('/hidden-' + id)
+  }
+}
+
 // 遍历后台传来的路由字符串，转换为组件对象
 function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
   return asyncRouterMap.filter(route => {
+    ensureRoutePath(route)
     if (type && route.children) {
       route.children = filterChildren(route.children)
     }
@@ -82,8 +91,9 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
 
 function filterChildren(childrenMap, lastRouter = false) {
   var children = []
-  childrenMap.forEach(el => {
-    el.path = lastRouter ? lastRouter.path + '/' + el.path : el.path
+  childrenMap.forEach((el, idx) => {
+    ensureRoutePath(el, 'item-' + idx)
+    el.path = lastRouter ? (lastRouter.path + '/' + el.path).replace(/\/+/g, '/') : el.path
     if (el.children && el.children.length && el.component === 'ParentView') {
       children = children.concat(filterChildren(el.children, el))
     } else {
diff --git a/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue b/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue
index 796c828..6c50534 100644
--- a/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue
+++ b/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue
@@ -1,12 +1,30 @@
 <template>
   <div class="context-menu" v-if="visible" :style="positionStyle">
-    <div class="menu-section">
+    <div class="menu-section" v-if="!entityData || (entityData.type !== 'routePlatform' && entityData.type !== 'route')">
       <div class="menu-item" @click="handleDelete">
         <span class="menu-icon">🗑️</span>
         <span>删除</span>
       </div>
     </div>
 
+    <!-- 航线：上锁/解锁（上锁后不可编辑） -->
+    <div class="menu-section" v-if="entityData && entityData.type === 'route'">
+      <div class="menu-title">航线编辑</div>
+      <div class="menu-item" @click="handleToggleRouteLock">
+        <span class="menu-icon">{{ isRouteLocked ? '🔓' : '🔒' }}</span>
+        <span>{{ isRouteLocked ? '解锁' : '上锁' }}</span>
+      </div>
+    </div>
+
+    <!-- 航线上飞机：显示/隐藏标牌 -->
+    <div class="menu-section" v-if="entityData && entityData.type === 'routePlatform'">
+      <div class="menu-title">飞机标牌</div>
+      <div class="menu-item" @click="handleToggleRouteLabel">
+        <span class="menu-icon">🏷️</span>
+        <span>{{ entityData.labelVisible ? '隐藏标牌' : '显示标牌' }}</span>
+      </div>
+    </div>
+
     <!-- 线段特有选项 -->
     <div class="menu-section" v-if="entityData.type === 'line' && !entityData.routeId">
       <div class="menu-title">线段属性</div>
@@ -106,7 +124,7 @@
     </div>
 
     <!-- 多边形特有选项 -->
-    <div class="menu-section" v-if="entityData.type === 'polygon' || entityData.type === 'rectangle' || entityData.type === 'circle' || entityData.type === 'sector'">
+    <div class="menu-section" v-if="entityData.type === 'polygon' || entityData.type === 'rectangle' || entityData.type === 'circle' || entityData.type === 'sector' || entityData.type === 'powerZone'">
       <div class="menu-title">填充属性</div>
       <div class="menu-item" @click="toggleColorPicker('color')">
         <span class="menu-icon">🎨</span>
@@ -272,6 +290,24 @@
         </div>
       </div>
     </div>
+
+    <!-- 平台图标（拖拽到地图的图标）特有选项 -->
+    <div class="menu-section" v-if="entityData.type === 'platformIcon'">
+      <div class="menu-title">平台图标</div>
+      <div class="menu-item" @click.stop="handleShowTransformBox">
+        <span class="menu-icon">📐</span>
+        <span>显示伸缩框</span>
+      </div>
+      <div class="menu-item" @click="handleEditPlatformPosition">
+        <span class="menu-icon">📍</span>
+        <span>修改位置</span>
+      </div>
+      <div class="menu-item" @click="handleEditPlatformHeading">
+        <span class="menu-icon">🧭</span>
+        <span>修改朝向</span>
+        <span class="menu-value">{{ entityData.heading != null ? entityData.heading + '°' : '0°' }}</span>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -290,6 +326,10 @@ export default {
     entityData: {
       type: Object,
       default: null
+    },
+    routeLocked: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
@@ -317,6 +357,10 @@ export default {
         left: this.position.x + 'px',
         top: this.position.y + 'px'
       }
+    },
+    isRouteLocked() {
+      if (!this.entityData || this.entityData.type !== 'route' || this.entityData.routeId == null) return false
+      return !!this.routeLocked[this.entityData.routeId]
     }
   },
   methods: {
@@ -324,6 +368,26 @@ export default {
       this.$emit('delete')
     },
 
+    handleShowTransformBox() {
+      this.$emit('show-transform-box')
+    },
+
+    handleEditPlatformPosition() {
+      this.$emit('edit-platform-position')
+    },
+
+    handleEditPlatformHeading() {
+      this.$emit('edit-platform-heading')
+    },
+
+    handleToggleRouteLabel() {
+      this.$emit('toggle-route-label')
+    },
+
+    handleToggleRouteLock() {
+      this.$emit('toggle-route-lock')
+    },
+
     toggleColorPicker(property) {
       if (this.showColorPickerFor === property) {
         this.showColorPickerFor = null
diff --git a/ruoyi-ui/src/views/cesiumMap/DrawingToolbar.vue b/ruoyi-ui/src/views/cesiumMap/DrawingToolbar.vue
index 58d3b46..d6c880d 100644
--- a/ruoyi-ui/src/views/cesiumMap/DrawingToolbar.vue
+++ b/ruoyi-ui/src/views/cesiumMap/DrawingToolbar.vue
@@ -42,10 +42,10 @@ export default {
       // 完整工具列表（空域模式，移除点和线）
       allToolbarItems: [
         { id: 'mouse', name: '鼠标', icon: 'el-icon-position' },
-        { id: 'polygon', name: '面', icon: 'el-icon-house' },
-        { id: 'rectangle', name: '矩形', icon: 'jx' },
-        { id: 'circle', name: '圆形', icon: 'circle' },
-        { id: 'sector', name: '扇形', icon: 'sx' },
+        { id: 'polygon', name: '多边形空域', icon: 'el-icon-house' },
+        { id: 'rectangle', name: '矩形空域', icon: 'jx' },
+        { id: 'circle', name: '圆形空域', icon: 'circle' },
+        { id: 'sector', name: '扇形空域', icon: 'sx' },
         { id: 'arrow', name: '箭头', icon: 'el-icon-right' },
         { id: 'text', name: '文本', icon: 'el-icon-document' },
         { id: 'image', name: '图片', icon: 'el-icon-picture-outline' },
diff --git a/ruoyi-ui/src/views/cesiumMap/LocateDialog.vue b/ruoyi-ui/src/views/cesiumMap/LocateDialog.vue
index 63419b0..750db97 100644
--- a/ruoyi-ui/src/views/cesiumMap/LocateDialog.vue
+++ b/ruoyi-ui/src/views/cesiumMap/LocateDialog.vue
@@ -61,7 +61,7 @@
             <el-option
               v-for="item in waypointList"
               :key="item.id"
-              :label="`${item.name} (${item.lng}, ${item.lat})`"
+              :label="`${item.name} (${degreesToDMS(item.lng)}, ${degreesToDMS(item.lat)})`"
               :value="item.id"
             />
           </el-select>
@@ -70,9 +70,7 @@
         <el-form-item label="经度：">
           <el-input
             v-model="formData.lng"
-            type="number"
-            placeholder="例如 116.40"
-            step="0.000001"
+            placeholder="例如 116°23'48.64""
             clearable
           />
         </el-form-item>
@@ -80,9 +78,7 @@
         <el-form-item label="纬度：">
           <el-input
             v-model="formData.lat"
-            type="number"
-            placeholder="例如 39.90"
-            step="0.000001"
+            placeholder="例如 39°54'33.48""
             clearable
           />
         </el-form-item>
@@ -120,8 +116,8 @@ export default {
         scenarioId: null,
         routeId: null,
         waypointId: null,
-        lng: '116.3974',
-        lat: '39.9093'
+        lng: '116°23\'48.64"',
+        lat: '39°54\'33.48"'
       },
       scenarioList: [],
       routeList: [],
@@ -144,13 +140,29 @@ export default {
     }
   },
   methods: {
+    degreesToDMS(decimalDegrees) {
+      const degrees = Math.floor(decimalDegrees)
+      const minutesDecimal = (decimalDegrees - degrees) * 60
+      const minutes = Math.floor(minutesDecimal)
+      const seconds = ((minutesDecimal - minutes) * 60).toFixed(2)
+      return `${degrees}°${minutes}'${seconds}"`
+    },
+    dmsToDegrees(dms) {
+      const match = dms.match(/^(-?\d+)°(\d+)'([\d.]+)"$/)
+      if (!match) return null
+      const degrees = parseFloat(match[1])
+      const minutes = parseFloat(match[2])
+      const seconds = parseFloat(match[3])
+      const sign = degrees < 0 ? -1 : 1
+      return sign * (Math.abs(degrees) + minutes / 60 + seconds / 3600)
+    },
     resetForm() {
       this.formData = {
         scenarioId: null,
         routeId: null,
         waypointId: null,
-        lng: '116.3974',
-        lat: '39.9093'
+        lng: '116°23\'48.64"',
+        lat: '39°54\'33.48"'
       }
       this.routeList = []
       this.waypointList = []
@@ -202,8 +214,8 @@ export default {
       if (value) {
         const waypoint = this.waypointList.find(w => w.id === value)
         if (waypoint) {
-          this.formData.lng = waypoint.lng
-          this.formData.lat = waypoint.lat
+          this.formData.lng = this.degreesToDMS(waypoint.lng)
+          this.formData.lat = this.degreesToDMS(waypoint.lat)
         }
       }
     },
@@ -216,19 +228,27 @@ export default {
     handleConfirm() {
       const { lng, lat } = this.formData
       
-      if (!lng || !lat || isNaN(parseFloat(lng)) || isNaN(parseFloat(lat))) {
+      if (!lng || !lat) {
         this.$message.error('请输入有效的经度和纬度！')
         return
       }
       
-      if (lng < -180 || lng > 180 || lat < -90 || lat > 90) {
+      const lngDegrees = this.dmsToDegrees(lng)
+      const latDegrees = this.dmsToDegrees(lat)
+      
+      if (lngDegrees === null || latDegrees === null || isNaN(lngDegrees) || isNaN(latDegrees)) {
+        this.$message.error('请输入有效的度分秒格式！格式：116°23\'48.64"')
+        return
+      }
+      
+      if (lngDegrees < -180 || lngDegrees > 180 || latDegrees < -90 || latDegrees > 90) {
         this.$message.error('经纬度超出有效范围！')
         return
       }
       
       this.$emit('confirm', {
-        lng: parseFloat(lng),
-        lat: parseFloat(lat)
+        lng: lngDegrees,
+        lat: latDegrees
       })
       this.$emit('update:visible', false)
     }
diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue
index 01f73a9..55593ca 100644
--- a/ruoyi-ui/src/views/cesiumMap/index.vue
+++ b/ruoyi-ui/src/views/cesiumMap/index.vue
@@ -32,8 +32,14 @@
       :visible="contextMenu.visible"
       :position="contextMenu.position"
       :entity-data="contextMenu.entityData"
+      :route-locked="routeLocked"
       @delete="deleteEntityFromContextMenu"
       @update-property="updateEntityProperty"
+      @edit-platform-position="openPlatformIconPositionDialog"
+      @edit-platform-heading="openPlatformIconHeadingDialog"
+      @show-transform-box="showPlatformIconTransformBox"
+      @toggle-route-label="toggleRouteLabelVisibility"
+      @toggle-route-lock="toggleRouteLock"
     />
 
     <!-- 定位弹窗 -->
@@ -44,6 +50,18 @@
       @cancel="handleLocateCancel"
     />
 
+    <!-- 平台图标旋转模式提示 -->
+    <div v-if="platformIconRotateTip" class="platform-icon-rotate-tip">
+      {{ platformIconRotateTip }}
+    </div>
+
+    <!-- 半径输入弹窗 -->
+    <radius-dialog
+      :visible="radiusDialogVisible"
+      @update:visible="radiusDialogVisible = $event"
+      @confirm="handleRadiusConfirm"
+    />
+
     <!-- 地图右下角：比例尺 + 经纬度 -->
     <div class="map-info-panel">
       <div class="scale-bar" @click="handleScaleClick">
@@ -67,6 +85,7 @@ import MeasurementPanel from './MeasurementPanel.vue'
 import HoverTooltip from './HoverTooltip.vue'
 import ContextMenu from './ContextMenu.vue'
 import LocateDialog from './LocateDialog.vue'
+import RadiusDialog from '../dialogs/RadiusDialog.vue'
 import axios from 'axios'
 import request from '@/utils/request'
 import { getToken } from '@/utils/auth'
@@ -130,6 +149,9 @@ export default {
       drawingPointEntities: [], // 存储线绘制时的点实体
       drawingStartPoint: null,
       isDrawing: false,
+      missionHoldParamsByIndex: {},
+      missionPendingHold: null,
+      tempHoldEntity: null,
       activeCursorPosition: null, // 实时鼠标位置
       // 实体管理
       allEntities: [], // 所有绘制的实体
@@ -149,6 +171,10 @@ export default {
         position: { x: 0, y: 0 },
         entityData: null
       },
+      // 航线飞机标牌显示状态：routeId -> true 显示 / false 隐藏，不设则默认显示
+      routeLabelVisible: {},
+      // 航线上锁状态：routeId -> true 上锁（不可编辑）/ false 或未设 可编辑
+      routeLocked: {},
       // 默认样式
       defaultStyles: {
         point: { color: '#FF0000', size: 12 },
@@ -171,7 +197,34 @@ export default {
       currentScaleUnit: 'm',
       isApplyingScale: false,
       // 定位相关
-      locateDialogVisible: false
+      locateDialogVisible: false,
+      // 威力区绘制相关
+      radiusDialogVisible: false,
+      powerZoneCenter: null,
+      powerZoneCircleEntity: null,
+      powerZoneCenterEntity: null,
+      // 平台图标图形化编辑：拖拽移动、旋转、伸缩框
+      draggingPlatformIcon: null,
+      rotatingPlatformIcon: null,
+      platformIconRotateTip: '',
+      platformIconDragCameraEnabled: true,
+      selectedPlatformIcon: null,
+      pendingDragIcon: null,
+      dragStartScreenPos: null,
+      draggingRotateHandle: null,
+      draggingScaleHandle: null,
+      clickedOnEmpty: false,
+      PLATFORM_ICON_BASE_SIZE: 72,
+      PLATFORM_SCALE_BOX_HALF_DEG: 0.0005,
+      PLATFORM_SCALE_BOX_MIN_HALF_DEG: 0.0007,
+      PLATFORM_ROTATE_HANDLE_OFFSET_DEG: 0.0009,
+      PLATFORM_DRAG_THRESHOLD_PX: 10,
+      DESIRED_BOX_HALF_PX: 58,
+      DESIRED_ROTATE_OFFSET_PX: 50,
+      // 实体点击防抖，避免双击误触导致相机高度剧烈变化
+      entityClickDebounceTimer: null,
+      lastEntityClickTime: 0,
+      cameraStateBeforeEntityClick: null
     }
   },
   components: {
@@ -179,7 +232,8 @@ export default {
     MeasurementPanel,
     HoverTooltip,
     ContextMenu,
-    LocateDialog
+    LocateDialog,
+    RadiusDialog
   },
   mounted() {
     console.log(this.drawDomClick,999999)
@@ -375,6 +429,8 @@ export default {
     startMissionRouteDrawing() {
       this.stopDrawing(); // 停止其他可能存在的绘制
       this.drawingPoints = [];
+      this.missionHoldParamsByIndex = {};
+      this.missionPendingHold = null;
       let activeCursorPosition = null;
       this.isDrawing = true;
       this.viewer.canvas.style.cursor = 'crosshair';
@@ -393,6 +449,7 @@ export default {
         if (!position) return;
         this.drawingPoints.push(position);
         const wpIndex = this.drawingPoints.length;
+        this.$emit('drawing-points-update', this.drawingPoints.length);
         // 绘制业务航点
         this.viewer.entities.add({
           id: `temp_wp_${wpIndex}`,
@@ -412,31 +469,33 @@ export default {
           },
           label: {
             text: `WP${wpIndex}`,
-            font: '12px MicroSoft YaHei',
+            font: '14px Microsoft YaHei',
             pixelOffset: new Cesium.Cartesian2(0, -20),
-            fillColor: Cesium.Color.WHITE,
+            fillColor: Cesium.Color.fromCssColorString('#333333'),
             outlineColor: Cesium.Color.BLACK,
-            outlineWidth: 2,
+            outlineWidth: 1,
             style: Cesium.LabelStyle.FILL_AND_OUTLINE
           }
         });
-        //  第一次点击后，创建动态黑白斑马线
+        //  第一次点击后，创建动态黑白斑马线（若有盘旋则在连线中插入盘旋点）
         if (this.drawingPoints.length === 1) {
           this.tempPreviewEntity = this.viewer.entities.add({
             polyline: {
               positions: new Cesium.CallbackProperty(() => {
-                if (this.drawingPoints.length > 0 && activeCursorPosition) {
-                  return [...this.drawingPoints, activeCursorPosition];
+                let positions = this.drawingPoints;
+                if (this.missionPendingHold && this.drawingPoints.length > 0) {
+                  const idx = this.missionPendingHold.beforeIndex;
+                  positions = [
+                    ...this.drawingPoints.slice(0, idx + 1),
+                    this.missionPendingHold.center,
+                    ...this.drawingPoints.slice(idx + 1)
+                  ];
                 }
-                return this.drawingPoints;
+                if (positions.length > 0 && activeCursorPosition) return [...positions, activeCursorPosition];
+                return positions;
               }, false),
-              width: 4,
-              // 黑白斑马材质
-              material: new Cesium.PolylineDashMaterialProperty({
-                color: Cesium.Color.WHITE,      // 主色：白
-                gapColor: Cesium.Color.BLACK,   // 间隙色：黑
-                dashLength: 20.0                // 斑马纹长度
-              }),
+              width: 3,
+              material: this.getPolylineSolidMaterial('#800080'),
               clampToGround: true
             }
           });
@@ -445,18 +504,36 @@ export default {
       // 右键点击逻辑（结束绘制、抛出数据、恢复右键）
       this.drawingHandler.setInputAction(() => {
         if (this.drawingPoints.length > 1) {
-          // 转换坐标并传回给 childRoom/index.vue
-          const latLngPoints = this.drawingPoints.map((p, index) => {
-            const coords = this.cartesianToLatLng(p);
-            return {
-              id: index + 1,
-              name: `WP${index + 1}`,
+          const latLngPoints = [];
+          let insertIdx = 0;
+          for (let i = 0; i < this.drawingPoints.length; i++) {
+            const coords = this.cartesianToLatLng(this.drawingPoints[i]);
+            const meta = this.missionHoldParamsByIndex[i];
+            latLngPoints.push({
+              id: insertIdx + 1,
+              name: meta ? 'HOLD' : `WP${insertIdx + 1}`,
               lat: coords.lat,
               lng: coords.lng,
               alt: 5000,
-              speed: 800
-            };
-          });
+              speed: 800,
+              ...(meta && { pointType: meta.radius != null ? 'hold_circle' : 'hold_ellipse', holdParams: JSON.stringify(meta) })
+            });
+            insertIdx++;
+            if (this.missionPendingHold && this.missionPendingHold.beforeIndex === i) {
+              const holdCoords = this.cartesianToLatLng(this.missionPendingHold.center);
+              latLngPoints.push({
+                id: insertIdx + 1,
+                name: 'HOLD',
+                lat: holdCoords.lat,
+                lng: holdCoords.lng,
+                alt: 5000,
+                speed: 800,
+                pointType: this.missionPendingHold.params.radius != null ? 'hold_circle' : 'hold_ellipse',
+                holdParams: JSON.stringify(this.missionPendingHold.params)
+              });
+              insertIdx++;
+            }
+          }
           this.$emit('draw-complete', latLngPoints);
         } else {
           this.$message.info('点数不足，航线已取消');
@@ -468,6 +545,38 @@ export default {
         }, 200);
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     },
+
+    /** 航线绘制过程中：在最后两航点之间插入盘旋（由父组件在弹窗确认后调用）。插入后“最后一个点”会被移除，下一点击即为盘旋后的下一航点。 */
+    insertHoldBetweenLastTwo(holdParams) {
+      if (!this.drawingPoints || this.drawingPoints.length < 2) return;
+      const last = this.drawingPoints[this.drawingPoints.length - 1];
+      this.drawingPoints.pop();
+      const removedWpId = `temp_wp_${this.drawingPoints.length + 1}`;
+      const lastPointEntity = this.viewer.entities.getById(removedWpId);
+      if (lastPointEntity) this.viewer.entities.remove(lastPointEntity);
+      this.missionPendingHold = {
+        beforeIndex: this.drawingPoints.length - 1,
+        center: Cesium.Cartesian3.clone(last),
+        params: holdParams
+      };
+      if (this.tempHoldEntity) {
+        try { this.viewer.entities.remove(this.tempHoldEntity); } catch (e) {}
+        this.tempHoldEntity = null;
+      }
+      this.tempHoldEntity = this.viewer.entities.add({
+        id: 'temp_hold_preview',
+        name: 'HOLD',
+        position: this.missionPendingHold.center,
+        point: { pixelSize: 10, color: Cesium.Color.ORANGE, outlineColor: Cesium.Color.WHITE, outlineWidth: 2, disableDepthTestDistance: Number.POSITIVE_INFINITY },
+        label: { text: 'HOLD', font: '14px Microsoft YaHei', fillColor: Cesium.Color.ORANGE, outlineColor: Cesium.Color.BLACK, outlineWidth: 1 }
+      });
+      this.$emit('drawing-points-update', this.drawingPoints.length);
+    },
+
+    getMissionDrawingPointsCount() {
+      return (this.drawingPoints && this.drawingPoints.length) || 0;
+    },
+
     // 格式化平台图标 URL（与 RouteEditDialog / RightPanel 一致）
     formatPlatformIconUrl(url) {
       if (!url) return '';
@@ -475,6 +584,312 @@ export default {
       const backendUrl = process.env.VUE_APP_BACKEND_URL || '';
       return backendUrl + cleanPath;
     },
+
+    /** 默认平台图标（无 imageUrl 时使用）：简单飞机剪影 SVG */
+    getDefaultPlatformIconDataUrl() {
+      const svg = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="%23666" d="M28 14L18 8l-4 2v4L8 10 4 14l4 2 2 4-4 2v4l4 2 4-2 2 4 2-2v-6l8-4 4-2v-4l-4 2-8-4z"/></svg>';
+      return 'data:image/svg+xml,' + encodeURIComponent(svg);
+    },
+
+    /** 伸缩框旋转手柄图标 SVG：蓝底、白边、白色弧形箭头 */
+    getRotationHandleIconDataUrl() {
+      const svg = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">' +
+        '<circle cx="16" cy="16" r="14" fill="#008aff" stroke="#fff" stroke-width="2"/>' +
+        '<path fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" ' +
+        'd="M9 16 A7 7 0 0 1 23 16"/>' +
+        '<path fill="#fff" stroke="#fff" stroke-width="1" d="M22 14.2 L25 16 L22 17.8 Z"/>' +
+        '</svg>';
+      return 'data:image/svg+xml,' + encodeURIComponent(svg);
+    },
+
+    /** 从手柄实体 id 解析出平台图标 entityData 与类型（rotate / scale-0~3） */
+    getPlatformIconDataFromHandleId(handleEntityId) {
+      if (!handleEntityId || typeof handleEntityId !== 'string') return null;
+      if (handleEntityId.endsWith('-rotate-handle')) {
+        const baseId = handleEntityId.replace(/-rotate-handle$/, '');
+        const ed = this.allEntities.find(e => e.type === 'platformIcon' && e.id === baseId);
+        return ed ? { entityData: ed, type: 'rotate' } : null;
+      }
+      const scaleIdx = handleEntityId.lastIndexOf('-scale-');
+      if (scaleIdx !== -1) {
+        const baseId = handleEntityId.substring(0, scaleIdx);
+        const cornerIndex = parseInt(handleEntityId.substring(scaleIdx + 7), 10);
+        if (!isNaN(cornerIndex) && cornerIndex >= 0 && cornerIndex <= 3) {
+          const ed = this.allEntities.find(e => e.type === 'platformIcon' && e.id === baseId);
+          return ed ? { entityData: ed, type: 'scale', cornerIndex } : null;
+        }
+      }
+      return null;
+    },
+
+    /** 在当前视野下，图标位置处 1 像素对应的经纬度（用于伸缩框固定屏幕尺寸） */
+    getDegreesPerPixelAt(lng, lat) {
+      if (!this.viewer || this.viewer.scene.mode !== Cesium.SceneMode.SCENE2D) {
+        return { degPerPxLng: this.PLATFORM_SCALE_BOX_HALF_DEG / this.DESIRED_BOX_HALF_PX, degPerPxLat: this.PLATFORM_SCALE_BOX_HALF_DEG / this.DESIRED_BOX_HALF_PX };
+      }
+      const center = Cesium.Cartesian3.fromDegrees(lng, lat);
+      const east = Cesium.Cartesian3.fromDegrees(lng + 0.005, lat);
+      const north = Cesium.Cartesian3.fromDegrees(lng, lat + 0.005);
+      const sc = Cesium.SceneTransforms.worldToWindowCoordinates(this.viewer.scene, center);
+      const se = Cesium.SceneTransforms.worldToWindowCoordinates(this.viewer.scene, east);
+      const sn = Cesium.SceneTransforms.worldToWindowCoordinates(this.viewer.scene, north);
+      if (!sc || !se || !sn) {
+        return { degPerPxLng: this.PLATFORM_SCALE_BOX_HALF_DEG / this.DESIRED_BOX_HALF_PX, degPerPxLat: this.PLATFORM_SCALE_BOX_HALF_DEG / this.DESIRED_BOX_HALF_PX };
+      }
+      const pxLng = Math.max(1, Math.abs(se.x - sc.x));
+      const pxLat = Math.max(1, Math.abs(sn.y - sc.y));
+      return {
+        degPerPxLng: 0.005 / pxLng,
+        degPerPxLat: 0.005 / pxLat
+      };
+    },
+
+    /** 更新平台图标 billboard 的宽高（根据 iconScale） */
+    updatePlatformIconBillboardSize(entityData) {
+      if (!entityData || !entityData.entity || !entityData.entity.billboard) return;
+      const scale = Math.max(0.2, Math.min(3, entityData.iconScale || 1));
+      entityData.iconScale = scale;
+      const size = this.PLATFORM_ICON_BASE_SIZE * scale;
+      entityData.entity.billboard.width = new Cesium.ConstantProperty(size);
+      entityData.entity.billboard.height = new Cesium.ConstantProperty(size);
+    },
+
+    /** 显示伸缩框：旋转手柄 + 四角缩放手柄 + 矩形边线（按屏幕像素固定尺寸，任意缩放都易点） */
+    showTransformHandles(entityData) {
+      if (!this.viewer || !entityData || entityData.type !== 'platformIcon') return;
+      this.removeTransformHandles(entityData);
+      const id = entityData.id;
+      const lng = entityData.lng;
+      const lat = entityData.lat;
+      const dpp = this.getDegreesPerPixelAt(lng, lat);
+      const baseHalfDeg = this.DESIRED_BOX_HALF_PX * Math.min(dpp.degPerPxLng, dpp.degPerPxLat);
+      const half = Math.max((entityData.iconScale || 1) * baseHalfDeg, baseHalfDeg * 0.5);
+      const rotOffsetLat = this.DESIRED_ROTATE_OFFSET_PX * dpp.degPerPxLat;
+      const rotOffset = Math.max(rotOffsetLat, this.PLATFORM_ROTATE_HANDLE_OFFSET_DEG);
+      const rotationHandle = this.viewer.entities.add({
+        id: id + '-rotate-handle',
+        position: Cesium.Cartesian3.fromDegrees(lng, lat + rotOffset),
+        billboard: {
+          image: this.getRotationHandleIconDataUrl(),
+          width: 36,
+          height: 36,
+          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      });
+      const corners = [
+        Cesium.Cartesian3.fromDegrees(lng + half, lat + half),
+        Cesium.Cartesian3.fromDegrees(lng - half, lat + half),
+        Cesium.Cartesian3.fromDegrees(lng - half, lat - half),
+        Cesium.Cartesian3.fromDegrees(lng + half, lat - half)
+      ];
+      const scaleHandles = corners.map((pos, i) =>
+        this.viewer.entities.add({
+          id: id + '-scale-' + i,
+          position: pos,
+          point: {
+            pixelSize: 14,
+            color: Cesium.Color.WHITE,
+            outlineColor: Cesium.Color.fromCssColorString('#008aff'),
+            outlineWidth: 3,
+            disableDepthTestDistance: Number.POSITIVE_INFINITY
+          }
+        })
+      );
+      const linePositions = [corners[0], corners[1], corners[2], corners[3], corners[0]];
+      const frameLine = this.viewer.entities.add({
+        id: id + '-scale-frame',
+        polyline: {
+          positions: linePositions,
+          width: 3,
+          material: this.getPolylineSolidMaterial('#008aff'),
+          clampToGround: true,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY
+        }
+      });
+      entityData.transformHandles = {
+        rotation: rotationHandle,
+        scale: scaleHandles,
+        frame: frameLine
+      };
+    },
+
+    /** 移除伸缩框手柄与边线 */
+    removeTransformHandles(entityData) {
+      if (!entityData || !entityData.transformHandles) return;
+      const h = entityData.transformHandles;
+      if (h.rotation) this.viewer.entities.remove(h.rotation);
+      if (h.scale) h.scale.forEach(e => this.viewer.entities.remove(e));
+      if (h.frame) this.viewer.entities.remove(h.frame);
+      entityData.transformHandles = null;
+    },
+
+    /** 根据图标当前位置、iconScale 与当前视野更新伸缩框（保持固定像素尺寸） */
+    updateTransformHandlePositions(entityData) {
+      if (!entityData || !entityData.transformHandles) return;
+      const lng = entityData.lng;
+      const lat = entityData.lat;
+      const dpp = this.getDegreesPerPixelAt(lng, lat);
+      const baseHalfDeg = this.DESIRED_BOX_HALF_PX * Math.min(dpp.degPerPxLng, dpp.degPerPxLat);
+      const half = Math.max((entityData.iconScale || 1) * baseHalfDeg, baseHalfDeg * 0.5);
+      const rotOffsetLat = this.DESIRED_ROTATE_OFFSET_PX * dpp.degPerPxLat;
+      const rotOffset = Math.max(rotOffsetLat, this.PLATFORM_ROTATE_HANDLE_OFFSET_DEG);
+      entityData.transformHandles.rotation.position = Cesium.Cartesian3.fromDegrees(lng, lat + rotOffset);
+      const corners = [
+        Cesium.Cartesian3.fromDegrees(lng + half, lat + half),
+        Cesium.Cartesian3.fromDegrees(lng - half, lat + half),
+        Cesium.Cartesian3.fromDegrees(lng - half, lat - half),
+        Cesium.Cartesian3.fromDegrees(lng + half, lat - half)
+      ];
+      entityData.transformHandles.scale.forEach((ent, i) => { ent.position = corners[i]; });
+      const linePositions = [corners[0], corners[1], corners[2], corners[3], corners[0]];
+      entityData.transformHandles.frame.polyline.positions = new Cesium.ConstantProperty(linePositions);
+      this.viewer.scene.requestRender();
+    },
+
+    /**
+     * 从右侧平台列表拖拽放置到地图：在放置点添加平台图标实体，支持后续修改位置与朝向。
+     * @param {Object} platform - 平台数据 { id, name, type, imageUrl, iconUrl, icon, color }
+     * @param {number} clientX - 放置点的视口 X
+     * @param {number} clientY - 放置点的视口 Y
+     */
+    addPlatformIconFromDrag(platform, clientX, clientY) {
+      if (!this.viewer || !platform) return;
+      const canvas = this.viewer.scene.canvas;
+      const rect = canvas.getBoundingClientRect();
+      const x = clientX - rect.left;
+      const y = clientY - rect.top;
+      const cartesian = this.viewer.camera.pickEllipsoid(new Cesium.Cartesian2(x, y), this.viewer.scene.globe.ellipsoid);
+      if (!cartesian) {
+        this.$message && this.$message.warning('请将图标放置到地图有效区域内');
+        return;
+      }
+      const iconUrl = platform.imageUrl || platform.iconUrl;
+      const imageSrc = iconUrl ? this.formatPlatformIconUrl(iconUrl) : this.getDefaultPlatformIconDataUrl();
+      this.entityCounter++;
+      const id = `platformIcon_${this.entityCounter}`;
+      const headingDeg = 0;
+      const rotation = Math.PI / 2 - (headingDeg * Math.PI / 180);
+      const iconScale = 1.0;
+      const size = this.PLATFORM_ICON_BASE_SIZE * iconScale;
+      const entity = this.viewer.entities.add({
+        id,
+        name: platform.name || '平台',
+        position: cartesian,
+        billboard: {
+          image: imageSrc,
+          width: size,
+          height: size,
+          verticalOrigin: Cesium.VerticalOrigin.CENTER,
+          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+          rotation,
+          scaleByDistance: new Cesium.NearFarScalar(500, 1.2, 200000, 0.35),
+          translucencyByDistance: new Cesium.NearFarScalar(1000, 1.0, 500000, 0.6)
+        }
+      });
+      const { lat, lng } = this.cartesianToLatLng(cartesian);
+      const entityData = {
+        id,
+        type: 'platformIcon',
+        platformId: platform.id,
+        platform,
+        name: platform.name || '平台',
+        heading: headingDeg,
+        lat,
+        lng,
+        entity,
+        imageUrl: iconUrl,
+        label: platform.name || '平台',
+        iconScale,
+        transformHandles: null
+      };
+      this.allEntities.push(entityData);
+      this.$nextTick(() => {
+        if (this.selectedPlatformIcon) this.removeTransformHandles(this.selectedPlatformIcon);
+        this.selectedPlatformIcon = entityData;
+        this.showTransformHandles(entityData);
+        this.$message && this.$message.success('已放置。上方箭头旋转、四角调大小、拖动图标移动；点击空白收起');
+      });
+      return entityData;
+    },
+    /** 清除某房间下由 loadRoomPlatformIcons 加载的平台图标（仅从地图与 allEntities 移除） */
+    clearRoomPlatformIcons(roomId) {
+      if (!roomId || !this.allEntities) return;
+      const toRemove = this.allEntities.filter(e => e.type === 'platformIcon' && e.roomId === roomId);
+      toRemove.forEach(ed => {
+        this.removeTransformHandles(ed);
+        if (this.selectedPlatformIcon === ed) this.selectedPlatformIcon = null;
+        if (ed.entity) this.viewer && this.viewer.entities.remove(ed.entity);
+      });
+      this.allEntities = this.allEntities.filter(e => !(e.type === 'platformIcon' && e.roomId === roomId));
+    },
+    /** 加载某房间下保存的平台图标到地图；list 项含 id, lng, lat, heading, iconScale, platformId, platformName, platformType, iconUrl */
+    loadRoomPlatformIcons(roomId, list) {
+      if (!this.viewer || !roomId || !list || !list.length) return;
+      this.clearRoomPlatformIcons(roomId);
+      const baseHalfDeg = 0.00015;
+      list.forEach((item, idx) => {
+        const platform = {
+          id: item.platformId,
+          name: item.platformName,
+          type: item.platformType,
+          imageUrl: item.iconUrl,
+          iconUrl: item.iconUrl
+        };
+        const iconUrl = item.iconUrl || platform.iconUrl;
+        const imageSrc = iconUrl ? this.formatPlatformIconUrl(iconUrl) : this.getDefaultPlatformIconDataUrl();
+        this.entityCounter++;
+        const id = `platformIcon_room_${roomId}_${item.id}`;
+        const headingDeg = (item.heading != null ? item.heading : 0);
+        const rotation = Math.PI / 2 - (headingDeg * Math.PI / 180);
+        const scaleVal = item.iconScale ?? item.icon_scale ?? 1;
+        const iconScale = Math.max(0.2, Math.min(3, scaleVal));
+        const size = this.PLATFORM_ICON_BASE_SIZE * iconScale;
+        const cartesian = Cesium.Cartesian3.fromDegrees(item.lng, item.lat);
+        const entity = this.viewer.entities.add({
+          id,
+          name: platform.name || '平台',
+          position: cartesian,
+          billboard: {
+            image: imageSrc,
+            width: size,
+            height: size,
+            verticalOrigin: Cesium.VerticalOrigin.CENTER,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            rotation,
+            scaleByDistance: new Cesium.NearFarScalar(500, 1.2, 200000, 0.35),
+            translucencyByDistance: new Cesium.NearFarScalar(1000, 1.0, 500000, 0.6)
+          }
+        });
+        const entityData = {
+          id,
+          type: 'platformIcon',
+          platformId: platform.id,
+          platform,
+          name: platform.name || '平台',
+          heading: headingDeg,
+          lat: item.lat,
+          lng: item.lng,
+          entity,
+          imageUrl: iconUrl,
+          label: platform.name || '平台',
+          iconScale,
+          transformHandles: null,
+          serverId: item.id,
+          roomId
+        };
+        this.allEntities.push(entityData);
+      });
+    },
+    /** 为已放置的平台图标设置服务端 ID（保存成功后由父组件调用） */
+    setPlatformIconServerId(entityId, serverId, roomId) {
+      const ed = this.allEntities.find(e => e.type === 'platformIcon' && (e.id === entityId || (e.entity && e.entity.id === entityId)));
+      if (ed) {
+        ed.serverId = serverId;
+        if (roomId != null) ed.roomId = roomId;
+      }
+    },
     //正式航线渲染函数
     renderRouteWaypoints(waypoints, routeId = 'default', platformId, platform, style) {
       if (!waypoints || waypoints.length < 1) return;
@@ -484,24 +899,39 @@ export default {
       if (existingLine) {
         this.viewer.entities.remove(existingLine);
       }
-      // 清理属于该航线的旧平台图标
+      // 清理属于该航线的旧平台图标与标牌
       const platformBillboardId = `route-platform-${routeId}`;
+      const platformLabelId = `route-platform-label-${routeId}`;
       const existingPlatform = this.viewer.entities.getById(platformBillboardId);
       if (existingPlatform) {
         this.viewer.entities.remove(existingPlatform);
       }
-      // 清理所有属于该航线的旧点
+      const existingLabel = this.viewer.entities.getById(platformLabelId);
+      if (existingLabel) {
+        this.viewer.entities.remove(existingLabel);
+      }
+      // 清理所有属于该航线的旧点（含转弯半径两侧的 entry/exit 点）
       waypoints.forEach((wp,index) => {
         const waypointEntityId = `wp_${routeId}_${wp.id}`;
         const existingWaypoint = this.viewer.entities.getById(waypointEntityId);
         if (existingWaypoint) {
           this.viewer.entities.remove(existingWaypoint);
         }
+        ['_entry', '_exit'].forEach(suffix => {
+          const entryExitId = `wp_${routeId}_${wp.id}${suffix}`;
+          const existingEntryExit = this.viewer.entities.getById(entryExitId);
+          if (existingEntryExit) this.viewer.entities.remove(existingEntryExit);
+        });
         const arcId = `arc-line-${routeId}-${index}`;
         const existingArc = this.viewer.entities.getById(arcId);
         if (existingArc) {
           this.viewer.entities.remove(existingArc);
         }
+        const holdId = `hold-line-${routeId}-${index}`;
+        const existingHold = this.viewer.entities.getById(holdId);
+        if (existingHold) {
+          this.viewer.entities.remove(existingHold);
+        }
       });
       const wpStyle = (style && style.waypoint) ? style.waypoint : {};
       const lineStyle = (style && style.line) ? style.line : {};
@@ -509,15 +939,37 @@ export default {
       const wpColor = wpStyle.color || '#ffffff';
       const wpOutline = wpStyle.outlineColor || '#0078FF';
       const wpOutlineW = wpStyle.outlineWidth != null ? wpStyle.outlineWidth : 2;
-      // 遍历并绘制航点标记
+      // 航线默认紫色、线宽 3；与测距线一致使用轮廓材质，平滑无锯齿
+      const lineWidth = lineStyle.width != null ? lineStyle.width : 3;
+      const lineColor = lineStyle.color || '#800080';
+      const lineMaterial = this.getPolylineSolidMaterial(lineColor);
+      // 先收集所有航点的世界坐标
       const originalPositions = [];
-      waypoints.forEach((wp, index) => {
+      waypoints.forEach((wp) => {
         const lon = parseFloat(wp.lng);
         const lat = parseFloat(wp.lat);
-        // 使用 Number 转换 Double 类型
         const altValue = Number(wp.alt || 5000);
-        const pos = Cesium.Cartesian3.fromDegrees(lon, lat, altValue);
-        originalPositions.push(pos);
+        originalPositions.push(Cesium.Cartesian3.fromDegrees(lon, lat, altValue));
+      });
+      // 判断航点 i 是否为“转弯半径”航点（将用弧线两端两个点替代中心点）
+      const isTurnWaypointWithArc = (i) => {
+        if (i < 1 || i >= waypoints.length - 1) return false;
+        const wp = waypoints[i];
+        if (this.getWaypointRadius(wp) <= 0) return false;
+        const nextPos = originalPositions[i + 1];
+        let nextLogical = nextPos;
+        if (this.isHoldWaypoint(waypoints[i + 1])) {
+          const holdParams = this.parseHoldParams(waypoints[i + 1]);
+          nextLogical = holdParams && holdParams.radius != null
+            ? this.getCircleEntryPoint(originalPositions[i + 1], originalPositions[i], holdParams.radius)
+            : this.getEllipseEntryPoint(originalPositions[i + 1], originalPositions[i], holdParams.semiMajor ?? 500, holdParams.semiMinor ?? 300, ((holdParams.headingDeg || 0) * Math.PI) / 180);
+        }
+        return !!nextLogical;
+      };
+      // 遍历并绘制航点标记：转弯半径处不画中心点，改在下面画弧线时画两端两个点
+      waypoints.forEach((wp, index) => {
+        if (isTurnWaypointWithArc(index)) return;
+        const pos = originalPositions[index];
         this.viewer.entities.add({
           id: `wp_${routeId}_${wp.id}`,
           name: wp.name || `WP${index + 1}`,
@@ -536,11 +988,11 @@ export default {
           },
           label: {
             text: wp.name || `WP${index + 1}`,
-            font: `${Math.max(9, pixelSize + 2)}px MicroSoft YaHei`,
+            font: `${wp.labelFontSize != null ? Math.min(28, Math.max(10, Number(wp.labelFontSize))) : 14}px Microsoft YaHei`,
             pixelOffset: new Cesium.Cartesian2(0, -Math.max(14, pixelSize + 8)),
-            fillColor: Cesium.Color.WHITE,
+            fillColor: Cesium.Color.fromCssColorString(wp.labelColor || '#333333'),
             outlineColor: Cesium.Color.BLACK,
-            outlineWidth: 2,
+            outlineWidth: 1,
             style: Cesium.LabelStyle.FILL_AND_OUTLINE
           }
         });
@@ -572,55 +1024,149 @@ export default {
             ...(initialRotation !== undefined && { rotation: initialRotation })
           }
         });
+        // 飞机标牌：显示名字、高度、速度、航向，随飞机实时运动
+        const firstWp = waypoints[0];
+        const firstAlt = firstWp && (firstWp.alt != null) ? Number(firstWp.alt) : 0;
+        const firstSpeed = firstWp && (firstWp.speed != null) ? Number(firstWp.speed) : 800;
+        const initialHeadingRad = pathData.path && pathData.path.length >= 2
+          ? this.computeHeadingFromPositions(pathData.path[0], pathData.path[1]) : undefined;
+        const initialHeadingDeg = initialHeadingRad != null ? (initialHeadingRad * 180 / Math.PI) : 0;
+        const labelText = this.formatPlatformLabelText({
+          name: (platform && platform.name) || '平台',
+          altitude: firstAlt,
+          speed: firstSpeed,
+          headingDeg: initialHeadingDeg
+        });
+        const labelShow = this.routeLabelVisible[routeId] !== false
+        this.viewer.entities.add({
+          id: platformLabelId,
+          name: '平台标牌',
+          position: originalPositions[0],
+          show: labelShow,
+          properties: { routeId: routeId },
+          label: {
+            text: labelText,
+            font: '16px Microsoft YaHei',
+            fillColor: Cesium.Color.fromCssColorString('#333333'),
+            outlineColor: Cesium.Color.fromCssColorString('#e0e0e0'),
+            outlineWidth: 1,
+            style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+            showBackground: true,
+            backgroundColor: Cesium.Color.fromCssColorString('rgba(255, 255, 255, 0.95)'),
+            backgroundPadding: new Cesium.Cartesian2(10, 6),
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            pixelOffset: new Cesium.Cartesian2(0, -42),
+            disableDepthTestDistance: Number.POSITIVE_INFINITY,
+            scaleByDistance: new Cesium.NearFarScalar(500, 1.0, 200000, 0.65)
+          }
+        });
       }
-      // 绘制连线
+      // 绘制连线（含盘旋弧）
       if (waypoints.length > 1) {
-        let finalPathPositions = [];
-        for (let i = 0; i < waypoints.length; i++) {
+        const finalPathPositions = [originalPositions[0]];
+        let lastPos = originalPositions[0];
+        for (let i = 1; i < waypoints.length; i++) {
           const currPos = originalPositions[i];
-          const radius = this.getWaypointRadius(waypoints[i]);
-          // 如果不是首尾点且有半径，我们就画红色的弧线
-          if (i > 0 && i < waypoints.length - 1 && radius > 0) {
-            const prevPos = originalPositions[i - 1];
-            const nextPos = originalPositions[i + 1];
-            const arcPoints = this.computeArcPositions(prevPos, currPos, nextPos, radius);
-            // 绘制红色实线弧
-          this.viewer.entities.add({
-            id: `arc-line-${routeId}-${i}`,
-            polyline: {
-              positions: arcPoints,
-              width: 8,
-              material: Cesium.Color.RED,
-              clampToGround: true,
-              zIndex: 20
-            },
-            properties: {routeId: routeId}
-          });
-            console.log(`>>> 航点 ${waypoints[i].name} 已渲染红色转弯弧，半径: ${radius}`);
-          }
-          if (i === 0 || i === waypoints.length - 1 || radius <= 0) {
-            finalPathPositions.push(currPos);
+          const wp = waypoints[i];
+          const nextPos = i + 1 < waypoints.length ? originalPositions[i + 1] : null;
+          if (this.isHoldWaypoint(wp)) {
+            const params = this.parseHoldParams(wp);
+            const radius = params && params.radius != null ? params.radius : 500;
+            const semiMajor = params && (params.semiMajor != null || params.semiMajorAxis != null) ? (params.semiMajor ?? params.semiMajorAxis) : 500;
+            const semiMinor = params && (params.semiMinor != null || params.semiMinorAxis != null) ? (params.semiMinor ?? params.semiMinorAxis) : 300;
+            const headingRad = ((params && params.headingDeg != null ? params.headingDeg : 0) * Math.PI) / 180;
+            const clockwise = params && params.clockwise !== false;
+            const entry = params && params.radius != null
+              ? this.getCircleEntryPoint(currPos, lastPos, radius)
+              : this.getEllipseEntryPoint(currPos, lastPos, semiMajor, semiMinor, headingRad);
+            const exit = params && params.radius != null
+              ? this.getCircleTangentExitPoint(currPos, nextPos || currPos, radius, clockwise)
+              : this.getEllipseTangentExitPoint(currPos, nextPos || currPos, semiMajor, semiMinor, headingRad, clockwise);
+            finalPathPositions.push(entry);
+            let arcPoints;
+            if (params && params.radius != null) {
+              const enu = Cesium.Transforms.eastNorthUpToFixedFrame(currPos);
+              const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+              const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+              const toEntry = Cesium.Cartesian3.subtract(entry, currPos, new Cesium.Cartesian3());
+              const entryAngle = Math.atan2(Cesium.Cartesian3.dot(toEntry, east), Cesium.Cartesian3.dot(toEntry, north));
+              arcPoints = this.getCircleFullCircle(currPos, radius, entryAngle, clockwise, 48);
+            } else {
+              const enuE = Cesium.Transforms.eastNorthUpToFixedFrame(currPos);
+              const eastE = Cesium.Matrix4.getColumn(enuE, 0, new Cesium.Cartesian3());
+              const northE = Cesium.Matrix4.getColumn(enuE, 1, new Cesium.Cartesian3());
+              const toEntryE = Cesium.Cartesian3.subtract(entry, currPos, new Cesium.Cartesian3());
+              const thetaE = Math.atan2(Cesium.Cartesian3.dot(toEntryE, eastE), Cesium.Cartesian3.dot(toEntryE, northE));
+              const entryLocalAngle = thetaE - headingRad;
+              arcPoints = this.getEllipseFullCircle(currPos, semiMajor, semiMinor, headingRad, entryLocalAngle, clockwise, 48);
+            }
+            for (let k = 1; k < arcPoints.length; k++) finalPathPositions.push(arcPoints[k]);
+            finalPathPositions.push(exit);
+            this.viewer.entities.add({
+              id: `hold-line-${routeId}-${i}`,
+              polyline: { positions: [entry, ...arcPoints.slice(1), exit], width: 8, material: this.getPolylineSolidMaterial('#FFA500'), clampToGround: true, zIndex: 20 },
+              properties: { routeId: routeId }
+            });
+            lastPos = exit;
           } else {
-            const prevPos = originalPositions[i - 1];
-            const nextPos = originalPositions[i + 1];
-            // 计算弧线点集
-            const arcPoints = this.computeArcPositions(prevPos, currPos, nextPos, radius);
-            finalPathPositions.push(...arcPoints);
-          }
-        }
-        const lineWidth = lineStyle.width != null ? lineStyle.width : 4;
-        const lineColor = lineStyle.color || '#ffffff';
-        const gapColor = lineStyle.gapColor != null ? lineStyle.gapColor : '#000000';
-        const dashLen = lineStyle.dashLength != null ? lineStyle.dashLength : 20;
-        const useDash = (lineStyle.style || 'dash') === 'dash';
-        const lineMaterial = useDash
-          ? new Cesium.PolylineDashMaterialProperty({
-              color: Cesium.Color.fromCssColorString(lineColor),
-              gapColor: Cesium.Color.fromCssColorString(gapColor),
-              dashLength: dashLen
-            })
-          : Cesium.Color.fromCssColorString(lineColor);
-        // 绘制包含弧线的 Polyline
+            const radius = this.getWaypointRadius(wp);
+            let nextLogical = nextPos;
+            if (nextPos && i + 1 < waypoints.length && this.isHoldWaypoint(waypoints[i + 1])) {
+              const holdParams = this.parseHoldParams(waypoints[i + 1]);
+              nextLogical = holdParams && holdParams.radius != null
+                ? this.getCircleEntryPoint(originalPositions[i + 1], currPos, holdParams.radius)
+                : this.getEllipseEntryPoint(originalPositions[i + 1], currPos, holdParams.semiMajor ?? 500, holdParams.semiMinor ?? 300, ((holdParams.headingDeg || 0) * Math.PI) / 180);
+            }
+            if (i < waypoints.length - 1 && radius > 0 && nextLogical) {
+              const arcPoints = this.computeArcPositions(lastPos, currPos, nextLogical, radius);
+              this.viewer.entities.add({
+                id: `arc-line-${routeId}-${i}`,
+                polyline: { positions: arcPoints, width: lineWidth, material: lineMaterial, clampToGround: true, zIndex: 20 },
+                properties: { routeId: routeId }
+              });
+              // 转弯半径两侧航点与航线整体航点风格一致，点击均打开原航点编辑（dbId 为当前 wp.id）
+              const wpName = wp.name || `WP${i + 1}`;
+              const arcEntry = arcPoints[0];
+              const arcExit = arcPoints[arcPoints.length - 1];
+              [arcEntry, arcExit].forEach((pos, idx) => {
+                const suffix = idx === 0 ? '_entry' : '_exit';
+                this.viewer.entities.add({
+                  id: `wp_${routeId}_${wp.id}${suffix}`,
+                  name: wpName,
+                  position: pos,
+                  properties: {
+                    isMissionWaypoint: true,
+                    routeId: routeId,
+                    dbId: wp.id,
+                  },
+                  point: {
+                    pixelSize: pixelSize,
+                    color: Cesium.Color.fromCssColorString(wpColor),
+                    outlineColor: Cesium.Color.fromCssColorString(wpOutline),
+                    outlineWidth: wpOutlineW,
+                    disableDepthTestDistance: Number.POSITIVE_INFINITY
+                  },
+                  label: {
+                    text: wpName,
+                    font: `${wp.labelFontSize != null ? Math.min(28, Math.max(10, Number(wp.labelFontSize))) : 14}px Microsoft YaHei`,
+                    pixelOffset: new Cesium.Cartesian2(0, -Math.max(14, pixelSize + 8)),
+                    fillColor: Cesium.Color.fromCssColorString(wp.labelColor || '#333333'),
+                    outlineColor: Cesium.Color.BLACK,
+                    outlineWidth: 1,
+                    style: Cesium.LabelStyle.FILL_AND_OUTLINE
+                  }
+                });
+              });
+              finalPathPositions.push(...arcPoints);
+              lastPos = arcPoints[arcPoints.length - 1];
+            } else {
+              finalPathPositions.push(currPos);
+              lastPos = currPos;
+            }
+          }
+        }
+        // 绘制包含弧线的 Polyline（lineWidth/lineMaterial 已在上方与航点样式一起计算，默认紫色线宽3）
         const routeEntity = this.viewer.entities.add({
           id: lineId,
           polyline: {
@@ -633,7 +1179,7 @@ export default {
           properties: {isMissionRouteLine: true, routeId: routeId}
         });
         if (this.allEntities) {
-          this.allEntities.push({id: lineId, entity: routeEntity, type: 'route'});
+          this.allEntities.push({ id: lineId, entity: routeEntity, type: 'route', routeId });
         }
       }
     },
@@ -648,6 +1194,133 @@ export default {
       return (v_mps * v_mps) / (g * Math.tan(radians));
     },
 
+    isHoldWaypoint(wp) {
+      const t = (wp && wp.pointType) || (wp && wp.point_type) || 'normal';
+      return t === 'hold_circle' || t === 'hold_ellipse';
+    },
+    parseHoldParams(wp) {
+      const raw = (wp && wp.holdParams) || (wp && wp.hold_params);
+      if (!raw) return null;
+      try {
+        const p = typeof raw === 'string' ? JSON.parse(raw) : raw;
+        return {
+          radius: p.radius,
+          semiMajor: p.semiMajor ?? p.semiMajorAxis,
+          semiMinor: p.semiMinor ?? p.semiMinorAxis,
+          headingDeg: p.headingDeg ?? 0,
+          clockwise: p.clockwise !== false
+        };
+      } catch (e) {
+        return null;
+      }
+    },
+
+    /** 圆上从 entry 到 exit 的弧段（按顺时针/逆时针），采样点数 */
+    getCircleArcEntryToExit(centerCartesian, radiusMeters, entryCartesian, exitCartesian, clockwise, numPoints) {
+      const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+      const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+      const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+      const toEntry = Cesium.Cartesian3.subtract(entryCartesian, centerCartesian, new Cesium.Cartesian3());
+      const toExit = Cesium.Cartesian3.subtract(exitCartesian, centerCartesian, new Cesium.Cartesian3());
+      let entryAngle = Math.atan2(Cesium.Cartesian3.dot(toEntry, east), Cesium.Cartesian3.dot(toEntry, north));
+      let exitAngle = Math.atan2(Cesium.Cartesian3.dot(toExit, east), Cesium.Cartesian3.dot(toExit, north));
+      let diff = exitAngle - entryAngle;
+      const sign = clockwise ? -1 : 1;
+      if (sign * diff <= 0) diff += sign * 2 * Math.PI;
+      const points = [];
+      for (let i = 0; i <= numPoints; i++) {
+        const t = i / numPoints;
+        const angle = entryAngle + sign * t * Math.abs(diff);
+        const offset = Cesium.Cartesian3.add(
+          Cesium.Cartesian3.multiplyByScalar(north, Math.cos(angle) * radiusMeters, new Cesium.Cartesian3()),
+          Cesium.Cartesian3.multiplyByScalar(east, Math.sin(angle) * radiusMeters, new Cesium.Cartesian3()),
+          new Cesium.Cartesian3()
+        );
+        points.push(Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3()));
+      }
+      return points;
+    },
+
+    /** 圆上整圈（360°）采样，从 startAngleRad 起按顺时针/逆时针，用于盘旋段渲染为整圆 */
+    getCircleFullCircle(centerCartesian, radiusMeters, startAngleRad, clockwise, numPoints) {
+      const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+      const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+      const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+      const sign = clockwise ? -1 : 1;
+      const points = [];
+      for (let i = 0; i <= numPoints; i++) {
+        const t = i / numPoints;
+        const angle = startAngleRad + sign * t * 2 * Math.PI;
+        const offset = Cesium.Cartesian3.add(
+          Cesium.Cartesian3.multiplyByScalar(north, Math.cos(angle) * radiusMeters, new Cesium.Cartesian3()),
+          Cesium.Cartesian3.multiplyByScalar(east, Math.sin(angle) * radiusMeters, new Cesium.Cartesian3()),
+          new Cesium.Cartesian3()
+        );
+        points.push(Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3()));
+      }
+      return points;
+    },
+
+    /** 椭圆上从 entry 到 exit 的弧段（按顺时针/逆时针） */
+    getEllipseArcEntryToExit(centerCartesian, semiMajorM, semiMinorM, headingRad, entryCartesian, exitCartesian, clockwise, numPoints) {
+      const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+      const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+      const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+      const toLocalAngle = (cart) => {
+        const toP = Cesium.Cartesian3.subtract(cart, centerCartesian, new Cesium.Cartesian3());
+        const e = Cesium.Cartesian3.dot(toP, east);
+        const n = Cesium.Cartesian3.dot(toP, north);
+        const theta = Math.atan2(e, n);
+        const local = theta - headingRad;
+        return local;
+      };
+      let entryT = toLocalAngle(entryCartesian);
+      let exitT = toLocalAngle(exitCartesian);
+      let diff = exitT - entryT;
+      const sign = clockwise ? -1 : 1;
+      if (sign * diff <= 0) diff += sign * 2 * Math.PI;
+      const c = Math.cos(headingRad);
+      const s = Math.sin(headingRad);
+      const points = [];
+      for (let i = 0; i <= numPoints; i++) {
+        const t = i / numPoints;
+        const angle = entryT + sign * t * Math.abs(diff);
+        const localE = semiMajorM * Math.cos(angle) * c - semiMinorM * Math.sin(angle) * s;
+        const localN = semiMajorM * Math.cos(angle) * s + semiMinorM * Math.sin(angle) * c;
+        const offset = Cesium.Cartesian3.add(
+          Cesium.Cartesian3.multiplyByScalar(north, localN, new Cesium.Cartesian3()),
+          Cesium.Cartesian3.multiplyByScalar(east, localE, new Cesium.Cartesian3()),
+          new Cesium.Cartesian3()
+        );
+        points.push(Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3()));
+      }
+      return points;
+    },
+
+    /** 椭圆上整圈（360°）采样，从 startLocalAngle 起按顺时针/逆时针，用于盘旋段渲染为整椭圆 */
+    getEllipseFullCircle(centerCartesian, semiMajorM, semiMinorM, headingRad, startLocalAngle, clockwise, numPoints) {
+      const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+      const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+      const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+      const sign = clockwise ? -1 : 1;
+      const c = Math.cos(headingRad);
+      const s = Math.sin(headingRad);
+      const points = [];
+      for (let i = 0; i <= numPoints; i++) {
+        const t = i / numPoints;
+        const angle = startLocalAngle + sign * t * 2 * Math.PI;
+        const localE = semiMajorM * Math.cos(angle) * c - semiMinorM * Math.sin(angle) * s;
+        const localN = semiMajorM * Math.cos(angle) * s + semiMinorM * Math.sin(angle) * c;
+        const offset = Cesium.Cartesian3.add(
+          Cesium.Cartesian3.multiplyByScalar(north, localN, new Cesium.Cartesian3()),
+          Cesium.Cartesian3.multiplyByScalar(east, localE, new Cesium.Cartesian3()),
+          new Cesium.Cartesian3()
+        );
+        points.push(Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3()));
+      }
+      return points;
+    },
+
     // 计算转弯处的圆弧点集
     computeArcPositions(p1, p2, p3, radius) {
       const v1 = Cesium.Cartesian3.subtract(p1, p2, new Cesium.Cartesian3());
@@ -676,13 +1349,142 @@ export default {
       return arc;
     },
 
+    /** 圆：中心( Cartesian3 )、半径(米)、顺时针、采样数 → 世界坐标点数组（从进入点沿圆到出口点需外部指定起止角或由 entry/exit 截取） */
+    computeCirclePositions(centerCartesian, radiusMeters, clockwise, numPoints) {
+      if (!this.viewer || !centerCartesian || radiusMeters <= 0) return [];
+      const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+      const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+      const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+      const points = [];
+      const sign = clockwise ? -1 : 1;
+      for (let i = 0; i <= numPoints; i++) {
+        const t = i / numPoints;
+        const angle = sign * t * 2 * Math.PI;
+        const offset = Cesium.Cartesian3.add(
+          Cesium.Cartesian3.multiplyByScalar(north, Math.cos(angle) * radiusMeters, new Cesium.Cartesian3()),
+          Cesium.Cartesian3.multiplyByScalar(east, Math.sin(angle) * radiusMeters, new Cesium.Cartesian3()),
+          new Cesium.Cartesian3()
+        );
+        points.push(Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3()));
+      }
+      return points;
+    },
+
+    /** 椭圆：中心、半长轴/半短轴(米)、长轴方位(弧度)、顺时针、采样数 → 世界坐标点数组 */
+    computeEllipsePositions(centerCartesian, semiMajorM, semiMinorM, headingRad, clockwise, numPoints) {
+      if (!this.viewer || !centerCartesian || semiMajorM <= 0 || semiMinorM <= 0) return [];
+      const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+      const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+      const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+      const c = Math.cos(headingRad);
+      const s = Math.sin(headingRad);
+      const points = [];
+      const sign = clockwise ? -1 : 1;
+      for (let i = 0; i <= numPoints; i++) {
+        const t = i / numPoints;
+        const angle = sign * t * 2 * Math.PI;
+        const localE = semiMajorM * Math.cos(angle) * c - semiMinorM * Math.sin(angle) * s;
+        const localN = semiMajorM * Math.cos(angle) * s + semiMinorM * Math.sin(angle) * c;
+        const offset = Cesium.Cartesian3.add(
+          Cesium.Cartesian3.multiplyByScalar(north, localN, new Cesium.Cartesian3()),
+          Cesium.Cartesian3.multiplyByScalar(east, localE, new Cesium.Cartesian3()),
+          new Cesium.Cartesian3()
+        );
+        points.push(Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3()));
+      }
+      return points;
+    },
+
+    /** 圆上进入点：从 prev 飞向 center 时与圆的交点（靠近 prev 的那侧） */
+    getCircleEntryPoint(centerCartesian, prevPointCartesian, radiusMeters) {
+      const toCenter = Cesium.Cartesian3.subtract(centerCartesian, prevPointCartesian, new Cesium.Cartesian3());
+      const dist = Cesium.Cartesian3.magnitude(toCenter);
+      if (dist < 1e-6) return centerCartesian;
+      if (radiusMeters >= dist) return Cesium.Cartesian3.clone(prevPointCartesian);
+      const unit = Cesium.Cartesian3.normalize(toCenter, new Cesium.Cartesian3());
+      return Cesium.Cartesian3.add(prevPointCartesian, Cesium.Cartesian3.multiplyByScalar(unit, dist - radiusMeters, new Cesium.Cartesian3()), new Cesium.Cartesian3());
+    },
+
+    /** 圆上切线出口点：从圆飞往 next 时在圆上的切点（选顺时针/逆时针中朝向 next 的那一侧） */
+    getCircleTangentExitPoint(centerCartesian, nextPointCartesian, radiusMeters, clockwise) {
+      const toNext = Cesium.Cartesian3.subtract(nextPointCartesian, centerCartesian, new Cesium.Cartesian3());
+      const d = Cesium.Cartesian3.magnitude(toNext);
+      if (d < 1e-6) return centerCartesian;
+      const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+      const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+      const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+      const e = Cesium.Cartesian3.dot(toNext, east);
+      const n = Cesium.Cartesian3.dot(toNext, north);
+      const theta = Math.atan2(e, n);
+      const alpha = Math.acos(Math.min(1, radiusMeters / d));
+      const sign = clockwise ? 1 : -1;
+      const exitAngle = theta + sign * alpha;
+      const offset = Cesium.Cartesian3.add(
+        Cesium.Cartesian3.multiplyByScalar(north, Math.cos(exitAngle) * radiusMeters, new Cesium.Cartesian3()),
+        Cesium.Cartesian3.multiplyByScalar(east, Math.sin(exitAngle) * radiusMeters, new Cesium.Cartesian3()),
+        new Cesium.Cartesian3()
+      );
+      return Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3());
+    },
+
+    /** 椭圆上进入点：从 prev 指向 center 的方向与椭圆边的交点（靠近 prev 的一侧） */
+    getEllipseEntryPoint(centerCartesian, prevPointCartesian, semiMajorM, semiMinorM, headingRad) {
+      const toPrev = Cesium.Cartesian3.subtract(prevPointCartesian, centerCartesian, new Cesium.Cartesian3());
+      const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+      const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+      const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+      const de = Cesium.Cartesian3.dot(toPrev, east);
+      const dn = Cesium.Cartesian3.dot(toPrev, north);
+      const c = Math.cos(-headingRad);
+      const s = Math.sin(-headingRad);
+      const dx = de * c - dn * s;
+      const dy = de * s + dn * c;
+      const n = Math.sqrt((dx * dx) / (semiMajorM * semiMajorM) + (dy * dy) / (semiMinorM * semiMinorM));
+      if (n < 1e-6) return centerCartesian;
+      const k = 1 / n;
+      const lx = k * dx;
+      const ly = k * dy;
+      const backE = lx * Math.cos(headingRad) - ly * Math.sin(headingRad);
+      const backN = lx * Math.sin(headingRad) + ly * Math.cos(headingRad);
+      const offset = Cesium.Cartesian3.add(
+        Cesium.Cartesian3.multiplyByScalar(north, backN, new Cesium.Cartesian3()),
+        Cesium.Cartesian3.multiplyByScalar(east, backE, new Cesium.Cartesian3()),
+        new Cesium.Cartesian3()
+      );
+      return Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3());
+    },
+
+    /** 椭圆上“出口点”：沿长轴方向近似为下一航点方向的切点（取椭圆上最靠近 next 的点再沿法向微调为切向出口） */
+    getEllipseTangentExitPoint(centerCartesian, nextPointCartesian, semiMajorM, semiMinorM, headingRad, clockwise) {
+      const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+      const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+      const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+      const toNext = Cesium.Cartesian3.subtract(nextPointCartesian, centerCartesian, new Cesium.Cartesian3());
+      const e = Cesium.Cartesian3.dot(toNext, east);
+      const n = Cesium.Cartesian3.dot(toNext, north);
+      const theta = Math.atan2(e, n);
+      const localAngle = theta - headingRad;
+      const cosA = Math.cos(localAngle);
+      const sinA = Math.sin(localAngle);
+      const r = (semiMajorM * semiMinorM) / Math.sqrt((semiMinorM * cosA) ** 2 + (semiMajorM * sinA) ** 2);
+      const sign = clockwise ? -1 : 1;
+      const exitLocal = sign * Math.atan2(semiMinorM * sinA, semiMajorM * cosA);
+      const localE = semiMajorM * Math.cos(exitLocal) * Math.cos(headingRad) - semiMinorM * Math.sin(exitLocal) * Math.sin(headingRad);
+      const localN = semiMajorM * Math.cos(exitLocal) * Math.sin(headingRad) + semiMinorM * Math.sin(exitLocal) * Math.cos(headingRad);
+      const offset = Cesium.Cartesian3.add(
+        Cesium.Cartesian3.multiplyByScalar(north, localN, new Cesium.Cartesian3()),
+        Cesium.Cartesian3.multiplyByScalar(east, localE, new Cesium.Cartesian3()),
+        new Cesium.Cartesian3()
+      );
+      return Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3());
+    },
+
     /**
-     * 获取与地图绘制一致的带转弯弧的路径（用于推演时图标沿弧线运动）。
-     * @param {Array} waypoints - 航点列表，需含 lng, lat, alt, speed, turnAngle
-     * @returns {{ path: Array<{lng,lat,alt}>, segmentEndIndices: number[] }} path 为路径点；segmentEndIndices[i] 为第 i 段（航点 i -> i+1）在 path 中的结束下标
+     * 获取与地图绘制一致的带转弯弧与盘旋弧的路径（用于推演时图标沿弧线运动）。
+     * @returns {{ path, segmentEndIndices, holdArcRanges: { [legIndex]: { start, end } } }}
      */
     getRoutePathWithSegmentIndices(waypoints) {
-      if (!waypoints || waypoints.length === 0) return { path: [], segmentEndIndices: [] };
+      if (!waypoints || waypoints.length === 0) return { path: [], segmentEndIndices: [], holdArcRanges: {} };
       const ellipsoid = this.viewer.scene.globe.ellipsoid;
       const toLngLatAlt = (cartesian) => {
         const carto = Cesium.Cartographic.fromCartesian(cartesian, ellipsoid);
@@ -695,22 +1497,72 @@ export default {
       const originalPositions = waypoints.map(wp =>
         Cesium.Cartesian3.fromDegrees(parseFloat(wp.lng), parseFloat(wp.lat), Number(wp.alt) || 0)
       );
-      const path = [];
+      const path = [toLngLatAlt(originalPositions[0])];
       const segmentEndIndices = [];
-      for (let i = 0; i < waypoints.length; i++) {
+      const holdArcRanges = {};
+      let lastPos = originalPositions[0];
+      for (let i = 1; i < waypoints.length; i++) {
         const currPos = originalPositions[i];
-        const radius = this.getWaypointRadius(waypoints[i]);
-        if (i === 0 || i === waypoints.length - 1 || radius <= 0) {
-          path.push(toLngLatAlt(currPos));
+        const wp = waypoints[i];
+        const nextPos = i + 1 < waypoints.length ? originalPositions[i + 1] : null;
+        if (this.isHoldWaypoint(wp)) {
+          const params = this.parseHoldParams(wp);
+          const radius = params && params.radius != null ? params.radius : 500;
+          const semiMajor = params && (params.semiMajor != null || params.semiMajorAxis != null) ? (params.semiMajor ?? params.semiMajorAxis) : 500;
+          const semiMinor = params && (params.semiMinor != null || params.semiMinorAxis != null) ? (params.semiMinor ?? params.semiMinorAxis) : 300;
+          const headingRad = ((params && params.headingDeg != null ? params.headingDeg : 0) * Math.PI) / 180;
+          const clockwise = params && params.clockwise !== false;
+          const entry = params && params.radius != null
+            ? this.getCircleEntryPoint(currPos, lastPos, radius)
+            : this.getEllipseEntryPoint(currPos, lastPos, semiMajor, semiMinor, headingRad);
+          const exit = params && params.radius != null
+            ? this.getCircleTangentExitPoint(currPos, nextPos || currPos, radius, clockwise)
+            : this.getEllipseTangentExitPoint(currPos, nextPos || currPos, semiMajor, semiMinor, headingRad, clockwise);
+          path.push(toLngLatAlt(entry));
+          const arcStartIdx = path.length - 1;
+          let arcPoints;
+          if (params && params.radius != null) {
+            const enu = Cesium.Transforms.eastNorthUpToFixedFrame(currPos);
+            const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+            const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+            const toEntry = Cesium.Cartesian3.subtract(entry, currPos, new Cesium.Cartesian3());
+            const entryAngle = Math.atan2(Cesium.Cartesian3.dot(toEntry, east), Cesium.Cartesian3.dot(toEntry, north));
+            arcPoints = this.getCircleFullCircle(currPos, radius, entryAngle, clockwise, 48);
+          } else {
+            const enuE = Cesium.Transforms.eastNorthUpToFixedFrame(currPos);
+            const eastE = Cesium.Matrix4.getColumn(enuE, 0, new Cesium.Cartesian3());
+            const northE = Cesium.Matrix4.getColumn(enuE, 1, new Cesium.Cartesian3());
+            const toEntryE = Cesium.Cartesian3.subtract(entry, currPos, new Cesium.Cartesian3());
+            const thetaE = Math.atan2(Cesium.Cartesian3.dot(toEntryE, eastE), Cesium.Cartesian3.dot(toEntryE, northE));
+            const entryLocalAngle = thetaE - headingRad;
+            arcPoints = this.getEllipseFullCircle(currPos, semiMajor, semiMinor, headingRad, entryLocalAngle, clockwise, 48);
+          }
+          for (let k = 1; k < arcPoints.length; k++) path.push(toLngLatAlt(arcPoints[k]));
+          path.push(toLngLatAlt(exit));
+          holdArcRanges[i - 1] = { start: arcStartIdx, end: path.length - 1 };
+          segmentEndIndices[i - 1] = path.length - 1;
+          lastPos = exit;
         } else {
-          const prevPos = originalPositions[i - 1];
-          const nextPos = originalPositions[i + 1];
-          const arcPoints = this.computeArcPositions(prevPos, currPos, nextPos, radius);
-          arcPoints.forEach(p => path.push(toLngLatAlt(p)));
+          let nextLogical = nextPos;
+          if (nextPos && i + 1 < waypoints.length && this.isHoldWaypoint(waypoints[i + 1])) {
+            const holdParams = this.parseHoldParams(waypoints[i + 1]);
+            nextLogical = holdParams && holdParams.radius != null
+              ? this.getCircleEntryPoint(originalPositions[i + 1], currPos, holdParams.radius)
+              : this.getEllipseEntryPoint(originalPositions[i + 1], currPos, holdParams.semiMajor ?? 500, holdParams.semiMinor ?? 300, ((holdParams.headingDeg || 0) * Math.PI) / 180);
+          }
+          const radius = this.getWaypointRadius(wp);
+          if (i < waypoints.length - 1 && radius > 0 && nextLogical) {
+            const arcPoints = this.computeArcPositions(lastPos, currPos, nextLogical, radius);
+            arcPoints.forEach(p => path.push(toLngLatAlt(p)));
+            lastPos = arcPoints[arcPoints.length - 1];
+          } else {
+            path.push(toLngLatAlt(currPos));
+            lastPos = currPos;
+          }
+          segmentEndIndices[i - 1] = path.length - 1;
         }
-        if (i >= 1) segmentEndIndices[i - 1] = path.length - 1;
       }
-      return { path, segmentEndIndices };
+      return { path, segmentEndIndices, holdArcRanges };
     },
 
     removeRouteById(routeId) {
@@ -719,8 +1571,8 @@ export default {
       for (let i = entityList.length - 1; i >= 0; i--) {
         const entity = entityList[i];
         let shouldRemove = false;
-        // 平台图标实体：通过 id 匹配
-        if (entity.id === `route-platform-${routeId}`) {
+        // 平台图标与标牌实体：通过 id 匹配
+        if (entity.id === `route-platform-${routeId}` || entity.id === `route-platform-label-${routeId}`) {
           shouldRemove = true;
         } else if (entity.properties && entity.properties.routeId) {
           const id = entity.properties.routeId.getValue && entity.properties.routeId.getValue();
@@ -728,7 +1580,7 @@ export default {
         }
         if (shouldRemove) this.viewer.entities.remove(entity);
       }
-      this.allEntities = this.allEntities.filter(item => item.id !== routeId && item.id !== `route-platform-${routeId}`);
+      this.allEntities = this.allEntities.filter(item => item.id !== routeId && item.id !== `route-platform-${routeId}` && item.id !== `route-platform-label-${routeId}`);
     },
     /**
      * 根据当前点与另一点计算航向角（弧度），用于飞机图标朝向。
@@ -753,8 +1605,18 @@ export default {
       return heading;
     },
 
-    /** 动态推演：更新某条航线的平台图标位置与朝向（position: { lng, lat, alt } 或 Cesium.Cartesian3；directionPoint 为用于计算机头朝向的另一点，如下一位置或上一位置） */
-    updatePlatformPosition(routeId, position, directionPoint) {
+    /** 格式化飞机标牌文案：名字、高度(m)、速度(km/h)、航向(°) */
+    formatPlatformLabelText(data) {
+      const name = (data && data.name != null) ? String(data.name) : '—';
+      const alt = (data && data.altitude != null) ? Number(data.altitude) : 0;
+      const speed = (data && data.speed != null) ? Number(data.speed) : 0;
+      const hdg = (data && data.headingDeg != null) ? Number(data.headingDeg) : 0;
+      const headingNorm = ((hdg % 360) + 360) % 360;
+      return `${name}\n高度: ${Math.round(alt)}m  速度: ${Math.round(speed)}km/h  航向: ${Math.round(headingNorm)}°`;
+    },
+
+    /** 动态推演：更新某条航线的平台图标位置与朝向（position: { lng, lat, alt } 或 Cesium.Cartesian3；directionPoint 为用于计算机头朝向的另一点；labelData 可选，用于更新标牌 { name, altitude, speed, headingDeg }） */
+    updatePlatformPosition(routeId, position, directionPoint, labelData) {
       if (!this.viewer) return;
       const entity = this.viewer.entities.getById(`route-platform-${routeId}`);
       if (!entity || !entity.position) return;
@@ -775,6 +1637,14 @@ export default {
           entity.billboard.rotation = Math.PI / 2 - heading;
         }
       }
+      // 更新标牌位置与文案（与数据库对应：名字、高度、速度、航向）
+      const labelEntity = this.viewer.entities.getById(`route-platform-label-${routeId}`);
+      if (labelEntity && labelEntity.position) {
+        labelEntity.position = cartesian;
+        if (labelData && labelEntity.label) {
+          labelEntity.label.text = this.formatPlatformLabelText(labelData);
+        }
+      }
     },
     checkCesiumLoaded() {
       if (typeof Cesium === 'undefined') {
@@ -812,11 +1682,39 @@ export default {
           mapProjection: new Cesium.WebMercatorProjection(),
           imageryProvider: false,
           terrainProvider: new Cesium.EllipsoidTerrainProvider(),
-          baseLayer: false
+          baseLayer: false,
+          // 按需渲染：仅在场景变化时渲染，降低空闲时 CPU/GPU 占用（若某处界面不刷新可主动调用 viewer.scene.requestRender()）
+          requestRenderMode: true,
+          maximumRenderTimeChange: Infinity,
+          // 允许截图时读取 canvas 内容（若截图仅用 readPixels 可改为 false 以提升性能）
+          contextOptions: {
+            preserveDrawingBuffer: true,
+            antialias: true  // 开启 WebGL 全局抗锯齿
+          },
+          // 多重采样抗锯齿（WebGL2 下生效，8 在浏览器缩放时线条更平滑）
+          msaaSamples: 8
         })
         this.viewer.cesiumWidget.creditContainer.style.display = "none"
+        // 根据浏览器缩放比例提高渲染分辨率，减轻 80% 等缩放下线条锯齿
+        this.applyResolutionScale()
+        this._resolutionScaleCleanup = this.setupResolutionScaleListener()
+        // 按需渲染时：实体增删改后主动请求一帧，避免界面不刷新
+        if (this.viewer.scene.requestRenderMode) {
+          this.viewer.entities.collectionChanged.addEventListener(() => {
+            this.viewer.scene.requestRender()
+          })
+        }
         this.loadOfflineMap()
         this.setup2DConstraints()
+        // 移除 Cesium 自带的双击缩放，使双击实体/空白均无任何效果
+        try {
+          const handler = this.viewer.screenSpaceEventHandler || (this.viewer.cesiumWidget && this.viewer.cesiumWidget.screenSpaceEventHandler)
+          if (handler) {
+            handler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_DOUBLE_CLICK)
+          }
+        } catch (e) {
+          // 部分版本可能无此 action，忽略
+        }
         // 初始视野：中国中心（仅中国瓦片时无需世界瓦片，国外区域会无瓦片显示为空白）
         this.viewer.camera.setView({
           destination: Cesium.Cartesian3.fromDegrees(116.3974, 39.9093, 12000000),
@@ -828,12 +1726,13 @@ export default {
         })
         this.initScaleBar()
         this.initPointMovement()
+        this.initPlatformIconInteraction()
         this.initRightClickHandler()
         this.initHoverHandler()
         this.initMouseCoordinates()
         console.log('Cesium离线二维地图已加载')
-        console.log('Cesium离线二维地图已加载')
-        // 1. 定义全局拾取处理器
+
+        // 1. 定义全局拾取处理器（含防抖，避免双击误触导致相机高度剧烈变化）
         this.handler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas);
         this.handler.setInputAction((click) => {
           // 隐藏右键菜单
@@ -844,30 +1743,77 @@ export default {
           const pickedObject = this.viewer.scene.pick(click.position);
           if (Cesium.defined(pickedObject) && pickedObject.id) {
             const entity = pickedObject.id;
-
-            // --- 修正后的安全日志 ---
-            console.log(">>> [点击检测] 实体ID:", entity.id);
+            const idStr = (entity && entity.id) ? entity.id : '';
+            if (idStr && (idStr.endsWith('-rotate-handle') || idStr.indexOf('-scale-') !== -1)) return;
+            const platformIconData = this.allEntities.find(e => e.type === 'platformIcon' && e.entity === entity);
 
             // 获取属性时必须传入当前仿真时间
             const now = Cesium.JulianDate.now();
             const props = entity.properties ? entity.properties.getValue(now) : null;
+            const isWaypoint = props && props.isMissionWaypoint;
+            const isRouteLine = props && props.isMissionRouteLine;
+            const isPlatformIcon = !!platformIconData;
+            // 仅对航线、航点、平台图标做防抖与相机保存（其它实体不处理）
+            if (!isWaypoint && !isRouteLine && !isPlatformIcon) return;
 
-            console.log(">>> [点击检测] 业务数据详情:", props);
-
-            if (props && props.isMissionWaypoint) {
-              const dbId = props.dbId;
-              const routeId = props.routeId;
-              console.log(`>>> [地图触发] 点击了点 ${dbId}, 属于航线 ${routeId}`);
-              // 关键：把航线 ID 也传给父组件
-              this.$emit('open-waypoint-dialog', dbId, routeId);
-            } else if (props && props.isMissionRouteLine) {
-              const routeId = props.routeId;
-              console.log(`>>> [地图触发] 点击了航线 ${routeId}`);
-              // 触发航线编辑弹窗事件
-              this.$emit('open-route-dialog', routeId);
+            const nowMs = Date.now();
+            // 防抖：若与上次点击间隔过短，视为双击，仅清除定时器不触发弹窗
+            if (nowMs - this.lastEntityClickTime < 300) {
+              if (this.entityClickDebounceTimer) {
+                clearTimeout(this.entityClickDebounceTimer);
+                this.entityClickDebounceTimer = null;
+              }
+              this.lastEntityClickTime = 0;
+              return;
+            }
+            this.lastEntityClickTime = nowMs;
+            this.saveCameraStateBeforeEntityClick();
+
+            if (this.entityClickDebounceTimer) clearTimeout(this.entityClickDebounceTimer);
+            const dbId = isWaypoint ? props.dbId : null;
+            const routeId = isWaypoint ? props.routeId : (isRouteLine ? props.routeId : null);
+            if (isWaypoint || isRouteLine) {
+              this.entityClickDebounceTimer = setTimeout(() => {
+                this.entityClickDebounceTimer = null;
+                this.lastEntityClickTime = 0;
+                // 上锁的航线不打开编辑
+                if (this.routeLocked[routeId]) {
+                  this.$message && this.$message.info('该航线已上锁，请右键选择“解锁”后再编辑');
+                  return;
+                }
+                if (isWaypoint) {
+                  console.log(`>>> [地图触发] 点击了点 ${dbId}, 属于航线 ${routeId}`);
+                  this.$emit('open-waypoint-dialog', dbId, routeId);
+                } else if (isRouteLine) {
+                  console.log(`>>> [地图触发] 点击了航线 ${routeId}`);
+                  this.$emit('open-route-dialog', routeId);
+                }
+              }, 250);
             }
           }
         }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+
+        // 双击实体时恢复相机，避免误触导致地图放大过多
+        this.handler.setInputAction((click) => {
+          if (this.isDrawing) return;
+          const pickedObject = this.viewer.scene.pick(click.position);
+          if (!Cesium.defined(pickedObject) || !pickedObject.id) return;
+          const entity = pickedObject.id;
+          const idStr = (entity && entity.id) ? entity.id : '';
+          if (idStr && (idStr.endsWith('-rotate-handle') || idStr.indexOf('-scale-') !== -1)) return;
+          const platformIconData = this.allEntities.find(e => e.type === 'platformIcon' && e.entity === entity);
+          const now = Cesium.JulianDate.now();
+          const props = entity.properties ? entity.properties.getValue(now) : null;
+          const isEntity = platformIconData || (props && (props.isMissionWaypoint || props.isMissionRouteLine));
+          if (isEntity && this.cameraStateBeforeEntityClick) {
+            this.restoreCameraStateAfterEntityDoubleClick();
+            if (this.entityClickDebounceTimer) {
+              clearTimeout(this.entityClickDebounceTimer);
+              this.entityClickDebounceTimer = null;
+            }
+            this.lastEntityClickTime = 0;
+          }
+        }, Cesium.ScreenSpaceEventType.LEFT_DOUBLE_CLICK);
       } catch (error) {
         console.error('地图错误:', error)
         // 如果Cesium加载失败，显示错误信息
@@ -890,22 +1836,61 @@ export default {
         const pickedObject = this.viewer.scene.pick(click.position)
         if (Cesium.defined(pickedObject) && pickedObject.id) {
           const pickedEntity = pickedObject.id
-          // 查找对应的实体数据
-          let entityData = this.allEntities.find(e => e.entity === pickedEntity || e === pickedEntity)
-          // 特殊处理：如果点击的是线段上的点，找到对应的线实体
+          const idStr = typeof pickedEntity.id === 'string' ? pickedEntity.id : (pickedEntity.id || '')
+          let entityData = null
+          // 航线上的飞机（平台图标）：右键可切换标牌显示/隐藏
+          if (idStr.startsWith('route-platform-') && !idStr.startsWith('route-platform-label-')) {
+            const routeId = idStr.replace('route-platform-', '')
+            entityData = {
+              type: 'routePlatform',
+              routeId,
+              entity: pickedEntity,
+              labelVisible: this.routeLabelVisible[routeId] !== false
+            }
+          }
           if (!entityData) {
-            // 检查是否是线段上的点
-            for (const lineEntity of this.allEntities) {
-              if (lineEntity.type === 'line' && lineEntity.pointEntities) {
-                if (lineEntity.pointEntities.includes(pickedEntity)) {
-                  entityData = lineEntity
+            // 查找对应的实体数据
+            entityData = this.allEntities.find(e => e.entity === pickedEntity || e === pickedEntity)
+            // 特殊处理：如果点击的是线段上的点，找到对应的线实体
+            if (!entityData) {
+              for (const lineEntity of this.allEntities) {
+                if (lineEntity.type === 'line' && lineEntity.pointEntities) {
+                  if (lineEntity.pointEntities.includes(pickedEntity)) {
+                    entityData = lineEntity
+                    break
+                  }
+                }
+              }
+            }
+            // 特殊处理：如果点击的是威力区的圆心，找到对应的威力区实体
+            if (!entityData) {
+              for (const powerZoneEntity of this.allEntities) {
+                if (powerZoneEntity.type === 'powerZone' && powerZoneEntity.centerEntity === pickedEntity) {
+                  entityData = powerZoneEntity
                   break
                 }
               }
             }
+            // 特殊处理：右键点击航点或航线时，从实体属性解析出 routeId，用于显示航线“上锁/解锁”菜单
+            if (!entityData && pickedEntity.properties) {
+              const now = Cesium.JulianDate.now();
+              const props = pickedEntity.properties.getValue ? pickedEntity.properties.getValue(now) : null;
+              if (props) {
+                const isWp = props.isMissionWaypoint && props.isMissionWaypoint.getValue ? props.isMissionWaypoint.getValue() : props.isMissionWaypoint;
+                const isLine = props.isMissionRouteLine && props.isMissionRouteLine.getValue ? props.isMissionRouteLine.getValue() : props.isMissionRouteLine;
+                if (isWp || isLine) {
+                  let rId = props.routeId;
+                  if (rId && rId.getValue) rId = rId.getValue();
+                  if (rId) entityData = { type: 'route', routeId: rId };
+                }
+              }
+            }
           }
-          if (entityData && entityData.type !== 'route') {
-            // 显示上下文菜单
+          // 航线实体在 allEntities 中可能没有 routeId，从 id 解析
+          if (entityData && entityData.type === 'route' && entityData.id && !entityData.routeId) {
+            entityData = { ...entityData, routeId: entityData.id.replace('route-line-', '') };
+          }
+          if (entityData) {
             this.contextMenu = {
               visible: true,
               position: {
@@ -918,6 +1903,187 @@ export default {
         }
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
     },
+
+    /** 平台图标图形化操作：伸缩框（旋转手柄 + 四角缩放）、拖拽移动、单击选中 */
+    initPlatformIconInteraction() {
+      const canvas = this.viewer.scene.canvas;
+      this.platformIconHandler = new Cesium.ScreenSpaceEventHandler(canvas);
+
+      this.platformIconHandler.setInputAction((click) => {
+        if (this.isDrawing || this.rotatingPlatformIcon) return;
+        const picked = this.viewer.scene.pick(click.position);
+        this.clickedOnEmpty = !Cesium.defined(picked) || !picked.id;
+        if (picked && picked.id) {
+          const idStr = typeof picked.id === 'string' ? picked.id : (picked.id.id || '');
+          if (idStr.endsWith('-scale-frame')) {
+            this.clickedOnEmpty = false;
+            return;
+          }
+          const handleInfo = this.getPlatformIconDataFromHandleId(idStr);
+          if (handleInfo) {
+            this.clickedOnEmpty = false;
+            if (handleInfo.type === 'rotate') {
+              this.draggingRotateHandle = handleInfo.entityData;
+              this.platformIconDragCameraEnabled = this.viewer.scene.screenSpaceCameraController.enableInputs;
+              this.viewer.scene.screenSpaceCameraController.enableInputs = false;
+              return;
+            }
+            if (handleInfo.type === 'scale') {
+              this.draggingScaleHandle = { entityData: handleInfo.entityData, cornerIndex: handleInfo.cornerIndex };
+              this.platformIconDragCameraEnabled = this.viewer.scene.screenSpaceCameraController.enableInputs;
+              this.viewer.scene.screenSpaceCameraController.enableInputs = false;
+              return;
+            }
+          }
+          const entityData = this.allEntities.find(e => e.type === 'platformIcon' && e.entity === picked.id);
+          if (entityData) {
+            this.pendingDragIcon = entityData;
+            this.dragStartScreenPos = { x: click.position.x, y: click.position.y };
+            return;
+          }
+        }
+      }, Cesium.ScreenSpaceEventType.LEFT_DOWN);
+
+      this.platformIconHandler.setInputAction((movement) => {
+        if (this.draggingRotateHandle) {
+          const ed = this.draggingRotateHandle;
+          if (ed.entity && ed.entity.position) {
+            const now = Cesium.JulianDate.now();
+            const position = ed.entity.position.getValue(now);
+            if (position) {
+              const screenPos = Cesium.SceneTransforms.worldToWindowCoordinates(this.viewer.scene, position);
+              if (screenPos) {
+                const dx = movement.endPosition.x - screenPos.x;
+                const dy = movement.endPosition.y - screenPos.y;
+                const screenAngle = Math.atan2(dy, dx);
+                ed.entity.billboard.rotation = -screenAngle;
+                let headingDeg = (screenAngle + Math.PI / 2) * (180 / Math.PI);
+                if (headingDeg < 0) headingDeg += 360;
+                if (headingDeg >= 360) headingDeg -= 360;
+                ed.heading = Math.round(headingDeg);
+              }
+            }
+          }
+          this.viewer.scene.requestRender();
+          return;
+        }
+        if (this.draggingScaleHandle) {
+          const { entityData: ed, cornerIndex } = this.draggingScaleHandle;
+          const cartesian = this.viewer.camera.pickEllipsoid(movement.endPosition, this.viewer.scene.globe.ellipsoid);
+          if (cartesian) {
+            const { lat: newLat, lng: newLng } = this.cartesianToLatLng(cartesian);
+            const lng = ed.lng;
+            const lat = ed.lat;
+            const dpp = this.getDegreesPerPixelAt(lng, lat);
+            const baseHalf = this.DESIRED_BOX_HALF_PX * Math.min(dpp.degPerPxLng, dpp.degPerPxLat);
+            let newHalfDeg;
+            if (cornerIndex === 0) newHalfDeg = Math.min(newLng - lng, newLat - lat);
+            else if (cornerIndex === 1) newHalfDeg = Math.min(lng - newLng, newLat - lat);
+            else if (cornerIndex === 2) newHalfDeg = Math.min(lng - newLng, lat - newLat);
+            else newHalfDeg = Math.min(newLng - lng, lat - newLat);
+            if (newHalfDeg > 0.0001 && baseHalf > 1e-10) {
+              ed.iconScale = Math.max(0.2, Math.min(3, newHalfDeg / baseHalf));
+              this.updatePlatformIconBillboardSize(ed);
+              this.updateTransformHandlePositions(ed);
+            }
+          }
+          return;
+        }
+        if (this.pendingDragIcon) {
+          const dx = movement.endPosition.x - this.dragStartScreenPos.x;
+          const dy = movement.endPosition.y - this.dragStartScreenPos.y;
+          if (Math.sqrt(dx * dx + dy * dy) > (this.PLATFORM_DRAG_THRESHOLD_PX || 10)) {
+            this.draggingPlatformIcon = this.pendingDragIcon;
+            this.pendingDragIcon = null;
+            this.platformIconDragCameraEnabled = this.viewer.scene.screenSpaceCameraController.enableInputs;
+            this.viewer.scene.screenSpaceCameraController.enableInputs = false;
+          }
+        }
+        if (this.draggingPlatformIcon) {
+          const cartesian = this.viewer.camera.pickEllipsoid(movement.endPosition, this.viewer.scene.globe.ellipsoid);
+          if (cartesian) {
+            this.draggingPlatformIcon.entity.position = cartesian;
+            const { lat, lng } = this.cartesianToLatLng(cartesian);
+            this.draggingPlatformIcon.lat = lat;
+            this.draggingPlatformIcon.lng = lng;
+            if (this.selectedPlatformIcon === this.draggingPlatformIcon) {
+              this.updateTransformHandlePositions(this.draggingPlatformIcon);
+            }
+          }
+          this.viewer.scene.requestRender();
+        }
+        if (this.rotatingPlatformIcon && this.rotatingPlatformIcon.entity && this.rotatingPlatformIcon.entity.position) {
+          const now = Cesium.JulianDate.now();
+          const position = this.rotatingPlatformIcon.entity.position.getValue(now);
+          if (position) {
+            const screenPos = Cesium.SceneTransforms.worldToWindowCoordinates(this.viewer.scene, position);
+            if (screenPos) {
+              const dx = movement.endPosition.x - screenPos.x;
+              const dy = movement.endPosition.y - screenPos.y;
+              const screenAngle = Math.atan2(dy, dx);
+              this.rotatingPlatformIcon.entity.billboard.rotation = -screenAngle;
+              let headingDeg = (screenAngle + Math.PI / 2) * (180 / Math.PI);
+              if (headingDeg < 0) headingDeg += 360;
+              if (headingDeg >= 360) headingDeg -= 360;
+              this.rotatingPlatformIcon.heading = Math.round(headingDeg);
+            }
+          }
+          this.viewer.scene.requestRender();
+        }
+      }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+
+      this.platformIconHandler.setInputAction(() => {
+        if (this.pendingDragIcon) {
+          if (this.selectedPlatformIcon === this.pendingDragIcon) {
+            this.removeTransformHandles(this.selectedPlatformIcon);
+            this.selectedPlatformIcon = null;
+          } else {
+            if (this.selectedPlatformIcon) this.removeTransformHandles(this.selectedPlatformIcon);
+            this.selectedPlatformIcon = this.pendingDragIcon;
+            this.showTransformHandles(this.pendingDragIcon);
+          }
+          this.pendingDragIcon = null;
+          this.dragStartScreenPos = null;
+        }
+        if (this.clickedOnEmpty && this.selectedPlatformIcon) {
+          this.removeTransformHandles(this.selectedPlatformIcon);
+          this.selectedPlatformIcon = null;
+        }
+        this.clickedOnEmpty = false;
+        if (this.draggingRotateHandle) {
+          this.$emit('platform-icon-updated', this.draggingRotateHandle);
+          this.viewer.scene.screenSpaceCameraController.enableInputs = this.platformIconDragCameraEnabled;
+          this.draggingRotateHandle = null;
+        }
+        if (this.draggingScaleHandle) {
+          this.$emit('platform-icon-updated', this.draggingScaleHandle.entityData);
+          this.viewer.scene.screenSpaceCameraController.enableInputs = this.platformIconDragCameraEnabled;
+          this.draggingScaleHandle = null;
+        }
+        if (this.draggingPlatformIcon) {
+          this.$emit('platform-icon-updated', this.draggingPlatformIcon);
+          this.viewer.scene.screenSpaceCameraController.enableInputs = this.platformIconDragCameraEnabled;
+          this.draggingPlatformIcon = null;
+        }
+        if (this.rotatingPlatformIcon) {
+          this.$emit('platform-icon-updated', this.rotatingPlatformIcon);
+          this.viewer.scene.screenSpaceCameraController.enableInputs = this.platformIconDragCameraEnabled;
+          this.rotatingPlatformIcon = null;
+          this.platformIconRotateTip = '';
+        }
+      }, Cesium.ScreenSpaceEventType.LEFT_UP);
+
+      const onCameraMoveEnd = () => {
+        if (this.selectedPlatformIcon && this.selectedPlatformIcon.transformHandles) {
+          this.updateTransformHandlePositions(this.selectedPlatformIcon);
+        }
+      };
+      this.viewer.camera.moveEnd.addEventListener(onCameraMoveEnd);
+      this.platformIconCameraListener = () => {
+        this.viewer.camera.moveEnd.removeEventListener(onCameraMoveEnd);
+      };
+    },
+
     // 初始化鼠标悬停事件处理器
     initHoverHandler() {
       // 创建屏幕空间事件处理器
@@ -948,21 +2114,49 @@ export default {
           }
           // 如果是线实体，显示长度信息
           if (entityData && entityData.type === 'line') {
-            const length = this.calculateLineLength(entityData.positions)
-            // 根据当前方位角类型计算方位角
-            const bearingType = entityData.bearingType || 'true';
-            const bearing = bearingType === 'magnetic'
-              ? this.calculateMagneticBearing(entityData.positions)
-              : this.calculateTrueBearing(entityData.positions);
-            // 显示小框提示
-            this.hoverTooltip = {
-              visible: true,
-              content: `${(length / 1000).toFixed(1)}km ，${bearingType === 'magnetic' ? '磁' : '真'}：${bearing.toFixed(1)}°`,
-              position: {
-                x: movement.endPosition.x + 10,
-                y: movement.endPosition.y - 10
+            // 找到鼠标悬停在线段的哪一段
+            const segmentIndex = this.findClosestSegment(entityData.positions, movement.endPosition);
+            if (segmentIndex !== -1) {
+              // 计算累计长度（前segmentIndex+1段的长度）
+              let cumulativeLength = 0;
+              for (let i = 0; i < segmentIndex + 1; i++) {
+                if (i < entityData.positions.length - 1) {
+                  cumulativeLength += Cesium.Cartesian3.distance(entityData.positions[i], entityData.positions[i + 1]);
+                }
               }
-            };
+              // 计算当前段的方位角
+              const currentSegmentPositions = [entityData.positions[segmentIndex], entityData.positions[segmentIndex + 1]];
+              // 根据当前方位角类型计算方位角
+              const bearingType = entityData.bearingType || 'true';
+              const bearing = bearingType === 'magnetic'
+                ? this.calculateMagneticBearing(currentSegmentPositions)
+                : this.calculateTrueBearing(currentSegmentPositions);
+              // 根据工具模式决定显示格式
+              if (this.toolMode === 'ranging') {
+                // 测距模式：使用千米，简化格式
+                this.hoverTooltip = {
+                  visible: true,
+                  content: `${(cumulativeLength / 1000).toFixed(1)}km ，${bearingType === 'magnetic' ? '磁' : '真'}：${bearing.toFixed(1)}°`,
+                  position: {
+                    x: movement.endPosition.x + 10,
+                    y: movement.endPosition.y - 10
+                  }
+                };
+              } else {
+                // 空域模式：使用米，完整格式
+                this.hoverTooltip = {
+                  visible: true,
+                  content: `累计长度：${cumulativeLength.toFixed(2)} 米\n${bearingType === 'magnetic' ? '磁方位' : '真方位'}：${bearing.toFixed(2)}°`,
+                  position: {
+                    x: movement.endPosition.x + 10,
+                    y: movement.endPosition.y - 10
+                  }
+                };
+              }
+            } else {
+              // 如果没有找到对应的段，隐藏信息
+              this.hoverTooltip.visible = false;
+            }
           } else {
             // 如果不是线实体，隐藏信息
             this.hoverTooltip.visible = false;
@@ -1018,6 +2212,32 @@ export default {
       controller.enableLook = false
       scene.screenSpaceCameraController.maximumPitch = 0
       scene.screenSpaceCameraController.minimumPitch = 0
+      // 限制最小相机高度，防止双击时地图放大过多（单位：米）
+      controller.minimumZoomDistance = 2000
+    },
+    /** 在可能触发缩放的实体点击前保存相机状态，供双击时恢复 */
+    saveCameraStateBeforeEntityClick() {
+      if (!this.viewer || !this.viewer.camera) return
+      const cam = this.viewer.camera
+      const carto = cam.positionCartographic
+      this.cameraStateBeforeEntityClick = {
+        longitude: carto.longitude,
+        latitude: carto.latitude,
+        height: carto.height,
+        heading: cam.heading,
+        pitch: cam.pitch,
+        roll: cam.roll
+      }
+    },
+    /** 双击实体后恢复相机，避免误触导致地图放大过多 */
+    restoreCameraStateAfterEntityDoubleClick() {
+      if (!this.viewer || !this.viewer.camera || !this.cameraStateBeforeEntityClick) return
+      const s = this.cameraStateBeforeEntityClick
+      this.viewer.camera.setView({
+        destination: Cesium.Cartesian3.fromRadians(s.longitude, s.latitude, s.height),
+        orientation: { heading: s.heading, pitch: s.pitch, roll: s.roll }
+      })
+      this.cameraStateBeforeEntityClick = null
     },
     loadOfflineMap() {
       this.viewer.imageryLayers.removeAll()
@@ -1062,7 +2282,7 @@ export default {
           this.viewer.entities.add({
             position: Cesium.Cartesian3.fromDegrees(lon, lat),
             label: {
-              text: `${lat}°N\n${lon}°E`,
+              text: `${this.degreesToDMS(lat)}N\n${this.degreesToDMS(lon)}E`,
               font: '12px sans-serif',
               fillColor: Cesium.Color.BLACK,
               outlineColor: Cesium.Color.WHITE,
@@ -1148,11 +2368,18 @@ export default {
         const entity = allEntities[i];
         if (entity.id && (
           entity.id.toString().startsWith('temp_wp_') ||
-          entity.id.toString().includes('temp-preview')
+          entity.id.toString().includes('temp-preview') ||
+          entity.id === 'temp_hold_preview'
         )) {
           this.viewer.entities.remove(entity);
         }
       }
+      if (this.tempHoldEntity) {
+        try { this.viewer.entities.remove(this.tempHoldEntity); } catch (e) {}
+        this.tempHoldEntity = null;
+      }
+      this.missionPendingHold = null;
+      this.missionHoldParamsByIndex = {};
       //清理已知的预览实体
       if (this.tempEntity) {
         this.viewer.entities.remove(this.tempEntity);
@@ -1237,15 +2464,28 @@ export default {
             const length = this.calculateLineLength(tempPositions);
             // 默认为真方位，因为绘制过程中还没有bearingType属性
             const bearing = this.calculateTrueBearing(tempPositions);
-            // 更新小框提示，显示实时长度和真方位角
-            this.hoverTooltip = {
-              visible: true,
-              content: `长度：${length.toFixed(2)} 米\n真方位：${bearing.toFixed(2)}°`,
-              position: {
-                x: movement.endPosition.x + 10,
-                y: movement.endPosition.y - 10
-              }
-            };
+            // 根据工具模式决定显示格式
+            if (this.toolMode === 'ranging') {
+              // 测距模式：使用千米，简化格式
+              this.hoverTooltip = {
+                visible: true,
+                content: `${(length / 1000).toFixed(1)}km ，真：${bearing.toFixed(1)}°`,
+                position: {
+                  x: movement.endPosition.x + 10,
+                  y: movement.endPosition.y - 10
+                }
+              };
+            } else {
+              // 空域模式：使用米，完整格式
+              this.hoverTooltip = {
+                visible: true,
+                content: `长度：${length.toFixed(2)} 米\n真方位：${bearing.toFixed(2)}°`,
+                position: {
+                  x: movement.endPosition.x + 10,
+                  y: movement.endPosition.y - 10
+                }
+              };
+            }
           } else {
             // 如果没有点，隐藏提示
             this.hoverTooltip.visible = false;
@@ -1283,27 +2523,24 @@ export default {
             }
             this.tempEntity = this.viewer.entities.add({
               polyline: {
-                positions: this.drawingPoints,
+                positions: this.getPolylinePositionsStraightIn2D([...this.drawingPoints], false),
                 width: this.defaultStyles.line.width,
-                material: Cesium.Color.fromCssColorString(this.defaultStyles.line.color),
+                material: this.getPolylineSolidMaterial(this.defaultStyles.line.color),
                 clampToGround: true
               }
             });
           }
-          // 创建新的预览虚线（使用 CallbackProperty 实现实时更新）
+          // 创建新的预览线（与测距线一致：轮廓材质，2D 下直线）
           this.tempPreviewEntity = this.viewer.entities.add({
             polyline: {
               positions: new Cesium.CallbackProperty(() => {
-                if (this.activeCursorPosition) {
-                  return [this.drawingPoints[this.drawingPoints.length - 1], this.activeCursorPosition];
+                if (this.activeCursorPosition && this.drawingPoints.length > 0) {
+                  return this.getPolylinePositionsStraightIn2D([this.drawingPoints[this.drawingPoints.length - 1], this.activeCursorPosition], false);
                 }
-                return [this.drawingPoints[this.drawingPoints.length - 1]];
+                return this.drawingPoints.length > 0 ? [this.drawingPoints[this.drawingPoints.length - 1]] : [];
               }, false),
               width: this.defaultStyles.line.width,
-              material: new Cesium.PolylineDashMaterialProperty({
-                color: Cesium.Color.fromCssColorString(this.defaultStyles.line.color),
-                dashLength: 16
-              }),
+              material: this.getPolylineSolidMaterial(this.defaultStyles.line.color),
               clampToGround: true
             }
           });
@@ -1410,15 +2647,14 @@ export default {
               polyline: {
                 // positions 使用 CallbackProperty 实现动态闭合线
                 positions: new Cesium.CallbackProperty(() => {
-                  if (this.activeCursorPosition) {
-                    // 闭合回路：[所有点, 鼠标位置, 回到起点]
-                    return [...this.drawingPoints, this.activeCursorPosition, this.drawingPoints[0]];
+                  if (this.activeCursorPosition && this.drawingPoints.length >= 2) {
+                    return this.getPolylinePositionsStraightIn2D([...this.drawingPoints, this.activeCursorPosition], true);
                   }
                   return this.drawingPoints;
                 }, false),
                 width: this.defaultStyles.polygon.width,
-                // 边框使用实线，表示正在编辑中
-                material: Cesium.Color.fromCssColorString(this.defaultStyles.polygon.color),
+                // 边框与测距线一致：轮廓材质，2D 下直线
+                material: this.getPolylineSolidMaterial(this.defaultStyles.polygon.color),
                 clampToGround: true
               }
             });
@@ -1439,12 +2675,6 @@ export default {
     finishPolygonDrawing() {
       const positions = [...this.drawingPoints]
       const entity = this.addPolygonEntity(positions)
-      // 计算面积
-      const area = this.calculatePolygonArea(positions)
-      this.measurementResult = {
-        area: area,
-        type: 'polygon'
-      }
       // 重置绘制点数组，保持绘制状态以继续绘制
       this.drawingPoints = []
       if (this.tempEntity) {
@@ -1496,26 +2726,13 @@ export default {
                 // 关键：使用 CallbackProperty 动态计算矩形边框线
                 positions: new Cesium.CallbackProperty(() => {
                   if (this.drawingPoints.length > 0 && this.activeCursorPosition) {
-                    // 计算矩形的四个角点
                     const rect = Cesium.Rectangle.fromCartesianArray([this.drawingPoints[0], this.activeCursorPosition]);
-                    const west = rect.west;
-                    const south = rect.south;
-                    const east = rect.east;
-                    const north = rect.north;
-
-                    // 创建四个角点的笛卡尔坐标
-                    const southwest = Cesium.Cartesian3.fromRadians(west, south);
-                    const southeast = Cesium.Cartesian3.fromRadians(east, south);
-                    const northeast = Cesium.Cartesian3.fromRadians(east, north);
-                    const northwest = Cesium.Cartesian3.fromRadians(west, north);
-
-                    // 返回闭合的边框线位置数组
-                    return [southwest, southeast, northeast, northwest, southwest];
+                    return this.getRectangleBorderPositions(rect);
                   }
                   return [];
                 }, false),
                 width: this.defaultStyles.rectangle.width,
-                material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color),
+                material: this.getPolylineSolidMaterial(this.defaultStyles.rectangle.color),
                 clampToGround: true // 贴地
               }
             });
@@ -1547,20 +2764,8 @@ export default {
       this.entityCounter++;
       const id = `rectangle_${this.entityCounter}`;
 
-      // 计算矩形的四个角点
-      const west = rect.west;
-      const south = rect.south;
-      const east = rect.east;
-      const north = rect.north;
-
-      // 创建四个角点的笛卡尔坐标
-      const southwest = Cesium.Cartesian3.fromRadians(west, south);
-      const southeast = Cesium.Cartesian3.fromRadians(east, south);
-      const northeast = Cesium.Cartesian3.fromRadians(east, north);
-      const northwest = Cesium.Cartesian3.fromRadians(west, north);
-
-      // 创建边框线的位置数组（闭合）
-      const borderPositions = [southwest, southeast, northeast, northwest, southwest];
+      // 创建边框线位置（按等经度/等纬度采样，2D 缩小时仍为直线）
+      const borderPositions = this.getRectangleBorderPositions(rect);
 
       // 创建一个复合实体，包含填充和边框
       const finalEntity = this.viewer.entities.add({
@@ -1575,7 +2780,7 @@ export default {
         polyline: {
           positions: borderPositions,
           width: this.defaultStyles.rectangle.width,
-          material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color),
+          material: this.getPolylineSolidMaterial(this.defaultStyles.rectangle.color),
           clampToGround: true
         }
       });
@@ -1590,16 +2795,10 @@ export default {
         borderColor: this.defaultStyles.rectangle.color, // 边框颜色
         opacity: this.defaultStyles.rectangle.opacity,
         width: this.defaultStyles.rectangle.width,
-        label: `矩形 ${this.entityCounter}`
+        label: `矩形空域 ${this.entityCounter}`
       };
       this.allEntities.push(entityData);
-      // 5. 计算并显示面积
-      const area = this.calculateRectangleArea(rect);
-      this.measurementResult = {
-        area: area,
-        type: 'rectangle'
-      };
-      // 6. 重置状态，保持绘制状态以继续绘制
+      // 5. 重置状态，保持绘制状态以继续绘制
       this.drawingPoints = [];
     },
     // 计算矩形面积（辅助方法）
@@ -1746,7 +2945,7 @@ export default {
                       }
                     }, false),
                     width: this.defaultStyles.circle.width,
-                    material: Cesium.Color.fromCssColorString(this.defaultStyles.circle.color),
+                    material: this.getPolylineSolidMaterial(this.defaultStyles.circle.color),
                     clampToGround: true
                   }
                 });
@@ -1806,7 +3005,7 @@ export default {
         polyline: {
           positions: circlePositions,
           width: this.defaultStyles.circle.width,
-          material: Cesium.Color.fromCssColorString(this.defaultStyles.circle.color),
+          material: this.getPolylineSolidMaterial(this.defaultStyles.circle.color),
           clampToGround: true
         }
       });
@@ -1822,21 +3021,34 @@ export default {
         opacity: this.defaultStyles.circle.opacity,
         width: this.defaultStyles.circle.width,
         radius: radius,
-        label: `圆形 ${this.entityCounter}`
+        label: `圆形空域 ${this.entityCounter}`
       };
       this.allEntities.push(entityData);
-      // 5. 计算面积 (π * r²) 并显示
-      // 半径单位是米，面积单位是平方米
-      const area = Math.PI * Math.pow(radius, 2);
-      this.measurementResult = {
-        radius: radius, // 也可以额外显示半径
-        area: area,
-        type: 'circle'
-      };
-      // 6. 重置状态，保持绘制状态以继续绘制
+      // 5. 重置状态，保持绘制状态以继续绘制
       this.drawingPoints = [];
       this.activeCursorPosition = null;
     },
+    ellipseHeadingFromCenterAndMajor(center, majorEnd) {
+      const ellipsoid = this.viewer.scene.globe.ellipsoid;
+      const enu = Cesium.Transforms.eastNorthUpToFixedFrame(center);
+      const toMajor = Cesium.Cartesian3.subtract(majorEnd, center, new Cesium.Cartesian3());
+      const e = Cesium.Cartesian3.dot(toMajor, Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3()));
+      const n = Cesium.Cartesian3.dot(toMajor, Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3()));
+      return Math.atan2(e, n);
+    },
+    ellipseSemiMinorFromThreePoints(center, majorEnd, thirdPoint) {
+      const ellipsoid = this.viewer.scene.globe.ellipsoid;
+      const enu = Cesium.Transforms.eastNorthUpToFixedFrame(center);
+      const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+      const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+      const toMajor = Cesium.Cartesian3.subtract(majorEnd, center, new Cesium.Cartesian3());
+      const heading = Math.atan2(Cesium.Cartesian3.dot(toMajor, east), Cesium.Cartesian3.dot(toMajor, north));
+      const toThird = Cesium.Cartesian3.subtract(thirdPoint, center, new Cesium.Cartesian3());
+      const e3 = Cesium.Cartesian3.dot(toThird, east);
+      const n3 = Cesium.Cartesian3.dot(toThird, north);
+      const minorComponent = -e3 * Math.sin(heading) + n3 * Math.cos(heading);
+      return Math.abs(minorComponent);
+    },
     // 绘制扇形
     startSectorDrawing() {
       // 重置绘制状态
@@ -1871,10 +3083,7 @@ export default {
                   return [];
                 }, false),
                 width: this.defaultStyles.sector.width,
-                material: new Cesium.PolylineDashMaterialProperty({
-                  color: Cesium.Color.fromCssColorString(this.defaultStyles.sector.color),
-                  dashLength: 16
-                }),
+                material: this.getPolylineSolidMaterial(this.defaultStyles.sector.color),
                 clampToGround: true
               }
             });
@@ -1930,7 +3139,7 @@ export default {
                   return [];
                 }, false),
                 width: this.defaultStyles.sector.width,
-                material: Cesium.Color.fromCssColorString(this.defaultStyles.sector.color),
+                material: this.getPolylineSolidMaterial(this.defaultStyles.sector.color),
                 clampToGround: true
               }
             });
@@ -1964,7 +3173,7 @@ export default {
       // 3. 创建最终显示的静态实体
       const finalEntity = this.viewer.entities.add({
         id: 'sector-' + new Date().getTime(),
-        name: `扇形 ${this.entityCounter}`,
+        name: `扇形空域 ${this.entityCounter}`,
         // 填充部分
         polygon: {
           hierarchy: new Cesium.PolygonHierarchy(positions),
@@ -1976,7 +3185,7 @@ export default {
         polyline: {
           positions: positions,
           width: this.defaultStyles.sector.width,
-          material: Cesium.Color.fromCssColorString(this.defaultStyles.sector.color),
+          material: this.getPolylineSolidMaterial(this.defaultStyles.sector.color),
           clampToGround: true
         }
       });
@@ -1995,14 +3204,14 @@ export default {
         borderColor: this.defaultStyles.sector.color, // 边框颜色
         opacity: 0.5,
         width: this.defaultStyles.sector.width,
-        label: `扇形 ${this.entityCounter}`
+        label: `扇形空域 ${this.entityCounter}`
       };
       this.allEntities.push(entityData);
       // 5. 重置状态，保持绘制状态以继续绘制
       this.drawingPoints = [];
     },
     // 生成圆形的点，用于绘制边框线
-    generateCirclePositions(center, radius, numPoints = 128) {
+    generateCirclePositions(center, radius, numPoints = 192) {
       const positions = [];
       const ellipsoid = this.viewer.scene.globe.ellipsoid;
 
@@ -2079,7 +3288,7 @@ export default {
       // 确保角度差不为零
       angleDiff = Math.max(0.01, angleDiff);
       // 计算扇形的顶点数（根据角度差确定，确保平滑）
-      const numPoints = Math.max(10, Math.ceil(angleDiff * 180 / Math.PI / 5));
+      const numPoints = Math.max(16, Math.ceil(angleDiff * 180 / Math.PI / 3));
       const angleStep = angleDiff / (numPoints - 1);
       // 生成扇形的顶点（顺时针方向）
       for (let i = 0; i < numPoints; i++) {
@@ -2136,7 +3345,7 @@ export default {
                   return [];
                 }, false),
                 width: 8, // 增加宽度以获得更大的箭头头部
-                // 使用箭头材质
+                // 使用箭头材质以显示箭头方向
                 material: new Cesium.PolylineArrowMaterialProperty(
                   Cesium.Color.fromCssColorString(this.defaultStyles.arrow.color)
                 ),
@@ -2470,13 +3679,14 @@ export default {
     addLineEntity(positions, pointEntities = []) {
       this.entityCounter++
       const id = `line_${this.entityCounter}`
+      const straightPositions = this.getPolylinePositionsStraightIn2D(positions, false)
       const entity = this.viewer.entities.add({
         id: id,
         name: `线 ${this.entityCounter}`,
         polyline: {
-          positions: positions,
+          positions: straightPositions,
           width: this.defaultStyles.line.width,
-          material: Cesium.Color.fromCssColorString(this.defaultStyles.line.color),
+          material: this.getPolylineSolidMaterial(this.defaultStyles.line.color),
           clampToGround: true
         }
       })
@@ -2502,24 +3712,20 @@ export default {
     addPolygonEntity(positions) {
       this.entityCounter++
       const id = `polygon_${this.entityCounter}`
-      // 闭合多边形
       const polygonPositions = [...positions, positions[0]]
-      // 创建一个复合实体，包含填充和边框
+      const straightBorder = this.getPolylinePositionsStraightIn2D(polygonPositions, false)
       const entity = this.viewer.entities.add({
         id: id,
         name: `面 ${this.entityCounter}`,
-        // 填充部分
         polygon: {
           hierarchy: new Cesium.PolygonHierarchy(polygonPositions),
-          // 初始无填充
           material: Cesium.Color.TRANSPARENT,
           clampToGround: true
         },
-        // 边框部分
         polyline: {
-          positions: polygonPositions,
+          positions: straightBorder,
           width: this.defaultStyles.polygon.width,
-          material: Cesium.Color.fromCssColorString(this.defaultStyles.polygon.color),
+          material: this.getPolylineSolidMaterial(this.defaultStyles.polygon.color),
           clampToGround: true
         }
       })
@@ -2533,7 +3739,7 @@ export default {
         borderColor: this.defaultStyles.polygon.color,
         opacity: 0,
         width: this.defaultStyles.polygon.width,
-        label: `面 ${this.entityCounter}`
+        label: `多边形空域 ${this.entityCounter}`
       }
       this.allEntities.push(entityData)
       entity.clickHandler = (e) => {
@@ -2547,7 +3753,7 @@ export default {
       const id = `rectangle_${this.entityCounter}`
       const entity = this.viewer.entities.add({
         id: id,
-        name: `矩形 ${this.entityCounter}`,
+        name: `矩形空域 ${this.entityCounter}`,
         rectangle: {
           coordinates: coordinates,
           // 移除填充颜色，只显示边框
@@ -2568,7 +3774,7 @@ export default {
       const id = `circle_${this.entityCounter}`
       const entity = this.viewer.entities.add({
         id: id,
-        name: `圆形 ${this.entityCounter}`,
+        name: `圆形空域 ${this.entityCounter}`,
         position: center, // 圆心位置
         // 【优化】使用 ellipse (椭圆) 绘制圆形
         ellipse: {
@@ -2586,6 +3792,113 @@ export default {
       return entity
     },
     // ================== 工具方法 ==================
+    /** 生成普通纯色折线材质（无轮廓/发光） */
+    getPolylineSolidMaterial(cssColor) {
+      const color = Cesium.Color.fromCssColorString(cssColor)
+      return new Cesium.ColorMaterialProperty(color)
+    },
+    /** 根据浏览器缩放比例设置渲染分辨率，减轻 80% 等缩放下线条锯齿 */
+    applyResolutionScale() {
+      if (!this.viewer || !this.viewer.cesiumWidget) return
+      const vv = window.visualViewport
+      const scale = (vv && typeof vv.scale === 'number') ? vv.scale : 1
+      // 始终使用至少 2.0 倍超采样，80% 缩放下再按比例提高（上限 2.5），显著减轻锯齿
+      let resolutionScale = 2.0
+      if (scale > 0 && scale < 1) {
+        resolutionScale = Math.min(2.5, 1 / scale)
+        if (resolutionScale < 2.0) resolutionScale = 2.0
+      }
+      this.viewer.resolutionScale = resolutionScale
+      try {
+        if (typeof this.viewer.cesiumWidget.resize === 'function') {
+          this.viewer.cesiumWidget.resize()
+        }
+      } catch (e) { /* 忽略 resize 异常 */ }
+      if (this.viewer.scene.requestRenderMode) this.viewer.scene.requestRender()
+    },
+    /** 监听浏览器缩放/窗口变化，更新 resolutionScale；返回取消监听的函数 */
+    setupResolutionScaleListener() {
+      const onResize = () => {
+        this.applyResolutionScale()
+      }
+      if (window.visualViewport) {
+        window.visualViewport.addEventListener('resize', onResize)
+        window.visualViewport.addEventListener('scroll', onResize)
+      }
+      window.addEventListener('resize', onResize)
+      return () => {
+        if (window.visualViewport) {
+          window.visualViewport.removeEventListener('resize', onResize)
+          window.visualViewport.removeEventListener('scroll', onResize)
+        }
+        window.removeEventListener('resize', onResize)
+      }
+    },
+    /** 按等经度/等纬度采样矩形边框，使在 2D 地图缩小时仍显示为直线（避免测地线弯弧） */
+    getRectangleBorderPositions(rect, segmentsPerEdge = 48) {
+      const west = rect.west
+      const south = rect.south
+      const east = rect.east
+      const north = rect.north
+      const positions = []
+      const n = Math.max(2, segmentsPerEdge)
+      for (let i = 0; i <= n; i++) {
+        const lon = west + (east - west) * (i / n)
+        positions.push(Cesium.Cartesian3.fromRadians(lon, south))
+      }
+      for (let i = 1; i <= n; i++) {
+        const lat = south + (north - south) * (i / n)
+        positions.push(Cesium.Cartesian3.fromRadians(east, lat))
+      }
+      for (let i = 1; i <= n; i++) {
+        const lon = east - (east - west) * (i / n)
+        positions.push(Cesium.Cartesian3.fromRadians(lon, north))
+      }
+      for (let i = 1; i < n; i++) {
+        const lat = north - (north - south) * (i / n)
+        positions.push(Cesium.Cartesian3.fromRadians(west, lat))
+      }
+      return positions
+    },
+    /** 在 2D 墨卡托下将一段线采样为“直线”（避免测地线弯弧）；返回 Cartesian3 数组含起点到终点 */
+    sampleSegmentStraightIn2D(cartesianA, cartesianB, numSegments = 32) {
+      const cgA = Cesium.Cartographic.fromCartesian(cartesianA)
+      const cgB = Cesium.Cartographic.fromCartesian(cartesianB)
+      const lonA = cgA.longitude
+      const latA = cgA.latitude
+      const lonB = cgB.longitude
+      const latB = cgB.latitude
+      const yA = Math.log(Math.tan(Math.PI / 4 + latA / 2))
+      const yB = Math.log(Math.tan(Math.PI / 4 + latB / 2))
+      const n = Math.max(1, numSegments)
+      const positions = []
+      for (let i = 0; i <= n; i++) {
+        const t = i / n
+        const x = lonA + t * (lonB - lonA)
+        const y = yA + t * (yB - yA)
+        const lat = 2 * Math.atan(Math.exp(y)) - Math.PI / 2
+        positions.push(Cesium.Cartesian3.fromRadians(x, lat))
+      }
+      return positions
+    },
+    /** 将折线/多边形顶点按 2D 墨卡托“直线”采样，使缩放小时仍显示为直；closed 为 true 表示多边形闭合 */
+    getPolylinePositionsStraightIn2D(positions, closed = false, segmentsPerEdge = 32) {
+      if (!positions || positions.length < 2) return positions
+      const n = positions.length
+      const result = []
+      const segs = closed ? n : n - 1
+      for (let seg = 0; seg < segs; seg++) {
+        const i = seg
+        const j = closed ? (seg + 1) % n : seg + 1
+        const sampled = this.sampleSegmentStraightIn2D(positions[i], positions[j], segmentsPerEdge)
+        if (seg === 0) {
+          result.push(...sampled)
+        } else {
+          for (let k = 1; k < sampled.length; k++) result.push(sampled[k])
+        }
+      }
+      return result
+    },
     getClickPosition(pixelPosition) {
       const cartesian = this.viewer.camera.pickEllipsoid(pixelPosition, this.viewer.scene.globe.ellipsoid)
       return cartesian
@@ -2677,20 +3990,45 @@ export default {
       let declination;
 
       if (lngDeg >= 73 && lngDeg <= 135 && latDeg >= 18 && latDeg <= 53) {
-        // 中国地区简化磁偏角模型
-        // 基于2020年数据，每年约变化0.1度
+        // 中国地区简化磁偏角模型（基于WMM2025模型数据）
+        // 注意：中国大部分地区磁偏角偏西（负值），只有新疆、西藏等少数地区偏东（正值）
+        // 数据来源：NOAA WMM-2025模型
         const year = new Date().getFullYear();
-        const yearOffset = (year - 2020) * 0.1;
+        const yearOffset = (year - 2025) * 0.04;
 
         if (lngDeg < 100) {
-          // 西部地区
-          declination = 2.0 - yearOffset;
+          // 西部地区（新疆、西藏等）
+          if (latDeg > 40) {
+            // 西北地区（新疆北部）
+            declination = 3.0 - yearOffset;
+          } else if (latDeg > 32) {
+            // 西南地区（四川、重庆等）
+            declination = -2.0 - yearOffset;
+          } else {
+            // 西藏地区
+            declination = 1.0 - yearOffset;
+          }
         } else if (lngDeg < 115) {
-          // 中部地区
-          declination = 1.0 - yearOffset;
+          // 中部地区（华北、华中）
+          if (latDeg > 38) {
+            // 华北地区（北京等）
+            declination = -7.5 - yearOffset;
+          } else if (latDeg > 32) {
+            // 华中北部
+            declination = -5.0 - yearOffset;
+          } else {
+            // 华中南部
+            declination = -3.5 - yearOffset;
+          }
         } else {
-          // 东部地区
-          declination = 0.5 - yearOffset;
+          // 东部地区（华东、华南）
+          if (latDeg > 35) {
+            // 华东地区（上海等）
+            declination = -5.5 - yearOffset;
+          } else {
+            // 华南地区（广州、深圳等）
+            declination = -2.5 - yearOffset;
+          }
         }
       } else {
         // 其他地区默认磁偏角为0
@@ -2717,8 +4055,8 @@ export default {
       // 计算磁偏角
       const declination = this.calculateMagneticDeclination(startLat, startLng);
 
-      // 计算磁方位角（真方位角加上磁偏角）
-      let magneticBearing = trueBearing + declination;
+      // 计算磁方位角（真方位角减去磁偏角）
+      let magneticBearing = trueBearing - declination;
 
       // 调整到0-360范围
       return (magneticBearing + 360) % 360;
@@ -2768,7 +4106,7 @@ export default {
           break
         case 'line':
           if (entity.polyline) {
-            entity.polyline.material = Cesium.Color.fromCssColorString(data.color)
+            entity.polyline.material = this.getPolylineSolidMaterial(data.color)
             entity.polyline.width = data.width
           }
           break
@@ -2777,7 +4115,7 @@ export default {
             entity.polygon.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
           }
           if (entity.polyline) {
-            entity.polyline.material = Cesium.Color.fromCssColorString(data.borderColor || data.color)
+            entity.polyline.material = this.getPolylineSolidMaterial(data.borderColor || data.color)
             entity.polyline.width = data.width
           }
           break
@@ -2786,7 +4124,7 @@ export default {
             entity.rectangle.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
           }
           if (entity.polyline) {
-            entity.polyline.material = Cesium.Color.fromCssColorString(data.borderColor || data.color)
+            entity.polyline.material = this.getPolylineSolidMaterial(data.borderColor || data.color)
             entity.polyline.width = data.width
           }
           break
@@ -2795,7 +4133,31 @@ export default {
             entity.ellipse.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
           }
           if (entity.polyline) {
-            entity.polyline.material = Cesium.Color.fromCssColorString(data.borderColor || data.color)
+            entity.polyline.material = this.getPolylineSolidMaterial(data.borderColor || data.color)
+            entity.polyline.width = data.width
+          }
+          break
+        case 'ellipse':
+          if (entity.ellipse) {
+            entity.ellipse.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
+            entity.ellipse.outlineColor = Cesium.Color.fromCssColorString(data.color)
+            entity.ellipse.outlineWidth = data.width
+          }
+          break
+        case 'hold_circle':
+        case 'hold_ellipse':
+          if (entity.ellipse) {
+            entity.ellipse.material = Cesium.Color.TRANSPARENT
+            entity.ellipse.outlineColor = Cesium.Color.fromCssColorString(data.color)
+            entity.ellipse.outlineWidth = data.width || 2
+          }
+          break
+        case 'powerZone':
+          if (entity.ellipse) {
+            entity.ellipse.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
+          }
+          if (entity.polyline) {
+            entity.polyline.material = this.getPolylineSolidMaterial(data.borderColor || data.color)
             entity.polyline.width = data.width
           }
           break
@@ -2804,7 +4166,7 @@ export default {
             entity.polygon.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
           }
           if (entity.polyline) {
-            entity.polyline.material = Cesium.Color.fromCssColorString(data.borderColor || data.color)
+            entity.polyline.material = this.getPolylineSolidMaterial(data.borderColor || data.color)
             entity.polyline.width = data.width
           }
           break
@@ -2837,6 +4199,38 @@ export default {
         this.selectedEntity = null
       }
     },
+    /** 右键航线：上锁/解锁，上锁后该航线不可编辑 */
+    toggleRouteLock() {
+      const ed = this.contextMenu.entityData;
+      if (!ed || ed.type !== 'route' || ed.routeId == null) {
+        this.contextMenu.visible = false;
+        return;
+      }
+      const routeId = ed.routeId;
+      const nextLocked = !this.routeLocked[routeId];
+      this.$set(this.routeLocked, routeId, nextLocked);
+      this.contextMenu.visible = false;
+      this.$message && this.$message.success(nextLocked ? '航线已上锁，无法修改' : '航线已解锁，可以编辑');
+      this.$emit('route-lock-changed', { routeId, locked: nextLocked });
+    },
+
+    /** 右键飞机：切换该航线飞机标牌的显示/隐藏 */
+    toggleRouteLabelVisibility() {
+      const ed = this.contextMenu.entityData
+      if (!ed || ed.type !== 'routePlatform' || ed.routeId == null) {
+        this.contextMenu.visible = false
+        return
+      }
+      const routeId = ed.routeId
+      const nextVisible = !(this.routeLabelVisible[routeId] !== false)
+      this.$set(this.routeLabelVisible, routeId, nextVisible)
+      const labelEntity = this.viewer.entities.getById(`route-platform-label-${routeId}`)
+      if (labelEntity) {
+        labelEntity.show = nextVisible
+      }
+      this.contextMenu.visible = false
+      if (this.viewer.scene.requestRenderMode) this.viewer.scene.requestRender()
+    },
     // 从右键菜单删除实体
     deleteEntityFromContextMenu() {
       if (this.contextMenu.entityData) {
@@ -2857,7 +4251,7 @@ export default {
         // 更新实体数据
         entityData[property] = value
         // 当修改填充色时，默认设置透明度为 20%
-        if (property === 'color' && (entityData.type === 'polygon' || entityData.type === 'rectangle' || entityData.type === 'circle' || entityData.type === 'sector')) {
+        if (property === 'color' && (entityData.type === 'polygon' || entityData.type === 'rectangle' || entityData.type === 'circle' || entityData.type === 'sector' || entityData.type === 'powerZone')) {
           entityData.opacity = 0.2
         }
         // 更新实体样式
@@ -2866,6 +4260,53 @@ export default {
         this.contextMenu.visible = false
       }
     },
+
+    /** 右键「显示伸缩框」：选中该图标并显示旋转/缩放手柄 */
+    showPlatformIconTransformBox() {
+      const fromMenu = this.contextMenu.entityData
+      if (!fromMenu || fromMenu.type !== 'platformIcon' || !fromMenu.entity) {
+        this.contextMenu.visible = false
+        return
+      }
+      const ed = this.allEntities.find(e => e.type === 'platformIcon' && e.id === fromMenu.id) || fromMenu
+      if (!ed.entity) {
+        this.contextMenu.visible = false
+        return
+      }
+      if (ed.lat == null || ed.lng == null) {
+        const now = Cesium.JulianDate.now()
+        const pos = ed.entity.position && ed.entity.position.getValue(now)
+        if (pos) {
+          const ll = this.cartesianToLatLng(pos)
+          ed.lat = ll.lat
+          ed.lng = ll.lng
+        }
+      }
+      if (this.selectedPlatformIcon) this.removeTransformHandles(this.selectedPlatformIcon)
+      this.selectedPlatformIcon = ed
+      this.showTransformHandles(ed)
+      this.contextMenu.visible = false
+      this.viewer.scene.requestRender()
+      this.$message && this.$message.success('已显示伸缩框')
+    },
+
+    /** 位置改为图形化：直接拖动图标即可，无需弹窗 */
+    openPlatformIconPositionDialog() {
+      this.contextMenu.visible = false
+      this.$message && this.$message.info('请直接拖动图标以修改位置')
+    },
+
+    /** 进入旋转模式：移动鼠标设置朝向，单击结束（期间锁定地图） */
+    openPlatformIconHeadingDialog() {
+      const ed = this.contextMenu.entityData
+      if (!ed || ed.type !== 'platformIcon' || !ed.entity) return
+      this.rotatingPlatformIcon = ed
+      this.platformIconRotateTip = '移动鼠标设置朝向，单击结束'
+      this.platformIconDragCameraEnabled = this.viewer.scene.screenSpaceCameraController.enableInputs
+      this.viewer.scene.screenSpaceCameraController.enableInputs = false
+      this.contextMenu.visible = false
+      this.$message && this.$message.info('移动鼠标可调整朝向，单击地图任意处结束')
+    },
     removeEntity(id) {
       // 查找对应的实体数据
       const index = this.allEntities.findIndex(e =>
@@ -2875,6 +4316,12 @@ export default {
       )
       if (index > -1) {
         const entity = this.allEntities[index]
+        // 平台图标：移除伸缩框并清除选中；若已保存到服务端则通知父组件删除
+        if (entity.type === 'platformIcon') {
+          if (entity.serverId) this.$emit('platform-icon-removed', { serverId: entity.serverId })
+          this.removeTransformHandles(entity)
+          if (this.selectedPlatformIcon === entity) this.selectedPlatformIcon = null
+        }
         // 从地图中移除
         if (entity instanceof Cesium.Entity) {
           // 情况 A: 直接是 Cesium Entity 对象
@@ -2889,6 +4336,10 @@ export default {
             this.viewer.entities.remove(pointEntity)
           })
         }
+        // 移除威力区的圆心实体
+        if (entity.type === 'powerZone' && entity.centerEntity) {
+          this.viewer.entities.remove(entity.centerEntity)
+        }
         // 从数组中移除
         this.allEntities.splice(index, 1)
         // 如果删除的是选中的实体，清空选中状态
@@ -2953,6 +4404,14 @@ export default {
                   this.viewer.entities.remove(pointEntity);
                 });
               }
+              if (item.type === 'platformIcon') {
+                this.removeTransformHandles(item);
+                if (this.selectedPlatformIcon === item) this.selectedPlatformIcon = null;
+              }
+              // 移除威力区的圆心实体
+              if (item.type === 'powerZone' && item.centerEntity) {
+                this.viewer.entities.remove(item.centerEntity);
+              }
             } catch (e) {
               console.warn('删除实体失败:', e);
             }
@@ -2999,10 +4458,13 @@ export default {
       const names = {
         point: '点',
         line: '线',
-        polygon: '面',
-        rectangle: '矩形',
-        circle: '圆形',
-        sector: '扇形',
+        polygon: '多边形空域',
+        rectangle: '矩形空域',
+        circle: '圆形空域',
+        ellipse: '椭圆',
+        hold_circle: '圆形盘旋',
+        hold_ellipse: '椭圆盘旋',
+        sector: '扇形空域',
         arrow: '箭头',
         text: '文本',
         image: '图片'
@@ -3025,6 +4487,14 @@ export default {
             points: entity.points
           } : entity.type === 'rectangle' ? {
             coordinates: entity.coordinates
+          } : entity.type === 'ellipse' || entity.type === 'hold_ellipse' ? {
+            center: entity.points && entity.points[0] ? entity.points[0] : (entity.positions && entity.positions[0] ? this.cartesianToLatLng(entity.positions[0]) : null),
+            semiMajorAxis: entity.semiMajorAxis,
+            semiMinorAxis: entity.semiMinorAxis,
+            headingDeg: entity.headingDeg
+          } : (entity.type === 'circle' || entity.type === 'hold_circle') ? {
+            center: entity.points && entity.points[0] ? entity.points[0] : (entity.positions && entity.positions[0] ? this.cartesianToLatLng(entity.positions[0]) : null),
+            radius: entity.radius
           } : {
             center: entity.center,
             radius: entity.radius
@@ -3096,11 +4566,12 @@ export default {
           break
         case 'line':
           const linePositions = entityData.data.points.map(p => Cesium.Cartesian3.fromDegrees(p.lng, p.lat))
+          const straightLinePositions = this.getPolylinePositionsStraightIn2D(linePositions, false)
           entity = this.viewer.entities.add({
             polyline: {
-              positions: linePositions,
+              positions: straightLinePositions,
               width: 3,
-              material: Cesium.Color.fromCssColorString(color),
+              material: this.getPolylineSolidMaterial(color),
               clampToGround: true
             },
             label: {
@@ -3125,7 +4596,7 @@ export default {
               outlineWidth: 2
             },
             label: {
-              text: entityData.label || '面',
+              text: entityData.label || '多边形空域',
               font: '14px sans-serif',
               fillColor: Cesium.Color.WHITE,
               outlineColor: Cesium.Color.BLACK,
@@ -3146,7 +4617,7 @@ export default {
               outlineWidth: 2
             },
             label: {
-              text: entityData.label || '矩形',
+              text: entityData.label || '矩形空域',
               font: '14px sans-serif',
               fillColor: Cesium.Color.WHITE,
               outlineColor: Cesium.Color.BLACK,
@@ -3174,7 +4645,70 @@ export default {
               outlineWidth: 2
             },
             label: {
-              text: entityData.label || '圆形',
+              text: entityData.label || '圆形空域',
+              font: '14px sans-serif',
+              fillColor: Cesium.Color.WHITE,
+              outlineColor: Cesium.Color.BLACK,
+              outlineWidth: 2,
+              style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+              verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+              pixelOffset: new Cesium.Cartesian2(0, -10)
+            }
+          })
+          break
+        case 'hold_circle': {
+          const hcRadius = entityData.data.radius || 1000
+          if (hcRadius <= 0) {
+            this.$message.error('圆形盘旋半径必须大于0')
+            return
+          }
+          const hcCenter = entityData.data.center
+          entity = this.viewer.entities.add({
+            position: Cesium.Cartesian3.fromDegrees(hcCenter.lng, hcCenter.lat),
+            ellipse: {
+              semiMinorAxis: hcRadius,
+              semiMajorAxis: hcRadius,
+              material: Cesium.Color.TRANSPARENT,
+              outline: true,
+              outlineColor: Cesium.Color.fromCssColorString(color),
+              outlineWidth: entityData.data.width != null ? entityData.data.width : 2
+            },
+            label: {
+              text: entityData.label || '圆形盘旋',
+              font: '14px sans-serif',
+              fillColor: Cesium.Color.WHITE,
+              outlineColor: Cesium.Color.BLACK,
+              outlineWidth: 2,
+              style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+              verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+              pixelOffset: new Cesium.Cartesian2(0, -10)
+            }
+          })
+          break
+        }
+        case 'hold_ellipse': {
+          const heCenter = entityData.data.center
+          if (!heCenter) {
+            this.$message.error('椭圆盘旋缺少中心点')
+            return
+          }
+          let heA = entityData.data.semiMajorAxis || 1000
+          let heB = entityData.data.semiMinorAxis || 500
+          if (heB > heA) { [heA, heB] = [heB, heA] }
+          const heHeading = entityData.data.headingDeg != null ? (entityData.data.headingDeg * Math.PI / 180) : 0
+          entity = this.viewer.entities.add({
+            position: Cesium.Cartesian3.fromDegrees(heCenter.lng, heCenter.lat),
+            ellipse: {
+              semiMajorAxis: heA,
+              semiMinorAxis: heB,
+              rotation: heHeading,
+              material: Cesium.Color.TRANSPARENT,
+              outline: true,
+              outlineColor: Cesium.Color.fromCssColorString(color),
+              outlineWidth: entityData.data.width != null ? entityData.data.width : 2
+            },
+            label: {
+              text: entityData.label || '椭圆盘旋',
               font: '14px sans-serif',
               fillColor: Cesium.Color.WHITE,
               outlineColor: Cesium.Color.BLACK,
@@ -3185,6 +4719,7 @@ export default {
             }
           })
           break
+        }
       }
       if (entity) {
         this.allEntities.push({
@@ -3437,13 +4972,12 @@ export default {
               id: selectedLineEntity.id,
               name: selectedLineEntity.label,
               polyline: {
-                positions: newPositions,
+                positions: this.getPolylinePositionsStraightIn2D(newPositions, false),
                 width: selectedLineEntity.width,
-                material: Cesium.Color.fromCssColorString(selectedLineEntity.color),
+                material: this.getPolylineSolidMaterial(selectedLineEntity.color),
                 clampToGround: true
               }
             })
-            // 更新线实体的引用和位置数组
             selectedLineEntity.entity = newEntity
             selectedLineEntity.positions = newPositions
             // 更新点数据
@@ -3493,12 +5027,31 @@ export default {
     destroyViewer() {
       this.stopDrawing()
       this.clearAll(false)
+      if (this.entityClickDebounceTimer) {
+        clearTimeout(this.entityClickDebounceTimer)
+        this.entityClickDebounceTimer = null
+      }
+      this.lastEntityClickTime = 0
+      this.cameraStateBeforeEntityClick = null
+      if (this.handler) {
+        this.handler.destroy()
+        this.handler = null
+      }
 
       if (this.pointMovementHandler) {
         this.pointMovementHandler.destroy()
         this.pointMovementHandler = null
       }
 
+      if (this.platformIconHandler) {
+        this.platformIconHandler.destroy()
+        this.platformIconHandler = null
+      }
+      if (typeof this.platformIconCameraListener === 'function') {
+        this.platformIconCameraListener()
+        this.platformIconCameraListener = null
+      }
+
       if (this.rightClickHandler) {
         this.rightClickHandler.destroy()
         this.rightClickHandler = null
@@ -3513,6 +5066,10 @@ export default {
         this.scaleBarCleanup()
         this.scaleBarCleanup = null
       }
+      if (typeof this._resolutionScaleCleanup === 'function') {
+        this._resolutionScaleCleanup()
+        this._resolutionScaleCleanup = null
+      }
 
       if (this.viewer) {
         this.viewer.destroy()
@@ -3579,6 +5136,86 @@ export default {
       // 计算鼠标点到投影点的距离
       const distanceVec = [mousePosition.x - projection[0], mousePosition.y - projection[1]];
       return Math.sqrt(distanceVec[0] * distanceVec[0] + distanceVec[1] * distanceVec[1]);
+    },
+    // 威力区绘制相关方法
+    startPowerZoneDrawing() {
+      this.stopDrawing();
+      this.powerZoneCenter = null;
+      this.powerZoneCircleEntity = null;
+      this.powerZoneCenterEntity = null;
+
+      this.isDrawing = true;
+      this.viewer.canvas.style.cursor = 'crosshair';
+      this.drawingHandler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas);
+
+      this.drawingHandler.setInputAction((click) => {
+        const position = this.getClickPosition(click.position);
+        if (!position) return;
+
+        this.powerZoneCenter = position;
+
+        this.powerZoneCenterEntity = this.viewer.entities.add({
+          position: position,
+          point: {
+            pixelSize: 10,
+            color: Cesium.Color.RED,
+            outlineColor: Cesium.Color.WHITE,
+            outlineWidth: 2,
+            disableDepthTestDistance: Number.POSITIVE_INFINITY
+          }
+        });
+
+        this.drawingHandler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
+        this.drawingHandler.destroy();
+        this.drawingHandler = null;
+
+        this.radiusDialogVisible = true;
+      }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+    },
+    handleRadiusConfirm(radiusData) {
+      if (!this.powerZoneCenter) return;
+
+      const radiusInMeters = radiusData.unit === 'km' ? radiusData.radius * 1000 : radiusData.radius;
+
+      const circlePositions = this.generateCirclePositions(this.powerZoneCenter, radiusInMeters);
+
+      this.powerZoneCircleEntity = this.viewer.entities.add({
+        position: this.powerZoneCenter,
+        ellipse: {
+          semiMinorAxis: radiusInMeters,
+          semiMajorAxis: radiusInMeters,
+          material: Cesium.Color.RED.withAlpha(0),
+          clampToGround: true
+        },
+        polyline: {
+          positions: circlePositions,
+          width: 2,
+          material: this.getPolylineSolidMaterial('#FF0000'),
+          clampToGround: true
+        }
+      });
+
+      this.allEntities.push({
+        id: ++this.entityCounter,
+        type: 'powerZone',
+        entity: this.powerZoneCircleEntity,
+        centerEntity: this.powerZoneCenterEntity,
+        center: this.powerZoneCenter,
+        radius: radiusInMeters,
+        color: '#FF0000',
+        opacity: 0,
+        borderColor: '#FF0000',
+        width: 2
+      });
+
+      this.isDrawing = false;
+      this.viewer.canvas.style.cursor = 'default';
+
+      this.$message.success(`威力区创建成功，半径：${radiusData.radius}${radiusData.unit}`);
+
+      this.powerZoneCenter = null;
+      this.powerZoneCircleEntity = null;
+      this.powerZoneCenterEntity = null;
     }
   }
 }
@@ -3615,6 +5252,23 @@ export default {
   display: none !important;
 }
 
+/* 平台图标旋转模式提示条：放在顶部菜单下方，避免被遮挡（顶部栏约 60px） */
+.platform-icon-rotate-tip {
+  position: absolute;
+  top: 72px;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 99;
+  background: rgba(0, 138, 255, 0.95);
+  color: #fff;
+  padding: 10px 20px;
+  border-radius: 6px;
+  font-size: 14px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.25);
+  pointer-events: none;
+  white-space: nowrap;
+}
+
 /* 地图右下角信息面板：比例尺在上、经纬度在下，整体略下移减少遮挡 */
 .map-info-panel {
   position: absolute;
diff --git a/ruoyi-ui/src/views/childRoom/RightPanel.vue b/ruoyi-ui/src/views/childRoom/RightPanel.vue
index 17eaaa0..27c6bbb 100644
--- a/ruoyi-ui/src/views/childRoom/RightPanel.vue
+++ b/ruoyi-ui/src/views/childRoom/RightPanel.vue
@@ -164,8 +164,10 @@
                 <div
                   v-for="platform in airPlatforms"
                   :key="platform.id"
-                  class="platform-item"
-                  @click="handleOpenPlatformDialog(platform)"
+                  class="platform-item platform-item-draggable"
+                  draggable="true"
+                  @click="handlePlatformItemClick(platform, $event)"
+                  @dragstart="onPlatformDragStart($event, platform)"
                 >
                   <div class="platform-icon" :style="{ color: platform.color }">
                     <img v-if="isImg(platform.imageUrl)"
@@ -195,8 +197,10 @@
                 <div
                   v-for="platform in seaPlatforms"
                   :key="platform.id"
-                  class="platform-item"
-                  @click="handleOpenPlatformDialog(platform)"
+                  class="platform-item platform-item-draggable"
+                  draggable="true"
+                  @click="handlePlatformItemClick(platform, $event)"
+                  @dragstart="onPlatformDragStart($event, platform)"
                 >
                   <div class="platform-icon" :style="{ color: platform.color }">
                     <img v-if="isImg(platform.imageUrl)"
@@ -221,8 +225,10 @@
                 <div
                   v-for="platform in groundPlatforms"
                   :key="platform.id"
-                  class="platform-item"
-                  @click="handleOpenPlatformDialog(platform)"
+                  class="platform-item platform-item-draggable"
+                  draggable="true"
+                  @click="handlePlatformItemClick(platform, $event)"
+                  @dragstart="onPlatformDragStart($event, platform)"
                 >
                   <div class="platform-icon" :style="{ color: platform.color }">
                     <img v-if="isImg(platform.imageUrl)"
@@ -313,7 +319,8 @@ export default {
     return {
       activePlatformTab: 'air',
       expandedPlans: [], // 展开的方案列表
-      expandedRoutes: [] // 展开的航线列表
+      expandedRoutes: [], // 展开的航线列表
+      platformJustDragged: false // 刚拖拽过，避免拖拽后误触点击打开弹窗
     }
   },
   watch: {
@@ -504,6 +511,35 @@ export default {
 
     handleOpenPlatformDialog(platform) {
       this.$emit('open-platform-dialog', platform)
+    },
+
+    /** 平台项点击：若刚拖拽过则不打开弹窗，避免误触 */
+    handlePlatformItemClick(platform, ev) {
+      if (this.platformJustDragged) {
+        this.platformJustDragged = false
+        return
+      }
+      this.handleOpenPlatformDialog(platform)
+    },
+
+    /** 拖拽平台图标到地图时传递平台数据 */
+    onPlatformDragStart(ev, platform) {
+      this.platformJustDragged = true
+      setTimeout(() => { this.platformJustDragged = false }, 300)
+      try {
+        ev.dataTransfer.setData('application/json', JSON.stringify({
+          id: platform.id,
+          name: platform.name,
+          type: platform.type,
+          imageUrl: platform.imageUrl,
+          iconUrl: platform.iconUrl,
+          icon: platform.icon,
+          color: platform.color
+        }))
+        ev.dataTransfer.effectAllowed = 'copy'
+      } catch (e) {
+        console.warn('Platform drag start failed', e)
+      }
     }
   }
 }
@@ -829,6 +865,14 @@ export default {
   box-shadow: 0 2px 8px rgba(0, 138, 255, 0.15);
 }
 
+.platform-item-draggable {
+  cursor: grab;
+}
+
+.platform-item-draggable:active {
+  cursor: grabbing;
+}
+
 .platform-icon {
   width: 40px;
   height: 40px;
diff --git a/ruoyi-ui/src/views/childRoom/TopHeader.vue b/ruoyi-ui/src/views/childRoom/TopHeader.vue
index ffcca60..456b03a 100644
--- a/ruoyi-ui/src/views/childRoom/TopHeader.vue
+++ b/ruoyi-ui/src/views/childRoom/TopHeader.vue
@@ -217,11 +217,14 @@
       <div class="header-right">
         <!-- 作战信息区域 -->
         <div class="combat-info-group">
-          <div class="info-box">
+          <div
+            class="info-box room-name-box clickable"
+            @click="handleBackToSelectRoom"
+          >
             <i class="el-icon-office-building info-icon"></i>
             <div class="info-content">
-              <div class="info-label">{{ $t('topHeader.info.roomCode') }}</div>
-              <div class="info-value">{{ roomCode }}</div>
+              <div class="info-label">{{ $t('topHeader.info.roomName') }}</div>
+              <div class="info-value">{{ roomDisplayName }}</div>
             </div>
           </div>
 
@@ -270,12 +273,7 @@
         </div>
       </div>
 
-      <!-- 威力区弹窗 -->
-      <power-zone-dialog
-        v-model="powerZoneDialogVisible"
-        :power-zone="currentPowerZone"
-        @save="savePowerZone"
-      />
+
 
       <!-- 比例尺弹窗 -->
       <scale-dialog
@@ -297,14 +295,12 @@
 </template>
 
 <script>
-import PowerZoneDialog from '../dialogs/PowerZoneDialog'
 import ScaleDialog from '../dialogs/ScaleDialog'
 import ExternalParamsDialog from '../dialogs/ExternalParamsDialog'
 
 export default {
   name: 'TopHeader',
   components: {
-    PowerZoneDialog,
     ScaleDialog,
     ExternalParamsDialog
   },
@@ -358,8 +354,6 @@ export default {
   data() {
     return {
       activeTopNav: 'file',
-      powerZoneDialogVisible: false,
-      currentPowerZone: {},
       scaleDialogVisible: false,
       currentScale: {},
       externalParamsDialogVisible: false,
@@ -372,6 +366,11 @@ export default {
     }
   },
   computed: {
+    /** 显示数据库房间名，无则回退为房间编号 */
+    roomDisplayName() {
+      if (this.roomDetail && this.roomDetail.name) return this.roomDetail.name;
+      return this.roomCode;
+    },
     topNavItems() {
       return [
         { id: 'file', name: this.$t('topHeader.nav.file'), icon: 'el-icon-document' },
@@ -396,6 +395,17 @@ export default {
     }
   },
   methods: {
+    /** 点击房间名称：弹窗确认是否回到选择房间页面 */
+    handleBackToSelectRoom() {
+      this.$confirm('是否返回选择房间页面？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'info'
+      }).then(() => {
+        this.$router.push({ path: '/selectRoom' }).catch(() => {})
+      }).catch(() => {})
+    },
+
     selectTopNav(item) {
       this.$emit('select-nav', item)
     },
@@ -511,8 +521,7 @@ export default {
 
     // 空域下拉菜单方法
     powerZone() {
-      this.powerZoneDialogVisible = true
-      this.currentPowerZone = {}
+      this.$emit('start-power-zone-drawing')
     },
 
     threatZone() {
diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue
index 43a310a..9d1aacf 100644
--- a/ruoyi-ui/src/views/childRoom/index.vue
+++ b/ruoyi-ui/src/views/childRoom/index.vue
@@ -1,24 +1,37 @@
 <template>
   <!-- 以地图为绝对定位背景，所有组件浮动其上 -->
-  <div class="mission-planning-container">
-    <!-- 地图背景 -->
-    <div id="gis-map-background" class="map-background">
+  <div class="mission-planning-container" :class="{ 'screenshot-mode': screenshotMode }">
+    <!-- 地图背景：支持从右侧平台列表拖拽图标到地图 -->
+    <div
+      id="gis-map-background"
+      class="map-background"
+      @dragover.prevent="handleMapDragover"
+      @drop="handleMapDrop"
+    >
       <!-- cesiummap组件 -->
       <cesiumMap ref="cesiumMap" :drawDomClick="drawDom || airspaceDrawDom"
                  :tool-mode="drawDom ? 'ranging' : (airspaceDrawDom ? 'airspace' : 'airspace')"
                  :scaleConfig="scaleConfig"
                  @draw-complete="handleMapDrawComplete"
+                 @drawing-points-update="missionDrawingPointsCount = $event"
                  @open-waypoint-dialog="handleOpenWaypointEdit"
-                 @scale-click="handleScaleClick" />
-                 @open-route-dialog="handleOpenRouteEdit" />
-      <div class="map-overlay-text">
-        <i class="el-icon-location-outline text-3xl mb-2 block"></i>
-        <p>二维GIS地图区域</p>
-        <p class="text-sm mt-1">支持标绘/航线/空域/实时态势</p>
+                 @open-route-dialog="handleOpenRouteEdit"
+                 @scale-click="handleScaleClick"
+                 @platform-icon-updated="onPlatformIconUpdated"
+                 @platform-icon-removed="onPlatformIconRemoved" />
+      <div v-show="!screenshotMode" class="map-overlay-text">
+        <!-- <i class="el-icon-location-outline text-3xl mb-2 block"></i> -->
+        <!-- <p>二维GIS地图区域</p>
+        <p class="text-sm mt-1">支持标绘/航线/空域/实时态势</p> -->
+      </div>
+      <div v-if="missionDrawingActive && missionDrawingPointsCount >= 2 && !screenshotMode" class="mission-drawing-actions" style="position:absolute; bottom:16px; left:50%; transform:translateX(-50%); z-index:10; display:flex; gap:8px; align-items:center;">
+        <span class="text-white text-sm">已 {{ missionDrawingPointsCount }} 个航点，右键结束</span>
+        <el-button type="primary" size="small" @click="openAddHoldDuringDrawing">插入盘旋</el-button>
       </div>
 
       <!-- 地图中间的浮动红点（触发左侧菜单） -->
       <div
+        v-show="!screenshotMode"
         class="floating-red-dot left-red-dot"
         :class="{ hidden: !isMenuHidden }"
         @click="showMenu"
@@ -61,6 +74,7 @@
     </div>
     <!-- 顶部导航栏 -->
     <top-header
+      v-show="!screenshotMode"
       :room-code="roomCode"
       :online-count="onlineCount"
       :combat-time="combatTime"
@@ -96,7 +110,7 @@
       @load-terrain="loadTerrain"
       @change-projection="changeProjection"
       @load-aero-chart="loadAeroChart"
-      @save-power-zone="savePowerZone"
+      @start-power-zone-drawing="startPowerZoneDrawing"
       @threat-zone="threatZone"
       @route-calculation="routeCalculation"
       @conflict-display="conflictDisplay"
@@ -118,6 +132,7 @@
     />
     <!-- 左侧折叠菜单栏 - 蓝色主题 -->
     <left-menu
+      v-show="!screenshotMode"
       :is-hidden="isMenuHidden"
       :menu-items="menuItems"
       :active-menu="activeMenu"
@@ -137,6 +152,7 @@
     />
     <!-- 右侧实体列表（浮动）- 蓝色主题 -->
     <right-panel
+      v-show="!screenshotMode"
       ref="rightPanel"
       :is-hidden="isRightPanelHidden"
       :active-tab="activeRightTab"
@@ -173,9 +189,10 @@
       @open-import-dialog="showImportDialog = true"
     />
     <!-- 左下角工具面板 -->
-    <bottom-left-panel />
+    <bottom-left-panel v-show="!screenshotMode" />
     <!-- 底部时间轴（最初版本的样式）- 蓝色主题 -->
     <div
+      v-show="!screenshotMode"
       class="floating-timeline blue-theme"
       :class="{ 'show': showKTimePopup }"
     >
@@ -226,13 +243,56 @@
           </div>
         </div>
       </div>
-      <div v-if="deductionWarnings.length > 0" class="deduction-warnings">
+      <div v-if="deductionWarnings.length > 0 || hasEarlyArrivalLegs" class="deduction-warnings">
         <i class="el-icon-warning-outline"></i>
-        <span>{{ deductionWarnings[0] }}</span>
+        <span>{{ deductionWarnings[0] || '存在航段将提前到达下一航点。' }}</span>
         <el-tooltip v-if="deductionWarnings.length > 1" :content="deductionWarnings.join('；')" placement="top">
           <span class="warnings-more">等 {{ deductionWarnings.length }} 条</span>
         </el-tooltip>
+        <el-button v-if="hasEarlyArrivalLegs" type="text" size="mini" @click="openAddHoldFromFirstEarly">在此添加盘旋</el-button>
       </div>
+      <el-dialog :title="addHoldDialogTitle" :visible.sync="showAddHoldDialog" width="420px" append-to-body>
+        <div v-if="addHoldContext" class="add-hold-tip">{{ addHoldDialogTip }}</div>
+        <el-form :model="addHoldForm" label-width="100px" size="small">
+          <el-form-item label="盘旋类型">
+            <el-radio-group v-model="addHoldForm.holdType">
+              <el-radio label="hold_circle">圆形</el-radio>
+              <el-radio label="hold_ellipse">椭圆</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="addHoldForm.holdType === 'hold_circle'" label="半径(米)">
+            <el-input-number v-model="addHoldForm.radius" :min="100" :max="50000" style="width:100%" />
+          </el-form-item>
+          <template v-if="addHoldForm.holdType === 'hold_ellipse'">
+            <el-form-item label="长半轴(米)">
+              <el-input-number v-model="addHoldForm.semiMajor" :min="100" :max="50000" style="width:100%" />
+            </el-form-item>
+            <el-form-item label="短半轴(米)">
+              <el-input-number v-model="addHoldForm.semiMinor" :min="50" :max="50000" style="width:100%" />
+            </el-form-item>
+            <el-form-item label="长轴方位(度)">
+              <el-input-number v-model="addHoldForm.headingDeg" :min="-180" :max="180" style="width:100%" />
+            </el-form-item>
+          </template>
+          <el-form-item label="盘旋方向">
+            <el-radio-group v-model="addHoldForm.clockwise">
+              <el-radio :label="true">顺时针</el-radio>
+              <el-radio :label="false">逆时针</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="计划离开(K时)">
+            <el-input
+              v-model.number="addHoldForm.startTimeMinutes"
+              type="number"
+              placeholder="正数=K+多少分钟，负数=K-多少分钟，留空用下一航点时间"
+            />
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="showAddHoldDialog = false">取消</el-button>
+          <el-button type="primary" @click="saveAddHold">确定添加</el-button>
+        </span>
+      </el-dialog>
     </div>
 
     <!-- 在线成员弹窗 -->
@@ -261,12 +321,7 @@
       @save="updateWaypoint"
     />
 
-    <!-- 威力区弹窗 -->
-    <power-zone-dialog
-      v-model="showPowerZoneDialog"
-      :power-zone="currentPowerZone"
-      @save="savePowerZone"
-    />
+
 
     <!-- 比例尺弹窗 -->
     <scale-dialog
@@ -314,6 +369,31 @@
         <el-button type="primary" @click="confirmCreatePlan">确 定</el-button>
       </div>
     </el-dialog>
+
+    <!-- 截图保存弹窗：选择文件名后保存到本地（浏览器会弹出保存位置对话框） -->
+    <el-dialog
+      title="保存地图截图"
+      :visible.sync="showScreenshotDialog"
+      width="520px"
+      append-to-body
+      class="screenshot-save-dialog"
+    >
+      <div class="screenshot-preview" v-if="screenshotDataUrl">
+        <img :src="screenshotDataUrl" alt="截图预览" />
+      </div>
+      <el-form label-width="90px">
+        <el-form-item label="文件名">
+          <el-input v-model="screenshotFileName" placeholder="例如：地图截图.png" />
+        </el-form-item>
+        <p class="screenshot-tip">点击「保存」后，浏览器将弹出保存对话框，您可选择保存路径。</p>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="showScreenshotDialog = false">取 消</el-button>
+        <el-button type="primary" @click="confirmSaveScreenshot">
+          <i class="el-icon-download"></i> 保 存
+        </el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -323,7 +403,6 @@ import OnlineMembersDialog from '@/views/dialogs/OnlineMembersDialog'
 import PlatformEditDialog from '@/views/dialogs/PlatformEditDialog'
 import RouteEditDialog from '@/views/dialogs/RouteEditDialog'
 import WaypointEditDialog from '@/views/dialogs/WaypointEditDialog'
-import PowerZoneDialog from '@/views/dialogs/PowerZoneDialog'
 import ScaleDialog from '@/views/dialogs/ScaleDialog'
 import ExternalParamsDialog from '@/views/dialogs/ExternalParamsDialog'
 import PageLayoutDialog from '@/views/dialogs/PageLayoutDialog'
@@ -333,10 +412,11 @@ import BottomLeftPanel from './BottomLeftPanel'
 import TopHeader from './TopHeader'
 import { listScenario,addScenario,delScenario} from "@/api/system/scenario";
 import { listRoutes, getRoutes, addRoutes, updateRoutes, delRoutes } from "@/api/system/routes";
-import { updateWaypoints } from "@/api/system/waypoints";
+import { updateWaypoints, addWaypoints, delWaypoints } from "@/api/system/waypoints";
 import { listLib,addLib,delLib} from "@/api/system/lib";
 import { getRooms, updateRooms } from "@/api/system/rooms";
 import { getMenuConfig, saveMenuConfig } from "@/api/system/userMenuConfig";
+import { listByRoomId as listRoomPlatformIcons, addRoomPlatformIcon, updateRoomPlatformIcon, delRoomPlatformIcon } from "@/api/system/roomPlatformIcon";
 import PlatformImportDialog from "@/views/dialogs/PlatformImportDialog.vue";
 export default {
   name: 'MissionPlanningView',
@@ -347,7 +427,6 @@ export default {
     PlatformEditDialog,
     RouteEditDialog,
     WaypointEditDialog,
-    PowerZoneDialog,
     ScaleDialog,
     ExternalParamsDialog,
     PageLayoutDialog,
@@ -369,19 +448,17 @@ export default {
       selectedRoute: null,
       showWaypointDialog: false,
       selectedWaypoint: null,
-      // 威力区、比例尺、外部参数弹窗
-      showPowerZoneDialog: false,
-      currentPowerZone: {},
+      // 比例尺、外部参数弹窗
       showScaleDialog: false,
       currentScale: {
         scaleNumerator: 1,
-        scaleDenominator: 20,
-        unit: 'km'
+        scaleDenominator: 1000,
+        unit: 'm'
       },
       scaleConfig: {
         scaleNumerator: 1,
-        scaleDenominator: 20,
-        unit: 'km'
+        scaleDenominator: 1000,
+        unit: 'm'
       },
       showExternalParamsDialog: false,
       currentExternalParams: {},
@@ -390,9 +467,16 @@ export default {
       showNameDialog: false,
       newRouteName: '',
       tempMapPoints: [],
+      platformIconSaveTimer: null,
       //导入平台弹窗
       showImportDialog: false,
 
+      // 地图截图
+      screenshotMode: false,
+      showScreenshotDialog: false,
+      screenshotDataUrl: '',
+      screenshotFileName: '',
+
       // 作战信息
       roomCode: 'JTF-7-ALPHA',
       onlineCount: 30,
@@ -415,7 +499,7 @@ export default {
         { id: 'pattern', name: '空域', icon: 'ky' },
         { id: 'deduction', name: '推演', icon: 'el-icon-video-play' },
         { id: 'modify', name: '测距', icon: 'cj' },
-        { id: 'refresh', name: '刷新', icon: 'el-icon-refresh' },
+        { id: 'refresh', name: '截图', icon: 'screenshot', action: 'refresh' },
         { id: 'basemap', name: '底图', icon: 'dt' },
         { id: 'save', name: '保存', icon: 'el-icon-document-checked' },
         { id: 'import', name: '导入', icon: 'el-icon-upload2' },
@@ -518,6 +602,12 @@ export default {
       currentTime: 'K+00:00:00',
       deductionMinutesFromK: 0,
       deductionWarnings: [],
+      deductionEarlyArrivalByRoute: {}, // routeId -> earlyArrivalLegs
+      showAddHoldDialog: false,
+      addHoldContext: null, // { routeId, routeName, legIndex, fromName, toName }
+      addHoldForm: { holdType: 'hold_circle', radius: 500, semiMajor: 500, semiMinor: 300, headingDeg: 0, clockwise: true, startTime: '', startTimeMinutes: null },
+      missionDrawingActive: false,
+      missionDrawingPointsCount: 0,
       isPlaying: false,
       playbackSpeed: 1,
       playbackInterval: null,
@@ -556,12 +646,10 @@ export default {
     isAdmin() {
       const roles = this.$store.getters.roles || [];
       const id = this.$store.getters.id;
-      const userLevel = String(this.$store.getters.userLevel);
       return (
-        id === '1' ||                           //系统超级管理员 ID
-        userLevel === '1' ||                    //数据库 user_level 字段为管理员
-        roles.includes('admin') ||              //拥有超级管理员角色
-        roles.includes('manager')               //拥有你新定义的“业务管理员”角色
+        roles.includes('admin') ||
+        String(id) === '1' ||
+        (Array.isArray(roles) && roles.some(r => String(r).toLowerCase() === 'admin'))
       );
     },
     canSetKTime() {
@@ -571,6 +659,19 @@ export default {
     kTimeDisplay() {
       if (!this.roomDetail || !this.roomDetail.kAnchorTime) return '';
       return this.formatKTimeForPicker(this.roomDetail.kAnchorTime) || '';
+    },
+    hasEarlyArrivalLegs() {
+      return this.activeRouteIds.some(rid => (this.deductionEarlyArrivalByRoute[rid] || []).length > 0);
+    },
+    addHoldDialogTitle() {
+      if (!this.addHoldContext) return '添加盘旋';
+      if (this.addHoldContext.mode === 'drawing') return '在最后两航点之间插入盘旋';
+      return '在此航段添加盘旋';
+    },
+    addHoldDialogTip() {
+      if (!this.addHoldContext) return '';
+      if (this.addHoldContext.mode === 'drawing') return '在最后两航点之间插入盘旋，保存航线时生效。';
+      return `在 ${this.addHoldContext.fromName} 与 ${this.addHoldContext.toName} 之间添加盘旋，到计划时间后沿切线飞往下一航点（原「下一格」航点将被移除）。`;
     }
   },
   mounted() {
@@ -771,6 +872,14 @@ export default {
       // 关闭弹窗
       this.showPlatformDialog = false;
     },
+    /** 新建航线时写入数据库的默认样式（与地图默认显示一致：紫色实线线宽3） */
+    getDefaultRouteAttributes() {
+      const defaultAttrs = {
+        waypointStyle: { pixelSize: 7, color: '#ffffff', outlineColor: '#0078FF', outlineWidth: 2 },
+        lineStyle: { style: 'solid', width: 3, color: '#800080', gapColor: '#000000', dashLength: 20 }
+      };
+      return JSON.stringify(defaultAttrs);
+    },
     /** 从航线 attributes JSON 解析出地图渲染用的样式对象 */
     parseRouteStyle(attributes) {
       if (attributes == null || attributes === '') return null;
@@ -837,6 +946,8 @@ export default {
             if (route && route.waypoints && route.waypoints.length > 0) {
               this.$refs.cesiumMap.removeRouteById(updatedRoute.id);
               this.$refs.cesiumMap.renderRouteWaypoints(route.waypoints, updatedRoute.id, route.platformId, route.platform, routeStyle);
+              // 切换平台后按当前推演时间把图标更新到对应位置，避免图标回到起点
+              this.$nextTick(() => this.updateDeductionPositions());
             }
           }
         } else {
@@ -858,6 +969,8 @@ export default {
       }
       // 进入 Cesium 绘图模式
       if (this.$refs.cesiumMap) {
+        this.missionDrawingActive = true;
+        this.missionDrawingPointsCount = 0;
         this.$refs.cesiumMap.startMissionRouteDrawing();
         this.$message.success(`${plan.name}开启航线规划`);
       }
@@ -939,6 +1052,13 @@ export default {
               });
             });
           }
+          // 加载该房间下保存的地图平台图标
+          const rId = roomId || this.currentRoomId;
+          if (rId && this.$refs.cesiumMap && typeof this.$refs.cesiumMap.loadRoomPlatformIcons === 'function') {
+            listRoomPlatformIcons(rId).then(res => {
+              if (res.code === 200 && res.data) this.$refs.cesiumMap.loadRoomPlatformIcons(rId, res.data);
+            }).catch(() => {});
+          }
         }
       } catch (error) {
         console.error("数据加载失败:", error);
@@ -946,6 +1066,7 @@ export default {
       }
     },
     handleMapDrawComplete(points) {
+      this.missionDrawingActive = false;
       if (!points || points.length < 2) {
         this.$message.error('航点太少，无法生成航线');
         this.drawDom = false;
@@ -954,6 +1075,13 @@ export default {
       this.tempMapPoints = points; // 暂存坐标点
       this.showNameDialog = true;  // 弹出对话框起名
     },
+
+    openAddHoldDuringDrawing() {
+      this.addHoldContext = { mode: 'drawing' };
+      this.addHoldForm = { holdType: 'hold_circle', radius: 500, semiMajor: 500, semiMinor: 300, headingDeg: 0, clockwise: true, startTime: '', startTimeMinutes: 60 };
+      this.showAddHoldDialog = true;
+    },
+
     /** 弹窗点击“确定”：正式将数据保存到后端数据库 */
     async confirmSaveNewRoute() {
       // 1. 严格校验
@@ -967,22 +1095,32 @@ export default {
         return;
       }
 
-      // 2. 构造数据
-      const finalWaypoints = this.tempMapPoints.map((p, index) => ({
-        name: `WP${index + 1}`,
+      // 2. 构造数据（含盘旋航点的 pointType、holdParams；地图标签默认字号 14、颜色 #333333）
+      // 新建航线时：首尾航点转弯坡度固定为 0，中间可编辑航点默认 45°
+      const wpCount = this.tempMapPoints.length;
+      const finalWaypoints = this.tempMapPoints.map((p, index) => {
+        const isFirstOrLast = index === 0 || index === wpCount - 1;
+        const defaultTurnAngle = isFirstOrLast ? 0.0 : 45.0;
+        return {
+        name: p.name || `WP${index + 1}`,
         lat: p.lat,
         lng: p.lng,
-        alt: 5000.0,
-        speed: 800.0,
-        startTime: 'K+00:00:00',
-        turnAngle: 0.0
-      }));
+        alt: p.alt != null ? p.alt : 5000.0,
+        speed: p.speed != null ? p.speed : 800.0,
+        startTime: p.startTime || 'K+00:00:00',
+        turnAngle: p.turnAngle != null ? p.turnAngle : defaultTurnAngle,
+        labelFontSize: p.labelFontSize != null ? p.labelFontSize : 14,
+        labelColor: p.labelColor || '#333333',
+        ...(p.pointType && { pointType: p.pointType }),
+        ...(p.holdParams != null && { holdParams: typeof p.holdParams === 'string' ? p.holdParams : JSON.stringify(p.holdParams) })
+        };
+      });
 
       const routeData = {
         callSign: this.newRouteName,
         scenarioId: currentScenarioId,
         platformId: 1,
-        attributes: "{}",
+        attributes: this.getDefaultRouteAttributes(),
         waypoints: finalWaypoints
       };
 
@@ -1070,26 +1208,35 @@ export default {
             : 'K+00:00:00',
           turnAngle: updatedWaypoint.turnAngle
         };
+        if (updatedWaypoint.pointType != null) payload.pointType = updatedWaypoint.pointType;
+        if (updatedWaypoint.holdParams != null) payload.holdParams = updatedWaypoint.holdParams;
+        if (updatedWaypoint.labelFontSize != null) payload.labelFontSize = updatedWaypoint.labelFontSize;
+        if (updatedWaypoint.labelColor != null) payload.labelColor = updatedWaypoint.labelColor;
         const response = await updateWaypoints(payload);
         if (response.code === 200) {
           const index = this.selectedRouteDetails.waypoints.findIndex(p => p.id === updatedWaypoint.id);
           if (index !== -1) {
             // 更新本地数据（用已提交的 payload 保证 startTime 等与数据库一致）
             this.selectedRouteDetails.waypoints.splice(index, 1, { ...updatedWaypoint, ...payload });
-            // 通知地图组件同步更新
+            const merged = { ...updatedWaypoint, ...payload };
+            const routeInList = this.routes.find(r => r.id === this.selectedRouteDetails.id);
+            if (routeInList && routeInList.waypoints) {
+              const idxInList = routeInList.waypoints.findIndex(p => p.id === updatedWaypoint.id);
+              if (idxInList !== -1) routeInList.waypoints.splice(idxInList, 1, merged);
+            }
             if (this.$refs.cesiumMap) {
-              // 更新航点图标
               this.$refs.cesiumMap.updateWaypointGraphicById(updatedWaypoint.id, updatedWaypoint.name);
-              // 重新触发航线渲染
               this.$refs.cesiumMap.renderRouteWaypoints(
                 this.selectedRouteDetails.waypoints,
                 this.selectedRouteDetails.id,
                 this.selectedRouteDetails.platformId,
-                this.selectedRouteDetails.platform
+                this.selectedRouteDetails.platform,
+                this.parseRouteStyle(this.selectedRouteDetails.attributes)
               );
             }
             this.showWaypointDialog = false;
             this.$message.success('航点信息已持久化至数据库');
+            this.$nextTick(() => this.updateDeductionPositions());
           }
         } else {
           // 如果 code 不是 200，手动抛出错误进入catch
@@ -1116,7 +1263,7 @@ export default {
       return this.activeRouteIds && this.activeRouteIds.length > 0;
     },
     updateCombatTime() {
-      // 有推演航线时：作战时间 = 推演时间轴当前时间（由 updateTimeFromProgress 同步）
+      // 作战时间始终与推演时间轴同步：有航线时用 deductionMinutesFromK，无航线时用 currentTime（由时间轴 updateTimeFromProgress 计算）
       if (this.hasDeductionRange()) {
         const sign = this.deductionMinutesFromK >= 0 ? '+' : '-';
         const absMin = Math.abs(Math.floor(this.deductionMinutesFromK));
@@ -1125,8 +1272,8 @@ export default {
         this.combatTime = `K${sign}${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}:00`;
         return;
       }
-      // 无推演航线时：保持进入房间时的固定作战时间，不随真实时间变化
-      this.combatTime = 'K+00:00:00';
+      // 无展示航线时：作战时间仍随推演时间轴变化，用 currentTime
+      this.combatTime = this.currentTime || 'K+00:00:00';
     },
     /** 将作战时间字符串（如 K+01:30:00）解析为相对 K 的分钟数 */
     combatTimeToMinutes(str) {
@@ -1160,7 +1307,6 @@ export default {
     openKTimeSetDialog() {
       console.log("当前登录 ID (myId):", this.$store.getters.id);
       console.log("当前房间 ownerId:", this.roomDetail ? this.roomDetail.ownerId : '无房间信息');
-      console.log("当前房间 userLevel:", this.$store.getters.userLevel);
       console.log("当前角色 roles:", this.$store.getters.roles);
       if (!this.canSetKTime) {
         this.$message.info('仅房主或管理员可设定或修改 K 时');
@@ -1327,10 +1473,7 @@ export default {
         'loadTerrain': () => this.loadTerrain(),
         'changeProjection': () => this.changeProjection(),
         'loadAeroChart': () => this.loadAeroChart(),
-        'powerZone': () => {
-          this.showPowerZoneDialog = true
-          this.currentPowerZone = {}
-        },
+        'powerZone': () => this.startPowerZoneDrawing(),
         'threatZone': () => this.threatZone(),
         'routeCalculation': () => this.routeCalculation(),
         'conflictDisplay': () => this.conflictDisplay(),
@@ -1346,7 +1489,8 @@ export default {
         'toggleLandmark': () => this.toggleLandmark(),
         'toggleRoute': () => this.toggleRoute(),
         'layerFavorites': () => this.layerFavorites(),
-        'routeFavorites': () => this.routeFavorites()
+        'routeFavorites': () => this.routeFavorites(),
+        'refresh': () => this.captureMapScreenshot()
       }
 
       if (actionMap[actionId]) {
@@ -1354,6 +1498,76 @@ export default {
       }
     },
 
+    /** 截图：隐藏上下左右菜单只保留地图，用 postRender + readPixels 避免 WebGL 缓冲被清空导致黑屏 */
+    async captureMapScreenshot() {
+      const cm = this.$refs.cesiumMap
+      if (!cm || !cm.viewer || !cm.viewer.scene || !cm.viewer.scene.canvas) {
+        this.$message.warning('地图未就绪，请稍后再试')
+        return
+      }
+      this.screenshotMode = true
+      await this.$nextTick()
+      await new Promise(r => setTimeout(r, 350))
+      const viewer = cm.viewer
+      const canvas = viewer.scene.canvas
+      const self = this
+      const removeListener = viewer.scene.postRender.addEventListener(function captureFrame() {
+        removeListener()
+        self.screenshotMode = false
+        try {
+          const gl = canvas.getContext('webgl2') || canvas.getContext('webgl')
+          if (!gl) {
+            self.$message.error('无法获取 WebGL 上下文')
+            return
+          }
+          const width = canvas.width
+          const height = canvas.height
+          if (width === 0 || height === 0) {
+            self.$message.error('画布尺寸为 0')
+            return
+          }
+          const pixels = new Uint8Array(width * height * 4)
+          gl.bindFramebuffer(gl.FRAMEBUFFER, null)
+          gl.readPixels(0, 0, width, height, gl.RGBA, gl.UNSIGNED_BYTE, pixels)
+          const offscreen = document.createElement('canvas')
+          offscreen.width = width
+          offscreen.height = height
+          const ctx = offscreen.getContext('2d')
+          const imageData = ctx.createImageData(width, height)
+          for (let y = 0; y < height; y++) {
+            const srcRow = (height - 1 - y) * width * 4
+            const dstRow = y * width * 4
+            for (let i = 0; i < width * 4; i++) imageData.data[dstRow + i] = pixels[srcRow + i]
+          }
+          ctx.putImageData(imageData, 0, 0)
+          const dataUrl = offscreen.toDataURL('image/png')
+          const now = new Date()
+          const timeStr = now.getFullYear() + '-' + String(now.getMonth() + 1).padStart(2, '0') + '-' + String(now.getDate()).padStart(2, '0') + '_' + String(now.getHours()).padStart(2, '0') + String(now.getMinutes()).padStart(2, '0') + String(now.getSeconds()).padStart(2, '0')
+          self.screenshotFileName = `地图截图_${timeStr}.png`
+          self.screenshotDataUrl = dataUrl
+          self.showScreenshotDialog = true
+        } catch (e) {
+          self.$message.error('截图失败：' + (e && e.message ? e.message : '未知错误'))
+        }
+      })
+      viewer.scene.requestRender()
+    },
+
+    /** 确认保存截图：触发浏览器下载（用户可在保存对话框中选择路径） */
+    confirmSaveScreenshot() {
+      if (!this.screenshotDataUrl) return
+      let name = (this.screenshotFileName || '地图截图.png').trim()
+      if (!name) name = '地图截图.png'
+      if (!/\.(png|jpg|jpeg)$/i.test(name)) name = name + '.png'
+      const a = document.createElement('a')
+      a.href = this.screenshotDataUrl
+      a.download = name
+      a.click()
+      this.showScreenshotDialog = false
+      this.screenshotDataUrl = ''
+      this.$message.success('已触发下载，请在浏览器保存对话框中选择保存位置')
+    },
+
     handleDeleteMenuItem(deletedItem) {
       const index = this.menuItems.findIndex(item => item.id === deletedItem.id)
       if (index > -1) {
@@ -1389,7 +1603,12 @@ export default {
             arr = typeof data.menuItems === 'string' ? JSON.parse(data.menuItems) : data.menuItems
           } catch (e) { /* 解析失败保留默认 */ }
           if (Array.isArray(arr) && arr.length > 0) {
-            this.menuItems = arr
+            const defaultMap = (this.defaultMenuItems || []).reduce((m, it) => { m[it.id] = it; return m }, {})
+            this.menuItems = arr.map(item => {
+              const def = defaultMap[item.id]
+              if (def) return { ...item, name: def.name, icon: def.icon, action: def.action }
+              return item
+            })
           }
         }
         if (data.position && ['left', 'top', 'bottom'].includes(data.position)) {
@@ -1465,6 +1684,67 @@ export default {
       this.showScaleDialog = true
     },
 
+    /** 拖拽经过地图时允许放置 */
+    handleMapDragover(ev) {
+      ev.preventDefault()
+      if (ev.dataTransfer) ev.dataTransfer.dropEffect = 'copy'
+    },
+
+    /** 将平台图标放置到地图上，并保存到当前房间 */
+    async handleMapDrop(ev) {
+      ev.preventDefault()
+      const raw = ev.dataTransfer && ev.dataTransfer.getData('application/json')
+      if (!raw) return
+      try {
+        const platform = JSON.parse(raw)
+        const map = this.$refs.cesiumMap
+        if (!map || typeof map.addPlatformIconFromDrag !== 'function') return
+        const entityData = map.addPlatformIconFromDrag(platform, ev.clientX, ev.clientY)
+        if (!entityData || !this.currentRoomId) return
+        const payload = {
+          roomId: this.currentRoomId,
+          platformId: platform.id,
+          platformName: platform.name || '',
+          platformType: platform.type || '',
+          iconUrl: platform.imageUrl || platform.iconUrl || '',
+          lng: entityData.lng,
+          lat: entityData.lat,
+          heading: entityData.heading != null ? entityData.heading : 0,
+          iconScale: entityData.iconScale != null ? entityData.iconScale : 1
+        }
+        const res = await addRoomPlatformIcon(payload)
+        if (res.code === 200 && res.data && res.data.id) {
+          map.setPlatformIconServerId(entityData.id, res.data.id, this.currentRoomId)
+          entityData.serverId = res.data.id
+          entityData.roomId = this.currentRoomId
+          this.$message.success('平台图标已保存到当前房间')
+        }
+      } catch (e) {
+        console.warn('Parse platform drag data or save failed', e)
+        this.$message && this.$message.error('保存平台图标失败')
+      }
+    },
+    /** 平台图标移动/旋转/缩放结束：防抖更新到服务端 */
+    onPlatformIconUpdated(entityData) {
+      if (!entityData || !entityData.serverId) return
+      if (this.platformIconSaveTimer) clearTimeout(this.platformIconSaveTimer)
+      this.platformIconSaveTimer = setTimeout(() => {
+        this.platformIconSaveTimer = null
+        updateRoomPlatformIcon({
+          id: entityData.serverId,
+          lng: entityData.lng,
+          lat: entityData.lat,
+          heading: entityData.heading != null ? entityData.heading : 0,
+          iconScale: entityData.iconScale != null ? entityData.iconScale : 1
+        }).then(() => {}).catch(() => {})
+      }, 500)
+    },
+    /** 平台图标从地图删除时同步删除服务端记录 */
+    onPlatformIconRemoved({ serverId }) {
+      if (!serverId) return
+      delRoomPlatformIcon(serverId).then(() => {}).catch(() => {})
+    },
+
     handleScaleUnitChange(unit) {
       this.scaleConfig.unit = unit
       if (this.$refs.cesiumMap) {
@@ -1488,9 +1768,9 @@ export default {
     },
 
     // 空域下拉菜单方法
-    savePowerZone(powerZone) {
-      console.log('保存威力区:', powerZone)
-      this.$message.success(`威力区 "${powerZone.name}" 保存成功`);
+    startPowerZoneDrawing() {
+      this.airspaceDrawDom = true
+      this.$refs.cesiumMap.startPowerZoneDrawing()
     },
 
     threatZone() {
@@ -1740,10 +2020,8 @@ export default {
       const hours = Math.floor(absMin / 60);
       const minutes = absMin % 60;
       this.currentTime = `K${sign}${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}:00`;
-      // 右上角作战时间与推演时间轴同步
-      if (this.hasDeductionRange()) {
-        this.combatTime = this.currentTime;
-      }
+      // 右上角作战时间随时与推演时间轴同步（无论是否展示航线）
+      this.combatTime = this.currentTime;
       this.updateDeductionPositions();
     },
 
@@ -1778,6 +2056,62 @@ export default {
       const min = parseInt(m[3], 10);
       return sign * (h * 60 + min);
     },
+    /** 将相对 K 的分钟数转为 startTime 字符串（如 K+01:00、K-00:30） */
+    minutesToStartTime(minutes) {
+      const m = Math.floor(Number(minutes));
+      if (!Number.isFinite(m)) return 'K+00:00';
+      const sign = m >= 0 ? '+' : '-';
+      const abs = Math.abs(m);
+      const h = Math.floor(abs / 60);
+      const min = abs % 60;
+      return `K${sign}${String(h).padStart(2, '0')}:${String(min).padStart(2, '0')}`;
+    },
+
+    isHoldWaypoint(wp) {
+      const t = (wp && wp.pointType) || (wp && wp.point_type) || 'normal';
+      return t === 'hold_circle' || t === 'hold_ellipse';
+    },
+    parseHoldParams(wp) {
+      const raw = (wp && wp.holdParams) || (wp && wp.hold_params);
+      if (!raw) return null;
+      try {
+        const p = typeof raw === 'string' ? JSON.parse(raw) : raw;
+        return { radius: p.radius, semiMajor: p.semiMajor ?? p.semiMajorAxis, semiMinor: p.semiMinor ?? p.semiMinorAxis, headingDeg: p.headingDeg ?? 0, clockwise: p.clockwise !== false };
+      } catch (e) {
+        return null;
+      }
+    },
+
+    /** 路径片段总距离（米） */
+    pathSliceDistance(pathSlice) {
+      if (!pathSlice || pathSlice.length < 2) return 0;
+      let d = 0;
+      for (let i = 1; i < pathSlice.length; i++) d += this.segmentDistance(pathSlice[i - 1], pathSlice[i]);
+      return d;
+    },
+
+    /** 圆周上按角度取点：圆心 lng/lat/alt，半径米。angleRad 为从北顺时针的角度弧度，0=北 */
+    positionOnCircle(centerLng, centerLat, centerAlt, radiusM, angleRad) {
+      const R = 6371000;
+      const latRad = (centerLat * Math.PI) / 180;
+      const dNorth = radiusM * Math.cos(angleRad);
+      const dEast = radiusM * Math.sin(angleRad);
+      const dLat = (dNorth / R) * (180 / Math.PI);
+      const dLng = (dEast / (R * Math.cos(latRad))) * (180 / Math.PI);
+      return {
+        lng: centerLng + dLng,
+        lat: centerLat + dLat,
+        alt: centerAlt != null ? centerAlt : 0
+      };
+    },
+    /** 从圆心到某点的角度（弧度，从北顺时针），用于盘旋入口基准角 */
+    angleFromCenterToPoint(centerLng, centerLat, pointLng, pointLat) {
+      const R = 6371000;
+      const latRad = (centerLat * Math.PI) / 180;
+      const dNorth = (pointLat - centerLat) * (R * Math.PI / 180);
+      const dEast = (pointLng - centerLng) * (R * Math.cos(latRad) * Math.PI / 180);
+      return Math.atan2(dEast, dNorth);
+    },
 
     /** 两航点间近似距离（米），含高度差 */
     segmentDistance(wp1, wp2) {
@@ -1794,26 +2128,28 @@ export default {
     },
 
     /**
-     * 按速度与计划时间构建航线时间轴：含飞行段与“提前到达则等待”的等待段，并做航段校验。
-     * 若所有航点相对 K 时相同，则在 [globalMin, globalMax] 内按航点顺序均匀分布，避免闪现。
+     * 按速度与计划时间构建航线时间轴：含飞行段、盘旋段与“提前到达则等待”的等待段。
+     * pathData 可选：{ path, segmentEndIndices, holdArcRanges }，由 getRoutePathWithSegmentIndices 提供，用于输出 hold 段。
      */
-    buildRouteTimeline(waypoints, globalMin, globalMax) {
+    buildRouteTimeline(waypoints, globalMin, globalMax, pathData) {
       const warnings = [];
       if (!waypoints || waypoints.length === 0) return { segments: [], warnings };
-      const points = waypoints.map(wp => ({
+      const points = waypoints.map((wp, idx) => ({
         lng: parseFloat(wp.lng),
         lat: parseFloat(wp.lat),
         alt: Number(wp.alt) || 0,
         minutes: this.waypointStartTimeToMinutes(wp.startTime),
-        speed: Number(wp.speed) || 800
+        speed: Number(wp.speed) || 800,
+        isHold: this.isHoldWaypoint(wp)
       }));
+      const hasHold = points.some(p => p.isHold);
       const allSame = points.every(p => p.minutes === points[0].minutes);
-      if (allSame && points.length > 1) {
+      if (allSame && points.length > 1 && !hasHold) {
         const span = Math.max(globalMax - globalMin, 1);
         points.forEach((p, i) => {
           p.minutes = globalMin + (span * i) / (points.length - 1);
         });
-      } else {
+      } else if (!hasHold) {
         points.sort((a, b) => a.minutes - b.minutes);
       }
       if (points.length === 1) {
@@ -1826,7 +2162,61 @@ export default {
       }
       const effectiveTime = [points[0].minutes];
       const segments = [];
+      const path = pathData && pathData.path;
+      const segmentEndIndices = pathData && pathData.segmentEndIndices;
+      const holdArcRanges = pathData && pathData.holdArcRanges || {};
       for (let i = 0; i < points.length - 1; i++) {
+        if (this.isHoldWaypoint(waypoints[i + 1]) && path && segmentEndIndices && holdArcRanges[i]) {
+          const range = holdArcRanges[i];
+          const startIdx = i === 0 ? 0 : segmentEndIndices[i - 1] + 1;
+          const toEntrySlice = path.slice(startIdx, range.start + 1);
+          const holdPathSlice = path.slice(range.start, range.end + 1);
+          const exitIdx = segmentEndIndices[i];
+          const toNextSlice = path.slice(exitIdx, (segmentEndIndices[i + 1] != null ? segmentEndIndices[i + 1] : path.length - 1) + 1);
+          const distToEntry = this.pathSliceDistance(toEntrySlice);
+          const speedKmh = points[i].speed || 800;
+          const travelToEntryMin = (distToEntry / 1000) * (60 / speedKmh);
+          const arrivalEntry = effectiveTime[i] + travelToEntryMin;
+          const holdEndTime = points[i + 1].minutes;
+          const distExitToNext = this.pathSliceDistance(toNextSlice);
+          const travelExitMin = (distExitToNext / 1000) * (60 / speedKmh);
+          const arrivalNext = holdEndTime + travelExitMin;
+          effectiveTime[i + 1] = holdEndTime;
+          if (i + 2 < points.length) effectiveTime[i + 2] = arrivalNext;
+          const posCur = { lng: points[i].lng, lat: points[i].lat, alt: points[i].alt };
+          const entryPos = toEntrySlice.length ? toEntrySlice[toEntrySlice.length - 1] : posCur;
+          const exitPos = holdPathSlice.length ? holdPathSlice[holdPathSlice.length - 1] : entryPos;
+          const holdDurationMin = holdEndTime - arrivalEntry;
+          const holdWp = waypoints[i + 1];
+          const holdParams = this.parseHoldParams(holdWp);
+          const holdCenter = holdWp ? { lng: parseFloat(holdWp.lng), lat: parseFloat(holdWp.lat), alt: Number(holdWp.alt) || 0 } : null;
+          const holdRadius = holdParams && holdParams.radius != null ? holdParams.radius : null;
+          const holdClockwise = holdParams && holdParams.clockwise !== false;
+          const holdCircumference = holdRadius != null ? 2 * Math.PI * holdRadius : null;
+          const holdEntryAngle = holdCenter && entryPos && holdRadius != null
+            ? this.angleFromCenterToPoint(holdCenter.lng, holdCenter.lat, entryPos.lng, entryPos.lat)
+            : null;
+          segments.push({ startTime: effectiveTime[i], endTime: arrivalEntry, startPos: posCur, endPos: entryPos, type: 'fly', legIndex: i, pathSlice: toEntrySlice });
+          segments.push({
+            startTime: arrivalEntry,
+            endTime: holdEndTime,
+            startPos: entryPos,
+            endPos: exitPos,
+            type: 'hold',
+            legIndex: i,
+            holdPath: holdPathSlice,
+            holdDurationMin,
+            speedKmh: points[i].speed || 800,
+            holdCenter,
+            holdRadius,
+            holdCircumference,
+            holdClockwise,
+            holdEntryAngle
+          });
+          segments.push({ startTime: holdEndTime, endTime: arrivalNext, startPos: exitPos, endPos: toNextSlice.length ? toNextSlice[toNextSlice.length - 1] : exitPos, type: 'fly', legIndex: i, pathSlice: toNextSlice });
+          i++;
+          continue;
+        }
         const dist = this.segmentDistance(points[i], points[i + 1]);
         const speedKmh = points[i].speed || 800;
         const travelMin = (dist / 1000) * (60 / speedKmh);
@@ -1850,7 +2240,19 @@ export default {
           segments.push({ startTime: actualArrival, endTime: effectiveTime[i + 1], startPos: posNext, endPos: posNext, type: 'wait', legIndex: i });
         }
       }
-      return { segments, warnings };
+      const earlyArrivalLegs = [];
+      for (let i = 0; i < points.length - 1; i++) {
+        if (this.isHoldWaypoint(waypoints[i + 1])) continue;
+        const dist = this.segmentDistance(points[i], points[i + 1]);
+        const speedKmh = points[i].speed || 800;
+        const travelMin = (dist / 1000) * (60 / speedKmh);
+        const actualArrival = effectiveTime[i] + travelMin;
+        const scheduled = points[i + 1].minutes;
+        if (travelMin > 0 && scheduled - points[i].minutes > 0 && actualArrival < scheduled - 0.5) {
+          earlyArrivalLegs.push({ legIndex: i, scheduled, actualArrival, fromName: waypoints[i].name, toName: waypoints[i + 1].name });
+        }
+      }
+      return { segments, warnings, earlyArrivalLegs };
     },
 
     /** 从路径片段中按比例 t（0~1）取点：按弧长比例插值 */
@@ -1878,31 +2280,52 @@ export default {
       };
     },
 
-    /** 从时间轴中取当前推演时间对应的位置；若有 path/segmentEndIndices 则沿带转弯弧的路径插值 */
+    /** 从时间轴中取当前推演时间对应的位置；支持 fly/wait/hold，hold 沿 holdPath 弧长插值 */
     getPositionFromTimeline(segments, minutesFromK, path, segmentEndIndices) {
       if (!segments || segments.length === 0) return null;
       if (minutesFromK <= segments[0].startTime) return segments[0].startPos;
       const last = segments[segments.length - 1];
       if (minutesFromK >= last.endTime) {
-        // 若最后一段是等待且有弧线路径，终点取弧线终点
         if (last.type === 'wait' && path && segmentEndIndices && last.legIndex != null && last.legIndex < segmentEndIndices.length && path[segmentEndIndices[last.legIndex]]) {
           return path[segmentEndIndices[last.legIndex]];
         }
+        if (last.type === 'hold' && last.holdPath && last.holdPath.length) return last.holdPath[last.holdPath.length - 1];
         return last.endPos;
       }
       for (let i = 0; i < segments.length; i++) {
         const s = segments[i];
         if (minutesFromK < s.endTime) {
-          const t = (minutesFromK - s.startTime) / (s.endTime - s.startTime);
+          const t = Math.max(0, Math.min(1, (minutesFromK - s.startTime) / (s.endTime - s.startTime)));
           if (s.type === 'wait') {
-            // 有弧线路径时在弧线终点等待，不跳到航点
             if (path && segmentEndIndices && s.legIndex != null && s.legIndex < segmentEndIndices.length) {
               const endIdx = segmentEndIndices[s.legIndex];
               if (path[endIdx]) return path[endIdx];
             }
             return s.startPos;
           }
-          // 有带弧路径且当前为飞行段且存在对应航段索引时，沿路径弧线插值（含上一段终点，保证从弧线终点匀速运动到本段终点、不闪现）
+          if (s.type === 'hold' && s.holdPath && s.holdPath.length) {
+            const durationMin = s.holdDurationMin != null ? s.holdDurationMin : (s.endTime - s.startTime);
+            const speedKmh = s.speedKmh != null ? s.speedKmh : 800;
+            const totalHoldDistM = (speedKmh * (durationMin / 60)) * 1000;
+            if (s.holdCircumference != null && s.holdCircumference > 0 && s.holdCenter && s.holdRadius != null) {
+              const currentDistM = t * totalHoldDistM;
+              const distOnLap = currentDistM % s.holdCircumference;
+              const angleRad = (distOnLap / s.holdCircumference) * (2 * Math.PI);
+              const signedAngle = s.holdClockwise ? -angleRad : angleRad;
+              const entryAngle = s.holdEntryAngle != null ? s.holdEntryAngle : 0;
+              const angle = entryAngle + signedAngle;
+              return this.positionOnCircle(s.holdCenter.lng, s.holdCenter.lat, s.holdCenter.alt, s.holdRadius, angle);
+            }
+            const holdPathLen = this.pathSliceDistance(s.holdPath);
+            if (holdPathLen <= 0) return this.getPositionAlongPathSlice(s.holdPath, t);
+            const currentDistM = t * totalHoldDistM;
+            const positionOnLap = currentDistM % holdPathLen;
+            const tLap = holdPathLen > 0 ? positionOnLap / holdPathLen : 0;
+            return this.getPositionAlongPathSlice(s.holdPath, tLap);
+          }
+          if (s.type === 'fly' && s.pathSlice && s.pathSlice.length) {
+            return this.getPositionAlongPathSlice(s.pathSlice, t);
+          }
           if (path && segmentEndIndices && s.legIndex != null && s.legIndex < segmentEndIndices.length) {
             const startIdx = s.legIndex === 0 ? 0 : segmentEndIndices[s.legIndex - 1];
             const endIdx = segmentEndIndices[s.legIndex];
@@ -1919,27 +2342,57 @@ export default {
       return last.endPos;
     },
 
-    /** 根据当前推演时间（相对 K 的分钟）得到平台位置，使用速度与等待逻辑；若有地图 ref 则沿转弯弧路径运动；返回 { position, nextPosition, previousPosition, warnings }，用于计算机头朝向 */
+    /** 根据当前推演时间（相对 K 的分钟）得到平台位置，使用速度与等待逻辑；若有地图 ref 则沿转弯弧/盘旋弧路径运动；返回 { position, nextPosition, previousPosition, warnings, earlyArrivalLegs, currentSegment }，currentSegment 含 speedKmh 用于标牌 */
     getPositionAtMinutesFromK(waypoints, minutesFromK, globalMin, globalMax) {
-      if (!waypoints || waypoints.length === 0) return { position: null, nextPosition: null, previousPosition: null, warnings: [] };
-      const { segments, warnings } = this.buildRouteTimeline(waypoints, globalMin, globalMax);
-      let path = null;
-      let segmentEndIndices = null;
+      if (!waypoints || waypoints.length === 0) return { position: null, nextPosition: null, previousPosition: null, warnings: [], earlyArrivalLegs: [], currentSegment: null };
+      let pathData = null;
       if (this.$refs.cesiumMap && this.$refs.cesiumMap.getRoutePathWithSegmentIndices) {
         const ret = this.$refs.cesiumMap.getRoutePathWithSegmentIndices(waypoints);
         if (ret.path && ret.path.length > 0 && ret.segmentEndIndices && ret.segmentEndIndices.length > 0) {
-          path = ret.path;
-          segmentEndIndices = ret.segmentEndIndices;
+          pathData = { path: ret.path, segmentEndIndices: ret.segmentEndIndices, holdArcRanges: ret.holdArcRanges || {} };
         }
       }
+      const { segments, warnings, earlyArrivalLegs } = this.buildRouteTimeline(waypoints, globalMin, globalMax, pathData);
+      const path = pathData ? pathData.path : null;
+      const segmentEndIndices = pathData ? pathData.segmentEndIndices : null;
       const position = this.getPositionFromTimeline(segments, minutesFromK, path, segmentEndIndices);
       const stepMin = 1 / 60;
       const nextPosition = this.getPositionFromTimeline(segments, minutesFromK + stepMin, path, segmentEndIndices);
       const previousPosition = this.getPositionFromTimeline(segments, minutesFromK - stepMin, path, segmentEndIndices);
-      return { position, nextPosition, previousPosition, warnings };
+      // 当前所在航段，用于标牌速度（与数据库航点 speed 对应）
+      let currentSegment = null;
+      if (segments && segments.length > 0) {
+        if (minutesFromK <= segments[0].startTime) {
+          const s = segments[0];
+          currentSegment = { legIndex: s.legIndex, speedKmh: waypoints[s.legIndex] ? (Number(waypoints[s.legIndex].speed) || 800) : 800 };
+        } else if (minutesFromK >= segments[segments.length - 1].endTime) {
+          const s = segments[segments.length - 1];
+          currentSegment = { legIndex: s.legIndex, speedKmh: s.speedKmh != null ? s.speedKmh : (waypoints[s.legIndex] ? (Number(waypoints[s.legIndex].speed) || 800) : 800) };
+        } else {
+          for (let i = 0; i < segments.length; i++) {
+            const s = segments[i];
+            if (minutesFromK >= s.startTime && minutesFromK < s.endTime) {
+              currentSegment = { legIndex: s.legIndex, speedKmh: s.speedKmh != null ? s.speedKmh : (waypoints[s.legIndex] ? (Number(waypoints[s.legIndex].speed) || 800) : 800) };
+              break;
+            }
+          }
+        }
+      }
+      return { position, nextPosition, previousPosition, warnings, earlyArrivalLegs: earlyArrivalLegs || [], currentSegment };
     },
 
-    /** 仅根据当前展示的航线（activeRouteIds）更新平台图标位置，并汇总航段提示 */
+    /** 根据两点计算航向角（度），北为 0，顺时针为正，与数据库/标牌航向一致 */
+    headingDegFromPositions(fromPos, toPos) {
+      if (!fromPos || !toPos) return 0;
+      const dLng = (toPos.lng != null ? Number(toPos.lng) : 0) - (fromPos.lng != null ? Number(fromPos.lng) : 0);
+      const dLat = (toPos.lat != null ? Number(toPos.lat) : 0) - (fromPos.lat != null ? Number(fromPos.lat) : 0);
+      if (Math.abs(dLng) < 1e-10 && Math.abs(dLat) < 1e-10) return 0;
+      const rad = Math.atan2(dLng, dLat);
+      let deg = (rad * 180 / Math.PI);
+      return ((deg % 360) + 360) % 360;
+    },
+
+    /** 仅根据当前展示的航线（activeRouteIds）更新平台图标位置与标牌，并汇总航段提示 */
     updateDeductionPositions() {
       if (!this.$refs.cesiumMap || !this.$refs.cesiumMap.updatePlatformPosition) return;
       const minutesFromK = this.deductionMinutesFromK != null ? this.deductionMinutesFromK : 0;
@@ -1948,13 +2401,113 @@ export default {
       this.activeRouteIds.forEach(routeId => {
         const route = this.routes.find(r => r.id === routeId);
         if (!route || !route.waypoints || route.waypoints.length === 0) return;
-        const { position, nextPosition, previousPosition, warnings } = this.getPositionAtMinutesFromK(route.waypoints, minutesFromK, minMinutes, maxMinutes);
+        const { position, nextPosition, previousPosition, warnings, earlyArrivalLegs, currentSegment } = this.getPositionAtMinutesFromK(route.waypoints, minutesFromK, minMinutes, maxMinutes);
         if (warnings && warnings.length) allWarnings.push(...warnings);
-        if (position) this.$refs.cesiumMap.updatePlatformPosition(routeId, position, nextPosition || previousPosition);
+        if (position) {
+          const directionPoint = nextPosition || previousPosition;
+          const labelData = {
+            name: (route.platform && route.platform.name) ? route.platform.name : '平台',
+            altitude: position.alt != null ? Number(position.alt) : 0,
+            speed: (currentSegment && currentSegment.speedKmh != null) ? currentSegment.speedKmh : 800,
+            headingDeg: directionPoint ? this.headingDegFromPositions(position, directionPoint) : 0
+          };
+          this.$refs.cesiumMap.updatePlatformPosition(routeId, position, directionPoint, labelData);
+        }
+        this.deductionEarlyArrivalByRoute[routeId] = earlyArrivalLegs || [];
       });
       this.deductionWarnings = [...new Set(allWarnings)];
     },
 
+    openAddHoldFromFirstEarly() {
+      for (const routeId of this.activeRouteIds) {
+        const legs = this.deductionEarlyArrivalByRoute[routeId] || [];
+        if (legs.length === 0) continue;
+        const route = this.routes.find(r => r.id === routeId);
+        const leg = legs[0];
+        const waypoints = route && route.waypoints ? route.waypoints : [];
+        const nextWp = waypoints[leg.legIndex + 1];
+        this.addHoldContext = {
+          routeId,
+          routeName: route ? route.name : '',
+          legIndex: leg.legIndex,
+          fromName: leg.fromName,
+          toName: leg.toName
+        };
+        const defaultStart = nextWp && nextWp.startTime ? nextWp.startTime : 'K+01:00';
+        this.addHoldForm.startTime = defaultStart;
+        this.addHoldForm.startTimeMinutes = this.waypointStartTimeToMinutes(defaultStart);
+        this.showAddHoldDialog = true;
+        return;
+      }
+    },
+
+    async saveAddHold() {
+      if (!this.addHoldContext) return;
+      if (this.addHoldContext.mode === 'drawing') {
+        const holdParams = this.addHoldForm.holdType === 'hold_circle'
+          ? { radius: this.addHoldForm.radius, clockwise: this.addHoldForm.clockwise }
+          : { semiMajor: this.addHoldForm.semiMajor, semiMinor: this.addHoldForm.semiMinor, headingDeg: this.addHoldForm.headingDeg, clockwise: this.addHoldForm.clockwise };
+        if (this.$refs.cesiumMap && this.$refs.cesiumMap.insertHoldBetweenLastTwo) {
+          this.$refs.cesiumMap.insertHoldBetweenLastTwo(holdParams);
+        }
+        this.showAddHoldDialog = false;
+        this.addHoldContext = null;
+        this.$message.success('已插入盘旋，继续点选航点后右键结束保存');
+        return;
+      }
+      const { routeId, legIndex } = this.addHoldContext;
+      const route = this.routes.find(r => r.id === routeId);
+      if (!route || !route.waypoints || route.waypoints.length < 2) {
+        this.$message.warning('航线数据异常');
+        return;
+      }
+      const waypoints = route.waypoints;
+      const prevWp = waypoints[legIndex];
+      const nextWp = waypoints[legIndex + 1];
+      const newSeq = (prevWp.seq != null ? Number(prevWp.seq) : legIndex + 1) + 1;
+      const baseSeq = prevWp.seq != null ? Number(prevWp.seq) : legIndex + 1;
+      const holdParams = this.addHoldForm.holdType === 'hold_circle'
+        ? { radius: this.addHoldForm.radius, clockwise: this.addHoldForm.clockwise }
+        : { semiMajor: this.addHoldForm.semiMajor, semiMinor: this.addHoldForm.semiMinor, headingDeg: this.addHoldForm.headingDeg, clockwise: this.addHoldForm.clockwise };
+      const startTime = this.addHoldForm.startTimeMinutes !== '' && this.addHoldForm.startTimeMinutes != null && !Number.isNaN(Number(this.addHoldForm.startTimeMinutes))
+          ? this.minutesToStartTime(Number(this.addHoldForm.startTimeMinutes))
+          : (nextWp.startTime || 'K+01:00');
+      try {
+        await addWaypoints({
+          routeId,
+          name: 'HOLD',
+          seq: newSeq,
+          lat: nextWp.lat,
+          lng: nextWp.lng,
+          alt: nextWp.alt != null ? nextWp.alt : prevWp.alt,
+          speed: prevWp.speed || 800,
+          startTime,
+          pointType: this.addHoldForm.holdType,
+          holdParams: JSON.stringify(holdParams)
+        });
+        await delWaypoints(nextWp.id);
+        for (let i = legIndex + 2; i < waypoints.length; i++) {
+          const w = waypoints[i];
+          if (w.id) {
+            await updateWaypoints({ ...w, seq: baseSeq + (i - legIndex) });
+          }
+        }
+        this.showAddHoldDialog = false;
+        this.addHoldContext = null;
+        await this.getList();
+        const updated = this.routes.find(r => r.id === routeId);
+        if (updated && updated.waypoints && this.activeRouteIds.includes(routeId) && this.$refs.cesiumMap) {
+          this.$refs.cesiumMap.removeRouteById(routeId);
+          this.$refs.cesiumMap.renderRouteWaypoints(updated.waypoints, routeId, updated.platformId, updated.platform, this.parseRouteStyle(updated.attributes));
+          this.$nextTick(() => this.updateDeductionPositions());
+        }
+        this.$message.success('已添加盘旋航点');
+      } catch (e) {
+        this.$message.error(e.msg || '添加盘旋失败');
+        console.error(e);
+      }
+    },
+
     // 时间控制（保留用于底部时间轴）
     play() {
       this.$message.success('推演开始');
@@ -2262,6 +2815,29 @@ export default {
   z-index: 1;
 }
 
+/* 截图保存弹窗 */
+.screenshot-save-dialog .screenshot-preview {
+  max-height: 320px;
+  overflow: hidden;
+  border-radius: 4px;
+  background: #f5f5f5;
+  margin-bottom: 12px;
+}
+.screenshot-save-dialog .screenshot-preview img {
+  display: block;
+  max-width: 100%;
+  width: auto;
+  height: auto;
+  max-height: 320px;
+  object-fit: contain;
+}
+.screenshot-save-dialog .screenshot-tip {
+  font-size: 12px;
+  color: #909399;
+  margin-top: 8px;
+  margin-bottom: 0;
+}
+
 /* ...其余样式省略，保持不变... */
 .map-overlay-text {
   position: absolute;
diff --git a/ruoyi-ui/src/views/dialogs/PowerZoneDialog.vue b/ruoyi-ui/src/views/dialogs/PowerZoneDialog.vue
index 0fd57a3..6e675ca 100644
--- a/ruoyi-ui/src/views/dialogs/PowerZoneDialog.vue
+++ b/ruoyi-ui/src/views/dialogs/PowerZoneDialog.vue
@@ -207,14 +207,30 @@ export default {
     }
   },
   methods: {
+    degreesToDMS(decimalDegrees) {
+      const degrees = Math.floor(decimalDegrees)
+      const minutesDecimal = (decimalDegrees - degrees) * 60
+      const minutes = Math.floor(minutesDecimal)
+      const seconds = ((minutesDecimal - minutes) * 60).toFixed(2)
+      return `${degrees}°${minutes}'${seconds}"`
+    },
+    dmsToDegrees(dms) {
+      const match = dms.match(/^(-?\d+)°(\d+)'([\d.]+)"$/)
+      if (!match) return null
+      const degrees = parseFloat(match[1])
+      const minutes = parseFloat(match[2])
+      const seconds = parseFloat(match[3])
+      const sign = degrees < 0 ? -1 : 1
+      return sign * (Math.abs(degrees) + minutes / 60 + seconds / 3600)
+    },
     initFormData() {
       this.formData = {
         name: this.powerZone.name || '',
         font: this.powerZone.font || 'Microsoft YaHei',
         shapeType: this.powerZone.shapeType || 'circle',
         location: {
-          lat: this.powerZone.lat || '',
-          lng: this.powerZone.lng || ''
+          lat: this.powerZone.lat ? this.degreesToDMS(this.powerZone.lat) : '',
+          lng: this.powerZone.lng ? this.degreesToDMS(this.powerZone.lng) : ''
         },
         radius: this.powerZone.radius || 0,
         angle: this.powerZone.angle || 0,
@@ -236,11 +252,19 @@ export default {
     savePowerZone() {
       this.$refs.formRef.validate((valid) => {
         if (valid) {
+          const latDegrees = this.dmsToDegrees(this.formData.location.lat);
+          const lngDegrees = this.dmsToDegrees(this.formData.location.lng);
+          
+          if (latDegrees === null || lngDegrees === null) {
+            this.$message.error('请输入有效的度分秒格式！格式：39°54\'33.48"');
+            return;
+          }
+          
           this.$emit('save', {
             ...this.powerZone,
             ...this.formData,
-            lat: this.formData.location.lat,
-            lng: this.formData.location.lng
+            lat: latDegrees,
+            lng: lngDegrees
           });
           this.closeDialog();
         }
diff --git a/ruoyi-ui/src/views/dialogs/RadiusDialog.vue b/ruoyi-ui/src/views/dialogs/RadiusDialog.vue
new file mode 100644
index 0000000..7e33dcc
--- /dev/null
+++ b/ruoyi-ui/src/views/dialogs/RadiusDialog.vue
@@ -0,0 +1,153 @@
+<template>
+  <div v-if="visible" class="radius-dialog">
+    <div class="dialog-content">
+      <div class="dialog-header">
+        <h3>输入半径</h3>
+        <div class="close-btn" @click="closeDialog">×</div>
+      </div>
+      
+      <div class="dialog-body">
+        <el-form :model="formData" :rules="rules" ref="formRef" label-width="80px" size="small">
+          <el-form-item label="半径" prop="radius">
+            <el-input-number 
+              v-model="formData.radius" 
+              :min="0.1" 
+              :precision="2"
+              placeholder="请输入半径"
+              style="width: 100%;"
+            ></el-input-number>
+          </el-form-item>
+          
+          <el-form-item label="单位" prop="unit">
+            <el-radio-group v-model="formData.unit">
+              <el-radio-button label="km">千米</el-radio-button>
+              <el-radio-button label="m">米</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+        </el-form>
+      </div>
+      
+      <div class="dialog-footer">
+        <el-button @click="closeDialog">取消</el-button>
+        <el-button type="primary" @click="confirmRadius">确定</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'RadiusDialog',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      formData: {
+        radius: 50,
+        unit: 'km'
+      },
+      rules: {
+        radius: [
+          { required: true, message: '请输入半径', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    closeDialog() {
+      this.$emit('update:visible', false)
+    },
+    confirmRadius() {
+      this.$refs.formRef.validate((valid) => {
+        if (valid) {
+          this.$emit('confirm', {
+            radius: this.formData.radius,
+            unit: this.formData.unit
+          })
+          this.closeDialog()
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.radius-dialog {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  pointer-events: none;
+}
+
+.dialog-content {
+  position: relative;
+  background: white;
+  border-radius: 8px;
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
+  width: 90%;
+  max-width: 400px;
+  animation: dialog-fade-in 0.3s ease;
+  pointer-events: auto;
+}
+
+@keyframes dialog-fade-in {
+  from {
+    opacity: 0;
+    transform: translateY(-20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.dialog-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16px 20px;
+  border-bottom: 1px solid #e8e8e8;
+}
+
+.dialog-header h3 {
+  margin: 0;
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+}
+
+.close-btn {
+  font-size: 20px;
+  color: #999;
+  cursor: pointer;
+  transition: color 0.3s;
+}
+
+.close-btn:hover {
+  color: #666;
+}
+
+.dialog-body {
+  padding: 20px;
+}
+
+.dialog-footer {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  padding: 16px 20px;
+  border-top: 1px solid #e8e8e8;
+  gap: 10px;
+}
+</style>
diff --git a/ruoyi-ui/src/views/dialogs/RouteEditDialog.vue b/ruoyi-ui/src/views/dialogs/RouteEditDialog.vue
index 5385869..5b1c818 100644
--- a/ruoyi-ui/src/views/dialogs/RouteEditDialog.vue
+++ b/ruoyi-ui/src/views/dialogs/RouteEditDialog.vue
@@ -221,13 +221,14 @@ export default {
         id: '',
         name: ''
       },
+      // 与地图默认、新建航线入库一致：紫色实线线宽3；仅当 attributes 为空时用于表单回退
       defaultStyle: {
         waypoint: { pixelSize: 7, color: '#ffffff', outlineColor: '#0078FF', outlineWidth: 2 },
-        line: { style: 'dash', width: 4, color: '#ffffff', gapColor: '#000000', dashLength: 20 }
+        line: { style: 'solid', width: 3, color: '#800080', gapColor: '#000000', dashLength: 20 }
       },
       styleForm: {
         waypoint: { pixelSize: 7, color: '#ffffff', outlineColor: '#0078FF', outlineWidth: 2 },
-        line: { style: 'dash', width: 4, color: '#ffffff', gapColor: '#000000', dashLength: 20 }
+        line: { style: 'solid', width: 3, color: '#800080', gapColor: '#000000', dashLength: 20 }
       },
       presetColors: [
         '#ffffff', '#000000', '#0078FF', '#409EFF', '#67C23A', '#E6A23C', '#F56C6C',
diff --git a/ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue b/ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue
index d03dd53..a1eca29 100644
--- a/ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue
+++ b/ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue
@@ -14,6 +14,22 @@
             <el-input v-model="formData.name" placeholder="请输入航点名称"></el-input>
           </el-form-item>
 
+          <el-form-item label="地图文字大小" prop="labelFontSize">
+            <el-input-number
+              v-model="formData.labelFontSize"
+              :min="10"
+              :max="28"
+              controls-position="right"
+              placeholder="字号(px)"
+              style="width: 100%;"
+            />
+            <div class="form-tip">航点名称在地图上的显示字号，微软雅黑字体</div>
+          </el-form-item>
+          <el-form-item label="地图文字颜色" prop="labelColor">
+            <el-color-picker v-model="formData.labelColor" size="small" />
+            <span class="color-value">{{ formData.labelColor }}</span>
+          </el-form-item>
+
           <el-form-item label="高度" prop="alt">
             <el-input-number
               v-model="formData.alt"
@@ -34,7 +50,7 @@
             ></el-input-number>
           </el-form-item>
 
-          <el-form-item label="转弯坡度" prop="turnAngle">
+          <el-form-item v-if="!isHoldWaypoint" label="转弯坡度" prop="turnAngle">
             <el-input-number
               v-model="formData.turnAngle"
               controls-position="right"
@@ -46,6 +62,34 @@
               ⚠️ 首尾航点坡度已锁定为 0，不可编辑
             </div>
           </el-form-item>
+          <template v-if="isHoldWaypoint">
+            <el-form-item label="盘旋类型">
+              <el-radio-group v-model="formData.pointType">
+                <el-radio label="hold_circle">圆形</el-radio>
+                <el-radio label="hold_ellipse">椭圆</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item v-if="formData.pointType === 'hold_circle'" label="半径(米)">
+              <el-input-number v-model="formData.holdRadius" :min="100" :max="50000" style="width:100%" />
+            </el-form-item>
+            <template v-if="formData.pointType === 'hold_ellipse'">
+              <el-form-item label="长半轴(米)">
+                <el-input-number v-model="formData.holdSemiMajor" :min="100" :max="50000" style="width:100%" />
+              </el-form-item>
+              <el-form-item label="短半轴(米)">
+                <el-input-number v-model="formData.holdSemiMinor" :min="50" :max="50000" style="width:100%" />
+              </el-form-item>
+              <el-form-item label="长轴方位(度)">
+                <el-input-number v-model="formData.holdHeadingDeg" :min="-180" :max="180" style="width:100%" />
+              </el-form-item>
+            </template>
+            <el-form-item label="盘旋方向">
+              <el-radio-group v-model="formData.holdClockwise">
+                <el-radio :label="true">顺时针</el-radio>
+                <el-radio :label="false">逆时针</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </template>
 
           <el-form-item label="相对 K 时（分钟）" prop="minutesFromK">
             <el-input-number
@@ -103,7 +147,15 @@ export default {
         minutesFromK: 0,
         currentIndex: -1,
         totalPoints: 0,
-        isBankDisabled: false
+        isBankDisabled: false,
+        pointType: 'normal',
+        holdRadius: 500,
+        holdSemiMajor: 500,
+        holdSemiMinor: 300,
+        holdHeadingDeg: 0,
+        holdClockwise: true,
+        labelFontSize: 14,
+        labelColor: '#333333'
       },
       rules: {
         name: [
@@ -124,6 +176,12 @@ export default {
       }
     };
   },
+  computed: {
+    isHoldWaypoint() {
+      const t = (this.waypoint && (this.waypoint.pointType || this.waypoint.point_type)) || (this.formData && this.formData.pointType) || 'normal';
+      return t === 'hold_circle' || t === 'hold_ellipse';
+    }
+  },
   watch: {
     value(newVal) {
       if (newVal && this.waypoint) {
@@ -142,6 +200,21 @@ export default {
       const total = this.waypoint.totalPoints || 0;
       const locked = (index === 0) || (total > 0 && index === total - 1);
 
+      const pt = (this.waypoint.pointType || this.waypoint.point_type) || 'normal';
+      let holdRadius = 500, holdSemiMajor = 500, holdSemiMinor = 300, holdHeadingDeg = 0, holdClockwise = true;
+      try {
+        const raw = this.waypoint.holdParams || this.waypoint.hold_params;
+        if (raw) {
+          const p = typeof raw === 'string' ? JSON.parse(raw) : raw;
+          holdRadius = p.radius != null ? p.radius : 500;
+          holdSemiMajor = p.semiMajor ?? p.semiMajorAxis ?? 500;
+          holdSemiMinor = p.semiMinor ?? p.semiMinorAxis ?? 300;
+          holdHeadingDeg = p.headingDeg ?? 0;
+          holdClockwise = p.clockwise !== false;
+        }
+      } catch (e) {}
+      const labelFontSize = this.waypoint.labelFontSize != null ? Number(this.waypoint.labelFontSize) : 14;
+      const labelColor = this.waypoint.labelColor || '#333333';
       this.formData = {
         name: this.waypoint.name || '',
         alt: this.waypoint.alt !== undefined && this.waypoint.alt !== null ? Number(this.waypoint.alt) : 0,
@@ -150,7 +223,15 @@ export default {
         currentIndex: index,
         totalPoints: total,
         isBankDisabled: locked,
-        turnAngle: locked ? 0 : (Number(this.waypoint.turnAngle) || 0)
+        turnAngle: locked ? 0 : (Number(this.waypoint.turnAngle) || 0),
+        pointType: pt,
+        holdRadius,
+        holdSemiMajor,
+        holdSemiMinor,
+        holdHeadingDeg,
+        holdClockwise,
+        labelFontSize: Math.min(28, Math.max(10, labelFontSize)),
+        labelColor
       };
 
       this.$nextTick(() => {
@@ -167,11 +248,25 @@ export default {
         if (valid) {
           const { minutesFromK, ...rest } = this.formData;
           const startTimeStr = this.minutesToStartTime(minutesFromK);
-          this.$emit('save', {
+          const payload = {
             ...this.waypoint,
             ...rest,
-            startTime: startTimeStr
-          });
+            startTime: startTimeStr,
+            labelFontSize: this.formData.labelFontSize,
+            labelColor: this.formData.labelColor
+          };
+          if (this.formData.pointType && this.formData.pointType !== 'normal') {
+            payload.pointType = this.formData.pointType;
+            payload.holdParams = this.formData.pointType === 'hold_circle'
+              ? JSON.stringify({ radius: this.formData.holdRadius, clockwise: this.formData.holdClockwise })
+              : JSON.stringify({
+                  semiMajor: this.formData.holdSemiMajor,
+                  semiMinor: this.formData.holdSemiMinor,
+                  headingDeg: this.formData.holdHeadingDeg,
+                  clockwise: this.formData.holdClockwise
+                });
+          }
+          this.$emit('save', payload);
           this.closeDialog();
         }
       });
@@ -295,4 +390,10 @@ export default {
   margin-top: 4px;
   line-height: 1.4;
 }
+
+.color-value {
+  margin-left: 8px;
+  font-size: 12px;
+  color: #606266;
+}
 </style>
diff --git a/ruoyi-ui/src/views/selectRoom/index.vue b/ruoyi-ui/src/views/selectRoom/index.vue
index 6740b94..92f172d 100644
--- a/ruoyi-ui/src/views/selectRoom/index.vue
+++ b/ruoyi-ui/src/views/selectRoom/index.vue
@@ -5,6 +5,9 @@
     <div class="main-content">
       <div class="room-panel">
         <div class="panel-header">
+          <a href="javascript:;" class="back-login" @click="backToLogin">
+            <i class="el-icon-back"></i> 返回登录
+          </a>
           <h2>房间选择</h2>
           <p>选择或创建您要加入的协作房间</p>
         </div>
@@ -169,6 +172,18 @@ export default {
     }
   },
   methods: {
+    /** 返回登录页：登出并跳转到登录界面 */
+    backToLogin() {
+      this.$confirm('确定退出当前账号并返回登录页吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$store.dispatch('LogOut').then(() => {
+          this.$router.push({ path: '/login' }).catch(() => {})
+        }).catch(() => {})
+      }).catch(() => {})
+    },
     getList() {
       listRooms().then(response => {
         this.rooms = response.rows || response;
@@ -309,6 +324,25 @@ export default {
   padding: 20px 24px 16px;
   border-bottom: 1px solid #e2e8f0;
   text-align: center;
+  position: relative;
+}
+
+.back-login {
+  position: absolute;
+  left: 24px;
+  top: 50%;
+  transform: translateY(-50%);
+  font-size: 14px;
+  color: #64748b;
+  text-decoration: none;
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  transition: color 0.2s;
+}
+
+.back-login:hover {
+  color: #165DFF;
 }
 
 .panel-header h2 {
diff --git a/ruoyi-ui/src/views/system/waypoints/index.vue b/ruoyi-ui/src/views/system/waypoints/index.vue
index 73c53fd..c5010f8 100644
--- a/ruoyi-ui/src/views/system/waypoints/index.vue
+++ b/ruoyi-ui/src/views/system/waypoints/index.vue
@@ -131,8 +131,16 @@
       <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="lat">
+        <template slot-scope="scope">
+          {{ degreesToDMS(scope.row.lat) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="经度" align="center" prop="lng">
+        <template slot-scope="scope">
+          {{ degreesToDMS(scope.row.lng) }}
+        </template>
+      </el-table-column>
       <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" />
@@ -178,10 +186,10 @@
           <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-input v-model="form.lat" placeholder="请输入纬度（度分秒格式，如：39°54'33.48"）" />
         </el-form-item>
         <el-form-item label="经度" prop="lng">
-          <el-input v-model="form.lng" placeholder="请输入经度" />
+          <el-input v-model="form.lng" placeholder="请输入经度（度分秒格式，如：116°23'48.64"）" />
         </el-form-item>
         <el-form-item label="高度 (米)" prop="alt">
           <el-input v-model="form.alt" placeholder="请输入高度 (米)" />
@@ -278,6 +286,27 @@ export default {
     this.getList()
   },
   methods: {
+    degreesToDMS(decimalDegrees) {
+      if (!decimalDegrees) return ''
+      const degrees = Math.floor(decimalDegrees)
+      const minutesDecimal = (decimalDegrees - degrees) * 60
+      const minutes = Math.floor(minutesDecimal)
+      const seconds = ((minutesDecimal - minutes) * 60).toFixed(2)
+      return `${degrees}°${minutes}'${seconds}"`
+    },
+    dmsToDegrees(dms) {
+      if (!dms) return null
+      const match = dms.match(/^(-?\d+)°(\d+)'([\d.]+)"$/)
+      if (!match) {
+        const num = parseFloat(dms)
+        return isNaN(num) ? null : num
+      }
+      const degrees = parseFloat(match[1])
+      const minutes = parseFloat(match[2])
+      const seconds = parseFloat(match[3])
+      const sign = degrees < 0 ? -1 : 1
+      return sign * (Math.abs(degrees) + minutes / 60 + seconds / 3600)
+    },
     /** 查询航线具体航点明细列表 */
     getList() {
       this.loading = true
@@ -336,6 +365,8 @@ export default {
       const id = row.id || this.ids
       getWaypoints(id).then(response => {
         this.form = response.data
+        this.form.lat = this.degreesToDMS(this.form.lat)
+        this.form.lng = this.degreesToDMS(this.form.lng)
         this.open = true
         this.title = "修改航线具体航点明细"
       })
@@ -344,14 +375,23 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.id != null) {
-            updateWaypoints(this.form).then(response => {
+          const formData = { ...this.form }
+          formData.lat = this.dmsToDegrees(formData.lat)
+          formData.lng = this.dmsToDegrees(formData.lng)
+          
+          if (formData.lat === null || formData.lng === null) {
+            this.$modal.msgError("请输入有效的度分秒格式！格式：39°54'33.48\"")
+            return
+          }
+          
+          if (formData.id != null) {
+            updateWaypoints(formData).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
-            addWaypoints(this.form).then(response => {
+            addWaypoints(formData).then(response => {
               this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 462f379..5632e77 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -22,7 +22,6 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
 const cesiumSource = 'node_modules/cesium/Build/Cesium'
 
 module.exports = {
-
   // 部署生产环境和开发环境下的URL。
   publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
   outputDir: 'dist',