diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Rooms.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Rooms.java
index c505cfa..3149144 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Rooms.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Rooms.java
@@ -37,6 +37,9 @@ public class Rooms extends BaseEntity
     @Excel(name = "K0基准时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date kAnchorTime;
 
+    /** 房间内空域/威力区等前端图形JSON */
+    private String frontendDrawings;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -87,6 +90,16 @@ public class Rooms extends BaseEntity
         return kAnchorTime;
     }
 
+    public void setFrontendDrawings(String frontendDrawings) 
+    {
+        this.frontendDrawings = frontendDrawings;
+    }
+
+    public String getFrontendDrawings() 
+    {
+        return frontendDrawings;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -95,6 +108,7 @@ public class Rooms extends BaseEntity
             .append("ownerId", getOwnerId())
             .append("name", getName())
             .append("kAnchorTime", getkAnchorTime())
+            .append("frontendDrawings", getFrontendDrawings())
             .toString();
     }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/RoomsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RoomsMapper.xml
index 09c4a35..9056679 100644
--- a/ruoyi-system/src/main/resources/mapper/system/RoomsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/RoomsMapper.xml
@@ -10,10 +10,11 @@
         <result property="ownerId"    column="owner_id"    />
         <result property="name"    column="name"    />
         <result property="kAnchorTime"    column="k_anchor_time"    />
+        <result property="frontendDrawings"    column="frontend_drawings"    />
     </resultMap>
 
     <sql id="selectRoomsVo">
-        select id, parent_id, owner_id, name, k_anchor_time from ry.rooms
+        select id, parent_id, owner_id, name, k_anchor_time, frontend_drawings from ry.rooms
     </sql>
 
     <select id="selectRoomsList" parameterType="Rooms" resultMap="RoomsResult">
@@ -38,12 +39,14 @@
             <if test="ownerId != null">owner_id,</if>
             <if test="name != null and name != ''">name,</if>
             <if test="kAnchorTime != null">k_anchor_time,</if>
+            <if test="frontendDrawings != null">frontend_drawings,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="parentId != null">#{parentId},</if>
             <if test="ownerId != null">#{ownerId},</if>
             <if test="name != null and name != ''">#{name},</if>
             <if test="kAnchorTime != null">#{kAnchorTime},</if>
+            <if test="frontendDrawings != null">#{frontendDrawings},</if>
         </trim>
     </insert>
 
@@ -54,6 +57,7 @@
             <if test="ownerId != null">owner_id = #{ownerId},</if>
             <if test="name != null and name != ''">name = #{name},</if>
             <if test="kAnchorTime != null">k_anchor_time = #{kAnchorTime},</if>
+            <if test="frontendDrawings != null">frontend_drawings = #{frontendDrawings},</if>
         </trim>
         where id = #{id}
     </update>
diff --git a/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue b/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue
index c7e10f7..d7dccca 100644
--- a/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue
+++ b/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue
@@ -7,13 +7,17 @@
       </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 class="menu-item" @click="handleCopyRoute">
+        <span class="menu-icon">📋</span>
+        <span>复制</span>
+      </div>
     </div>
 
     <!-- 航线上飞机：显示/隐藏/编辑标牌、编辑平台 -->
@@ -134,6 +138,11 @@
     <!-- 多边形特有选项 -->
     <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="editName" v-if="entityData.type === 'powerZone'">
+        <span class="menu-icon">📝</span>
+        <span>名称</span>
+        <span class="menu-value">{{ entityData.name || '' }}</span>
+      </div>
       <div class="menu-item" @click="toggleColorPicker('color')">
         <span class="menu-icon">🎨</span>
         <span>填充色</span>
@@ -315,6 +324,15 @@
         <span>修改朝向</span>
         <span class="menu-value">{{ entityData.heading != null ? entityData.heading + '°' : '0°' }}</span>
       </div>
+      <div class="menu-title" style="margin-top:8px;">航线</div>
+      <div class="menu-item" @click="handleStartRouteBeforePlatform">
+        <span class="menu-icon">⬅️</span>
+        <span>在此之前插入航线</span>
+      </div>
+      <div class="menu-item" @click="handleStartRouteAfterPlatform">
+        <span class="menu-icon">➡️</span>
+        <span>在此之后插入航线</span>
+      </div>
     </div>
   </div>
 </template>
@@ -388,10 +406,25 @@ export default {
       this.$emit('edit-platform-heading')
     },
 
+    handleStartRouteBeforePlatform() {
+      this.$emit('start-route-before-platform', this.entityData)
+    },
+
+    handleStartRouteAfterPlatform() {
+      this.$emit('start-route-after-platform', this.entityData)
+    },
+
     handleToggleRouteLabel() {
       this.$emit('toggle-route-label')
     },
 
+    editName() {
+      const newName = prompt('请输入威力区名称：', this.entityData.name || '')
+      if (newName !== null && newName.trim() !== '') {
+        this.$emit('update-property', 'name', newName.trim())
+      }
+    },
+
     handleToggleRouteLock() {
       this.$emit('toggle-route-lock')
     },
@@ -404,6 +437,10 @@ export default {
       this.$emit('power-zone')
     },
 
+    handleCopyRoute() {
+      this.$emit('copy-route')
+    },
+
     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 d6c880d..02c054f 100644
--- a/ruoyi-ui/src/views/cesiumMap/DrawingToolbar.vue
+++ b/ruoyi-ui/src/views/cesiumMap/DrawingToolbar.vue
@@ -41,7 +41,7 @@ export default {
     return {
       // 完整工具列表（空域模式，移除点和线）
       allToolbarItems: [
-        { id: 'mouse', name: '鼠标', icon: 'el-icon-position' },
+        { id: 'mouse', name: '鼠标', icon: 'cursor' },
         { id: 'polygon', name: '多边形空域', icon: 'el-icon-house' },
         { id: 'rectangle', name: '矩形空域', icon: 'jx' },
         { id: 'circle', name: '圆形空域', icon: 'circle' },
diff --git a/ruoyi-ui/src/views/cesiumMap/LocateDialog.vue b/ruoyi-ui/src/views/cesiumMap/LocateDialog.vue
index 750db97..9a9861e 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} (${degreesToDMS(item.lng)}, ${degreesToDMS(item.lat)})`"
+              :label="`${item.name} (${formatCoordinate(item.lng)}, ${formatCoordinate(item.lat)})`"
               :value="item.id"
             />
           </el-select>
@@ -70,7 +70,7 @@
         <el-form-item label="经度：">
           <el-input
             v-model="formData.lng"
-            placeholder="例如 116°23'48.64""
+            :placeholder="coordinateFormat === 'dms' ? '例如 116°23\'48.64&quot;' : '例如 116.396844'"
             clearable
           />
         </el-form-item>
@@ -78,7 +78,7 @@
         <el-form-item label="纬度：">
           <el-input
             v-model="formData.lat"
-            placeholder="例如 39°54'33.48""
+            :placeholder="coordinateFormat === 'dms' ? '例如 39°54\'33.48&quot;' : '例如 39.909289'"
             clearable
           />
         </el-form-item>
@@ -107,6 +107,10 @@ export default {
     visible: {
       type: Boolean,
       default: false
+    },
+    coordinateFormat: {
+      type: String,
+      default: 'dms' // 'decimal' 或 'dms'
     }
   },
   data() {
@@ -137,9 +141,44 @@ export default {
         this.loadScenarios()
       }
       this.$emit('update:visible', newVal)
+    },
+    coordinateFormat: {
+      handler(newVal) {
+        this.updateCoordinateFormat(newVal)
+      }
     }
-  },
+    },
   methods: {
+    updateCoordinateFormat(newFormat) {
+      if (!this.formData.lng || !this.formData.lat) return
+      
+      let lngDegrees, latDegrees
+      
+      if (this.coordinateFormat === 'dms') {
+        lngDegrees = this.dmsToDegrees(this.formData.lng)
+        latDegrees = this.dmsToDegrees(this.formData.lat)
+      } else {
+        lngDegrees = parseFloat(this.formData.lng)
+        latDegrees = parseFloat(this.formData.lat)
+      }
+      
+      if (lngDegrees !== null && latDegrees !== null && !isNaN(lngDegrees) && !isNaN(latDegrees)) {
+        if (newFormat === 'dms') {
+          this.formData.lng = this.degreesToDMS(lngDegrees)
+          this.formData.lat = this.degreesToDMS(latDegrees)
+        } else {
+          this.formData.lng = lngDegrees.toFixed(6)
+          this.formData.lat = latDegrees.toFixed(6)
+        }
+      }
+    },
+    formatCoordinate(value) {
+      if (this.coordinateFormat === 'dms') {
+        return this.degreesToDMS(value)
+      } else {
+        return value.toFixed(6)
+      }
+    },
     degreesToDMS(decimalDegrees) {
       const degrees = Math.floor(decimalDegrees)
       const minutesDecimal = (decimalDegrees - degrees) * 60
@@ -157,12 +196,22 @@ export default {
       return sign * (Math.abs(degrees) + minutes / 60 + seconds / 3600)
     },
     resetForm() {
-      this.formData = {
-        scenarioId: null,
-        routeId: null,
-        waypointId: null,
-        lng: '116°23\'48.64"',
-        lat: '39°54\'33.48"'
+      if (this.coordinateFormat === 'dms') {
+        this.formData = {
+          scenarioId: null,
+          routeId: null,
+          waypointId: null,
+          lng: '116°23\'48.64"',
+          lat: '39°54\'33.48"'
+        }
+      } else {
+        this.formData = {
+          scenarioId: null,
+          routeId: null,
+          waypointId: null,
+          lng: '116.396844',
+          lat: '39.909289'
+        }
       }
       this.routeList = []
       this.waypointList = []
@@ -214,8 +263,8 @@ export default {
       if (value) {
         const waypoint = this.waypointList.find(w => w.id === value)
         if (waypoint) {
-          this.formData.lng = this.degreesToDMS(waypoint.lng)
-          this.formData.lat = this.degreesToDMS(waypoint.lat)
+          this.formData.lng = this.formatCoordinate(waypoint.lng)
+          this.formData.lat = this.formatCoordinate(waypoint.lat)
         }
       }
     },
@@ -233,12 +282,24 @@ export default {
         return
       }
       
-      const lngDegrees = this.dmsToDegrees(lng)
-      const latDegrees = this.dmsToDegrees(lat)
+      let lngDegrees, latDegrees
       
-      if (lngDegrees === null || latDegrees === null || isNaN(lngDegrees) || isNaN(latDegrees)) {
-        this.$message.error('请输入有效的度分秒格式！格式：116°23\'48.64"')
-        return
+      if (this.coordinateFormat === 'dms') {
+        lngDegrees = this.dmsToDegrees(lng)
+        latDegrees = this.dmsToDegrees(lat)
+        
+        if (lngDegrees === null || latDegrees === null || isNaN(lngDegrees) || isNaN(latDegrees)) {
+          this.$message.error('请输入有效的度分秒格式！格式：116°23\'48.64"')
+          return
+        }
+      } else {
+        lngDegrees = parseFloat(lng)
+        latDegrees = parseFloat(lat)
+        
+        if (isNaN(lngDegrees) || isNaN(latDegrees)) {
+          this.$message.error('请输入有效的十进制格式！')
+          return
+        }
       }
       
       if (lngDegrees < -180 || lngDegrees > 180 || latDegrees < -90 || latDegrees > 90) {
diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue
index fa18607..e34114c 100644
--- a/ruoyi-ui/src/views/cesiumMap/index.vue
+++ b/ruoyi-ui/src/views/cesiumMap/index.vue
@@ -40,13 +40,20 @@
       @show-transform-box="showPlatformIconTransformBox"
       @toggle-route-label="toggleRouteLabelVisibility"
       @toggle-route-lock="toggleRouteLock"
+<<<<<<< HEAD
       @edit-platform="openEditPlatformDialog"
       @power-zone="openPowerZoneDialog"
+=======
+      @start-route-before-platform="handleStartRouteBeforePlatform"
+      @start-route-after-platform="handleStartRouteAfterPlatform"
+      @copy-route="handleCopyRouteFromMenu"
+>>>>>>> 9363256d79ba1d213479769fa0a97c737d179e32
     />
 
     <!-- 定位弹窗 -->
     <locate-dialog
       :visible="locateDialogVisible"
+      :coordinateFormat="coordinateFormat"
       @update:visible="locateDialogVisible = $event"
       @confirm="handleLocateConfirm"
       @cancel="handleLocateCancel"
@@ -57,6 +64,11 @@
       {{ platformIconRotateTip }}
     </div>
 
+    <!-- 航线复制预览提示 -->
+    <div v-if="copyPreviewWaypoints && copyPreviewWaypoints.length >= 2" class="copy-route-tip">
+      点击地图放置复制航线，右键取消
+    </div>
+
     <!-- 半径输入弹窗 -->
     <radius-dialog
       :visible="radiusDialogVisible"
@@ -187,6 +199,15 @@ export default {
         unit: 'km',
         position: 'bottom-right'
       })
+    },
+    coordinateFormat: {
+      type: String,
+      default: 'dms' // 'decimal' 或 'dms'
+    },
+    /** 航线上锁状态（由父组件维护，与右侧列表锁图标同步） */
+    routeLocked: {
+      type: Object,
+      default: () => ({})
     }
   },
   watch: {
@@ -206,6 +227,11 @@ export default {
           this.updateScaleFromConfig(newVal)
         }
       }
+    },
+    coordinateFormat: {
+      handler(newVal) {
+        this.updateCoordinatesDisplay()
+      }
     }
   },
   data() {
@@ -227,6 +253,7 @@ export default {
       // 实体管理
       allEntities: [], // 所有绘制的实体
       entityCounter: 0,
+      loadingDrawingsFromRoom: false,
       selectedEntity: null, // 当前选中的实体
       // 测量结果
       measurementResult: null,
@@ -264,10 +291,16 @@ export default {
       },
       // 航线飞机标牌显示状态：routeId -> true 显示 / false 隐藏，不设则默认显示
       routeLabelVisible: {},
+<<<<<<< HEAD
       // 航线飞机标牌样式：routeId -> { fontSize, fontColor }
       routeLabelStyles: {},
       // 航线上锁状态：routeId -> true 上锁（不可编辑）/ false 或未设 可编辑
       routeLocked: {},
+=======
+      // 航线上锁状态由父组件通过 prop routeLocked 传入，与右侧列表锁图标同步
+      // 从平台右键进入的航线绘制：{ platformInfo: { platformId, platform }, mode: 'before'|'after' }
+      platformRouteDrawing: null,
+>>>>>>> 9363256d79ba1d213479769fa0a97c737d179e32
       // 默认样式
       defaultStyles: {
         point: { color: '#FF0000', size: 12 },
@@ -277,11 +310,12 @@ export default {
         circle: { color: '#800080', opacity: 0, width: 4 },
         sector: { color: '#FF6347', opacity: 0, width: 3 },
         arrow: { color: '#FF0000', width: 6 },
-        text: { color: '#000000', font: '48px Microsoft YaHei, PingFang SC, sans-serif', backgroundColor: 'rgba(255, 255, 255, 0.8)' },
+        text: { color: '#000000', font: '14px PingFang SC, Microsoft YaHei, Helvetica Neue, sans-serif', backgroundColor: 'rgba(255, 255, 255, 0.92)' },
         image: { width: 150, height: 150 }
       },
       // 鼠标经纬度
       coordinatesText: '经度: --, 纬度: --',
+      currentCoordinates: null,
       // 比例尺（高德风格）
       scaleBarText: '--',
       scaleBarWidthPx: 80,
@@ -317,7 +351,18 @@ export default {
       // 实体点击防抖，避免双击误触导致相机高度剧烈变化
       entityClickDebounceTimer: null,
       lastEntityClickTime: 0,
-      cameraStateBeforeEntityClick: null
+      cameraStateBeforeEntityClick: null,
+      // 航点拖拽编辑：{ entity, routeId, dbId, originalAlt }；未超过阈值前为 pending
+      waypointDragging: null,
+      waypointDragPending: null,
+      WAYPOINT_DRAG_THRESHOLD_PX: 8,
+      /** 拖拽航点前相机 enableInputs 状态，松开时恢复 */
+      waypointDragCameraInputsEnabled: undefined,
+      lastClickWasDrag: false,
+      // 航线复制预览：整条航线跟随鼠标，左键放置
+      copyPreviewWaypoints: null,
+      copyPreviewEntity: null,
+      copyPreviewMouseCartesian: null
     }
   },
   components: {
@@ -470,7 +515,7 @@ export default {
           // 检查实体是否与航线相关
           const isRouteRelated = item.type === 'route' || item.routeId ||
             (item.entity && item.entity.properties &&
-             (item.entity.properties.isMissionWaypoint || item.entity.properties.isMissionRouteLine));
+              (item.entity.properties.isMissionWaypoint || item.entity.properties.isMissionRouteLine));
 
           // 如果是航线相关实体，从地图中移除
           if (isRouteRelated && item.entity) {
@@ -518,22 +563,22 @@ export default {
         console.warn(`>>> [地图同步失败] 尝试匹配 ID: ${dbId}, 但地图现有 ID 列表为:`, availableIds);
       }
     },
-    // 新建航线绘制
+    // 新建航线绘制（与测距一致：已确定段实线 + 最后一段到鼠标的虚线实时预览）
     startMissionRouteDrawing() {
       this.stopDrawing(); // 停止其他可能存在的绘制
       this.drawingPoints = [];
       this.missionHoldParamsByIndex = {};
       this.missionPendingHold = null;
-      let activeCursorPosition = null;
       this.isDrawing = true;
       this.viewer.canvas.style.cursor = 'crosshair';
       this.drawingHandler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas);
       window.addEventListener('contextmenu', this.preventContextMenu, true);
-      // 鼠标移动预览逻辑
+      // 鼠标移动：更新实时光标位置并请求重绘，实现虚线预览跟随
       this.drawingHandler.setInputAction((movement) => {
         const newPosition = this.getClickPosition(movement.endPosition);
         if (newPosition) {
-          activeCursorPosition = newPosition;
+          this.activeCursorPosition = newPosition;
+          if (this.viewer.scene.requestRender) this.viewer.scene.requestRender();
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
       // 左键点击逻辑
@@ -549,8 +594,8 @@ export default {
           name: `WP${wpIndex}`,
           position: position,
           properties: {
-            isMissionWaypoint: true, // 这是一个永久的业务标记
-            originalIndex: wpIndex,   // 存下它是第几个点
+            isMissionWaypoint: true,
+            originalIndex: wpIndex,
             temp: true
           },
           point: {
@@ -558,7 +603,7 @@ export default {
             color: Cesium.Color.WHITE,
             outlineColor: Cesium.Color.fromCssColorString('#0078FF'),
             outlineWidth: 3,
-            disableDepthTestDistance: Number.POSITIVE_INFINITY // 保证不被地形遮挡
+            disableDepthTestDistance: Number.POSITIVE_INFINITY
           },
           label: {
             text: `WP${wpIndex}`,
@@ -570,29 +615,46 @@ export default {
             style: Cesium.LabelStyle.FILL_AND_OUTLINE
           }
         });
-        //  第一次点击后，创建动态黑白斑马线（若有盘旋则在连线中插入盘旋点）
-        if (this.drawingPoints.length === 1) {
-          this.tempPreviewEntity = this.viewer.entities.add({
-            polyline: {
-              positions: new Cesium.CallbackProperty(() => {
-                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)
-                  ];
-                }
-                if (positions.length > 0 && activeCursorPosition) return [...positions, activeCursorPosition];
-                return positions;
-              }, false),
-              width: 3,
-              material: this.getPolylineSolidMaterial('#800080'),
-              clampToGround: true
-            }
-          });
+        // 已确定段：实线（≥2 点时更新）
+        if (this.drawingPoints.length >= 2) {
+          if (this.tempEntity) {
+            this.viewer.entities.remove(this.tempEntity);
+            this.tempEntity = null;
+          }
+          const solidPositions = this.getMissionRouteSolidPositions();
+          if (solidPositions.length >= 2) {
+            this.tempEntity = this.viewer.entities.add({
+              polyline: {
+                positions: solidPositions,
+                width: 3,
+                material: Cesium.Color.fromCssColorString('#800080'),
+                arcType: Cesium.ArcType.NONE
+              }
+            });
+          }
+        }
+        // 实时预览段：虚线（从最后一逻辑点到鼠标），与测距一致
+        if (this.tempPreviewEntity) {
+          this.viewer.entities.remove(this.tempPreviewEntity);
+          this.tempPreviewEntity = null;
         }
+        this.tempPreviewEntity = this.viewer.entities.add({
+          polyline: {
+            positions: new Cesium.CallbackProperty(() => {
+              const last = this.getMissionRouteLastPosition();
+              if (this.activeCursorPosition && last) {
+                return [last, this.activeCursorPosition];
+              }
+              return last ? [last, last] : [];
+            }, false),
+            width: 3,
+            material: new Cesium.PolylineDashMaterialProperty({
+              color: Cesium.Color.fromCssColorString('#800080'),
+              dashLength: 16
+            }),
+            arcType: Cesium.ArcType.NONE
+          }
+        });
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
       // 右键点击逻辑（结束绘制、抛出数据、恢复右键）
       this.drawingHandler.setInputAction(() => {
@@ -639,6 +701,251 @@ export default {
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     },
 
+    /** 航线绘制中“已确定”段的位置数组（含盘旋插入点），用于实线预览 */
+    getMissionRouteSolidPositions() {
+      if (!this.drawingPoints || this.drawingPoints.length === 0) return [];
+      if (!this.missionPendingHold || this.drawingPoints.length < 2) return [...this.drawingPoints];
+      const idx = this.missionPendingHold.beforeIndex;
+      return [
+        ...this.drawingPoints.slice(0, idx + 1),
+        this.missionPendingHold.center,
+        ...this.drawingPoints.slice(idx + 1)
+      ];
+    },
+    /** 航线绘制中虚线预览的起点（最后一逻辑点：最后一个航点或待插入盘旋中心） */
+    getMissionRouteLastPosition() {
+      if (!this.drawingPoints || this.drawingPoints.length === 0) return null;
+      if (this.missionPendingHold) return this.missionPendingHold.center;
+      return this.drawingPoints[this.drawingPoints.length - 1];
+    },
+
+    /**
+     * 从平台右键进入的航线绘制：在此之前插入（先画前段，平台为最后一站）/ 在此之后插入（平台为起点，再画后段）。
+     * @param {Object} entityData - 平台图标 entityData，含 lng, lat, platformId, platform, name
+     * @param {'before'|'after'} mode - 'before' 先画平台前航点，右键结束时平台作为最后一站；'after' 平台为起点再画后续
+     */
+    startMissionRouteDrawingFromPlatform(entityData, mode) {
+      this.stopDrawing();
+      const platformCartesian = Cesium.Cartesian3.fromDegrees(entityData.lng, entityData.lat);
+      const platformInfo = {
+        platformId: entityData.platformId,
+        platform: entityData.platform,
+        serverId: entityData.serverId,
+        mapEntityId: entityData.id
+      };
+      this.platformRouteDrawing = { platformInfo, mode, platformName: entityData.name || entityData.label || '平台' };
+
+      this.drawingPoints = [];
+      this.missionHoldParamsByIndex = {};
+      this.missionPendingHold = null;
+      this.activeCursorPosition = null;
+
+      if (mode === 'after') {
+        this.drawingPoints.push(platformCartesian);
+        this.viewer.entities.add({
+          id: 'temp_wp_1',
+          name: this.platformRouteDrawing.platformName,
+          position: platformCartesian,
+          properties: { isMissionWaypoint: true, originalIndex: 1, temp: true },
+          point: {
+            pixelSize: 10,
+            color: Cesium.Color.WHITE,
+            outlineColor: Cesium.Color.fromCssColorString('#0078FF'),
+            outlineWidth: 3,
+            disableDepthTestDistance: Number.POSITIVE_INFINITY
+          },
+          label: {
+            text: this.platformRouteDrawing.platformName,
+            font: '14px Microsoft YaHei',
+            pixelOffset: new Cesium.Cartesian2(0, -20),
+            fillColor: Cesium.Color.fromCssColorString('#333333'),
+            outlineColor: Cesium.Color.BLACK,
+            outlineWidth: 1,
+            style: Cesium.LabelStyle.FILL_AND_OUTLINE
+          }
+        });
+        this.$emit('drawing-points-update', 1);
+        // 平台→第一航点的虚线预览延后到首次 MOUSE_MOVE 创建，确保 activeCursorPosition 有效（否则 [last,last] 零长度不显示）
+      }
+
+      this.isDrawing = true;
+      this.$emit('platform-route-drawing-started');
+      this.viewer.canvas.style.cursor = 'crosshair';
+      this.drawingHandler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas);
+      window.addEventListener('contextmenu', this.preventContextMenu, true);
+
+      this.drawingHandler.setInputAction((movement) => {
+        const newPosition = this.getClickPosition(movement.endPosition);
+        if (newPosition) {
+          this.activeCursorPosition = newPosition;
+          // 「在此之后」仅 1 点时延后创建虚线；「在此之前」首点已在左键创建预览
+          const platformRoute = this.platformRouteDrawing;
+          const onePoint = platformRoute && this.drawingPoints.length === 1 && !this.tempPreviewEntity;
+          if (onePoint && platformRoute.mode === 'after') {
+            this.tempPreviewEntity = this.viewer.entities.add({
+              polyline: {
+                positions: new Cesium.CallbackProperty(() => {
+                  const last = this.drawingPoints.length > 0 ? this.drawingPoints[this.drawingPoints.length - 1] : null;
+                  if (last && this.activeCursorPosition) return [last, this.activeCursorPosition];
+                  return last ? [last, last] : [];
+                }, false),
+                width: 3,
+                material: new Cesium.PolylineDashMaterialProperty({
+                  color: Cesium.Color.fromCssColorString('#800080'),
+                  dashLength: 16
+                }),
+                arcType: Cesium.ArcType.NONE
+              }
+            });
+          }
+          if (this.viewer.scene.requestRender) this.viewer.scene.requestRender();
+        }
+      }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+
+      this.drawingHandler.setInputAction((click) => {
+        const position = this.getClickPosition(click.position);
+        if (!position) return;
+        const platformRoute = this.platformRouteDrawing;
+        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}`,
+          name: `WP${wpIndex}`,
+          position: position,
+          properties: { isMissionWaypoint: true, originalIndex: wpIndex, temp: true },
+          point: {
+            pixelSize: 10,
+            color: Cesium.Color.WHITE,
+            outlineColor: Cesium.Color.fromCssColorString('#0078FF'),
+            outlineWidth: 3,
+            disableDepthTestDistance: Number.POSITIVE_INFINITY
+          },
+          label: {
+            text: `WP${wpIndex}`,
+            font: '14px Microsoft YaHei',
+            pixelOffset: new Cesium.Cartesian2(0, -20),
+            fillColor: Cesium.Color.fromCssColorString('#333333'),
+            outlineColor: Cesium.Color.BLACK,
+            outlineWidth: 1,
+            style: Cesium.LabelStyle.FILL_AND_OUTLINE
+          }
+        });
+        // 「在此之前」首点：用点击位置初始化光标，这样立刻创建预览就有有效线段（一开始即显示预览）
+        if (platformRoute && platformRoute.mode === 'before' && this.drawingPoints.length === 1) {
+          this.activeCursorPosition = position;
+        }
+        // 与普通航线一致：已确定段实线，最后一段到鼠标虚线实时预览
+        if (this.tempPreviewEntity) {
+          this.viewer.entities.remove(this.tempPreviewEntity);
+          this.tempPreviewEntity = null;
+        }
+        if (this.drawingPoints.length >= 2) {
+          if (this.tempEntity) {
+            this.viewer.entities.remove(this.tempEntity);
+            this.tempEntity = null;
+          }
+          // 「在此之前」：先点的为倒数第二、最后点的为起点，实线显示为 最后点→…→第一点（与最终航线顺序一致）
+          const solidPositions = platformRoute && platformRoute.mode === 'before' ? [...this.drawingPoints].reverse() : [...this.drawingPoints];
+          this.tempEntity = this.viewer.entities.add({
+            polyline: {
+              positions: solidPositions,
+              width: 3,
+              material: Cesium.Color.fromCssColorString('#800080'),
+              arcType: Cesium.ArcType.NONE
+            }
+          });
+        }
+        this.tempPreviewEntity = this.viewer.entities.add({
+          polyline: {
+            positions: new Cesium.CallbackProperty(() => {
+              const last = this.drawingPoints.length > 0 ? this.drawingPoints[this.drawingPoints.length - 1] : null;
+              if (last && this.activeCursorPosition) return [last, this.activeCursorPosition];
+              return last ? [last, last] : [];
+            }, false),
+            width: 3,
+            material: new Cesium.PolylineDashMaterialProperty({
+              color: Cesium.Color.fromCssColorString('#800080'),
+              dashLength: 16
+            }),
+            arcType: Cesium.ArcType.NONE
+          }
+        });
+      }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+
+      this.drawingHandler.setInputAction(() => {
+        const pr = this.platformRouteDrawing;
+        if (!pr) {
+          this.stopDrawing();
+          this.$emit('drawing-cancelled');
+          setTimeout(() => window.removeEventListener('contextmenu', this.preventContextMenu, true), 200);
+          return;
+        }
+        let pointsToEmit = this.drawingPoints;
+        if (pr.mode === 'before') {
+          if (this.drawingPoints.length < 1) {
+            this.$message && this.$message.info('已取消');
+            this.platformRouteDrawing = null;
+            this.stopDrawing();
+            this.$emit('drawing-cancelled');
+            setTimeout(() => window.removeEventListener('contextmenu', this.preventContextMenu, true), 200);
+            return;
+          }
+          // 顺序反转：先点的为倒数第二个点，最后点的为起点；平台为最后一个点
+          pointsToEmit = [...this.drawingPoints].reverse();
+          pointsToEmit.push(platformCartesian);
+          const lastId = `temp_wp_${pointsToEmit.length}`;
+          this.viewer.entities.add({
+            id: lastId,
+            name: pr.platformName,
+            position: platformCartesian,
+            properties: { isMissionWaypoint: true, temp: true },
+            point: {
+              pixelSize: 10,
+              color: Cesium.Color.WHITE,
+              outlineColor: Cesium.Color.fromCssColorString('#0078FF'),
+              outlineWidth: 3,
+              disableDepthTestDistance: Number.POSITIVE_INFINITY
+            },
+            label: {
+              text: pr.platformName,
+              font: '14px Microsoft YaHei',
+              pixelOffset: new Cesium.Cartesian2(0, -20),
+              fillColor: Cesium.Color.fromCssColorString('#333333'),
+              outlineColor: Cesium.Color.BLACK,
+              outlineWidth: 1,
+              style: Cesium.LabelStyle.FILL_AND_OUTLINE
+            }
+          });
+        }
+        if (pointsToEmit.length < 2) {
+          this.$message && this.$message.info('点数不足，航线已取消');
+          this.platformRouteDrawing = null;
+          this.stopDrawing();
+          this.$emit('drawing-cancelled');
+          setTimeout(() => window.removeEventListener('contextmenu', this.preventContextMenu, true), 200);
+          return;
+        }
+        const latLngPoints = [];
+        pointsToEmit.forEach((pos, i) => {
+          const coords = this.cartesianToLatLng(pos);
+          const name = (pr.mode === 'after' && i === 0) || (pr.mode === 'before' && i === pointsToEmit.length - 1) ? pr.platformName : `WP${i + 1}`;
+          latLngPoints.push({
+            id: i + 1,
+            name,
+            lat: coords.lat,
+            lng: coords.lng,
+            alt: 5000,
+            speed: 800
+          });
+        });
+        this.$emit('draw-complete', latLngPoints, pr.platformInfo);
+        this.platformRouteDrawing = null;
+        this.stopDrawing();
+        setTimeout(() => window.removeEventListener('contextmenu', this.preventContextMenu, true), 200);
+      }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+    },
+
     /** 航线绘制过程中：在最后两航点之间插入盘旋（由父组件在弹窗确认后调用）。插入后“最后一个点”会被移除，下一点击即为盘旋后的下一航点。 */
     insertHoldBetweenLastTwo(holdParams) {
       if (!this.drawingPoints || this.drawingPoints.length < 2) return;
@@ -663,6 +970,22 @@ export default {
         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 }
       });
+      // 更新实线预览（含盘旋点）
+      if (this.tempEntity) {
+        this.viewer.entities.remove(this.tempEntity);
+        this.tempEntity = null;
+      }
+      const solidPositions = this.getMissionRouteSolidPositions();
+      if (solidPositions.length >= 2) {
+        this.tempEntity = this.viewer.entities.add({
+          polyline: {
+            positions: solidPositions,
+            width: 3,
+            material: Cesium.Color.fromCssColorString('#800080'),
+            arcType: Cesium.ArcType.NONE
+          }
+        });
+      }
       this.$emit('drawing-points-update', this.drawingPoints.length);
     },
 
@@ -977,8 +1300,8 @@ export default {
         polyline: {
           positions: linePositions,
           width: 3,
-          material: this.getPolylineSolidMaterial('#008aff'),
-          clampToGround: true,
+          material: Cesium.Color.fromCssColorString('#008aff'),
+          arcType: Cesium.ArcType.NONE,
           disableDepthTestDistance: Number.POSITIVE_INFINITY
         }
       });
@@ -1213,11 +1536,20 @@ export default {
       const wpColor = wpStyle.color || '#ffffff';
       const wpOutline = wpStyle.outlineColor || '#0078FF';
       const wpOutlineW = wpStyle.outlineWidth != null ? wpStyle.outlineWidth : 2;
-      // 航线默认紫色、线宽 3；与测距线一致使用轮廓材质，平滑无锯齿
+      // 航线默认紫色、线宽 3；与主航线一致的线型用于主线和转弯半径弧
       const lineWidth = lineStyle.width != null ? lineStyle.width : 3;
       const lineColor = lineStyle.color || '#800080';
-      const lineMaterial = this.getPolylineSolidMaterial(lineColor);
-      // 先收集所有航点的世界坐标
+      const gapColor = lineStyle.gapColor != null ? lineStyle.gapColor : '#000000';
+      const dashLen = lineStyle.dashLength != null ? lineStyle.dashLength : 20;
+      const useDash = (lineStyle.style || 'solid') === 'dash';
+      const lineMaterial = useDash
+        ? new Cesium.PolylineDashMaterialProperty({
+          color: Cesium.Color.fromCssColorString(lineColor),
+          gapColor: Cesium.Color.fromCssColorString(gapColor),
+          dashLength: dashLen
+        })
+        : Cesium.Color.fromCssColorString(lineColor);
+      // 先收集所有航点的世界坐标，并缓存航点 id 列表供拖拽时动态连线
       const originalPositions = [];
       waypoints.forEach((wp) => {
         const lon = parseFloat(wp.lng);
@@ -1225,6 +1557,8 @@ export default {
         const altValue = Number(wp.alt || 5000);
         originalPositions.push(Cesium.Cartesian3.fromDegrees(lon, lat, altValue));
       });
+      if (!this._routeWaypointIdsByRoute) this._routeWaypointIdsByRoute = {};
+      this._routeWaypointIdsByRoute[routeId] = waypoints.map((wp) => wp.id);
       // 判断航点 i 是否为“转弯半径”航点（将用弧线两端两个点替代中心点）
       const isTurnWaypointWithArc = (i) => {
         if (i < 1 || i >= waypoints.length - 1) return false;
@@ -1262,11 +1596,11 @@ export default {
           },
           label: {
             text: wp.name || `WP${index + 1}`,
-            font: `${wp.labelFontSize != null ? Math.min(28, Math.max(10, Number(wp.labelFontSize))) : 14}px Microsoft YaHei`,
+            font: `${wp.labelFontSize != null ? Math.min(28, Math.max(10, Number(wp.labelFontSize))) : 14}px PingFang SC, Hiragino Sans GB, Microsoft YaHei, Helvetica Neue, Helvetica, Arial, sans-serif`,
             pixelOffset: new Cesium.Cartesian2(0, -Math.max(14, pixelSize + 8)),
-            fillColor: Cesium.Color.fromCssColorString(wp.labelColor || '#333333'),
-            outlineColor: Cesium.Color.BLACK,
-            outlineWidth: 1,
+            fillColor: Cesium.Color.fromCssColorString(wp.labelColor || '#2c2c2c'),
+            outlineColor: Cesium.Color.fromCssColorString('#e8e8e8'),
+            outlineWidth: 0.5,
             style: Cesium.LabelStyle.FILL_AND_OUTLINE
           }
         });
@@ -1413,7 +1747,7 @@ export default {
             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 },
+              polyline: { positions: [entry, ...arcPoints.slice(1), exit], width: 8, material: Cesium.Color.ORANGE, arcType: Cesium.ArcType.NONE, zIndex: 20 },
               properties: { routeId: routeId }
             });
             lastPos = exit;
@@ -1430,7 +1764,7 @@ export default {
               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 },
+                polyline: { positions: arcPoints, width: lineWidth, material: lineMaterial, arcType: Cesium.ArcType.NONE, zIndex: 20 },
                 properties: { routeId: routeId }
               });
               // 转弯半径两侧航点与航线整体航点风格一致，点击均打开原航点编辑（dbId 为当前 wp.id）
@@ -1457,11 +1791,11 @@ export default {
                   },
                   label: {
                     text: wpName,
-                    font: `${wp.labelFontSize != null ? Math.min(28, Math.max(10, Number(wp.labelFontSize))) : 14}px Microsoft YaHei`,
+                    font: `${wp.labelFontSize != null ? Math.min(28, Math.max(10, Number(wp.labelFontSize))) : 14}px PingFang SC, Hiragino Sans GB, Microsoft YaHei, Helvetica Neue, Helvetica, Arial, sans-serif`,
                     pixelOffset: new Cesium.Cartesian2(0, -Math.max(14, pixelSize + 8)),
-                    fillColor: Cesium.Color.fromCssColorString(wp.labelColor || '#333333'),
-                    outlineColor: Cesium.Color.BLACK,
-                    outlineWidth: 1,
+                    fillColor: Cesium.Color.fromCssColorString(wp.labelColor || '#2c2c2c'),
+                    outlineColor: Cesium.Color.fromCssColorString('#e8e8e8'),
+                    outlineWidth: 0.5,
                     style: Cesium.LabelStyle.FILL_AND_OUTLINE
                   }
                 });
@@ -1474,14 +1808,17 @@ export default {
             }
           }
         }
-        // 绘制包含弧线的 Polyline（lineWidth/lineMaterial 已在上方与航点样式一起计算，默认紫色线宽3）
+        // 绘制主航线：用 CallbackProperty 从各航点实体取当前位置，拖拽时实时连线
+        const that = this;
         const routeEntity = this.viewer.entities.add({
           id: lineId,
           polyline: {
-            positions: finalPathPositions,
+            positions: new Cesium.CallbackProperty(function () {
+              return that.getRouteLinePositionsFromWaypointEntities(routeId) || finalPathPositions;
+            }, false),
             width: lineWidth,
             material: lineMaterial,
-            clampToGround: true,
+            arcType: Cesium.ArcType.NONE,
             zIndex: 1
           },
           properties: {isMissionRouteLine: true, routeId: routeId}
@@ -1491,6 +1828,41 @@ export default {
         }
       }
     },
+    /** 从各航点/弧线/盘旋实体取当前位置，供主航线折线实时连线（拖拽时动态跟随） */
+    getRouteLinePositionsFromWaypointEntities(routeId) {
+      const ids = this._routeWaypointIdsByRoute && this._routeWaypointIdsByRoute[routeId];
+      if (!ids || !ids.length || !this.viewer) return null;
+      const now = Cesium.JulianDate.now();
+      const positions = [];
+      for (let i = 0; i < ids.length; i++) {
+        const ent = this.viewer.entities.getById(`wp_${routeId}_${ids[i]}`);
+        if (ent && ent.position) {
+          const pos = ent.position.getValue(now);
+          if (pos) {
+            positions.push(Cesium.Cartesian3.clone(pos));
+            continue;
+          }
+        }
+        const arcEnt = this.viewer.entities.getById(`arc-line-${routeId}-${i}`);
+        if (arcEnt && arcEnt.polyline && arcEnt.polyline.positions) {
+          const arr = arcEnt.polyline.positions.getValue(now);
+          if (arr && arr.length) {
+            for (let k = 0; k < arr.length; k++) positions.push(Cesium.Cartesian3.clone(arr[k]));
+            continue;
+          }
+        }
+        const holdEnt = this.viewer.entities.getById(`hold-line-${routeId}-${i}`);
+        if (holdEnt && holdEnt.polyline && holdEnt.polyline.positions) {
+          const arr = holdEnt.polyline.positions.getValue(now);
+          if (arr && arr.length) {
+            for (let k = 0; k < arr.length; k++) positions.push(Cesium.Cartesian3.clone(arr[k]));
+            continue;
+          }
+        }
+      }
+      return positions.length > 0 ? positions : null;
+    },
+
     // 计算单个点的转弯半径
     getWaypointRadius(wp) {
       const speed = wp.speed || 800;
@@ -1893,6 +2265,7 @@ export default {
         }
         if (shouldRemove) this.viewer.entities.remove(entity);
       }
+      if (this._routeWaypointIdsByRoute) delete this._routeWaypointIdsByRoute[routeId];
       this.allEntities = this.allEntities.filter(item => item.id !== routeId && item.id !== `route-platform-${routeId}` && item.id !== `route-platform-label-${routeId}`);
     },
     /**
@@ -2057,21 +2430,18 @@ export default {
           imageryProvider: false,
           terrainProvider: new Cesium.EllipsoidTerrainProvider(),
           baseLayer: false,
-          // 按需渲染：仅在场景变化时渲染，降低空闲时 CPU/GPU 占用（若某处界面不刷新可主动调用 viewer.scene.requestRender()）
           requestRenderMode: true,
           maximumRenderTimeChange: Infinity,
-          // 允许截图时读取 canvas 内容（若截图仅用 readPixels 可改为 false 以提升性能）
           contextOptions: {
             preserveDrawingBuffer: true,
-            antialias: true  // 开启 WebGL 全局抗锯齿
-          },
-          // 多重采样抗锯齿（WebGL2 下生效，8 在浏览器缩放时线条更平滑）
-          msaaSamples: 8
+            webgl: {
+              antialias: true,
+              msaa: true,
+              msaaSamples: 4
+            }
+          }
         })
         this.viewer.cesiumWidget.creditContainer.style.display = "none"
-        // 根据浏览器缩放比例提高渲染分辨率，减轻 80% 等缩放下线条锯齿
-        this.applyResolutionScale()
-        this._resolutionScaleCleanup = this.setupResolutionScaleListener()
         // 按需渲染时：实体增删改后主动请求一帧，避免界面不刷新
         if (this.viewer.scene.requestRenderMode) {
           this.viewer.entities.collectionChanged.addEventListener(() => {
@@ -2105,8 +2475,10 @@ export default {
         this.initHoverHandler()
         this.initMouseCoordinates()
         console.log('Cesium离线二维地图已加载')
+        this.$emit('viewer-ready')
 
         // 1. 定义全局拾取处理器（含防抖，避免双击误触导致相机高度剧烈变化）
+        this.viewer.scene.postProcessStages.fxaa.enabled = true
         this.handler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas);
         this.handler.setInputAction((click) => {
           // 隐藏右键菜单
@@ -2114,6 +2486,43 @@ export default {
 
           if (this.isDrawing) return;
 
+          // 若上一次为拖拽结束，本次左键不打开弹窗
+          if (this.lastClickWasDrag) {
+            this.lastClickWasDrag = false;
+            return;
+          }
+          // 航线复制预览模式：左键放置
+          if (this.copyPreviewWaypoints && this.copyPreviewWaypoints.length > 0) {
+            const placePosition = this.getClickPosition(click.position);
+            if (placePosition) {
+              const carto = Cesium.Cartographic.fromCartesian(placePosition);
+              const placeLat = Cesium.Math.toDegrees(carto.latitude);
+              const placeLng = Cesium.Math.toDegrees(carto.longitude);
+              const first = this.copyPreviewWaypoints[0];
+              const firstLat = parseFloat(first.lat);
+              const firstLng = parseFloat(first.lng);
+              const dLat = placeLat - firstLat;
+              const dLng = placeLng - firstLng;
+              const isHold = (pt) => pt === 'hold_circle' || pt === 'hold_ellipse';
+              const points = this.copyPreviewWaypoints.map((wp, idx) => ({
+                name: isHold(wp.pointType || wp.point_type) ? 'HOLD' : `WP${idx + 1}`,
+                lat: parseFloat(wp.lat) + dLat,
+                lng: parseFloat(wp.lng) + dLng,
+                alt: wp.alt != null ? Number(wp.alt) : 5000,
+                speed: wp.speed != null ? wp.speed : 800,
+                startTime: wp.startTime || 'K+00:00:00',
+                turnAngle: wp.turnAngle != null ? wp.turnAngle : (idx === 0 || idx === this.copyPreviewWaypoints.length - 1 ? 0 : 45),
+                labelFontSize: wp.labelFontSize != null ? wp.labelFontSize : 14,
+                labelColor: wp.labelColor || '#333333',
+                ...(wp.pointType && { pointType: wp.pointType }),
+                ...(wp.holdParams != null && { holdParams: typeof wp.holdParams === 'string' ? wp.holdParams : JSON.stringify(wp.holdParams) })
+              }));
+              this.clearCopyPreview();
+              this.$emit('route-copy-placed', points);
+            }
+            return;
+          }
+
           const pickedObject = this.viewer.scene.pick(click.position);
           if (Cesium.defined(pickedObject) && pickedObject.id) {
             const entity = pickedObject.id;
@@ -2188,6 +2597,100 @@ export default {
             this.lastEntityClickTime = 0;
           }
         }, Cesium.ScreenSpaceEventType.LEFT_DOUBLE_CLICK);
+
+        // 航点拖拽：左键按下仅记录 pending，移动超过阈值后才真正开始拖拽（避免小范围移动带跑地图）
+        this.handler.setInputAction((click) => {
+          if (this.isDrawing || this.copyPreviewWaypoints) return;
+          const pickedObject = this.viewer.scene.pick(click.position);
+          if (!Cesium.defined(pickedObject) || !pickedObject.id) return;
+          const now = Cesium.JulianDate.now();
+          const props = pickedObject.id.properties ? pickedObject.id.properties.getValue(now) : null;
+          if (!props || !props.isMissionWaypoint) return;
+          const routeId = props.routeId && (props.routeId.getValue ? props.routeId.getValue() : props.routeId);
+          const dbId = props.dbId && (props.dbId.getValue ? props.dbId.getValue() : props.dbId);
+          if (routeId == null || dbId == null) return;
+          if (this.routeLocked[routeId]) return;
+          const entity = pickedObject.id;
+          const carto = Cesium.Cartographic.fromCartesian(entity.position.getValue(Cesium.JulianDate.now()));
+          this.waypointDragPending = {
+            entity,
+            routeId,
+            dbId,
+            originalAlt: carto.height,
+            startScreenX: click.position.x,
+            startScreenY: click.position.y
+          };
+        }, Cesium.ScreenSpaceEventType.LEFT_DOWN);
+
+        // 拖拽 / 复制预览：共用一个 MOUSE_MOVE；航点拖拽需超过阈值才生效
+        this.handler.setInputAction((movement) => {
+          if (this.waypointDragPending) {
+            const dx = movement.endPosition.x - this.waypointDragPending.startScreenX;
+            const dy = movement.endPosition.y - this.waypointDragPending.startScreenY;
+            const dist = Math.sqrt(dx * dx + dy * dy);
+            if (dist >= this.WAYPOINT_DRAG_THRESHOLD_PX) {
+              if (this.entityClickDebounceTimer) {
+                clearTimeout(this.entityClickDebounceTimer);
+                this.entityClickDebounceTimer = null;
+              }
+              this.waypointDragging = {
+                entity: this.waypointDragPending.entity,
+                routeId: this.waypointDragPending.routeId,
+                dbId: this.waypointDragPending.dbId,
+                originalAlt: this.waypointDragPending.originalAlt
+              };
+              this.waypointDragPending = null;
+              // 拖拽航点时锁定地图，方便操作
+              if (this.viewer && this.viewer.scene && this.viewer.scene.screenSpaceCameraController) {
+                this.waypointDragCameraInputsEnabled = this.viewer.scene.screenSpaceCameraController.enableInputs;
+                this.viewer.scene.screenSpaceCameraController.enableInputs = false;
+              }
+              const pos = this.getClickPositionWithHeight(movement.endPosition, this.waypointDragging.originalAlt);
+              if (pos) {
+                this.waypointDragging.entity.position = pos;
+                if (this.viewer.scene.requestRender) this.viewer.scene.requestRender();
+              }
+            }
+            if (this.waypointDragPending) return;
+          }
+          if (this.waypointDragging) {
+            const pos = this.getClickPositionWithHeight(movement.endPosition, this.waypointDragging.originalAlt);
+            if (pos) {
+              this.waypointDragging.entity.position = pos;
+              if (this.viewer.scene.requestRender) this.viewer.scene.requestRender();
+            }
+            return;
+          }
+          if (this.copyPreviewWaypoints && this.copyPreviewWaypoints.length >= 2) {
+            const cartesian = this.getClickPosition(movement.endPosition);
+            if (cartesian) {
+              this.copyPreviewMouseCartesian = cartesian;
+              this.updateCopyPreviewPolyline();
+              if (this.viewer.scene.requestRender) this.viewer.scene.requestRender();
+            }
+          }
+        }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+
+        // 拖拽结束：恢复地图操作、持久化新位置并清除状态；未超过阈值则只清 pending（视为点击）
+        this.handler.setInputAction((click) => {
+          if (this.waypointDragging) {
+            if (this.viewer && this.viewer.scene && this.viewer.scene.screenSpaceCameraController && this.waypointDragCameraInputsEnabled !== undefined) {
+              this.viewer.scene.screenSpaceCameraController.enableInputs = this.waypointDragCameraInputsEnabled;
+              this.waypointDragCameraInputsEnabled = undefined;
+            }
+            const entity = this.waypointDragging.entity;
+            const routeId = this.waypointDragging.routeId;
+            const dbId = this.waypointDragging.dbId;
+            const pos = entity.position.getValue(Cesium.JulianDate.now());
+            const ll = this.cartesianToLatLngAlt(pos);
+            if (ll) {
+              this.$emit('waypoint-position-changed', { dbId, routeId, lat: ll.lat, lng: ll.lng, alt: ll.alt });
+            }
+            this.lastClickWasDrag = true;
+            this.waypointDragging = null;
+          }
+          this.waypointDragPending = null;
+        }, Cesium.ScreenSpaceEventType.LEFT_UP);
       } catch (error) {
         console.error('地图错误:', error)
         // 如果Cesium加载失败，显示错误信息
@@ -2203,6 +2706,12 @@ export default {
         if (this.isDrawing) {
           return;
         }
+        // 若处于航线复制预览，右键取消
+        if (this.copyPreviewWaypoints) {
+          this.clearCopyPreview();
+          this.contextMenu.visible = false;
+          return;
+        }
 
         // 隐藏之前可能显示的菜单
         this.contextMenu.visible = false;
@@ -2761,10 +3270,18 @@ export default {
     addCoordinateLabels() {
       for (let lon = -180; lon <= 180; lon += 30) {
         for (let lat = -90; lat <= 90; lat += 30) {
+          let latText, lonText
+          if (this.coordinateFormat === 'dms') {
+            latText = `${this.degreesToDMS(lat)}N`
+            lonText = `${this.degreesToDMS(lon)}E`
+          } else {
+            latText = `${lat.toFixed(2)}°N`
+            lonText = `${lon.toFixed(2)}°E`
+          }
           this.viewer.entities.add({
             position: Cesium.Cartesian3.fromDegrees(lon, lat),
             label: {
-              text: `${this.degreesToDMS(lat)}N\n${this.degreesToDMS(lon)}E`,
+              text: `${latText}\n${lonText}`,
               font: '12px sans-serif',
               fillColor: Cesium.Color.BLACK,
               outlineColor: Cesium.Color.WHITE,
@@ -3005,24 +3522,27 @@ export default {
             }
             this.tempEntity = this.viewer.entities.add({
               polyline: {
-                positions: this.getPolylinePositionsStraightIn2D([...this.drawingPoints], false),
+                positions: this.drawingPoints,
                 width: this.defaultStyles.line.width,
-                material: this.getPolylineSolidMaterial(this.defaultStyles.line.color),
-                clampToGround: true
+                material: Cesium.Color.fromCssColorString(this.defaultStyles.line.color),
+                arcType: Cesium.ArcType.NONE
               }
             });
           }
-          // 创建新的预览线（与测距线一致：轮廓材质，2D 下直线）
+          // 创建新的预览虚线（使用 CallbackProperty 实现实时更新）
           this.tempPreviewEntity = this.viewer.entities.add({
             polyline: {
               positions: new Cesium.CallbackProperty(() => {
-                if (this.activeCursorPosition && this.drawingPoints.length > 0) {
-                  return this.getPolylinePositionsStraightIn2D([this.drawingPoints[this.drawingPoints.length - 1], this.activeCursorPosition], false);
+                if (this.activeCursorPosition) {
+                  return [this.drawingPoints[this.drawingPoints.length - 1], this.activeCursorPosition];
                 }
-                return this.drawingPoints.length > 0 ? [this.drawingPoints[this.drawingPoints.length - 1]] : [];
+                return [this.drawingPoints[this.drawingPoints.length - 1]];
               }, false),
               width: this.defaultStyles.line.width,
-              material: this.getPolylineSolidMaterial(this.defaultStyles.line.color),
+              material: new Cesium.PolylineDashMaterialProperty({
+                color: Cesium.Color.fromCssColorString(this.defaultStyles.line.color),
+                dashLength: 16
+              }),
               clampToGround: true
             }
           });
@@ -3129,15 +3649,16 @@ export default {
               polyline: {
                 // positions 使用 CallbackProperty 实现动态闭合线
                 positions: new Cesium.CallbackProperty(() => {
-                  if (this.activeCursorPosition && this.drawingPoints.length >= 2) {
-                    return this.getPolylinePositionsStraightIn2D([...this.drawingPoints, this.activeCursorPosition], true);
+                  if (this.activeCursorPosition) {
+                    // 闭合回路：[所有点, 鼠标位置, 回到起点]
+                    return [...this.drawingPoints, this.activeCursorPosition, this.drawingPoints[0]];
                   }
                   return this.drawingPoints;
                 }, false),
                 width: this.defaultStyles.polygon.width,
-                // 边框与测距线一致：轮廓材质，2D 下直线
-                material: this.getPolylineSolidMaterial(this.defaultStyles.polygon.color),
-                clampToGround: true
+                // 边框使用实线，表示正在编辑中
+                material: Cesium.Color.fromCssColorString(this.defaultStyles.polygon.color),
+                arcType: Cesium.ArcType.NONE
               }
             });
           }
@@ -3157,12 +3678,19 @@ 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) {
         this.viewer.entities.remove(this.tempEntity)
         this.tempEntity = null
       }
+      this.notifyDrawingEntitiesChanged()
       return entity
     },
     // 绘制矩形（优化版：两点定矩形，实时预览）
@@ -3199,23 +3727,34 @@ export default {
                   }
                   return Cesium.Rectangle.fromDegrees(0, 0, 0, 0);
                 }, false),
-                // 设置填充颜色
-                material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color).withAlpha(this.defaultStyles.rectangle.opacity),
-                clampToGround: true // 贴地
+                material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color).withAlpha(this.defaultStyles.rectangle.opacity)
               },
               // 边框部分
               polyline: {
                 // 关键：使用 CallbackProperty 动态计算矩形边框线
                 positions: new Cesium.CallbackProperty(() => {
                   if (this.drawingPoints.length > 0 && this.activeCursorPosition) {
+                    // 计算矩形的四个角点
                     const rect = Cesium.Rectangle.fromCartesianArray([this.drawingPoints[0], this.activeCursorPosition]);
-                    return this.getRectangleBorderPositions(rect);
+                    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 [];
                 }, false),
                 width: this.defaultStyles.rectangle.width,
-                material: this.getPolylineSolidMaterial(this.defaultStyles.rectangle.color),
-                clampToGround: true // 贴地
+                material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color),
+                arcType: Cesium.ArcType.NONE
               }
             });
           }
@@ -3246,8 +3785,20 @@ export default {
       this.entityCounter++;
       const id = `rectangle_${this.entityCounter}`;
 
-      // 创建边框线位置（按等经度/等纬度采样，2D 缩小时仍为直线）
-      const borderPositions = this.getRectangleBorderPositions(rect);
+      // 计算矩形的四个角点
+      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];
 
       // 创建一个复合实体，包含填充和边框
       const finalEntity = this.viewer.entities.add({
@@ -3255,15 +3806,14 @@ export default {
         // 填充部分
         rectangle: {
           coordinates: rect,
-          material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color).withAlpha(this.defaultStyles.rectangle.opacity),
-          clampToGround: true
+          material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color).withAlpha(this.defaultStyles.rectangle.opacity)
         },
         // 边框部分
         polyline: {
           positions: borderPositions,
           width: this.defaultStyles.rectangle.width,
-          material: this.getPolylineSolidMaterial(this.defaultStyles.rectangle.color),
-          clampToGround: true
+          material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color),
+          arcType: Cesium.ArcType.NONE
         }
       });
       // 4. 记录到实体列表
@@ -3277,11 +3827,18 @@ 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. 重置状态，保持绘制状态以继续绘制
+      // 5. 计算并显示面积
+      const area = this.calculateRectangleArea(rect);
+      this.measurementResult = {
+        area: area,
+        type: 'rectangle'
+      };
+      // 6. 重置状态，保持绘制状态以继续绘制
       this.drawingPoints = [];
+      this.notifyDrawingEntitiesChanged();
     },
     // 计算矩形面积（辅助方法）
     calculateRectangleArea(rectangle) {
@@ -3404,10 +3961,9 @@ export default {
                     }, false),
                     // 设置填充颜色
                     material: Cesium.Color.fromCssColorString(this.defaultStyles.circle.color).withAlpha(this.defaultStyles.circle.opacity),
-                    // 移除 outline 属性，改用 polyline 绘制边框
-                    clampToGround: true
+                    arcType: Cesium.ArcType.NONE
                   },
-                  // 边框部分
+                  // 边框部分 - 使用 polyline
                   polyline: {
                     // 关键：使用 CallbackProperty 动态计算圆形边框线
                     positions: new Cesium.CallbackProperty(() => {
@@ -3427,8 +3983,8 @@ export default {
                       }
                     }, false),
                     width: this.defaultStyles.circle.width,
-                    material: this.getPolylineSolidMaterial(this.defaultStyles.circle.color),
-                    clampToGround: true
+                    material: Cesium.Color.fromCssColorString(this.defaultStyles.circle.color),
+                    arcType: Cesium.ArcType.NONE
                   }
                 });
               }
@@ -3471,24 +4027,21 @@ export default {
       // 生成圆形的点，用于绘制边框线
       const circlePositions = this.generateCirclePositions(centerPoint, radius);
 
-      // 创建一个复合实体，包含填充和边框
       const finalEntity = this.viewer.entities.add({
         id: id,
         position: centerPoint,
-        // 填充部分
         ellipse: {
           semiMajorAxis: radius,
           semiMinorAxis: radius,
-          // 设置填充颜色
           material: Cesium.Color.fromCssColorString(this.defaultStyles.circle.color).withAlpha(this.defaultStyles.circle.opacity),
-          clampToGround: true
+          arcType: Cesium.ArcType.NONE
         },
         // 边框部分
         polyline: {
           positions: circlePositions,
           width: this.defaultStyles.circle.width,
-          material: this.getPolylineSolidMaterial(this.defaultStyles.circle.color),
-          clampToGround: true
+          material: Cesium.Color.fromCssColorString(this.defaultStyles.circle.color),
+          arcType: Cesium.ArcType.NONE
         }
       });
       // 4. 记录实体
@@ -3503,12 +4056,21 @@ 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. 重置状态，保持绘制状态以继续绘制
+      // 5. 计算面积 (π * r²) 并显示
+      // 半径单位是米，面积单位是平方米
+      const area = Math.PI * Math.pow(radius, 2);
+      this.measurementResult = {
+        radius: radius, // 也可以额外显示半径
+        area: area,
+        type: 'circle'
+      };
+      // 6. 重置状态，保持绘制状态以继续绘制
       this.drawingPoints = [];
       this.activeCursorPosition = null;
+      this.notifyDrawingEntitiesChanged();
     },
     ellipseHeadingFromCenterAndMajor(center, majorEnd) {
       const ellipsoid = this.viewer.scene.globe.ellipsoid;
@@ -3533,18 +4095,18 @@ export default {
     },
     // 绘制扇形
     startSectorDrawing() {
-      // 重置绘制状态
-      this.drawingPoints = []; // 存储圆心、半径端点、角度端点
+      this.drawingPoints = [];
       // 1. 清理旧实体
       if (this.tempEntity) this.viewer.entities.remove(this.tempEntity);
       if (this.tempPreviewEntity) this.viewer.entities.remove(this.tempPreviewEntity);
       this.tempEntity = null;
       this.tempPreviewEntity = null;
-      // 2. 鼠标移动事件
+      // 2. 鼠标移动事件（requestRender 保证 requestRenderMode 下实时预览会刷新）
       this.drawingHandler.setInputAction((movement) => {
         const newPosition = this.getClickPosition(movement.endPosition);
         if (newPosition) {
           this.activeCursorPosition = newPosition;
+          if (this.viewer.scene.requestRenderMode) this.viewer.scene.requestRender();
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
       // 3. 鼠标点击事件
@@ -3565,15 +4127,18 @@ export default {
                   return [];
                 }, false),
                 width: this.defaultStyles.sector.width,
-                material: this.getPolylineSolidMaterial(this.defaultStyles.sector.color),
-                clampToGround: true
+                material: new Cesium.PolylineDashMaterialProperty({
+                  color: Cesium.Color.fromCssColorString(this.defaultStyles.sector.color),
+                  dashLength: 16
+                }),
+                arcType: Cesium.ArcType.NONE
               }
             });
           }
           // --- 情况B：第二次点击（确定半径） ---
           else if (this.drawingPoints.length === 1) {
             this.drawingPoints.push(position);
-            this.activeCursorPosition = position; // 更新 activeCursorPosition 为实际点击位置
+            this.activeCursorPosition = position;
             const centerPoint = this.drawingPoints[0];
             const radiusPoint = this.drawingPoints[1];
             const fixedRadius = Cesium.Cartesian3.distance(centerPoint, radiusPoint);
@@ -3600,9 +4165,7 @@ export default {
                   }
                   return new Cesium.PolygonHierarchy([]);
                 }, false),
-                // 设置填充颜色
-                material: Cesium.Color.fromCssColorString(this.defaultStyles.sector.color).withAlpha(this.defaultStyles.sector.opacity),
-                clampToGround: true
+                material: Cesium.Color.fromCssColorString(this.defaultStyles.sector.color).withAlpha(this.defaultStyles.sector.opacity)
               },
               // 边框部分
               polyline: {
@@ -3621,15 +4184,15 @@ export default {
                   return [];
                 }, false),
                 width: this.defaultStyles.sector.width,
-                material: this.getPolylineSolidMaterial(this.defaultStyles.sector.color),
-                clampToGround: true
+                material: Cesium.Color.fromCssColorString(this.defaultStyles.sector.color),
+                arcType: Cesium.ArcType.NONE
               }
             });
           }
           // --- 情况C：第三次点击（确定角度） ---
           else if (this.drawingPoints.length === 2) {
             this.drawingPoints.push(position);
-            this.activeCursorPosition = null; // 停止动态更新
+            this.activeCursorPosition = null;
             // 传递角度点位置去结束绘制
             this.finishSectorDrawing(this.drawingPoints[0], this.drawingPoints[1], this.drawingPoints[2]);
           }
@@ -3655,20 +4218,18 @@ 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),
-          // 设置填充颜色
-          material: Cesium.Color.fromCssColorString(this.defaultStyles.sector.color).withAlpha(this.defaultStyles.sector.opacity),
-          clampToGround: true
+          material: Cesium.Color.fromCssColorString(this.defaultStyles.sector.color).withAlpha(this.defaultStyles.sector.opacity)
         },
         // 边框部分
         polyline: {
           positions: positions,
           width: this.defaultStyles.sector.width,
-          material: this.getPolylineSolidMaterial(this.defaultStyles.sector.color),
-          clampToGround: true
+          material: Cesium.Color.fromCssColorString(this.defaultStyles.sector.color),
+          arcType: Cesium.ArcType.NONE
         }
       });
       // 4. 记录实体
@@ -3682,18 +4243,19 @@ export default {
         endAngle: endAngle,
         positions: positions,
         entity: finalEntity,
-        color: this.defaultStyles.sector.color, // 填充颜色
-        borderColor: this.defaultStyles.sector.color, // 边框颜色
+        color: this.defaultStyles.sector.color,
+        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 = [];
+      this.notifyDrawingEntitiesChanged();
     },
     // 生成圆形的点，用于绘制边框线
-    generateCirclePositions(center, radius, numPoints = 192) {
+    generateCirclePositions(center, radius, numPoints = 1024) {
       const positions = [];
       const ellipsoid = this.viewer.scene.globe.ellipsoid;
 
@@ -3770,7 +4332,7 @@ export default {
       // 确保角度差不为零
       angleDiff = Math.max(0.01, angleDiff);
       // 计算扇形的顶点数（根据角度差确定，确保平滑）
-      const numPoints = Math.max(16, Math.ceil(angleDiff * 180 / Math.PI / 3));
+      const numPoints = Math.max(200, Math.ceil(angleDiff * 180 / Math.PI));
       const angleStep = angleDiff / (numPoints - 1);
       // 生成扇形的顶点（顺时针方向）
       for (let i = 0; i < numPoints; i++) {
@@ -3785,6 +4347,14 @@ export default {
       positions.push(center);
       return positions;
     },
+    // 生成扇形边缘点
+    generateSectorEdgePoint(center, radius, angle) {
+      const centerLL = Cesium.Cartographic.fromCartesian(center);
+      const distance = radius / 6378137;
+      const lat = centerLL.latitude + Math.sin(angle) * distance;
+      const lng = centerLL.longitude + Math.cos(angle) * distance / Math.cos(centerLL.latitude);
+      return Cesium.Cartesian3.fromRadians(lng, lat);
+    },
     // 计算两点之间的距离（米）
     calculateDistance(point1, point2) {
       return Cesium.Cartesian3.distance(point1, point2);
@@ -3797,11 +4367,12 @@ export default {
       if (this.tempPreviewEntity) this.viewer.entities.remove(this.tempPreviewEntity);
       this.tempEntity = null;
       this.tempPreviewEntity = null;
-      // 2. 鼠标移动事件
+      // 2. 鼠标移动事件（requestRender 保证 requestRenderMode 下实时预览会刷新）
       this.drawingHandler.setInputAction((movement) => {
         const newPosition = this.getClickPosition(movement.endPosition);
         if (newPosition) {
           this.activeCursorPosition = newPosition;
+          if (this.viewer.scene.requestRenderMode) this.viewer.scene.requestRender();
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
       // 3. 鼠标点击事件
@@ -3826,12 +4397,12 @@ export default {
                   }
                   return [];
                 }, false),
-                width: 8, // 增加宽度以获得更大的箭头头部
-                // 使用箭头材质以显示箭头方向
+                width: 12, // 增加宽度以获得更大的箭头头部
+                // 使用箭头材质
                 material: new Cesium.PolylineArrowMaterialProperty(
                   Cesium.Color.fromCssColorString(this.defaultStyles.arrow.color)
                 ),
-                clampToGround: true, // 贴地
+                arcType: Cesium.ArcType.NONE,
                 widthInMeters: false // 使用像素宽度模式
               }
             });
@@ -3863,6 +4434,7 @@ export default {
         const entity = this.addArrowEntity([...this.drawingPoints]);
         // 重置绘制点数组，保持绘制状态以继续绘制
         this.drawingPoints = [];
+        this.notifyDrawingEntitiesChanged();
         return entity;
       } else {
         this.cancelDrawing();
@@ -3879,11 +4451,11 @@ export default {
         name: `箭头 ${this.entityCounter}`,
         polyline: {
           positions: positions,
-          width: 8, // 增加宽度以获得更大的箭头头部
+          width: 12, // 增加宽度以获得更大的箭头头部
           material: new Cesium.PolylineArrowMaterialProperty(
             Cesium.Color.fromCssColorString(this.defaultStyles.arrow.color)
           ),
-          clampToGround: true,
+          arcType: Cesium.ArcType.NONE,
           // 使用像素宽度模式，确保箭头在缩放时保持比例
           widthInMeters: false
         }
@@ -3941,28 +4513,17 @@ export default {
           text: text,
           font: this.defaultStyles.text.font,
           fillColor: Cesium.Color.fromCssColorString(this.defaultStyles.text.color),
-          outlineColor: Cesium.Color.BLACK,
-          outlineWidth: 2,
+          outlineColor: Cesium.Color.fromCssColorString('#e5e5e5'),
+          outlineWidth: 1,
           style: Cesium.LabelStyle.FILL_AND_OUTLINE,
           verticalOrigin: Cesium.VerticalOrigin.CENTER,
           horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
           backgroundColor: Cesium.Color.fromCssColorString(this.defaultStyles.text.backgroundColor),
-          backgroundPadding: new Cesium.Cartesian2(10, 5),
+          backgroundPadding: new Cesium.Cartesian2(8, 5),
           pixelOffset: new Cesium.Cartesian2(0, 0),
-          // 随地图缩放调整大小
-          scaleByDistance: new Cesium.NearFarScalar(
-            1000,  // 近距离（米）
-            1.0,   // 近距离时的缩放比例
-            500000, // 远距离（米）
-            0.1    // 远距离时的缩放比例（不为0，保持可见）
-          ),
-          // 随地图缩放调整透明度
-          translucencyByDistance: new Cesium.NearFarScalar(
-            1000,  // 近距离（米）
-            1.0,   // 近距离时的透明度
-            500000, // 远距离（米）
-            0.3    // 远距离时的透明度
-          )
+          // 模仿高德：常用缩放下几乎不变，拉远时略缩小、拉近时略放大，过渡柔和
+          scaleByDistance: new Cesium.NearFarScalar(200, 1.12, 1200000, 0.72),
+          translucencyByDistance: new Cesium.NearFarScalar(300, 1.0, 600000, 0.88)
         }
       })
       const entityData = {
@@ -3983,6 +4544,7 @@ export default {
         this.selectEntity(entityData)
         e.stopPropagation()
       }
+      this.notifyDrawingEntitiesChanged()
       return entityData
     },
     // 绘制图片
@@ -4080,20 +4642,8 @@ export default {
           height: this.defaultStyles.image.height,
           verticalOrigin: Cesium.VerticalOrigin.CENTER,
           horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
-          // 随地图缩放调整大小
-          scaleByDistance: new Cesium.NearFarScalar(
-            1000,  // 近距离（米）
-            1.0,   // 近距离时的缩放比例
-            500000, // 远距离（米）
-            0.1    // 远距离时的缩放比例（不为0，保持可见）
-          ),
-          // 随地图缩放调整透明度
-          translucencyByDistance: new Cesium.NearFarScalar(
-            1000,  // 近距离（米）
-            1.0,   // 近距离时的透明度
-            500000, // 远距离（米）
-            0.3    // 远距离时的透明度
-          )
+          scaleByDistance: new Cesium.NearFarScalar(200, 1.12, 1200000, 0.72),
+          translucencyByDistance: new Cesium.NearFarScalar(300, 1.0, 600000, 0.88)
         }
       })
       const entityData = {
@@ -4113,6 +4663,7 @@ export default {
         this.selectEntity(entityData)
         e.stopPropagation()
       }
+      this.notifyDrawingEntitiesChanged()
       return entityData
     },
     // ================== 实体创建方法 ==================
@@ -4161,15 +4712,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: straightPositions,
+          positions: positions,
           width: this.defaultStyles.line.width,
-          material: this.getPolylineSolidMaterial(this.defaultStyles.line.color),
-          clampToGround: true
+          material: Cesium.Color.fromCssColorString(this.defaultStyles.line.color),
+          arcType: Cesium.ArcType.NONE
         }
       })
       const entityData = {
@@ -4194,21 +4744,23 @@ 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
+          material: Cesium.Color.TRANSPARENT
         },
+        // 边框部分
         polyline: {
-          positions: straightBorder,
+          positions: polygonPositions,
           width: this.defaultStyles.polygon.width,
-          material: this.getPolylineSolidMaterial(this.defaultStyles.polygon.color),
-          clampToGround: true
+          material: Cesium.Color.fromCssColorString(this.defaultStyles.polygon.color),
+          arcType: Cesium.ArcType.NONE
         }
       })
       const entityData = {
@@ -4221,13 +4773,14 @@ 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) => {
         this.selectEntity(entityData)
         e.stopPropagation()
       }
+      this.notifyDrawingEntitiesChanged()
       return entityData
     },
     addRectangleEntity(coordinates) {
@@ -4235,7 +4788,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,
           // 移除填充颜色，只显示边框
@@ -4256,17 +4809,17 @@ 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: {
-          semiMinorAxis: validRadius, // 半短轴 = 半径
-          semiMajorAxis: validRadius, // 半长轴 = 半径
-          // 移除填充颜色，只显示边框
+          semiMinorAxis: validRadius,
+          semiMajorAxis: validRadius,
           material: Cesium.Color.TRANSPARENT,
           outline: true,
           outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.circle.color),
-          outlineWidth: this.defaultStyles.circle.width
+          outlineWidth: this.defaultStyles.circle.width,
+          arcType: Cesium.ArcType.NONE
         }
       })
       // 【重要修改】直接把 entity 推入数组
@@ -4274,123 +4827,33 @@ 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()
+    getClickPosition(pixelPosition) {
+      const cartesian = this.viewer.camera.pickEllipsoid(pixelPosition, this.viewer.scene.globe.ellipsoid)
+      return cartesian
     },
-    /** 监听浏览器缩放/窗口变化，更新 resolutionScale；返回取消监听的函数 */
-    setupResolutionScaleListener() {
-      const onResize = () => {
-        this.applyResolutionScale()
-      }
-      if (window.visualViewport) {
-        window.visualViewport.addEventListener('resize', onResize)
-        window.visualViewport.addEventListener('scroll', onResize)
+    cartesianToLatLng(cartesian) {
+      const cartographic = Cesium.Cartographic.fromCartesian(cartesian)
+      return {
+        lat: Cesium.Math.toDegrees(cartographic.latitude),
+        lng: Cesium.Math.toDegrees(cartographic.longitude)
       }
-      window.addEventListener('resize', onResize)
-      return () => {
-        if (window.visualViewport) {
-          window.visualViewport.removeEventListener('resize', onResize)
-          window.visualViewport.removeEventListener('scroll', onResize)
-        }
-        window.removeEventListener('resize', onResize)
+    },
+    /** 笛卡尔坐标转经纬高（含高度，用于航点拖拽持久化） */
+    cartesianToLatLngAlt(cartesian) {
+      if (!Cesium.defined(cartesian)) return null
+      const cartographic = Cesium.Cartographic.fromCartesian(cartesian)
+      return {
+        lat: Cesium.Math.toDegrees(cartographic.latitude),
+        lng: Cesium.Math.toDegrees(cartographic.longitude),
+        alt: cartographic.height
       }
     },
-    /** 按等经度/等纬度采样矩形边框，使在 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) {
+    /** 屏幕坐标转笛卡尔，指定高度（用于拖拽时保持航点高度） */
+    getClickPositionWithHeight(pixelPosition, height) {
       const cartesian = this.viewer.camera.pickEllipsoid(pixelPosition, this.viewer.scene.globe.ellipsoid)
-      return cartesian
-    },
-    cartesianToLatLng(cartesian) {
+      if (!Cesium.defined(cartesian)) return null
       const cartographic = Cesium.Cartographic.fromCartesian(cartesian)
-      return {
-        lat: Cesium.Math.toDegrees(cartographic.latitude),
-        lng: Cesium.Math.toDegrees(cartographic.longitude)
-      }
+      return Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, height != null ? height : cartographic.height)
     },
     degreesToDMS(decimalDegrees) {
       const degrees = Math.floor(decimalDegrees)
@@ -4588,7 +5051,7 @@ export default {
           break
         case 'line':
           if (entity.polyline) {
-            entity.polyline.material = this.getPolylineSolidMaterial(data.color)
+            entity.polyline.material = Cesium.Color.fromCssColorString(data.color)
             entity.polyline.width = data.width
           }
           break
@@ -4597,7 +5060,7 @@ export default {
             entity.polygon.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
           }
           if (entity.polyline) {
-            entity.polyline.material = this.getPolylineSolidMaterial(data.borderColor || data.color)
+            entity.polyline.material = Cesium.Color.fromCssColorString(data.borderColor || data.color)
             entity.polyline.width = data.width
           }
           break
@@ -4606,7 +5069,7 @@ export default {
             entity.rectangle.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
           }
           if (entity.polyline) {
-            entity.polyline.material = this.getPolylineSolidMaterial(data.borderColor || data.color)
+            entity.polyline.material = Cesium.Color.fromCssColorString(data.borderColor || data.color)
             entity.polyline.width = data.width
           }
           break
@@ -4615,7 +5078,7 @@ export default {
             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.material = Cesium.Color.fromCssColorString(data.borderColor || data.color)
             entity.polyline.width = data.width
           }
           break
@@ -4639,16 +5102,19 @@ export default {
             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.material = Cesium.Color.fromCssColorString(data.borderColor || data.color)
             entity.polyline.width = data.width
           }
+          if (data.name && data.centerEntity && data.centerEntity.label) {
+            data.centerEntity.label.text = data.name
+          }
           break
         case 'sector':
           if (entity.polygon) {
             entity.polygon.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
           }
           if (entity.polyline) {
-            entity.polyline.material = this.getPolylineSolidMaterial(data.borderColor || data.color)
+            entity.polyline.material = Cesium.Color.fromCssColorString(data.borderColor || data.color)
             entity.polyline.width = data.width
           }
           break
@@ -4682,6 +5148,65 @@ export default {
       }
     },
     /** 右键航线：上锁/解锁，上锁后该航线不可编辑 */
+    /** 右键菜单「复制航线」：通知父组件，由父组件拉取航点后调用 startRouteCopyPreview */
+    handleCopyRouteFromMenu() {
+      const ed = this.contextMenu.entityData;
+      if (!ed || ed.type !== 'route' || ed.routeId == null) {
+        this.contextMenu.visible = false;
+        return;
+      }
+      this.contextMenu.visible = false;
+      this.$emit('copy-route', ed.routeId);
+    },
+    /** 开始航线复制预览：整条航线跟随鼠标，左键放置后父组件弹窗保存 */
+    startRouteCopyPreview(waypoints) {
+      if (!waypoints || waypoints.length < 2) return;
+      this.clearCopyPreview();
+      this.copyPreviewWaypoints = waypoints;
+      this.copyPreviewMouseCartesian = this.viewer.camera.pickEllipsoid(
+        new Cesium.Cartesian2(this.viewer.scene.canvas.clientWidth / 2, this.viewer.scene.canvas.clientHeight / 2),
+        this.viewer.scene.globe.ellipsoid
+      ) || Cesium.Cartesian3.fromDegrees(parseFloat(waypoints[0].lng), parseFloat(waypoints[0].lat), Number(waypoints[0].alt) || 5000);
+      this.updateCopyPreviewPolyline();
+    },
+    /** 更新复制预览折线：以当前鼠标位置为起点偏移整条航线 */
+    updateCopyPreviewPolyline() {
+      if (!this.copyPreviewWaypoints || this.copyPreviewWaypoints.length < 2 || !this.copyPreviewMouseCartesian) return;
+      const first = this.copyPreviewWaypoints[0];
+      const firstLon = parseFloat(first.lng) * (Math.PI / 180);
+      const firstLat = parseFloat(first.lat) * (Math.PI / 180);
+      const carto = Cesium.Cartographic.fromCartesian(this.copyPreviewMouseCartesian);
+      const dLon = carto.longitude - firstLon;
+      const dLat = carto.latitude - firstLat;
+      const positions = this.copyPreviewWaypoints.map(wp =>
+        Cesium.Cartesian3.fromRadians(
+          parseFloat(wp.lng) * (Math.PI / 180) + dLon,
+          parseFloat(wp.lat) * (Math.PI / 180) + dLat,
+          Number(wp.alt) || 5000
+        )
+      );
+      if (this.copyPreviewEntity) {
+        this.viewer.entities.remove(this.copyPreviewEntity);
+        this.copyPreviewEntity = null;
+      }
+      this.copyPreviewEntity = this.viewer.entities.add({
+        polyline: {
+          positions: positions,
+          width: 4,
+          material: Cesium.Color.fromCssColorString('rgba(0, 120, 255, 0.75)'),
+          arcType: Cesium.ArcType.NONE
+        }
+      });
+    },
+    /** 清除航线复制预览 */
+    clearCopyPreview() {
+      if (this.copyPreviewEntity) {
+        this.viewer.entities.remove(this.copyPreviewEntity);
+        this.copyPreviewEntity = null;
+      }
+      this.copyPreviewWaypoints = null;
+      this.copyPreviewMouseCartesian = null;
+    },
     toggleRouteLock() {
       const ed = this.contextMenu.entityData;
       if (!ed || ed.type !== 'route' || ed.routeId == null) {
@@ -4690,7 +5215,6 @@ export default {
       }
       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 });
@@ -4924,6 +5448,10 @@ export default {
         }
         // 更新实体样式
         this.updateEntityStyle(entityData)
+        // 若修改的是空域/威力区图形的样式，触发自动保存到房间，避免刷新后样式丢失
+        if (this.getDrawingEntityTypes().includes(entityData.type)) {
+          this.notifyDrawingEntitiesChanged()
+        }
         // 隐藏右键菜单
         this.contextMenu.visible = false
       }
@@ -4958,6 +5486,23 @@ export default {
       this.$message && this.$message.success('已显示伸缩框')
     },
 
+    /** 右键「在此之前插入航线」：先画平台前的航点，右键结束时将平台作为最后一站 */
+    handleStartRouteBeforePlatform() {
+      const entityData = this.contextMenu.entityData
+      this.contextMenu.visible = false
+      if (entityData && entityData.type === 'platformIcon' && entityData.lat != null && entityData.lng != null) {
+        this.startMissionRouteDrawingFromPlatform(entityData, 'before')
+      }
+    },
+    /** 右键「在此之后插入航线」：以平台为起点，再画后续航点 */
+    handleStartRouteAfterPlatform() {
+      const entityData = this.contextMenu.entityData
+      this.contextMenu.visible = false
+      if (entityData && entityData.type === 'platformIcon' && entityData.lat != null && entityData.lng != null) {
+        this.startMissionRouteDrawingFromPlatform(entityData, 'after')
+      }
+    },
+
     /** 位置改为图形化：直接拖动图标即可，无需弹窗 */
     openPlatformIconPositionDialog() {
       this.contextMenu.visible = false
@@ -5009,14 +5554,45 @@ export default {
           this.viewer.entities.remove(entity.centerEntity)
         }
         // 从数组中移除
+        const wasDrawingType = this.getDrawingEntityTypes().includes(entity.type)
         this.allEntities.splice(index, 1)
         // 如果删除的是选中的实体，清空选中状态
         if (this.selectedEntity && (this.selectedEntity.id === id || (this.selectedEntity.entity && this.selectedEntity.entity.id === id))) {
           this.selectedEntity = null
         }
+        if (wasDrawingType) this.notifyDrawingEntitiesChanged()
       }
     },
+    /** 根据房间平台图标记录 ID（serverId）移除地图上对应的平台图标（用于该平台已创建航线后删除其“占位”图标） */
+    removePlatformIconByServerId(serverId) {
+      if (!serverId || !this.allEntities) return
+      const ed = this.allEntities.find(e => e.type === 'platformIcon' && e.serverId === serverId)
+      if (!ed) return
+      this.removeTransformHandles(ed)
+      if (this.selectedPlatformIcon === ed) this.selectedPlatformIcon = null
+      if (ed.entity) this.viewer.entities.remove(ed.entity)
+      this.allEntities = this.allEntities.filter(e => !(e.type === 'platformIcon' && e.serverId === serverId))
+    },
     clearAll(showConfirm = true) {
+      // 空域模式：只清除空域/威力区图形，不清除摆放的平台与航线
+      if (this.toolMode === 'airspace') {
+        if (showConfirm) {
+          this.$confirm('是否清除所有空域图形？（平台与航线将保留）', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.clearDrawingEntities();
+            this.notifyDrawingEntitiesChanged();
+            this.$message({ type: 'success', message: '已清除空域图形' });
+          }).catch(() => {});
+        } else {
+          this.clearDrawingEntities();
+          this.notifyDrawingEntitiesChanged();
+        }
+        return;
+      }
+      // 测距等其他模式：保持原“清除所有编辑内容”行为
       if (showConfirm) {
         this.$confirm('是否清除所有编辑内容？', '提示', {
           confirmButtonText: '确定',
@@ -5032,110 +5608,274 @@ export default {
       }
     },
     executeClearAll() {
-        // 1. 检查数组是否有内容
-        if (this.allEntities && this.allEntities.length > 0) {
-          // 2. 遍历每一个对象进行删除
-          this.allEntities.forEach(item => {
-            try {
-              let entity = null;
-
-              // 情况 A: 数组里存的是原生的 Cesium Entity (点、线通常是这种情况)
-              if (item instanceof Cesium.Entity) {
-                entity = item;
-              }
-              // 情况 B: 数组里存的是包装对象 (你的矩形、圆可能是这种 { entity: ... })
-              else if (item.entity && item.entity instanceof Cesium.Entity) {
-                entity = item.entity;
-              }
-              // 情况 C: 兜底方案，尝试通过 ID 删除
-              else if (item.id) {
-                entity = this.viewer.entities.getById(item.id);
-              }
+      // 1. 检查数组是否有内容
+      if (this.allEntities && this.allEntities.length > 0) {
+        // 2. 遍历每一个对象进行删除
+        this.allEntities.forEach(item => {
+          try {
+            let entity = null;
 
-              // 检查是否是航线实体，如果是则跳过删除
-              if (entity && entity.properties) {
-                const isMissionWaypoint = entity.properties.isMissionWaypoint;
-                const isMissionRouteLine = entity.properties.isMissionRouteLine;
-                if (isMissionWaypoint || isMissionRouteLine) {
-                  return; // 跳过航线相关实体
-                }
-              }
+            // 情况 A: 数组里存的是原生的 Cesium Entity (点、线通常是这种情况)
+            if (item instanceof Cesium.Entity) {
+              entity = item;
+            }
+            // 情况 B: 数组里存的是包装对象 (你的矩形、圆可能是这种 { entity: ... })
+            else if (item.entity && item.entity instanceof Cesium.Entity) {
+              entity = item.entity;
+            }
+            // 情况 C: 兜底方案，尝试通过 ID 删除
+            else if (item.id) {
+              entity = this.viewer.entities.getById(item.id);
+            }
 
-              // 删除非航线实体
-              if (entity) {
-                this.viewer.entities.remove(entity);
+            // 检查是否是航线实体，如果是则跳过删除
+            if (entity && entity.properties) {
+              const isMissionWaypoint = entity.properties.isMissionWaypoint;
+              const isMissionRouteLine = entity.properties.isMissionRouteLine;
+              if (isMissionWaypoint || isMissionRouteLine) {
+                return; // 跳过航线相关实体
               }
+            }
 
-              // 移除线实体相关的点实体
-              if (item.type === 'line' && item.pointEntities) {
-                item.pointEntities.forEach(pointEntity => {
-                  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);
+            // 删除非航线实体
+            if (entity) {
+              this.viewer.entities.remove(entity);
             }
-          });
-        }
-        // 3. 清空数组（只保留航线实体）
-        this.allEntities = this.allEntities.filter(item => {
-          let entity = null;
-          if (item instanceof Cesium.Entity) {
-            entity = item;
-          } else if (item.entity && item.entity instanceof Cesium.Entity) {
-            entity = item.entity;
-          } else if (item.id) {
-            entity = this.viewer.entities.getById(item.id);
-          }
 
-          if (entity && entity.properties) {
-            const isMissionWaypoint = entity.properties.isMissionWaypoint;
-            const isMissionRouteLine = entity.properties.isMissionRouteLine;
-            return isMissionWaypoint || isMissionRouteLine;
+            // 移除线实体相关的点实体
+            if (item.type === 'line' && item.pointEntities) {
+              item.pointEntities.forEach(pointEntity => {
+                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);
           }
-          return false;
         });
-        // 4. 清理可能残留的绘制过程中的临时图形
-        if (this.tempEntity) {
-          this.viewer.entities.remove(this.tempEntity);
-          this.tempEntity = null;
+      }
+      // 3. 清空数组（只保留航线实体）
+      this.allEntities = this.allEntities.filter(item => {
+        let entity = null;
+        if (item instanceof Cesium.Entity) {
+          entity = item;
+        } else if (item.entity && item.entity instanceof Cesium.Entity) {
+          entity = item.entity;
+        } else if (item.id) {
+          entity = this.viewer.entities.getById(item.id);
         }
-        if (this.tempPreviewEntity) {
-          this.viewer.entities.remove(this.tempPreviewEntity);
-          this.tempPreviewEntity = null;
+
+        if (entity && entity.properties) {
+          const isMissionWaypoint = entity.properties.isMissionWaypoint;
+          const isMissionRouteLine = entity.properties.isMissionRouteLine;
+          return isMissionWaypoint || isMissionRouteLine;
         }
-        // 5. 重置其他状态（如测量面板、绘制状态）
-        this.measurementResult = null;
-        this.stopDrawing();
+        return false;
+      });
+      // 4. 清理可能残留的绘制过程中的临时图形
+      if (this.tempEntity) {
+        this.viewer.entities.remove(this.tempEntity);
+        this.tempEntity = null;
+      }
+      if (this.tempPreviewEntity) {
+        this.viewer.entities.remove(this.tempPreviewEntity);
+        this.tempPreviewEntity = null;
+      }
+      // 5. 重置其他状态（如测量面板、绘制状态）
+      this.measurementResult = null;
+      this.stopDrawing();
 
-        this.$message({
-          type: 'success',
-          message: '清除成功!'
-        });
+      this.notifyDrawingEntitiesChanged();
+      this.$message({
+        type: 'success',
+        message: '清除成功!'
+      });
+    },
+    // ================== 空域/威力区图形持久化 ==================
+    /** 需要持久化到方案的空域图形类型（不含平台图标、航线、测距点线） */
+    getDrawingEntityTypes() {
+      return ['polygon', 'rectangle', 'circle', 'sector', 'arrow', 'text', 'image', 'powerZone']
+    },
+    /** 空域/威力区图形增删时通知父组件，用于自动保存到房间（从房间加载时不触发） */
+    notifyDrawingEntitiesChanged() {
+      if (this.loadingDrawingsFromRoom) return
+      this.$emit('drawing-entities-changed')
+    },
+    /** 将单个实体序列化为可存储的 JSON 结构 */
+    serializeEntityForSave(entity) {
+      const base = { id: entity.id, type: entity.type, label: entity.label || '', color: entity.color || '#008aff' }
+      let data = {}
+      switch (entity.type) {
+        case 'point':
+          data = { lat: entity.lat, lng: entity.lng }; break
+        case 'line':
+          data = { points: entity.points || [] }; break
+        case 'polygon':
+          data = {
+            points: entity.points || [],
+            opacity: entity.opacity != null ? entity.opacity : 0,
+            width: entity.width != null ? entity.width : 4,
+            borderColor: entity.borderColor || entity.color
+          }; break
+        case 'rectangle':
+          if (entity.points && entity.points.length >= 2) {
+            const lngs = entity.points.map(p => p.lng)
+            const lats = entity.points.map(p => p.lat)
+            data = {
+              coordinates: { west: Math.min(...lngs), south: Math.min(...lats), east: Math.max(...lngs), north: Math.max(...lats) },
+              points: entity.points,
+              opacity: entity.opacity != null ? entity.opacity : 0,
+              width: entity.width != null ? entity.width : 4,
+              borderColor: entity.borderColor || entity.color
+            }
+          } else {
+            data = {
+              coordinates: entity.coordinates || {},
+              points: entity.points || [],
+              opacity: entity.opacity != null ? entity.opacity : 0,
+              width: entity.width != null ? entity.width : 4,
+              borderColor: entity.borderColor || entity.color
+            }
+          }
+          break
+        case 'circle':
+        case 'hold_circle':
+          data = {
+            center: entity.points && entity.points[0] ? entity.points[0] : (entity.positions && entity.positions[0] ? this.cartesianToLatLng(entity.positions[0]) : (entity.center && typeof entity.center.lat === 'number' ? entity.center : null)),
+            radius: entity.radius,
+            opacity: entity.opacity != null ? entity.opacity : 0,
+            width: entity.width != null ? entity.width : 4,
+            borderColor: entity.borderColor || entity.color
+          }; break
+        case 'ellipse':
+        case 'hold_ellipse':
+          data = {
+            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 != null ? entity.headingDeg : 0
+          }; break
+        case 'sector':
+          data = {
+            center: entity.center,
+            radius: entity.radius,
+            startAngle: entity.startAngle,
+            endAngle: entity.endAngle,
+            opacity: entity.opacity != null ? entity.opacity : 0,
+            width: entity.width != null ? entity.width : 3,
+            borderColor: entity.borderColor || entity.color
+          }; break
+        case 'arrow':
+          data = { points: entity.points || [] }; break
+        case 'text':
+          data = {
+            lat: entity.lat,
+            lng: entity.lng,
+            text: entity.text,
+            font: entity.font,
+            backgroundColor: entity.backgroundColor
+          }; break
+        case 'image':
+          data = {
+            lat: entity.lat,
+            lng: entity.lng,
+            imageUrl: entity.imageUrl,
+            width: entity.width,
+            height: entity.height
+          }; break
+        case 'powerZone': {
+          const center = entity.center && typeof entity.center.lat === 'number' ? entity.center : (entity.entity && entity.entity.position ? this.cartesianToLatLng(entity.entity.position.getValue(Cesium.JulianDate.now())) : null)
+          data = {
+            center,
+            radius: entity.radius,
+            name: entity.name,
+            color: entity.color,
+            opacity: entity.opacity,
+            borderColor: entity.borderColor,
+            width: entity.width
+          }; break
+        }
+        default:
+          data = entity.center != null ? { center: entity.center, radius: entity.radius } : {}
+      }
+      return { ...base, data }
+    },
+    /** 供父组件/方案保存时调用：仅返回空域与威力区图形数据（不含平台、航线等） */
+    getFrontendDrawingsData() {
+      const types = this.getDrawingEntityTypes()
+      const entities = (this.allEntities || [])
+        .filter(e => e && types.includes(e.type))
+        .map(e => this.serializeEntityForSave(e))
+      return { version: '1.0', date: new Date().toISOString(), entities }
+    },
+    /** 仅清除空域/威力区图形（不删平台图标、航线） */
+    clearDrawingEntities() {
+      if (!this.allEntities || !this.viewer) return
+      const types = this.getDrawingEntityTypes()
+      const toRemove = this.allEntities.filter(item => types.includes(item.type))
+      toRemove.forEach(item => {
+        try {
+          let entity = item.entity || (item instanceof Cesium.Entity ? item : null)
+          if (!entity && item.id) entity = this.viewer.entities.getById(item.id)
+          if (entity) this.viewer.entities.remove(entity)
+          if (item.type === 'powerZone' && item.centerEntity) this.viewer.entities.remove(item.centerEntity)
+        } catch (e) { console.warn('clearDrawingEntities:', e) }
+      })
+      this.allEntities = this.allEntities.filter(item => !types.includes(item.type))
+    },
+    /** 从房间/方案加载的 frontend_drawings JSON 恢复空域图形（先清空当前图形再导入；加载期间不触发自动保存） */
+    loadFrontendDrawings(data) {
+      if (!this.viewer) return
+      let payload = data
+      if (typeof data === 'string') {
+        try {
+          payload = JSON.parse(data)
+        } catch (e) {
+          console.warn('loadFrontendDrawings parse error', e)
+          return
+        }
+      }
+      this.loadingDrawingsFromRoom = true
+      try {
+        if (!payload || !Array.isArray(payload.entities) || payload.entities.length === 0) {
+          this.clearDrawingEntities()
+          return
+        }
+        this.clearDrawingEntities()
+        payload.entities.forEach(entityData => {
+          try {
+            this.importEntity(entityData)
+          } catch (err) {
+            console.warn('loadFrontendDrawings import entity failed', entityData?.type, err)
+          }
+        })
+      } finally {
+        this.loadingDrawingsFromRoom = false
+      }
     },
     // ================== 其他方法 ==================
     getTypeName(type) {
       const names = {
         point: '点',
         line: '线',
-        polygon: '多边形空域',
-        rectangle: '矩形空域',
-        circle: '圆形空域',
+        polygon: '面',
+        rectangle: '矩形',
+        circle: '圆形',
         ellipse: '椭圆',
         hold_circle: '圆形盘旋',
         hold_ellipse: '椭圆盘旋',
-        sector: '扇形空域',
+        sector: '扇形',
         arrow: '箭头',
         text: '文本',
-        image: '图片'
+        image: '图片',
+        powerZone: '威力区'
       }
       return names[type] || type
     },
@@ -5143,31 +5883,7 @@ export default {
       const data = {
         version: '1.0',
         date: new Date().toISOString(),
-        entities: this.allEntities.map(entity => ({
-          id: entity.id,
-          type: entity.type,
-          label: entity.label,
-          color: entity.color,
-          data: entity.type === 'point' ? {
-            lat: entity.lat,
-            lng: entity.lng
-          } : entity.type === 'line' || entity.type === 'polygon' ? {
-            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
-          }
-        }))
+        entities: (this.allEntities || []).map(entity => this.serializeEntityForSave(entity))
       }
       const blob = new Blob([JSON.stringify(data, null, 2)], {type: 'application/json'})
       const url = URL.createObjectURL(blob)
@@ -5234,13 +5950,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: straightLinePositions,
+              positions: linePositions,
               width: 3,
-              material: this.getPolylineSolidMaterial(color),
-              clampToGround: true
+              material: Cesium.Color.fromCssColorString(color),
+              arcType: Cesium.ArcType.NONE
             },
             label: {
               text: entityData.label || '线',
@@ -5253,77 +5968,96 @@ export default {
             }
           })
           break
-        case 'polygon':
+        case 'polygon': {
           const polygonPositions = entityData.data.points.map(p => Cesium.Cartesian3.fromDegrees(p.lng, p.lat))
+          const polyOpacity = entityData.data.opacity != null ? entityData.data.opacity : 0
+          const polyWidth = entityData.data.width != null ? entityData.data.width : 4
+          const polyBorderColor = entityData.data.borderColor || color
           entity = this.viewer.entities.add({
             polygon: {
               hierarchy: polygonPositions,
-              material: Cesium.Color.fromCssColorString(color).withAlpha(0.5),
-              outline: true,
-              outlineColor: Cesium.Color.fromCssColorString(color),
-              outlineWidth: 2
+              material: Cesium.Color.fromCssColorString(color).withAlpha(polyOpacity)
             },
-            label: {
-              text: entityData.label || '多边形空域',
-              font: '14px sans-serif',
-              fillColor: Cesium.Color.WHITE,
-              outlineColor: Cesium.Color.BLACK,
-              outlineWidth: 2,
-              style: Cesium.LabelStyle.FILL_AND_OUTLINE,
-              position: polygonPositions[0]
+            polyline: {
+              positions: [...polygonPositions, polygonPositions[0]],
+              width: polyWidth,
+              material: Cesium.Color.fromCssColorString(polyBorderColor),
+              arcType: Cesium.ArcType.NONE
             }
           })
           break
-        case 'rectangle':
-          const rectCoords = entityData.data.coordinates
+        }
+        case 'rectangle': {
+          let rectCoords = entityData.data.coordinates
+          if (!rectCoords && entityData.data.points && entityData.data.points.length >= 2) {
+            const lngs = entityData.data.points.map(p => p.lng)
+            const lats = entityData.data.points.map(p => p.lat)
+            rectCoords = { west: Math.min(...lngs), south: Math.min(...lats), east: Math.max(...lngs), north: Math.max(...lats) }
+          }
+          if (!rectCoords) break
+          const rectOpacity = entityData.data.opacity != null ? entityData.data.opacity : 0
+          const rectWidth = entityData.data.width != null ? entityData.data.width : 4
+          const rectBorderColor = entityData.data.borderColor || color
+          const rectColor = Cesium.Color.fromCssColorString(color).withAlpha(rectOpacity)
+          const southwest = Cesium.Cartesian3.fromDegrees(rectCoords.west, rectCoords.south)
+          const southeast = Cesium.Cartesian3.fromDegrees(rectCoords.east, rectCoords.south)
+          const northeast = Cesium.Cartesian3.fromDegrees(rectCoords.east, rectCoords.north)
+          const northwest = Cesium.Cartesian3.fromDegrees(rectCoords.west, rectCoords.north)
+          const borderPositions = [southwest, southeast, northeast, northwest, southwest]
           entity = this.viewer.entities.add({
             rectangle: {
               coordinates: Cesium.Rectangle.fromDegrees(rectCoords.west, rectCoords.south, rectCoords.east, rectCoords.north),
-              material: Cesium.Color.fromCssColorString(color).withAlpha(0.5),
-              outline: true,
-              outlineColor: Cesium.Color.fromCssColorString(color),
-              outlineWidth: 2
+              material: rectColor
             },
-            label: {
-              text: entityData.label || '矩形空域',
-              font: '14px sans-serif',
-              fillColor: Cesium.Color.WHITE,
-              outlineColor: Cesium.Color.BLACK,
-              outlineWidth: 2,
-              style: Cesium.LabelStyle.FILL_AND_OUTLINE,
-              position: Cesium.Cartesian3.fromDegrees((rectCoords.west + rectCoords.east) / 2, (rectCoords.south + rectCoords.north) / 2)
+            polyline: {
+              positions: borderPositions,
+              width: rectWidth,
+              material: Cesium.Color.fromCssColorString(rectBorderColor),
+              arcType: Cesium.ArcType.NONE
             }
           })
-          break
-        case 'circle':
-          // 检查半径是否有效
+          this.allEntities.push({
+            id: entity.id,
+            type: 'rectangle',
+            points: entityData.data.points || [],
+            coordinates: rectCoords,
+            entity,
+            color,
+            borderColor: rectBorderColor,
+            opacity: rectOpacity,
+            width: rectWidth,
+            label: entityData.label || '矩形'
+          })
+          return
+        }
+        case 'circle': {
           const radius = entityData.data.radius || 1000
           if (radius <= 0) {
             this.$message.error('圆形半径必须大于0')
             return
           }
+          const circleCenter = Cesium.Cartesian3.fromDegrees(entityData.data.center.lng, entityData.data.center.lat)
+          const circlePositions = this.generateCirclePositions(circleCenter, radius)
+          const circleOpacity = entityData.data.opacity != null ? entityData.data.opacity : 0
+          const circleWidth = entityData.data.width != null ? entityData.data.width : 4
+          const circleBorderColor = entityData.data.borderColor || color
           entity = this.viewer.entities.add({
-            position: Cesium.Cartesian3.fromDegrees(entityData.data.center.lng, entityData.data.center.lat),
+            position: circleCenter,
             ellipse: {
-              semiMinorAxis: radius,
               semiMajorAxis: radius,
-              material: Cesium.Color.fromCssColorString(color).withAlpha(0.5),
-              outline: true,
-              outlineColor: Cesium.Color.fromCssColorString(color),
-              outlineWidth: 2
+              semiMinorAxis: radius,
+              material: Cesium.Color.fromCssColorString(color).withAlpha(circleOpacity),
+              arcType: Cesium.ArcType.NONE
             },
-            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)
+            polyline: {
+              positions: circlePositions,
+              width: circleWidth,
+              material: Cesium.Color.fromCssColorString(circleBorderColor),
+              arcType: Cesium.ArcType.NONE
             }
           })
           break
+        }
         case 'hold_circle': {
           const hcRadius = entityData.data.radius || 1000
           if (hcRadius <= 0) {
@@ -5388,6 +6122,182 @@ export default {
           })
           break
         }
+        case 'sector': {
+          const d = entityData.data
+          if (!d || !d.center || d.radius == null) break
+          const center = Cesium.Cartesian3.fromDegrees(d.center.lng, d.center.lat)
+          const startAngle = d.startAngle != null ? d.startAngle : 0
+          const endAngle = d.endAngle != null ? d.endAngle : Math.PI * 0.5
+          const sectorOpacity = d.opacity != null ? d.opacity : 0
+          const sectorWidth = d.width != null ? d.width : 3
+          const sectorBorderColor = d.borderColor || color
+          const positions = this.generateSectorPositions(center, d.radius, startAngle, endAngle)
+          entity = this.viewer.entities.add({
+            polygon: {
+              hierarchy: new Cesium.PolygonHierarchy(positions),
+              material: Cesium.Color.fromCssColorString(color).withAlpha(sectorOpacity)
+            },
+            polyline: {
+              positions: positions,
+              width: sectorWidth,
+              material: Cesium.Color.fromCssColorString(sectorBorderColor),
+              arcType: Cesium.ArcType.NONE
+            }
+          })
+          this.allEntities.push({
+            id: entity.id,
+            type: 'sector',
+            center: d.center,
+            radius: d.radius,
+            startAngle,
+            endAngle,
+            positions,
+            entity,
+            color,
+            borderColor: sectorBorderColor,
+            opacity: sectorOpacity,
+            width: sectorWidth,
+            label: entityData.label || '扇形'
+          })
+          this.notifyDrawingEntitiesChanged()
+          return
+        }
+        case 'arrow': {
+          const pts = entityData.data.points
+          if (!pts || pts.length < 2) break
+          const arrowPositions = pts.map(p => Cesium.Cartesian3.fromDegrees(p.lng, p.lat))
+          entity = this.viewer.entities.add({
+            polyline: {
+              positions: arrowPositions,
+              width: 12,
+              material: new Cesium.PolylineArrowMaterialProperty(Cesium.Color.fromCssColorString(color)),
+              arcType: Cesium.ArcType.NONE,
+              widthInMeters: false
+            }
+          })
+          this.allEntities.push({
+            id: entity.id,
+            type: 'arrow',
+            points: pts,
+            positions: arrowPositions,
+            entity,
+            color,
+            label: entityData.label || '箭头',
+            width: entityData.data.width
+          })
+          this.notifyDrawingEntitiesChanged()
+          return
+        }
+        case 'text': {
+          const td = entityData.data
+          if (!td || td.lat == null || td.lng == null) break
+          const textPos = Cesium.Cartesian3.fromDegrees(td.lng, td.lat)
+          entity = this.viewer.entities.add({
+            position: textPos,
+            label: {
+              text: td.text != null ? td.text : (entityData.label || '文本'),
+              font: td.font || this.defaultStyles.text.font,
+              fillColor: Cesium.Color.fromCssColorString(color),
+              outlineColor: Cesium.Color.fromCssColorString('#e5e5e5'),
+              outlineWidth: 1,
+              style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+              verticalOrigin: Cesium.VerticalOrigin.CENTER,
+              horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+              backgroundColor: td.backgroundColor ? Cesium.Color.fromCssColorString(td.backgroundColor) : Cesium.Color.fromCssColorString(this.defaultStyles.text.backgroundColor),
+              backgroundPadding: new Cesium.Cartesian2(8, 5),
+              scaleByDistance: new Cesium.NearFarScalar(200, 1.12, 1200000, 0.72),
+              translucencyByDistance: new Cesium.NearFarScalar(300, 1.0, 600000, 0.88)
+            }
+          })
+          this.allEntities.push({
+            id: entity.id,
+            type: 'text',
+            lat: td.lat,
+            lng: td.lng,
+            text: td.text,
+            position: textPos,
+            entity,
+            color,
+            font: td.font,
+            backgroundColor: td.backgroundColor,
+            label: entityData.label || '文本'
+          })
+          this.notifyDrawingEntitiesChanged()
+          return
+        }
+        case 'image': {
+          const imgData = entityData.data
+          if (!imgData || imgData.lat == null || imgData.lng == null || !imgData.imageUrl) break
+          const imgPos = Cesium.Cartesian3.fromDegrees(imgData.lng, imgData.lat)
+          entity = this.viewer.entities.add({
+            position: imgPos,
+            billboard: {
+              image: imgData.imageUrl,
+              width: imgData.width != null ? imgData.width : this.defaultStyles.image.width,
+              height: imgData.height != null ? imgData.height : this.defaultStyles.image.height,
+              verticalOrigin: Cesium.VerticalOrigin.CENTER,
+              horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+              scaleByDistance: new Cesium.NearFarScalar(200, 1.12, 1200000, 0.72),
+              translucencyByDistance: new Cesium.NearFarScalar(300, 1.0, 600000, 0.88)
+            }
+          })
+          this.allEntities.push({
+            id: entity.id,
+            type: 'image',
+            lat: imgData.lat,
+            lng: imgData.lng,
+            imageUrl: imgData.imageUrl,
+            position: imgPos,
+            entity,
+            width: imgData.width,
+            height: imgData.height,
+            label: entityData.label || '图片'
+          })
+          this.notifyDrawingEntitiesChanged()
+          return
+        }
+        case 'powerZone': {
+          const pd = entityData.data
+          if (!pd || !pd.center || pd.radius == null) break
+          const pzCenter = Cesium.Cartesian3.fromDegrees(pd.center.lng, pd.center.lat)
+          const pzRadius = Math.max(1, pd.radius)
+          const circlePositions = this.generateCirclePositions(pzCenter, pzRadius)
+          entity = this.viewer.entities.add({
+            polygon: {
+              hierarchy: new Cesium.PolygonHierarchy(circlePositions),
+              material: Cesium.Color.TRANSPARENT,
+              outline: true,
+              outlineColor: Cesium.Color.fromCssColorString(pd.color || '#FF0000'),
+              outlineWidth: (pd.width != null ? pd.width : 2)
+            },
+            polyline: {
+              positions: circlePositions,
+              width: 2,
+              material: Cesium.Color.RED,
+              arcType: Cesium.ArcType.NONE
+            }
+          })
+          const centerEntity = this.viewer.entities.add({
+            position: pzCenter,
+            point: { pixelSize: 8, color: Cesium.Color.RED, outlineColor: Cesium.Color.WHITE, outlineWidth: 2 },
+            label: { text: pd.name || '威力区', 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, -12) }
+          })
+          this.allEntities.push({
+            id: entity.id,
+            type: 'powerZone',
+            entity,
+            centerEntity,
+            center: pd.center,
+            radius: pzRadius,
+            name: pd.name,
+            color: pd.color || '#FF0000',
+            opacity: pd.opacity,
+            borderColor: pd.borderColor,
+            width: pd.width
+          })
+          this.notifyDrawingEntitiesChanged()
+          return
+        }
       }
       if (entity) {
         this.allEntities.push({
@@ -5395,8 +6305,10 @@ export default {
           type: entityData.type,
           label: entityData.label,
           color: color,
+          entity,
           ...entityData.data
         })
+        if (this.getDrawingEntityTypes().includes(entityData.type)) this.notifyDrawingEntitiesChanged()
       }
     },
     handleLocate() {
@@ -5415,7 +6327,13 @@ export default {
           },
           duration: 2
         })
-        this.$message.success(`已定位到经度 ${this.degreesToDMS(lng)}，纬度 ${this.degreesToDMS(lat)}`)
+        let coordinateText
+        if (this.coordinateFormat === 'dms') {
+          coordinateText = `${this.degreesToDMS(lng)}，${this.degreesToDMS(lat)}`
+        } else {
+          coordinateText = `${lng.toFixed(6)}，${lat.toFixed(6)}`
+        }
+        this.$message.success(`已定位到经度 ${coordinateText}`)
       }
     },
 
@@ -5640,12 +6558,13 @@ export default {
               id: selectedLineEntity.id,
               name: selectedLineEntity.label,
               polyline: {
-                positions: this.getPolylinePositionsStraightIn2D(newPositions, false),
+                positions: newPositions,
                 width: selectedLineEntity.width,
-                material: this.getPolylineSolidMaterial(selectedLineEntity.color),
-                clampToGround: true
+                material: Cesium.Color.fromCssColorString(selectedLineEntity.color),
+                arcType: Cesium.ArcType.NONE
               }
             })
+            // 更新线实体的引用和位置数组
             selectedLineEntity.entity = newEntity
             selectedLineEntity.positions = newPositions
             // 更新点数据
@@ -5686,12 +6605,26 @@ export default {
           const cartographic = Cesium.Cartographic.fromCartesian(cartesian)
           const longitude = Cesium.Math.toDegrees(cartographic.longitude)
           const latitude = Cesium.Math.toDegrees(cartographic.latitude)
-          this.coordinatesText = `经度: ${this.degreesToDMS(longitude)}, 纬度: ${this.degreesToDMS(latitude)}`
+          this.currentCoordinates = { longitude, latitude }
+          this.updateCoordinatesDisplay()
         } else {
           this.coordinatesText = '经度: --, 纬度: --'
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE)
     },
+    // 更新坐标显示
+    updateCoordinatesDisplay() {
+      if (!this.currentCoordinates) {
+        this.coordinatesText = '经度: --, 纬度: --'
+        return
+      }
+      const { longitude, latitude } = this.currentCoordinates
+      if (this.coordinateFormat === 'dms') {
+        this.coordinatesText = `经度: ${this.degreesToDMS(longitude)}, 纬度: ${this.degreesToDMS(latitude)}`
+      } else {
+        this.coordinatesText = `经度: ${longitude.toFixed(6)}, 纬度: ${latitude.toFixed(6)}`
+      }
+    },
     destroyViewer() {
       this.stopDrawing()
       this.clearAll(false)
@@ -5734,10 +6667,6 @@ export default {
         this.scaleBarCleanup()
         this.scaleBarCleanup = null
       }
-      if (typeof this._resolutionScaleCleanup === 'function') {
-        this._resolutionScaleCleanup()
-        this._resolutionScaleCleanup = null
-      }
 
       if (this.viewer) {
         this.viewer.destroy()
@@ -5830,6 +6759,17 @@ export default {
             outlineColor: Cesium.Color.WHITE,
             outlineWidth: 2,
             disableDepthTestDistance: Number.POSITIVE_INFINITY
+          },
+          label: {
+            text: '',
+            font: '14px Microsoft YaHei',
+            fillColor: Cesium.Color.WHITE,
+            outlineColor: Cesium.Color.BLACK,
+            outlineWidth: 2,
+            style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+            verticalOrigin: Cesium.VerticalOrigin.TOP,
+            pixelOffset: new Cesium.Cartesian2(0, -20),
+            disableDepthTestDistance: Number.POSITIVE_INFINITY
           }
         });
 
@@ -5853,13 +6793,13 @@ export default {
           semiMinorAxis: radiusInMeters,
           semiMajorAxis: radiusInMeters,
           material: Cesium.Color.RED.withAlpha(0),
-          clampToGround: true
+          arcType: Cesium.ArcType.NONE
         },
         polyline: {
           positions: circlePositions,
           width: 2,
-          material: this.getPolylineSolidMaterial('#FF0000'),
-          clampToGround: true
+          material: Cesium.Color.RED,
+          arcType: Cesium.ArcType.NONE
         }
       });
 
@@ -5870,11 +6810,17 @@ export default {
         centerEntity: this.powerZoneCenterEntity,
         center: this.powerZoneCenter,
         radius: radiusInMeters,
+        name: radiusData.name,
         color: '#FF0000',
         opacity: 0,
         borderColor: '#FF0000',
         width: 2
       });
+      this.notifyDrawingEntitiesChanged();
+
+      if (this.powerZoneCenterEntity && this.powerZoneCenterEntity.label) {
+        this.powerZoneCenterEntity.label.text = radiusData.name;
+      }
 
       this.isDrawing = false;
       this.viewer.canvas.style.cursor = 'default';
@@ -5937,6 +6883,23 @@ export default {
   white-space: nowrap;
 }
 
+/* 航线复制预览提示 */
+.copy-route-tip {
+  position: absolute;
+  bottom: 60px;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 99;
+  background: rgba(0, 120, 255, 0.9);
+  color: #fff;
+  padding: 10px 20px;
+  border-radius: 6px;
+  font-size: 14px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.2);
+  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 27c6bbb..0854d2e 100644
--- a/ruoyi-ui/src/views/childRoom/RightPanel.vue
+++ b/ruoyi-ui/src/views/childRoom/RightPanel.vue
@@ -70,6 +70,11 @@
                     </el-tag>
                     <div class="tree-item-actions">
                       <i class="el-icon-view" title="显示/隐藏" @click.stop="handleToggleRouteVisibility(route)"></i>
+                      <i
+                        :class="routeLocked[route.id] ? 'el-icon-lock' : 'el-icon-unlock'"
+                        :title="routeLocked[route.id] ? '解锁' : '上锁'"
+                        @click.stop="$emit('toggle-route-lock', route)"
+                      ></i>
                       <i class="el-icon-edit" title="编辑" @click.stop="handleOpenRouteDialog(route)"></i>
                       <i class="el-icon-delete" title="删除" @click.stop="$emit('delete-route', route)"></i>
                     </div>
@@ -278,6 +283,11 @@ export default {
       type: Array,
       default: () => []
     },
+    /** 航线上锁状态：routeId -> true 上锁，与地图右键上锁/解锁同步 */
+    routeLocked: {
+      type: Object,
+      default: () => ({})
+    },
     selectedPlanId: {
       type: [String, Number],
       default: null
diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue
index 6654661..78d2d52 100644
--- a/ruoyi-ui/src/views/childRoom/index.vue
+++ b/ruoyi-ui/src/views/childRoom/index.vue
@@ -12,13 +12,23 @@
       <cesiumMap ref="cesiumMap" :drawDomClick="drawDom || airspaceDrawDom"
                  :tool-mode="drawDom ? 'ranging' : (airspaceDrawDom ? 'airspace' : 'airspace')"
                  :scaleConfig="scaleConfig"
+                 :coordinateFormat="coordinateFormat"
+                 :route-locked="routeLocked"
                  @draw-complete="handleMapDrawComplete"
+                 @route-lock-changed="handleRouteLockChanged"
                  @drawing-points-update="missionDrawingPointsCount = $event"
+                 @platform-route-drawing-started="missionDrawingActive = true"
+                 @drawing-cancelled="missionDrawingActive = false"
                  @open-waypoint-dialog="handleOpenWaypointEdit"
                  @open-route-dialog="handleOpenRouteEdit"
+                 @copy-route="handleCopyRoute"
+                 @route-copy-placed="handleRouteCopyPlaced"
+                 @waypoint-position-changed="handleWaypointPositionChanged"
                  @scale-click="handleScaleClick"
                  @platform-icon-updated="onPlatformIconUpdated"
-                 @platform-icon-removed="onPlatformIconRemoved" />
+                 @platform-icon-removed="onPlatformIconRemoved"
+                 @viewer-ready="onViewerReady"
+                 @drawing-entities-changed="onDrawingEntitiesChanged" />
       <div v-show="!screenshotMode" class="map-overlay-text">
         <!-- <i class="el-icon-location-outline text-3xl mb-2 block"></i> -->
         <!-- <p>二维GIS地图区域</p>
@@ -40,11 +50,17 @@
         <div class="red-dot"></div>
         <i class="el-icon-s-unfold icon-inside"></i>
       </div>
-      <el-dialog title="保存新航线" :visible.sync="showNameDialog" width="30%" :append-to-body="true">
+      <el-dialog title="保存新航线" :visible.sync="showNameDialog" width="30%" :append-to-body="true" @open="onSaveRouteDialogOpen" @close="tempMapPlatform = null; saveDialogScenarioId = null">
         <el-form label-width="80px">
           <el-form-item label="航线名称">
             <el-input v-model="newRouteName" placeholder="例如：航线一"></el-input>
           </el-form-item>
+          <el-form-item label="所属方案">
+            <el-select v-model="saveDialogScenarioId" placeholder="请选择方案" style="width:100%" clearable>
+              <el-option v-for="p in plans" :key="p.id" :label="p.name" :value="p.id" />
+            </el-select>
+            <div v-if="plans.length === 0" class="el-form-item__error" style="margin-top:4px;">暂无方案，请先点击地图左侧红点展开菜单，选择「方案」并新建方案后再保存。</div>
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="showNameDialog = false">取 消</el-button>
@@ -162,6 +178,7 @@
       :selected-route-id="selectedRouteId"
       :routes="routes"
       :active-route-ids="activeRouteIds"
+      :route-locked="routeLocked"
       :selected-route-details="selectedRouteDetails"
       :conflicts="conflicts"
       :conflict-count="conflictCount"
@@ -181,6 +198,7 @@
       @add-waypoint="addWaypoint"
       @cancel-route="cancelRoute"
       @toggle-route-visibility="toggleRouteVisibility"
+      @toggle-route-lock="handleToggleRouteLockFromPanel"
       @view-conflict="viewConflict"
       @resolve-conflict="resolveConflict"
       @run-conflict-check="runConflictCheck"
@@ -410,7 +428,7 @@ import LeftMenu from './LeftMenu'
 import RightPanel from './RightPanel'
 import BottomLeftPanel from './BottomLeftPanel'
 import TopHeader from './TopHeader'
-import { listScenario,addScenario,delScenario} from "@/api/system/scenario";
+import { listScenario, addScenario, delScenario } from "@/api/system/scenario";
 import { listRoutes, getRoutes, addRoutes, updateRoutes, delRoutes } from "@/api/system/routes";
 import { updateWaypoints, addWaypoints, delWaypoints } from "@/api/system/waypoints";
 import { listLib,addLib,delLib} from "@/api/system/lib";
@@ -467,6 +485,10 @@ export default {
       showNameDialog: false,
       newRouteName: '',
       tempMapPoints: [],
+      /** 从平台右键「在此之前/在此之后插入航线」完成时传入，保存航线时用作 platformId */
+      tempMapPlatform: null,
+      /** 保存新航线弹窗内选择的方案 ID（弹窗内可直接选方案，无需先展开侧边） */
+      saveDialogScenarioId: null,
       platformIconSaveTimer: null,
       //导入平台弹窗
       showImportDialog: false,
@@ -485,6 +507,7 @@ export default {
       roomDetail: null,
       showKTimeSetDialog: false,
       kTimeForm: { dateTime: null },
+      saveRoomDrawingsTimer: null,
 
       // 左侧菜单栏
       isMenuHidden: true,      // 是否完全隐藏左侧菜单
@@ -563,6 +586,9 @@ export default {
       showLandmark: true,
       showRoute: true,
 
+      // 坐标格式控制
+      coordinateFormat: 'dms', // 'decimal' 或 'dms'
+
       menuItems: [],
 
       // 右侧面板
@@ -570,6 +596,8 @@ export default {
       plans: [],
       activeRightTab: 'plan',
       activeRouteIds: [], // 存储当前所有选中的航线ID
+      /** 航线上锁状态：routeId -> true 上锁，与地图右键及右侧列表锁图标同步 */
+      routeLocked: {},
       // 冲突数据
       conflictCount: 2,
       conflicts: [
@@ -799,6 +827,106 @@ export default {
       }
     },
 
+    /** 右键「复制航线」：拉取航点后进入复制预览，左键放置后弹窗保存 */
+    async handleCopyRoute(routeId) {
+      try {
+        const res = await getRoutes(routeId);
+        if (res.code !== 200 || !res.data) {
+          this.$message.error('获取航线数据失败');
+          return;
+        }
+        const waypoints = res.data.waypoints || [];
+        if (waypoints.length < 2) {
+          this.$message.warning('航线航点不足，无法复制');
+          return;
+        }
+        if (this.$refs.cesiumMap && typeof this.$refs.cesiumMap.startRouteCopyPreview === 'function') {
+          this.$refs.cesiumMap.startRouteCopyPreview(waypoints);
+          this.$message.info('移动鼠标到目标位置，左键放置复制航线；右键取消');
+        }
+      } catch (e) {
+        this.$message.error('获取航线数据失败');
+        console.error(e);
+      }
+    },
+
+    /** 复制航线已放置：用当前偏移后的航点打开「保存新航线」弹窗 */
+    handleRouteCopyPlaced(points) {
+      this.tempMapPoints = points || [];
+      this.tempMapPlatform = null;
+      this.showNameDialog = true;
+    },
+
+    /** 地图上拖拽航点结束：将新位置写回数据库并刷新显示 */
+    async handleWaypointPositionChanged({ dbId, routeId, lat, lng, alt }) {
+      let waypoints = null;
+      let route = null;
+      if (this.selectedRouteDetails && this.selectedRouteDetails.id === routeId) {
+        waypoints = this.selectedRouteDetails.waypoints;
+        route = this.selectedRouteDetails;
+      }
+      if (!waypoints) {
+        const r = this.routes.find(r => r.id === routeId);
+        if (r && r.waypoints) {
+          waypoints = r.waypoints;
+          route = r;
+        }
+      }
+      if (!waypoints || !route) {
+        this.$message.error('未找到对应航线数据');
+        return;
+      }
+      const wp = waypoints.find(p => p.id === dbId);
+      if (!wp) {
+        this.$message.error('未找到对应航点');
+        return;
+      }
+      const payload = {
+        id: wp.id,
+        routeId: wp.routeId != null ? wp.routeId : routeId,
+        name: wp.name,
+        seq: wp.seq,
+        lat: Number(lat),
+        lng: Number(lng),
+        alt: Number(alt),
+        speed: wp.speed,
+        startTime: (wp.startTime != null && wp.startTime !== '') ? wp.startTime : 'K+00:00:00',
+        turnAngle: wp.turnAngle
+      };
+      if (wp.pointType != null) payload.pointType = wp.pointType;
+      if (wp.holdParams != null) payload.holdParams = wp.holdParams;
+      if (wp.labelFontSize != null) payload.labelFontSize = wp.labelFontSize;
+      if (wp.labelColor != null) payload.labelColor = wp.labelColor;
+      try {
+        const response = await updateWaypoints(payload);
+        if (response.code === 200) {
+          const merged = { ...wp, ...payload };
+          const idx = waypoints.findIndex(p => p.id === dbId);
+          if (idx !== -1) waypoints.splice(idx, 1, merged);
+          if (this.selectedRouteDetails && this.selectedRouteDetails.id === routeId) {
+            const i = this.selectedRouteDetails.waypoints.findIndex(p => p.id === dbId);
+            if (i !== -1) this.selectedRouteDetails.waypoints.splice(i, 1, merged);
+          }
+          if (this.$refs.cesiumMap) {
+            this.$refs.cesiumMap.renderRouteWaypoints(
+              waypoints,
+              routeId,
+              route.platformId,
+              route.platform,
+              this.parseRouteStyle(route.attributes)
+            );
+          }
+          this.$message.success('航点位置已更新');
+          this.$nextTick(() => this.updateDeductionPositions());
+        } else {
+          throw new Error(response.msg || '更新失败');
+        }
+      } catch (error) {
+        console.error('更新航点位置失败:', error);
+        this.$message.error(error.message || '更新失败，请重试');
+      }
+    },
+
     // 显示在线成员弹窗
     showOnlineMembersDialog() {
       this.showOnlineMembers = true;
@@ -998,7 +1126,7 @@ export default {
           if (idx > -1) {
             this.activeRouteIds.splice(idx, 1);
           }
-          await this.getList();
+          await this.getList({ skipRoomPlatformIcons: true });
         }
       } catch (e) {
         if (e !== 'cancel') {
@@ -1007,8 +1135,12 @@ export default {
         }
       }
     },
-    /** 从数据库拉取最新的航线列表数据 */
-    async getList() {
+    /**
+     * 从数据库拉取最新的航线列表数据
+     * @param {Object} opts - 可选：{ skipRoomPlatformIcons: true } 时不再加载房间平台图标（用于删除航线等仅航线变化的场景，避免地图上的平台图标被清空再重画导致闪一下）
+     */
+    async getList(opts = {}) {
+      const { skipRoomPlatformIcons = false } = opts;
       try {
         const roomId = this.$route.query.roomId || this.currentRoomId;
         const scenarioRes = await listScenario({ roomId: roomId });
@@ -1016,6 +1148,7 @@ export default {
           this.plans = scenarioRes.rows.map(s => ({
             id: s.id,
             name: s.name,
+            frontendDrawings: s.frontendDrawings || null,
             routes: []
           }));
         }
@@ -1054,12 +1187,14 @@ 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(() => {});
+          // 加载该房间下保存的地图平台图标（删除航线等操作时跳过，避免清空再重画导致平台图标闪一下）
+          if (!skipRoomPlatformIcons) {
+            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) {
@@ -1067,15 +1202,20 @@ export default {
         this.$message.error("获取方案列表失败");
       }
     },
-    handleMapDrawComplete(points) {
+    handleMapDrawComplete(points, options) {
       this.missionDrawingActive = false;
       if (!points || points.length < 2) {
         this.$message.error('航点太少，无法生成航线');
         this.drawDom = false;
         return;
       }
-      this.tempMapPoints = points; // 暂存坐标点
-      this.showNameDialog = true;  // 弹出对话框起名
+      this.tempMapPoints = points;
+      this.tempMapPlatform = (options && (options.platformId != null || options.platform)) ? options : null;
+      this.showNameDialog = true;
+    },
+    /** 保存新航线弹窗打开时：若当前未选方案则用已选方案或第一个方案填充，便于在弹窗内直接选择 */
+    onSaveRouteDialogOpen() {
+      this.saveDialogScenarioId = this.selectedPlanId || (this.plans[0] && this.plans[0].id) || null;
     },
 
     openAddHoldDuringDrawing() {
@@ -1091,9 +1231,9 @@ export default {
         this.$message.error('新增航线未命名，请输入名称后保存！');
         return;
       }
-      const currentScenarioId = this.selectedPlanId;
+      const currentScenarioId = this.saveDialogScenarioId != null ? this.saveDialogScenarioId : this.selectedPlanId;
       if (!currentScenarioId) {
-        this.$message.warning('请先在左侧选择一个方案，再保存航线！');
+        this.$message.warning(this.plans.length === 0 ? '暂无方案，请先点击地图左侧红点展开菜单，选择「方案」并新建方案后再保存。' : '请在上方选择所属方案后再保存。');
         return;
       }
 
@@ -1121,7 +1261,7 @@ export default {
       const routeData = {
         callSign: this.newRouteName,
         scenarioId: currentScenarioId,
-        platformId: 1,
+        platformId: (this.tempMapPlatform && this.tempMapPlatform.platformId != null) ? this.tempMapPlatform.platformId : 1,
         attributes: this.getDefaultRouteAttributes(),
         waypoints: finalWaypoints
       };
@@ -1148,25 +1288,37 @@ export default {
             this.activeRouteIds.push(newRouteId);
           }
 
-          // 3. UI 重置
+          // 3. 先保存“用于创建航线的平台”引用，再清空（后续删除要用到）
+          const platformToRemove = this.tempMapPlatform;
+
+          // 4. UI 重置
           this.drawDom = false;
           this.showNameDialog = false;
           this.newRouteName = '';
           this.tempMapPoints = [];
+          this.tempMapPlatform = null;
 
-          // 4. 【修复关键 B】：千万不要调用 clearAllWaypoints()！
-          // 改为只删除绘制过程中的临时预览实体，保留地图上已有的正式线
+          // 5. 【修复关键 B】：只清理临时预览实体，不 clearAllWaypoints
           if (this.$refs.cesiumMap) {
-            // 只清理临时点（假如你的地图组件有这个更细的方法）
-            // 如果没有，就直接删掉 tempPreviewEntity
             if (this.$refs.cesiumMap.tempPreviewEntity) {
               this.viewer.entities.remove(this.$refs.cesiumMap.tempPreviewEntity);
               this.$refs.cesiumMap.tempPreviewEntity = null;
             }
-            // 如果 clearAllWaypoints 会清空所有，那这里就不能调用它
           }
 
-          // 5. 刷新右侧列表（拉取最新数据，含新建航线）；getList 内部会根据 activeRouteIds 自动渲染新航线
+          // 6. 若本条航线是从“地图上的平台图标”创建的：先删库再刷新列表，最后从地图移除该占位图标（避免 getList 重新拉取到未删记录又画上去）
+          if (platformToRemove && this.$refs.cesiumMap) {
+            if (platformToRemove.serverId) {
+              await delRoomPlatformIcon(platformToRemove.serverId).catch(() => {});
+              if (typeof this.$refs.cesiumMap.removePlatformIconByServerId === 'function') {
+                this.$refs.cesiumMap.removePlatformIconByServerId(platformToRemove.serverId);
+              }
+            } else if (platformToRemove.mapEntityId && typeof this.$refs.cesiumMap.removeEntity === 'function') {
+              this.$refs.cesiumMap.removeEntity(platformToRemove.mapEntityId);
+            }
+          }
+
+          // 7. 刷新右侧列表（拉取最新数据，含新建航线）；getList 会重新加载房间平台图标，因已删记录，不会再画出该图标
           await this.getList();
           const routeFromList = this.routes.find(r => r.id === newRouteId);
           if (routeFromList) {
@@ -1290,9 +1442,43 @@ export default {
     getRoomDetail() {
       if (!this.currentRoomId) return;
       getRooms(this.currentRoomId).then(res => {
-        if (res.code === 200 && res.data) this.roomDetail = res.data;
+        if (res.code === 200 && res.data) {
+          this.roomDetail = res.data;
+          this.$nextTick(() => this.loadRoomDrawings());
+        }
       }).catch(() => {});
     },
+    /** 加载当前房间的空域/威力区图形（与房间 ID 绑定，进入该房间即显示） */
+    loadRoomDrawings() {
+      if (!this.roomDetail || !this.$refs.cesiumMap || typeof this.$refs.cesiumMap.loadFrontendDrawings !== 'function') return;
+      if (this.roomDetail.frontendDrawings) {
+        this.$refs.cesiumMap.loadFrontendDrawings(this.roomDetail.frontendDrawings);
+      } else {
+        this.$refs.cesiumMap.clearDrawingEntities();
+      }
+    },
+    /** 地图 viewer 就绪时加载当前房间图形（可能 getRoomDetail 尚未返回，此处再试一次） */
+    onViewerReady() {
+      this.loadRoomDrawings();
+    },
+    /** 空域/威力区图形增删时防抖自动保存到当前房间 */
+    onDrawingEntitiesChanged() {
+      if (!this.currentRoomId) return;
+      if (this.saveRoomDrawingsTimer) clearTimeout(this.saveRoomDrawingsTimer);
+      this.saveRoomDrawingsTimer = setTimeout(() => {
+        this.saveRoomDrawingsTimer = null;
+        this.saveRoomDrawingsToServer();
+      }, 600);
+    },
+    /** 将当前地图上的空域图形写入当前房间（静默保存，不弹成功提示；失败时抛出供调用方处理） */
+    async saveRoomDrawingsToServer() {
+      if (!this.currentRoomId || !this.$refs.cesiumMap) return;
+      if (typeof this.$refs.cesiumMap.getFrontendDrawingsData !== 'function') return;
+      const drawingsData = this.$refs.cesiumMap.getFrontendDrawingsData();
+      const frontendDrawingsStr = JSON.stringify(drawingsData);
+      await updateRooms({ id: this.currentRoomId, frontendDrawings: frontendDrawingsStr });
+      if (this.roomDetail) this.roomDetail.frontendDrawings = frontendDrawingsStr;
+    },
     /** 将任意日期字符串格式化为 yyyy-MM-dd HH:mm:ss，供日期选择器使用 */
     formatKTimeForPicker(val) {
       if (!val) return null;
@@ -1365,9 +1551,18 @@ export default {
       this.activeMenu = item.id;
     },
 
-    // 文件下拉菜单方法
-    savePlan() {
-      this.$message.success('保存计划');
+    // 文件下拉菜单方法：立即保存当前房间的空域/威力区图形（与自动保存共用逻辑）
+    async savePlan() {
+      if (!this.currentRoomId) {
+        this.$message.warning('请先进入任务房间');
+        return;
+      }
+      try {
+        await this.saveRoomDrawingsToServer();
+        this.$message.success('房间空域图形已保存');
+      } catch (e) {
+        this.$message.error('保存失败，请检查网络');
+      }
     },
 
     importPlanFile() {
@@ -1796,8 +1991,8 @@ export default {
     },
 
     coordinateConversion() {
-      this.$message.success('坐标换算');
-      // 这里可以添加坐标换算的逻辑
+      this.coordinateFormat = this.coordinateFormat === 'decimal' ? 'dms' : 'decimal'
+      this.$message.success(`坐标格式已切换为：${this.coordinateFormat === 'decimal' ? '十进制' : '度分秒'}`)
     },
 
     // 选项下拉菜单方法
@@ -2549,11 +2744,11 @@ export default {
       this.selectedRouteDetails = null;
       this.activeRouteIds = [];
 
-      // 物理清场
+      // 物理清场（仅航点/航线；空域图形与房间绑定，不随方案切换）
       if (this.$refs.cesiumMap && this.$refs.cesiumMap.clearAllWaypoints) {
         this.$refs.cesiumMap.clearAllWaypoints();
       }
-      console.log(`>>> [切换成功] 已进入方案: ${plan.name}，地图已清空，列表已展开。`);
+      console.log(`>>> [切换成功] 已进入方案: ${plan && plan.name}，地图已清空，列表已展开。`);
     },
     /** 切换航线：实现多选/开关逻辑 */
     async selectRoute(route) {
@@ -2730,6 +2925,18 @@ export default {
     },
 
     // 切换航线显示/隐藏
+    /** 地图右键上锁/解锁后同步到列表 */
+    handleRouteLockChanged({ routeId, locked }) {
+      this.$set(this.routeLocked, routeId, locked);
+    },
+    /** 右侧列表锁图标点击：切换该航线上锁状态，与地图右键状态同步 */
+    handleToggleRouteLockFromPanel(route) {
+      if (!route || route.id == null) return;
+      const nextLocked = !this.routeLocked[route.id];
+      this.$set(this.routeLocked, route.id, nextLocked);
+      this.$message.success(nextLocked ? '航线已上锁，无法修改' : '航线已解锁，可以编辑');
+    },
+
     toggleRouteVisibility(route) {
       const index = this.activeRouteIds.indexOf(route.id);
 
diff --git a/ruoyi-ui/src/views/dialogs/RadiusDialog.vue b/ruoyi-ui/src/views/dialogs/RadiusDialog.vue
index 7e33dcc..63d2914 100644
--- a/ruoyi-ui/src/views/dialogs/RadiusDialog.vue
+++ b/ruoyi-ui/src/views/dialogs/RadiusDialog.vue
@@ -8,6 +8,14 @@
       
       <div class="dialog-body">
         <el-form :model="formData" :rules="rules" ref="formRef" label-width="80px" size="small">
+          <el-form-item label="名称" prop="name">
+            <el-input 
+              v-model="formData.name" 
+              placeholder="请输入威力区名称"
+              style="width: 100%;"
+            ></el-input>
+          </el-form-item>
+          
           <el-form-item label="半径" prop="radius">
             <el-input-number 
               v-model="formData.radius" 
@@ -47,10 +55,14 @@ export default {
   data() {
     return {
       formData: {
+        name: '',
         radius: 50,
         unit: 'km'
       },
       rules: {
+        name: [
+          { required: true, message: '请输入威力区名称', trigger: 'blur' }
+        ],
         radius: [
           { required: true, message: '请输入半径', trigger: 'blur' }
         ]
@@ -65,6 +77,7 @@ export default {
       this.$refs.formRef.validate((valid) => {
         if (valid) {
           this.$emit('confirm', {
+            name: this.formData.name,
             radius: this.formData.radius,
             unit: this.formData.unit
           })