diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoutesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoutesController.java
index 15ee0d2..18a57c5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoutesController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoutesController.java
@@ -77,7 +77,12 @@ public class RoutesController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody Routes routes)
     {
-        return toAjax(routesService.insertRoutes(routes));
+        // 1. 执行插入，MyBatis 会通过 useGeneratedKeys="true" 自动将新 ID 注入 routes 对象
+        int rows = routesService.insertRoutes(routes);
+
+        // 2. 不要用 toAjax，直接返回 success 并带上 routes 对象
+        // 这样前端 response.data 就会包含这个带有 ID 的完整对象
+        return rows > 0 ? AjaxResult.success(routes) : AjaxResult.error("新增航线失败");
     }
 
     /**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RoutesServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RoutesServiceImpl.java
index e106817..cf781a4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RoutesServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RoutesServiceImpl.java
@@ -58,7 +58,16 @@ public class RoutesServiceImpl implements IRoutesService
     @Override
     public List<Routes> selectRoutesList(Routes routes)
     {
-        return routesMapper.selectRoutesList(routes);
+        // 获取基础列表
+        List<Routes> list = routesMapper.selectRoutesList(routes);
+        // 遍历列表，为每一条航线补全它的航点信息
+        for (Routes r : list) {
+            RouteWaypoints queryWp = new RouteWaypoints();
+            queryWp.setRouteId(r.getId());
+            List<RouteWaypoints> wpList = routeWaypointsService.selectRouteWaypointsList(queryWp);
+            r.setWaypoints(wpList);
+        }
+        return list;
     }
 
     /**
diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue
index 735b177..0e746b8 100644
--- a/ruoyi-ui/src/views/cesiumMap/index.vue
+++ b/ruoyi-ui/src/views/cesiumMap/index.vue
@@ -12,7 +12,6 @@
       @import-data="importData"
       @locate="handleLocate"
     />
-
     <measurement-panel
       v-if="measurementResult"
       :result="measurementResult"
@@ -20,7 +19,6 @@
     />
   </div>
 </template>
-
 <script>
 import * as Cesium from 'cesium'
 import 'cesium/Build/Cesium/Widgets/widgets.css'
@@ -60,7 +58,6 @@ export default {
     return {
       viewer: null,
       scaleBar: null,
-
       // 绘制相关
       drawingMode: null, // 'point', 'line', 'polygon', 'rectangle', 'circle'
       drawingHandler: null,
@@ -71,15 +68,12 @@ export default {
       drawingStartPoint: null,
       isDrawing: false,
       activeCursorPosition: null, // 实时鼠标位置
-
       // 实体管理
       allEntities: [], // 所有绘制的实体
       entityCounter: 0,
       selectedEntity: null, // 当前选中的实体
-
       // 测量结果
       measurementResult: null,
-
       // 默认样式
       defaultStyles: {
         point: { color: '#FF0000', size: 12 },
@@ -103,7 +97,6 @@ export default {
     // this.initMap()
     this.checkCesiumLoaded()
   },
-
   beforeDestroy() {
     // 销毁鼠标悬停事件处理器
     if (this.hoverHandler) {
@@ -112,35 +105,74 @@ export default {
     }
     this.destroyViewer()
   },
-
   methods: {
     preventContextMenu(e) {
       e.preventDefault();
     },
-    clearRoute() {
-      // 1. 清除记录在 allEntities 中的实体
-      this.allEntities.forEach(item => {
-        this.viewer.entities.remove(item.entity);
-      });
-      this.allEntities = [];
-
-      // 2. 额外保险：清除所有带业务标记的航点
+    clearAllWaypoints() {
+      console.log(">>> [执行深度清理] 正在清除所有航迹残留...");
+      // 清除所有带业务标记的实体（点和线）
       const entities = this.viewer.entities.values;
       for (let i = entities.length - 1; i >= 0; i--) {
         const entity = entities[i];
-        if (entity.properties && entity.properties.isMissionWaypoint) {
+        const props = entity.properties;
+        // 航点 (isMissionWaypoint)
+        const isWp = props && props.isMissionWaypoint;
+        // 航线 (isMissionRouteLine)
+        const isLine = props && props.isMissionRouteLine;
+        // 绘制时的临时 ID
+        const isTemp = entity.id && String(entity.id).includes('temp_wp_');
+
+        if (isWp || isLine || isTemp) {
           this.viewer.entities.remove(entity);
         }
       }
+      if (this.tempPreviewEntity) {
+        this.viewer.entities.remove(this.tempPreviewEntity);
+        this.tempPreviewEntity = null;
+      }
+      //清理手动维护的记录数组
+      if (this.allEntities) {
+        // 数组里的对象可能已经被上面物理清除了，这里再清一遍确保内存释放
+        this.allEntities.forEach(item => {
+          if (item.entity) this.viewer.entities.remove(item.entity);
+        });
+        this.allEntities = [];
+      }
+      // 重置坐标缓存
+      if (this.drawingPoints) {
+        this.drawingPoints = [];
+      }
+
+      console.log(">>> [清理完毕] 地图已清空，可以安全加载正式版数据。");
     },
-    updateWaypointGraphic(oldName, newName) {
-      // 根据旧名字找到对应的实体
+    updateWaypointGraphicById(dbId, newName) {
       const entities = this.viewer.entities.values;
-      const target = entities.find(e => e.name === oldName && e.properties.isMissionWaypoint);
+
+      // 1. 精确查找
+      const target = entities.find(e => {
+        // 必须确保实体有 properties 且包含 dbId
+        if (e.properties && e.properties.dbId) {
+          // 【核心修复】使用 .getValue() 获取包装内的原始值
+          // 同时使用 == (非严格等于) 兼容字符串与数字对比
+          return e.properties.dbId.getValue() === dbId;
+        }
+        return false;
+      });
 
       if (target) {
-        target.name = newName; // 更新实体名
-        target.label.text = newName; // 更新地图上显示的文字
+        // 2. 同步修改实体的属性与 Label 文字
+        target.name = newName;
+        if (target.label) {
+          target.label.text = newName;
+        }
+        console.log(`>>> [地图同步成功] ID:${dbId} 已重命名为: ${newName}`);
+      } else {
+        // 调试辅助：打印当前地图上所有可用的 ID，看看数据到底对不对
+        const availableIds = entities
+          .filter(e => e.properties && e.properties.dbId)
+          .map(e => e.properties.dbId.getValue());
+        console.warn(`>>> [地图同步失败] 尝试匹配 ID: ${dbId}, 但地图现有 ID 列表为:`, availableIds);
       }
     },
     // 新建航线绘制
@@ -150,7 +182,6 @@ export default {
       let activeCursorPosition = null;
       this.isDrawing = true;
       this.drawingHandler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas);
-
       window.addEventListener('contextmenu', this.preventContextMenu, true);
       // 鼠标移动预览逻辑
       this.drawingHandler.setInputAction((movement) => {
@@ -167,11 +198,13 @@ export default {
         const wpIndex = this.drawingPoints.length;
         // 绘制业务航点
         this.viewer.entities.add({
+          id: `temp_wp_${wpIndex}`,
           name: `WP${wpIndex}`,
           position: position,
           properties: {
             isMissionWaypoint: true, // 这是一个永久的业务标记
-            originalIndex: wpIndex   // 存下它是第几个点
+            originalIndex: wpIndex,   // 存下它是第几个点
+            temp: true
           },
           point: {
             pixelSize: 10,
@@ -212,7 +245,6 @@ export default {
           });
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-
       // 右键点击逻辑（结束绘制、抛出数据、恢复右键）
       this.drawingHandler.setInputAction(() => {
         if (this.drawingPoints.length > 1) {
@@ -239,28 +271,23 @@ export default {
         }, 200);
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     },
-
     renderRouteWaypoints(waypoints, routeId = 'default') {
-      console.log('renderRouteWaypoints被调用，航点数据:', waypoints);
-      console.log('航点数量:', waypoints ? waypoints.length : 0);
       if (!waypoints || waypoints.length < 1) return;
       const positions = [];
       // 1. 遍历并绘制航点标记
       waypoints.forEach((wp, index) => {
-        console.log(`处理航点${index}:`, wp);
-        console.log(`航点${index}的字段:`, Object.keys(wp));
         const lon = parseFloat(wp.lng);
         const lat = parseFloat(wp.lat);
-        console.log(`航点${index}坐标:`, {lon, lat, alt: wp.altitude || wp.alt});
         const pos = Cesium.Cartesian3.fromDegrees(lon, lat, parseFloat(wp.altitude || wp.alt || 500));
         positions.push(pos);
-
         this.viewer.entities.add({
+          id: `wp_${routeId}_${wp.id}`,
           name: wp.name || `WP${index + 1}`,
           position: pos,
           properties: {
             isMissionWaypoint: true,
-            routeId: routeId
+            routeId: routeId,
+            dbId: wp.id,
           },
           point: {
             pixelSize: 10,
@@ -280,7 +307,6 @@ export default {
           }
         });
       });
-
       // 2. 绘制连线（仅当点数 > 1 时）
       if (positions.length > 1) {
         const routeEntity = this.viewer.entities.add({
@@ -295,9 +321,9 @@ export default {
             }),
             clampToGround: true
           },
-          properties: { isMissionRouteLine: true, routeId: routeId }
+          properties: {isMissionRouteLine: true, routeId: routeId}
         });
-        this.allEntities.push({ id: `route-line-${routeId}`, entity: routeEntity, type: 'line' });
+        this.allEntities.push({id: `route-line-${routeId}`, entity: routeEntity, type: 'line'});
       }
     },
     removeRouteById(routeId) {
@@ -337,7 +363,6 @@ export default {
         // 确保 Cesium 已加载
         Cesium.buildModuleUrl.setBaseUrl(window.CESIUM_BASE_URL)
         Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJjN2MzMmE5OS01NGU3LTQzOGQtYjdjZi1mNGIwZTFjZjQ0NmEiLCJpZCI6MTQ0MDc2LCJpYXQiOjE2ODU3NjY1OTN9.iCmFY-5WNdvyAT-EO2j-unrFm4ZN9J6aSuB2wElQZ-I'
-
         this.viewer = new Cesium.Viewer('cesiumViewer', {
           animation: false,
           fullscreenButton: false,
@@ -356,11 +381,9 @@ export default {
           terrainProvider: new Cesium.EllipsoidTerrainProvider(),
           baseLayer: false
         })
-
         this.viewer.cesiumWidget.creditContainer.style.display = "none"
         this.loadOfflineMap()
         this.setup2DConstraints()
-
         this.viewer.camera.setView({
           destination: Cesium.Cartesian3.fromDegrees(116.3974, 39.9093, 5000000),
           orientation: {
@@ -369,57 +392,59 @@ export default {
             roll: 0
           }
         })
-
         this.initScaleBar()
-      this.initPointMovement()
-      this.initRightClickHandler()
-      this.initHoverHandler()
-      console.log('Cesium离线二维地图已加载')
+        this.initPointMovement()
+        this.initRightClickHandler()
+        this.initHoverHandler()
+        console.log('Cesium离线二维地图已加载')
         console.log('Cesium离线二维地图已加载')
         // 1. 定义全局拾取处理器
         this.handler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas);
-
         this.handler.setInputAction((click) => {
-          // 如果正在画线，则屏蔽掉详情弹窗逻辑，互不干扰
           if (this.isDrawing) return;
-          // 2. 拾取点击位置的对象
+
           const pickedObject = this.viewer.scene.pick(click.position);
           if (Cesium.defined(pickedObject) && pickedObject.id) {
             const entity = pickedObject.id;
-            // 3. 判断是否点中了业务航点
-            if (entity.properties && entity.properties.isMissionWaypoint) {
-              // 这里的 name 依然可以用作查询标识，或者用 ID
-              this.$emit('open-waypoint-dialog', entity.name);
+
+            // --- 修正后的安全日志 ---
+            console.log(">>> [点击检测] 实体ID:", entity.id);
+
+            // 获取属性时必须传入当前仿真时间
+            const now = Cesium.JulianDate.now();
+            const props = entity.properties ? entity.properties.getValue(now) : null;
+
+            console.log(">>> [点击检测] 业务数据详情:", props);
+
+            if (props && props.isMissionWaypoint) {
+              const dbId = props.dbId;
+              const routeId = props.routeId;
+              console.log(`>>> [地图触发] 点击了点 ${dbId}, 属于航线 ${routeId}`);
+              // 关键：把航线 ID 也传给父组件
+              this.$emit('open-waypoint-dialog', dbId, routeId);
             }
           }
         }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-
       } catch (error) {
         console.error('地图错误:', error)
         // 如果Cesium加载失败，显示错误信息
         this.showErrorMessage();
       }
     },
-
     initRightClickHandler() {
       // 创建屏幕空间事件处理器
       this.rightClickHandler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas)
-
       // 右键点击事件：删除单个实体
       this.rightClickHandler.setInputAction((click) => {
         // 如果正在绘制，不处理删除操作
         if (this.isDrawing) {
           return;
         }
-
         const pickedObject = this.viewer.scene.pick(click.position)
-
         if (Cesium.defined(pickedObject) && pickedObject.id) {
           const pickedEntity = pickedObject.id
-
           // 查找对应的实体数据
           let entityData = this.allEntities.find(e => e.entity === pickedEntity || e === pickedEntity)
-
           // 特殊处理：如果点击的是线段上的点，找到对应的线实体
           if (!entityData) {
             // 检查是否是线段上的点
@@ -432,7 +457,6 @@ export default {
               }
             }
           }
-
           if (entityData) {
             // 显示确认对话框
             if (confirm('确定要删除这个对象吗？')) {
@@ -446,27 +470,21 @@ export default {
         }
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
     },
-
     // 初始化鼠标悬停事件处理器
     initHoverHandler() {
       // 创建屏幕空间事件处理器
       this.hoverHandler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas)
-
       // 鼠标移动事件：检测是否悬停在线上
       this.hoverHandler.setInputAction((movement) => {
         // 如果正在绘制，不处理悬停操作
         if (this.isDrawing) {
           return;
         }
-
         const pickedObject = this.viewer.scene.pick(movement.endPosition)
-
         if (Cesium.defined(pickedObject) && pickedObject.id) {
           const pickedEntity = pickedObject.id
-
           // 查找对应的实体数据
           let entityData = this.allEntities.find(e => e.entity === pickedEntity || e === pickedEntity)
-
           // 特殊处理：如果悬停的是线段上的点，找到对应的线实体
           if (!entityData) {
             // 检查是否是线段上的点
@@ -479,7 +497,6 @@ export default {
               }
             }
           }
-
           // 如果是线实体，显示长度信息
           if (entityData && entityData.type === 'line') {
             const length = this.calculateLineLength(entityData.positions)
@@ -534,47 +551,39 @@ export default {
         `;
       }
     },
-
     setup2DConstraints() {
       const scene = this.viewer.scene
       const controller = scene.screenSpaceCameraController
-
       controller.enableTilt = false
       controller.enableRotate = false
       controller.enableLook = false
       scene.screenSpaceCameraController.maximumPitch = 0
       scene.screenSpaceCameraController.minimumPitch = 0
     },
-
     loadOfflineMap() {
-  this.viewer.imageryLayers.removeAll()
-  try {
-    // 修改部分：将原来的 ArcGIS 卫星图替换为高德矢量行政图
-    const administrativeMap = new Cesium.UrlTemplateImageryProvider({
-      // 高德地图矢量瓦片服务（纯 2D 行政图风格）
-      url: 'https://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-      minimumLevel: 0,
-      maximumLevel: 18,
-      // 高德不需要专门的 TilingScheme，默认即可，或者使用 WebMercator
-      tilingScheme: new Cesium.WebMercatorTilingScheme()
-    })
-
-    this.viewer.imageryLayers.addImageryProvider(administrativeMap)
-
-    // 如果需要叠加路网或注记，可以在这里再 add 一个图层
-
-  } catch (error) {
-    console.error('加载地图失败:', error)
-    this.showGridLayer()
-  }
-},
-
+      this.viewer.imageryLayers.removeAll()
+      try {
+        // 修改部分：将原来的 ArcGIS 卫星图替换为高德矢量行政图
+        const administrativeMap = new Cesium.UrlTemplateImageryProvider({
+          // 高德地图矢量瓦片服务（纯 2D 行政图风格）
+          url: 'https://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+          minimumLevel: 0,
+          maximumLevel: 18,
+          // 高德不需要专门的 TilingScheme，默认即可，或者使用 WebMercator
+          tilingScheme: new Cesium.WebMercatorTilingScheme()
+        })
+        this.viewer.imageryLayers.addImageryProvider(administrativeMap)
+        // 如果需要叠加路网或注记，可以在这里再 add 一个图层
+      } catch (error) {
+        console.error('加载地图失败:', error)
+        this.showGridLayer()
+      }
+    },
     showGridLayer() {
       const gridProvider = new Cesium.GridImageryProvider()
       this.viewer.imageryLayers.addImageryProvider(gridProvider)
       this.addCoordinateLabels()
     },
-
     addCoordinateLabels() {
       for (let lon = -180; lon <= 180; lon += 30) {
         for (let lat = -90; lat <= 90; lat += 30) {
@@ -594,9 +603,7 @@ export default {
         }
       }
     },
-
     // ================== 绘制功能 ==================
-
     toggleDrawing(mode) {
       if (this.drawingMode === mode) {
         // 停止当前绘制
@@ -607,23 +614,19 @@ export default {
         if (this.drawingMode) {
           this.stopDrawing()
         }
-
         // 开始新的绘制
         this.drawingMode = mode
         this.startDrawing(mode)
       }
     },
-
     startDrawing(mode) {
       this.stopDrawing()
       this.drawingPoints = []
       this.drawingStartPoint = null
       this.isDrawing = true
-
       this.drawingHandler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas)
-
       // 根据模式设置不同的鼠标样式和事件
-      switch(mode) {
+      switch (mode) {
         case 'point':
           this.startPointDrawing()
           break
@@ -652,28 +655,23 @@ export default {
           this.startImageDrawing()
           break
       }
-
       this.viewer.scene.canvas.style.cursor = 'crosshair'
       console.log(`开始绘制 ${this.getTypeName(mode)}`)
     },
-
     stopDrawing() {
       if (this.drawingHandler) {
         this.drawingHandler.destroy();
         this.drawingHandler = null;
       }
-
       if (this.tempEntity) {
         this.viewer.entities.remove(this.tempEntity);
         this.tempEntity = null;
       }
-
       // 确保也清理预览实体
       if (this.tempPreviewEntity) {
         this.viewer.entities.remove(this.tempPreviewEntity);
         this.tempPreviewEntity = null;
       }
-
       // 清理点实体
       if (this.drawingPointEntities) {
         this.drawingPointEntities.forEach(pointEntity => {
@@ -681,42 +679,34 @@ export default {
         });
         this.drawingPointEntities = [];
       }
-
       this.drawingPoints = [];
       this.drawingStartPoint = null;
       this.isDrawing = false;
       this.activeCursorPosition = null;
-
       // 重新初始化右键点击删除处理器
       if (!this.rightClickHandler) {
         this.initRightClickHandler();
       }
-
       // 隐藏测量结果
       this.measurementResult = null;
-
       this.viewer.scene.canvas.style.cursor = 'default';
     },
-
     cancelDrawing() {
       // 取消绘制，清理临时实体和状态
       if (this.tempEntity) {
         this.viewer.entities.remove(this.tempEntity);
         this.tempEntity = null;
       }
-
       if (this.tempPreviewEntity) {
         this.viewer.entities.remove(this.tempPreviewEntity);
         this.tempPreviewEntity = null;
       }
-
       if (this.drawingPointEntities) {
         this.drawingPointEntities.forEach(pointEntity => {
           this.viewer.entities.remove(pointEntity);
         });
         this.drawingPointEntities = [];
       }
-
       this.drawingPoints = [];
       this.activeCursorPosition = null;
     },
@@ -726,35 +716,30 @@ export default {
       this.drawingHandler.setInputAction((click) => {
         const position = this.getClickPosition(click.position)
         if (position) {
-          const { lat, lng } = this.cartesianToLatLng(position)
+          const {lat, lng} = this.cartesianToLatLng(position)
           this.addPointEntity(lat, lng)
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
     },
-
     // 绘制线
     startLineDrawing() {
       this.drawingPoints = [];
       this.drawingPointEntities = []; // 存储点实体
-
       // 清除可能存在的旧实体
       if (this.tempEntity) this.viewer.entities.remove(this.tempEntity);
       if (this.tempPreviewEntity) this.viewer.entities.remove(this.tempPreviewEntity);
       this.tempEntity = null;
       this.tempPreviewEntity = null;
-
       // 1. 鼠标移动事件：更新坐标变量并实时计算线段长度
       this.drawingHandler.setInputAction((movement) => {
         const newPosition = this.getClickPosition(movement.endPosition);
         if (newPosition) {
           this.activeCursorPosition = newPosition;
-
           // 当已经有至少一个点时，实时计算线段长度
           if (this.drawingPoints.length > 0) {
             // 计算从最后一个点到当前鼠标位置的线段长度
             const tempPositions = [...this.drawingPoints, newPosition];
             const length = this.calculateLineLength(tempPositions);
-
             // 更新测量结果，显示实时长度
             this.measurementResult = {
               distance: length,
@@ -763,13 +748,11 @@ export default {
           }
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
-
       // 2. 鼠标点击事件：确定点位
       this.drawingHandler.setInputAction((click) => {
         const position = this.getClickPosition(click.position);
         if (position) {
           this.drawingPoints.push(position);
-
           // 创建点实体并添加到场景中
           this.entityCounter++;
           const pointId = `point_${this.entityCounter}`;
@@ -784,13 +767,11 @@ export default {
             }
           });
           this.drawingPointEntities.push(pointEntity);
-
           // 移除旧的预览虚线
           if (this.tempPreviewEntity) {
             this.viewer.entities.remove(this.tempPreviewEntity);
             this.tempPreviewEntity = null;
           }
-
           // 创建或更新实线
           if (this.drawingPoints.length > 1) {
             if (this.tempEntity) {
@@ -805,7 +786,6 @@ export default {
               }
             });
           }
-
           // 创建新的预览虚线（使用 CallbackProperty 实现实时更新）
           this.tempPreviewEntity = this.viewer.entities.add({
             polyline: {
@@ -825,7 +805,6 @@ export default {
           });
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-
       // 3. 右键完成绘制
       this.drawingHandler.setInputAction(() => {
         // 移除临时实体
@@ -837,7 +816,6 @@ export default {
           this.viewer.entities.remove(this.tempEntity);
           this.tempEntity = null;
         }
-
         if (this.drawingPoints.length > 1) {
           this.finishLineDrawing();
         } else {
@@ -848,12 +826,10 @@ export default {
           this.drawingPointEntities = [];
           this.cancelDrawing();
         }
-
         // 重置鼠标位置
         this.activeCursorPosition = null;
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     },
-
     finishLineDrawing() {
       // 将预览线段转换为最终线段
       if (this.drawingPoints.length > 1) {
@@ -862,19 +838,14 @@ export default {
           this.viewer.entities.remove(this.tempPreviewEntity);
           this.tempPreviewEntity = null;
         }
-
         // 创建最终的实线实体
         const entity = this.addLineEntity([...this.drawingPoints], [...this.drawingPointEntities]);
-
         // 计算长度
         const length = this.calculateLineLength([...this.drawingPoints]);
         this.measurementResult = {
           distance: length,
           type: 'line'
         };
-
-
-
         // 重置绘制点数组，保持绘制状态以继续绘制
         this.drawingPoints = [];
         this.drawingPointEntities = [];
@@ -890,18 +861,15 @@ export default {
         return null;
       }
     },
-
     // 绘制多边形
     startPolygonDrawing() {
       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. 鼠标移动事件：只负责更新坐标变量，不涉及繁重的绘图逻辑
       this.drawingHandler.setInputAction((movement) => {
         const newPosition = this.getClickPosition(movement.endPosition);
@@ -909,17 +877,14 @@ export default {
           this.activeCursorPosition = newPosition;
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
-
       // 3. 鼠标点击事件：添加关键点
       this.drawingHandler.setInputAction((click) => {
         const position = this.getClickPosition(click.position);
         if (position) {
           this.drawingPoints.push(position);
-
           // === 关键逻辑：点击第一个点时，创建唯一的“动态多边形” ===
           if (this.drawingPoints.length === 1) {
             this.activeCursorPosition = position; // 初始化鼠标位置
-
             this.tempEntity = this.viewer.entities.add({
               // --- 填充面配置 ---
               polygon: {
@@ -958,7 +923,6 @@ export default {
           }
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-
       // 4. 右键完成绘制
       this.drawingHandler.setInputAction(() => {
         if (this.drawingPoints.length >= 3) {
@@ -966,23 +930,19 @@ export default {
         } else {
           this.cancelDrawing(); // 点数不够则取消
         }
-
         // 重置状态
         this.activeCursorPosition = null;
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     },
-
     finishPolygonDrawing() {
       const positions = [...this.drawingPoints]
       const entity = this.addPolygonEntity(positions)
-
       // 计算面积
       const area = this.calculatePolygonArea(positions)
       this.measurementResult = {
         area: area,
         type: 'polygon'
       }
-
       // 重置绘制点数组，保持绘制状态以继续绘制
       this.drawingPoints = []
       if (this.tempEntity) {
@@ -991,16 +951,13 @@ export default {
       }
       return entity
     },
-
     // 绘制矩形（优化版：两点定矩形，实时预览）
     startRectangleDrawing() {
       // 重置绘制状态
       this.drawingPoints = []; // 存储起点和终点
-
       // 1. 清理旧实体
       if (this.tempEntity) this.viewer.entities.remove(this.tempEntity);
       this.tempEntity = null;
-
       // 2. 鼠标移动事件：更新鼠标位置
       this.drawingHandler.setInputAction((movement) => {
         const newPosition = this.getClickPosition(movement.endPosition);
@@ -1008,7 +965,6 @@ export default {
           this.activeCursorPosition = newPosition;
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
-
       // 3. 鼠标点击事件
       this.drawingHandler.setInputAction((click) => {
         const position = this.getClickPosition(click.position);
@@ -1017,7 +973,6 @@ export default {
           if (this.drawingPoints.length === 0) {
             this.drawingPoints.push(position);
             this.activeCursorPosition = position; // 初始化鼠标位置
-
             // 创建动态预览矩形
             this.tempEntity = this.viewer.entities.add({
               rectangle: {
@@ -1043,29 +998,24 @@ export default {
             this.drawingPoints.push(position);
             // 停止监听鼠标移动，因为形状已确定
             this.activeCursorPosition = null;
-
             // 调用完成逻辑
             this.finishRectangleDrawing();
           }
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-
       // 4. 右键取消
       this.drawingHandler.setInputAction(() => {
         this.cancelDrawing();
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     },
-
     finishRectangleDrawing() {
       // 1. 获取最终的矩形范围对象
       const rect = Cesium.Rectangle.fromCartesianArray(this.drawingPoints);
-
       // 2. 移除动态预览的临时实体
       if (this.tempEntity) {
         this.viewer.entities.remove(this.tempEntity);
         this.tempEntity = null;
       }
-
       // 3. 创建最终显示的静态实体
       const finalEntity = this.viewer.entities.add({
         id: 'rectangle-' + new Date().getTime(), // 给个唯一ID
@@ -1078,52 +1028,41 @@ export default {
           clampToGround: true
         }
       });
-
       // 4. 记录到实体列表
       this.allEntities.push(finalEntity);
-
       // 5. 计算并显示面积
       const area = this.calculateRectangleArea(rect);
       this.measurementResult = {
         area: area,
         type: 'rectangle'
       };
-
       // 6. 重置状态，保持绘制状态以继续绘制
       this.drawingPoints = [];
     },
-
     // 计算矩形面积（辅助方法）
     calculateRectangleArea(rectangle) {
       // 获取地球椭球体对象
       const ellipsoid = this.viewer.scene.globe.ellipsoid;
-
       // 方法一：使用 Cesium 几何管道计算（更精确，但需要特定模块支持）
       // const geometry = new Cesium.RectangleGeometry({ rectangle: rectangle });
       // const geometryInstance = Cesium.RectangleGeometry.createGeometry(geometry);
       // ...比较复杂
-
       // 方法二：使用采样估算（简单且足够精确）
       // 获取矩形的四个角（弧度）
       const west = rectangle.west;
       const south = rectangle.south;
       const east = rectangle.east;
       const north = rectangle.north;
-
       // 计算中心点的纬度
       const centerLat = (south + north) / 2;
-
       // 计算宽度（东西向距离）：使用余弦定理校正纬度影响
       // 地球半径约为 6378137 米
       const R = 6378137;
       const width = (east - west) * R * Math.cos(centerLat);
-
       // 计算高度（南北向距离）
       const height = (north - south) * R;
-
       // 面积 = 宽 * 高
       const area = Math.abs(width * height);
-
       return area;
     },
     // 绘制圆形
@@ -1131,7 +1070,6 @@ export default {
       // 重置绘制状态
       this.drawingPoints = []; // 存储圆心
       this.activeCursorPosition = null;
-
       // 1. 清理旧实体
       if (this.tempEntity) {
         try {
@@ -1149,12 +1087,10 @@ export default {
         }
         this.tempPreviewEntity = null;
       }
-
       // 2. 重置事件处理器
       this.drawingHandler.removeInputAction(Cesium.ScreenSpaceEventType.MOUSE_MOVE);
       this.drawingHandler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
       this.drawingHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
-
       // 3. 鼠标移动事件
       this.drawingHandler.setInputAction((movement) => {
         try {
@@ -1166,7 +1102,6 @@ export default {
           console.warn('Mouse move error:', e);
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
-
       // 4. 鼠标点击事件
       this.drawingHandler.setInputAction((click) => {
         try {
@@ -1176,7 +1111,6 @@ export default {
             if (this.drawingPoints.length === 0) {
               this.drawingPoints.push(position);
               this.activeCursorPosition = position;
-
               // 创建动态预览圆形
               if (this.tempEntity) {
                 try {
@@ -1186,12 +1120,10 @@ export default {
                 }
                 this.tempEntity = null;
               }
-
               // 确保有有效的圆心位置
               if (position) {
                 // 先创建一个固定半径的临时圆，避免半径为0的情况
                 const initialRadius = 100; // 初始半径设为100米
-
                 this.tempEntity = this.viewer.entities.add({
                   position: position, // 直接使用确定的圆心位置
                   ellipse: {
@@ -1241,7 +1173,6 @@ export default {
               // 记录边缘点（虽然圆只需要圆心和半径，但记录下来方便后续处理）
               this.drawingPoints.push(position);
               this.activeCursorPosition = null; // 停止动态更新
-
               // 传递边缘点位置去结束绘制
               this.finishCircleDrawing(position);
             }
@@ -1250,7 +1181,6 @@ export default {
           console.warn('Mouse click error:', e);
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-
       // 5. 右键取消
       this.drawingHandler.setInputAction(() => {
         try {
@@ -1260,19 +1190,15 @@ export default {
         }
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     },
-
     finishCircleDrawing(edgePosition) {
       const centerPoint = this.drawingPoints[0];
-
       // 1. 计算最终半径
       const radius = Cesium.Cartesian3.distance(centerPoint, edgePosition);
-
       // 2. 移除动态预览实体
       if (this.tempEntity) {
         this.viewer.entities.remove(this.tempEntity);
         this.tempEntity = null;
       }
-
       // 3. 创建最终显示的静态实体
       const finalEntity = this.viewer.entities.add({
         id: 'circle-' + new Date().getTime(),
@@ -1286,36 +1212,29 @@ export default {
           outlineWidth: 2
         }
       });
-
       // 4. 记录实体
       this.allEntities.push(finalEntity);
-
       // 5. 计算面积 (π * r²) 并显示
       // 半径单位是米，面积单位是平方米
       const area = Math.PI * Math.pow(radius, 2);
-
       this.measurementResult = {
         radius: radius, // 也可以额外显示半径
         area: area,
         type: 'circle'
       };
-
       // 6. 重置状态，保持绘制状态以继续绘制
       this.drawingPoints = [];
       this.activeCursorPosition = null;
     },
-
     // 绘制扇形
     startSectorDrawing() {
       // 重置绘制状态
       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. 鼠标移动事件
       this.drawingHandler.setInputAction((movement) => {
         const newPosition = this.getClickPosition(movement.endPosition);
@@ -1323,7 +1242,6 @@ export default {
           this.activeCursorPosition = newPosition;
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
-
       // 3. 鼠标点击事件
       this.drawingHandler.setInputAction((click) => {
         const position = this.getClickPosition(click.position);
@@ -1332,7 +1250,6 @@ export default {
           if (this.drawingPoints.length === 0) {
             this.drawingPoints.push(position);
             this.activeCursorPosition = position;
-
             // 创建动态预览半径线
             this.tempPreviewEntity = this.viewer.entities.add({
               polyline: {
@@ -1358,13 +1275,11 @@ export default {
             const centerPoint = this.drawingPoints[0];
             const radiusPoint = this.drawingPoints[1];
             const fixedRadius = Cesium.Cartesian3.distance(centerPoint, radiusPoint);
-
             // 移除半径预览线
             if (this.tempPreviewEntity) {
               this.viewer.entities.remove(this.tempPreviewEntity);
               this.tempPreviewEntity = null;
             }
-
             // 创建动态预览扇形
             this.tempEntity = this.viewer.entities.add({
               polygon: {
@@ -1393,34 +1308,28 @@ export default {
           else if (this.drawingPoints.length === 2) {
             this.drawingPoints.push(position);
             this.activeCursorPosition = null; // 停止动态更新
-
             // 传递角度点位置去结束绘制
             this.finishSectorDrawing(this.drawingPoints[0], this.drawingPoints[1], this.drawingPoints[2]);
           }
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-
       // 4. 右键取消
       this.drawingHandler.setInputAction(() => {
         this.cancelDrawing();
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     },
-
     // 完成扇形绘制
     finishSectorDrawing(centerPoint, radiusPoint, anglePoint) {
       const radius = Cesium.Cartesian3.distance(centerPoint, radiusPoint);
       const startAngle = this.calculatePointAngle(centerPoint, radiusPoint);
       const endAngle = this.calculatePointAngle(centerPoint, anglePoint);
-
       // 1. 移除动态预览实体
       if (this.tempEntity) {
         this.viewer.entities.remove(this.tempEntity);
         this.tempEntity = null;
       }
-
       // 2. 生成扇形顶点
       const positions = this.generateSectorPositions(centerPoint, radius, startAngle, endAngle);
-
       // 3. 创建最终显示的静态实体
       const finalEntity = this.viewer.entities.add({
         id: 'sector-' + new Date().getTime(),
@@ -1434,7 +1343,6 @@ export default {
           perPositionHeight: false
         }
       });
-
       // 4. 记录实体
       this.entityCounter++;
       const entityData = {
@@ -1452,111 +1360,85 @@ export default {
         label: `扇形 ${this.entityCounter}`
       };
       this.allEntities.push(entityData);
-
       // 5. 重置状态，保持绘制状态以继续绘制
       this.drawingPoints = [];
     },
-
     // 计算角度
     calculateAngle(center, start, end) {
       const startLL = Cesium.Cartographic.fromCartesian(start);
       const endLL = Cesium.Cartographic.fromCartesian(end);
       const centerLL = Cesium.Cartographic.fromCartesian(center);
-
       // 计算两点相对于圆心的角度
       const startAngle = Math.atan2(startLL.latitude - centerLL.latitude, startLL.longitude - centerLL.longitude);
       const endAngle = Math.atan2(endLL.latitude - centerLL.latitude, endLL.longitude - centerLL.longitude);
-
       // 返回角度差
       return endAngle - startAngle;
     },
-
     // 计算角度差
     calculateAngleDiff(center, start, end) {
       const startLL = Cesium.Cartographic.fromCartesian(start);
       const endLL = Cesium.Cartographic.fromCartesian(end);
       const centerLL = Cesium.Cartographic.fromCartesian(center);
-
       // 计算两点相对于圆心的角度
       const startAngle = Math.atan2(startLL.latitude - centerLL.latitude, startLL.longitude - centerLL.longitude);
       const endAngle = Math.atan2(endLL.latitude - centerLL.latitude, endLL.longitude - centerLL.longitude);
-
       // 计算角度差（确保为正值）
       let angleDiff = endAngle - startAngle;
       if (angleDiff < 0) {
         angleDiff += 2 * Math.PI;
       }
-
       // 确保角度差在合理范围内
       return Math.max(0.1, Math.min(Math.PI * 2, angleDiff));
     },
-
     // 计算点相对于圆心的角度
     calculatePointAngle(center, point) {
       const pointLL = Cesium.Cartographic.fromCartesian(point);
       const centerLL = Cesium.Cartographic.fromCartesian(center);
-
       // 计算点相对于圆心的角度
       const angle = Math.atan2(pointLL.latitude - centerLL.latitude, pointLL.longitude - centerLL.longitude);
       return angle;
     },
-
     // 生成扇形顶点位置
     generateSectorPositions(center, radius, startAngle, endAngle) {
       const positions = [];
       const centerLL = Cesium.Cartographic.fromCartesian(center);
-
       // 添加圆心
       positions.push(center);
-
       // 计算角度差（顺时针方向）
       let angleDiff = startAngle - endAngle;
       if (angleDiff < 0) {
         angleDiff += 2 * Math.PI;
       }
-
       // 确保角度差不为零
       angleDiff = Math.max(0.01, angleDiff);
-
       // 计算扇形的顶点数（根据角度差确定，确保平滑）
       const numPoints = Math.max(5, Math.ceil(angleDiff * 180 / Math.PI / 10));
       const angleStep = angleDiff / (numPoints - 1);
-
       // 生成扇形的顶点（顺时针方向）
       for (let i = 0; i < numPoints; i++) {
         const currentAngle = startAngle - i * angleStep;
         const distance = radius / 6378137; // 转换为弧度
-
         const lat = centerLL.latitude + Math.sin(currentAngle) * distance;
         const lng = centerLL.longitude + Math.cos(currentAngle) * distance / Math.cos(centerLL.latitude);
-
         const position = Cesium.Cartesian3.fromRadians(lng, lat);
         positions.push(position);
       }
-
       // 闭合扇形
       positions.push(center);
-
       return positions;
     },
-
-
-
     // 计算两点之间的距离（米）
     calculateDistance(point1, point2) {
       return Cesium.Cartesian3.distance(point1, point2);
     },
-
     // 绘制箭头
     startArrowDrawing() {
       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. 鼠标移动事件
       this.drawingHandler.setInputAction((movement) => {
         const newPosition = this.getClickPosition(movement.endPosition);
@@ -1564,17 +1446,14 @@ export default {
           this.activeCursorPosition = newPosition;
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
-
       // 3. 鼠标点击事件
       this.drawingHandler.setInputAction((click) => {
         const position = this.getClickPosition(click.position);
         if (position) {
           this.drawingPoints.push(position);
-
           // --- 情况A：第一次点击（确定起点） ---
           if (this.drawingPoints.length === 1) {
             this.activeCursorPosition = position; // 初始化鼠标位置
-
             // 创建动态预览箭头
             this.tempPreviewEntity = this.viewer.entities.add({
               polyline: {
@@ -1603,19 +1482,16 @@ export default {
           else {
             // 停止监听鼠标移动，因为形状已确定
             this.activeCursorPosition = null;
-
             // 调用完成逻辑
             this.finishArrowDrawing();
           }
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-
       // 4. 右键取消
       this.drawingHandler.setInputAction(() => {
         this.cancelDrawing();
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     },
-
     // 完成箭头绘制
     finishArrowDrawing() {
       // 将预览箭头转换为最终箭头
@@ -1625,10 +1501,8 @@ export default {
           this.viewer.entities.remove(this.tempPreviewEntity);
           this.tempPreviewEntity = null;
         }
-
         // 创建最终的箭头实体
         const entity = this.addArrowEntity([...this.drawingPoints]);
-
         // 重置绘制点数组，保持绘制状态以继续绘制
         this.drawingPoints = [];
         return entity;
@@ -1637,12 +1511,10 @@ export default {
         return null;
       }
     },
-
     // 添加箭头实体
     addArrowEntity(positions) {
       this.entityCounter++
       const id = `arrow_${this.entityCounter}`
-
       // 创建箭头实体，使用固定宽度以确保等比例放大
       const entity = this.viewer.entities.add({
         id: id,
@@ -1658,7 +1530,6 @@ export default {
           widthInMeters: false
         }
       })
-
       const entityData = {
         id,
         type: 'arrow',
@@ -1669,23 +1540,18 @@ export default {
         width: this.defaultStyles.arrow.width,
         label: `箭头 ${this.entityCounter}`
       }
-
       this.allEntities.push(entityData)
-
       entity.clickHandler = (e) => {
         this.selectEntity(entityData)
         e.stopPropagation()
       }
-
       return entityData
     },
-
     // 绘制文本框
     startTextDrawing() {
       // 1. 清理旧实体
       if (this.tempEntity) this.viewer.entities.remove(this.tempEntity);
       this.tempEntity = null;
-
       // 2. 鼠标点击事件
       this.drawingHandler.setInputAction((click) => {
         const position = this.getClickPosition(click.position);
@@ -1698,21 +1564,17 @@ export default {
           }
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-
       // 3. 右键取消
       this.drawingHandler.setInputAction(() => {
         this.cancelDrawing();
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     },
-
     // 添加文本实体
     addTextEntity(position, text) {
       this.entityCounter++
       const id = `text_${this.entityCounter}`
-
       // 获取经纬度坐标
-      const { lat, lng } = this.cartesianToLatLng(position)
-
+      const {lat, lng} = this.cartesianToLatLng(position)
       const entity = this.viewer.entities.add({
         id: id,
         name: `文本 ${this.entityCounter}`,
@@ -1745,7 +1607,6 @@ export default {
           )
         }
       })
-
       const entityData = {
         id,
         type: 'text',
@@ -1759,23 +1620,18 @@ export default {
         backgroundColor: this.defaultStyles.text.backgroundColor,
         label: `文本 ${this.entityCounter}`
       }
-
       this.allEntities.push(entityData)
-
       entity.clickHandler = (e) => {
         this.selectEntity(entityData)
         e.stopPropagation()
       }
-
       return entityData
     },
-
     // 绘制图片
     startImageDrawing() {
       // 1. 清理旧实体
       if (this.tempEntity) this.viewer.entities.remove(this.tempEntity);
       this.tempEntity = null;
-
       // 2. 鼠标点击事件
       this.drawingHandler.setInputAction((click) => {
         const position = this.getClickPosition(click.position);
@@ -1784,7 +1640,6 @@ export default {
           const fileInput = document.createElement('input');
           fileInput.type = 'file';
           fileInput.accept = 'image/*';
-
           // 监听文件选择事件
           fileInput.onchange = (e) => {
             const file = e.target.files[0];
@@ -1792,28 +1647,23 @@ export default {
               // 创建 FormData 对象用于上传
               const formData = new FormData();
               formData.append('file', file);
-
               // 上传文件到服务器
               this.uploadImage(formData, position);
             }
           };
-
           // 触发文件选择对话框
           fileInput.click();
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-
       // 3. 右键取消
       this.drawingHandler.setInputAction(() => {
         this.cancelDrawing();
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     },
-
     // 上传图片
     uploadImage(formData, position) {
       // 显示加载状态
       this.$modal.loading('图片上传中，请稍候...');
-
       try {
         // 创建请求配置
         const config = {
@@ -1821,12 +1671,10 @@ export default {
             'Content-Type': 'multipart/form-data'
           }
         };
-
         // 发送请求 - 使用项目封装的 request 实例
         request.post('/common/upload', formData, config)
           .then((response) => {
             this.$modal.closeLoading();
-
             if (response.code === 200) {
               // 上传成功，获取图片 URL
               let imageUrl = response.url;
@@ -1838,7 +1686,6 @@ export default {
           })
           .catch((error) => {
             this.$modal.closeLoading();
-
             if (error.response) {
               // 服务器返回错误
               if (error.response.data && error.response.data.msg) {
@@ -1859,15 +1706,12 @@ export default {
         this.$modal.msgError('图片上传失败：' + error.message);
       }
     },
-
     // 添加图片实体
     addImageEntity(position, imageUrl) {
       this.entityCounter++
       const id = `image_${this.entityCounter}`
-
       // 获取经纬度坐标
-      const { lat, lng } = this.cartesianToLatLng(position)
-
+      const {lat, lng} = this.cartesianToLatLng(position)
       const entity = this.viewer.entities.add({
         id: id,
         name: `图片 ${this.entityCounter}`,
@@ -1894,7 +1738,6 @@ export default {
           )
         }
       })
-
       const entityData = {
         id,
         type: 'image',
@@ -1907,23 +1750,17 @@ export default {
         height: this.defaultStyles.image.height,
         label: `图片 ${this.entityCounter}`
       }
-
       this.allEntities.push(entityData)
-
       entity.clickHandler = (e) => {
         this.selectEntity(entityData)
         e.stopPropagation()
       }
-
       return entityData
     },
-
     // ================== 实体创建方法 ==================
-
     addPointEntity(lat, lng) {
       this.entityCounter++
       const id = `point_${this.entityCounter}`
-
       const entity = this.viewer.entities.add({
         id: id,
         name: `点 ${this.entityCounter}`,
@@ -1945,7 +1782,6 @@ export default {
           horizontalOrigin: Cesium.HorizontalOrigin.CENTER
         }
       })
-
       const entityData = {
         id,
         type: 'point',
@@ -1956,22 +1792,17 @@ export default {
         size: this.defaultStyles.point.size,
         label: `点 ${this.entityCounter}`
       }
-
       this.allEntities.push(entityData)
-
       // 添加点击事件
       entity.clickHandler = (e) => {
         this.selectEntity(entityData)
         e.stopPropagation()
       }
-
       return entityData
     },
-
     addLineEntity(positions, pointEntities = []) {
       this.entityCounter++
       const id = `line_${this.entityCounter}`
-
       const entity = this.viewer.entities.add({
         id: id,
         name: `线 ${this.entityCounter}`,
@@ -1982,7 +1813,6 @@ export default {
           clampToGround: true
         }
       })
-
       const entityData = {
         id,
         type: 'line',
@@ -1994,24 +1824,18 @@ export default {
         width: this.defaultStyles.line.width,
         label: `线 ${this.entityCounter}`
       }
-
       this.allEntities.push(entityData)
-
       entity.clickHandler = (e) => {
         this.selectEntity(entityData)
         e.stopPropagation()
       }
-
       return entityData
     },
-
     addPolygonEntity(positions) {
       this.entityCounter++
       const id = `polygon_${this.entityCounter}`
-
       // 闭合多边形
       const polygonPositions = [...positions, positions[0]]
-
       const entity = this.viewer.entities.add({
         id: id,
         name: `面 ${this.entityCounter}`,
@@ -2024,7 +1848,6 @@ export default {
           outlineWidth: this.defaultStyles.polygon.width
         }
       })
-
       const entityData = {
         id,
         type: 'polygon',
@@ -2036,51 +1859,41 @@ export default {
         width: this.defaultStyles.polygon.width,
         label: `面 ${this.entityCounter}`
       }
-
       this.allEntities.push(entityData)
-
       entity.clickHandler = (e) => {
         this.selectEntity(entityData)
         e.stopPropagation()
       }
-
       return entityData
     },
-
     addRectangleEntity(coordinates) {
-  this.entityCounter++
-  const id = `rectangle_${this.entityCounter}`
-
-  const entity = this.viewer.entities.add({
-    id: id,
-    name: `矩形 ${this.entityCounter}`,
-    rectangle: {
-      coordinates: coordinates,
-      material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color)
-        .withAlpha(this.defaultStyles.rectangle.opacity),
-      outline: true,
-      outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color),
-      outlineWidth: this.defaultStyles.rectangle.width
-    }
-  })
-
-  // 【重要修改】直接把 entity 推入数组，修复清除功能的 bug
-  this.allEntities.push(entity)
-
-  return entity
-},
+      this.entityCounter++
+      const id = `rectangle_${this.entityCounter}`
+      const entity = this.viewer.entities.add({
+        id: id,
+        name: `矩形 ${this.entityCounter}`,
+        rectangle: {
+          coordinates: coordinates,
+          material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color)
+            .withAlpha(this.defaultStyles.rectangle.opacity),
+          outline: true,
+          outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color),
+          outlineWidth: this.defaultStyles.rectangle.width
+        }
+      })
+      // 【重要修改】直接把 entity 推入数组，修复清除功能的 bug
+      this.allEntities.push(entity)
+      return entity
+    },
     addCircleEntity(center, radius) {
       // 确保半径有效
       const validRadius = Math.max(radius, 1)
-
       this.entityCounter++
       const id = `circle_${this.entityCounter}`
-
       const entity = this.viewer.entities.add({
         id: id,
         name: `圆形 ${this.entityCounter}`,
         position: center, // 圆心位置
-
         // 【优化】使用 ellipse (椭圆) 绘制圆形
         ellipse: {
           semiMinorAxis: validRadius, // 半短轴 = 半径
@@ -2092,20 +1905,15 @@ export default {
           outlineWidth: this.defaultStyles.circle.width
         }
       })
-
       // 【重要修改】直接把 entity 推入数组
       this.allEntities.push(entity)
-
       return entity
     },
-
     // ================== 工具方法 ==================
-
     getClickPosition(pixelPosition) {
       const cartesian = this.viewer.camera.pickEllipsoid(pixelPosition, this.viewer.scene.globe.ellipsoid)
       return cartesian
     },
-
     cartesianToLatLng(cartesian) {
       const cartographic = Cesium.Cartographic.fromCartesian(cartesian)
       return {
@@ -2113,11 +1921,9 @@ export default {
         lng: Cesium.Math.toDegrees(cartographic.longitude)
       }
     },
-
     calculateRectangle(start, end) {
       const startLL = this.cartesianToLatLng(start)
       const endLL = this.cartesianToLatLng(end)
-
       return Cesium.Rectangle.fromDegrees(
         Math.min(startLL.lng, endLL.lng),
         Math.min(startLL.lat, endLL.lat),
@@ -2125,55 +1931,44 @@ export default {
         Math.max(startLL.lat, endLL.lat)
       )
     },
-
     calculateCircle(center, radius, segments) {
       const positions = []
       const centerLL = Cesium.Cartographic.fromCartesian(center)
-
       for (let i = 0; i < segments; i++) {
         const angle = (i / segments) * Math.PI * 2
         const lat = centerLL.latitude + (radius / 6378137) * Math.sin(angle)
         const lon = centerLL.longitude + (radius / 6378137) * Math.cos(angle) / Math.cos(centerLL.latitude)
-
         positions.push(Cesium.Cartesian3.fromRadians(lon, lat))
       }
-
       return positions
     },
-
     calculateLineLength(positions) {
+      if (!this.selectedRouteDetails || !this.selectedRouteDetails.waypoints) {
+        console.warn(">>> [长度计算跳过] 航点数据暂不可用");
+        return 0;
+      }
       let totalLength = 0
       for (let i = 0; i < positions.length - 1; i++) {
         totalLength += Cesium.Cartesian3.distance(positions[i], positions[i + 1])
       }
       return totalLength
     },
-
     calculatePolygonArea(positions) {
       if (positions.length < 3) return 0
-
       let area = 0
       const n = positions.length
-
       for (let i = 0; i < n; i++) {
         const j = (i + 1) % n
         const p1 = Cesium.Cartographic.fromCartesian(positions[i])
         const p2 = Cesium.Cartographic.fromCartesian(positions[j])
-
         area += p1.longitude * p2.latitude - p2.longitude * p1.latitude
       }
-
       area = Math.abs(area) * 6378137 * 6378137 / 2
       return area
     },
-
-
-
     // ================== 实体管理 ==================
-
     selectEntity(entity) {
       this.selectedEntity = entity
-
       // 居中显示
       if (entity.type === 'point') {
         this.viewer.camera.flyTo({
@@ -2190,14 +1985,11 @@ export default {
         })
       }
     },
-
     updateEntityStyle() {
       if (!this.selectedEntity || !this.selectedEntity.entity) return
-
       const entity = this.selectedEntity.entity
       const data = this.selectedEntity
-
-      switch(data.type) {
+      switch (data.type) {
         case 'point':
           entity.point.color = Cesium.Color.fromCssColorString(data.color)
           entity.point.pixelSize = data.size
@@ -2223,26 +2015,21 @@ export default {
           break
       }
     },
-
     updateEntityLabel() {
       if (!this.selectedEntity || !this.selectedEntity.entity) return
-
       const entity = this.selectedEntity.entity
       entity.name = this.selectedEntity.label
-
       // 如果是点，更新标签
       if (this.selectedEntity.type === 'point') {
         entity.label.text = this.selectedEntity.label
       }
     },
-
     deleteSelectedEntity() {
       if (this.selectedEntity) {
         this.removeEntity(this.selectedEntity.id)
         this.selectedEntity = null
       }
     },
-
     removeEntity(id) {
       // 查找对应的实体数据
       const index = this.allEntities.findIndex(e =>
@@ -2250,10 +2037,8 @@ export default {
         (e.entity && e.entity.id === id) ||
         (e.type === 'line' && e.pointEntities && e.pointEntities.some(p => p.id === id))
       )
-
       if (index > -1) {
         const entity = this.allEntities[index]
-
         // 从地图中移除
         if (entity instanceof Cesium.Entity) {
           // 情况 A: 直接是 Cesium Entity 对象
@@ -2262,78 +2047,65 @@ export default {
           // 情况 B: 包装对象，包含 entity 属性
           this.viewer.entities.remove(entity.entity)
         }
-
         // 移除线实体相关的点实体
         if (entity.type === 'line' && entity.pointEntities) {
           entity.pointEntities.forEach(pointEntity => {
             this.viewer.entities.remove(pointEntity)
           })
         }
-
-
-
         // 从数组中移除
         this.allEntities.splice(index, 1)
-
         // 如果删除的是选中的实体，清空选中状态
         if (this.selectedEntity && (this.selectedEntity.id === id || (this.selectedEntity.entity && this.selectedEntity.entity.id === id))) {
           this.selectedEntity = null
         }
       }
     },
-
     clearAll() {
-  // 1. 检查数组是否有内容
-  if (this.allEntities && this.allEntities.length > 0) {
-
-    // 2. 遍历每一个对象进行删除
-    this.allEntities.forEach(item => {
-      try {
-        // 情况 A: 数组里存的是原生的 Cesium Entity (点、线通常是这种情况)
-        if (item instanceof Cesium.Entity) {
-          this.viewer.entities.remove(item);
-        }
-        // 情况 B: 数组里存的是包装对象 (你的矩形、圆可能是这种 { entity: ... })
-        else if (item.entity && item.entity instanceof Cesium.Entity) {
-          this.viewer.entities.remove(item.entity);
-        }
-        // 情况 C: 兜底方案，尝试通过 ID 删除
-        else if (item.id) {
-          this.viewer.entities.removeById(item.id);
-        }
-
-        // 移除线实体相关的点实体
-        if (item.type === 'line' && item.pointEntities) {
-          item.pointEntities.forEach(pointEntity => {
-            this.viewer.entities.remove(pointEntity);
-          });
-        }
-      } catch (e) {
-        console.warn('删除实体失败:', e);
+      // 1. 检查数组是否有内容
+      if (this.allEntities && this.allEntities.length > 0) {
+        // 2. 遍历每一个对象进行删除
+        this.allEntities.forEach(item => {
+          try {
+            // 情况 A: 数组里存的是原生的 Cesium Entity (点、线通常是这种情况)
+            if (item instanceof Cesium.Entity) {
+              this.viewer.entities.remove(item);
+            }
+            // 情况 B: 数组里存的是包装对象 (你的矩形、圆可能是这种 { entity: ... })
+            else if (item.entity && item.entity instanceof Cesium.Entity) {
+              this.viewer.entities.remove(item.entity);
+            }
+            // 情况 C: 兜底方案，尝试通过 ID 删除
+            else if (item.id) {
+              this.viewer.entities.removeById(item.id);
+            }
+            // 移除线实体相关的点实体
+            if (item.type === 'line' && item.pointEntities) {
+              item.pointEntities.forEach(pointEntity => {
+                this.viewer.entities.remove(pointEntity);
+              });
+            }
+          } catch (e) {
+            console.warn('删除实体失败:', e);
+          }
+        });
       }
-    });
-  }
-
-  // 3. 清空数组
-  this.allEntities = [];
-
-  // 4. 清理可能残留的绘制过程中的临时图形
-  if (this.tempEntity) {
-    this.viewer.entities.remove(this.tempEntity);
-    this.tempEntity = null;
-  }
-  if (this.tempPreviewEntity) {
-    this.viewer.entities.remove(this.tempPreviewEntity);
-    this.tempPreviewEntity = null;
-  }
-
-  // 5. 重置其他状态（如测量面板、绘制状态）
-  this.measurementResult = null;
-  this.stopDrawing();
-},
-
+      // 3. 清空数组
+      this.allEntities = [];
+      // 4. 清理可能残留的绘制过程中的临时图形
+      if (this.tempEntity) {
+        this.viewer.entities.remove(this.tempEntity);
+        this.tempEntity = null;
+      }
+      if (this.tempPreviewEntity) {
+        this.viewer.entities.remove(this.tempPreviewEntity);
+        this.tempPreviewEntity = null;
+      }
+      // 5. 重置其他状态（如测量面板、绘制状态）
+      this.measurementResult = null;
+      this.stopDrawing();
+    },
     // ================== 其他方法 ==================
-
     getTypeName(type) {
       const names = {
         point: '点',
@@ -2348,7 +2120,6 @@ export default {
       }
       return names[type] || type
     },
-
     exportData() {
       const data = {
         version: '1.0',
@@ -2371,18 +2142,15 @@ export default {
           }
         }))
       }
-
-      const blob = new Blob([JSON.stringify(data, null, 2)], { type: 'application/json' })
+      const blob = new Blob([JSON.stringify(data, null, 2)], {type: 'application/json'})
       const url = URL.createObjectURL(blob)
       const a = document.createElement('a')
       a.href = url
       a.download = `cesium-drawing-${new Date().toISOString().slice(0, 10)}.json`
       a.click()
       URL.revokeObjectURL(url)
-
       console.log('数据已导出', data)
     },
-
     importData() {
       const input = document.createElement('input')
       input.type = 'file'
@@ -2390,7 +2158,6 @@ export default {
       input.onchange = (e) => {
         const file = e.target.files[0]
         if (!file) return
-
         const reader = new FileReader()
         reader.onload = (event) => {
           try {
@@ -2413,11 +2180,9 @@ export default {
       }
       input.click()
     },
-
     importEntity(entityData) {
       let entity
       const color = entityData.color || '#008aff'
-
       switch (entityData.type) {
         case 'point':
           entity = this.viewer.entities.add({
@@ -2440,7 +2205,6 @@ export default {
             }
           })
           break
-
         case 'line':
           const linePositions = entityData.data.points.map(p => Cesium.Cartesian3.fromDegrees(p.lng, p.lat))
           entity = this.viewer.entities.add({
@@ -2461,7 +2225,6 @@ export default {
             }
           })
           break
-
         case 'polygon':
           const polygonPositions = entityData.data.points.map(p => Cesium.Cartesian3.fromDegrees(p.lng, p.lat))
           entity = this.viewer.entities.add({
@@ -2483,7 +2246,6 @@ export default {
             }
           })
           break
-
         case 'rectangle':
           const rectCoords = entityData.data.coordinates
           entity = this.viewer.entities.add({
@@ -2505,7 +2267,6 @@ export default {
             }
           })
           break
-
         case 'circle':
           // 检查半径是否有效
           const radius = entityData.data.radius || 1000
@@ -2536,7 +2297,6 @@ export default {
           })
           break
       }
-
       if (entity) {
         this.allEntities.push({
           id: entity.id,
@@ -2547,14 +2307,13 @@ export default {
         })
       }
     },
-
     handleLocate() {
       const h = this.$createElement
       this.$msgbox({
         title: '定位',
-        message: h('div', { style: 'padding: 10px 0;' }, [
-          h('div', { style: 'margin-bottom: 15px;' }, [
-            h('label', { style: 'display: block; margin-bottom: 5px; color: #606266;' }, '经度：'),
+        message: h('div', {style: 'padding: 10px 0;'}, [
+          h('div', {style: 'margin-bottom: 15px;'}, [
+            h('label', {style: 'display: block; margin-bottom: 5px; color: #606266;'}, '经度：'),
             h('input', {
               attrs: {
                 type: 'number',
@@ -2567,7 +2326,7 @@ export default {
             })
           ]),
           h('div', null, [
-            h('label', { style: 'display: block; margin-bottom: 5px; color: #606266;' }, '纬度：'),
+            h('label', {style: 'display: block; margin-bottom: 5px; color: #606266;'}, '纬度：'),
             h('input', {
               attrs: {
                 type: 'number',
@@ -2589,7 +2348,6 @@ export default {
             const latInput = instance.$el.querySelector('input[placeholder="例如 39.90"]')
             const lng = parseFloat(lngInput.value)
             const lat = parseFloat(latInput.value)
-
             if (!lng || !lat || isNaN(lng) || isNaN(lat)) {
               this.$message.error('请输入有效的经度和纬度！')
               return
@@ -2598,7 +2356,6 @@ export default {
               this.$message.error('经纬度超出有效范围！')
               return
             }
-
             if (this.viewer) {
               this.viewer.camera.flyTo({
                 destination: Cesium.Cartesian3.fromDegrees(lng, lat, 5000),
@@ -2621,28 +2378,22 @@ export default {
         this.$message.info('已取消定位')
       })
     },
-
     initScaleBar() {
       // ... 原有的比例尺代码保持不变
     },
-
     initPointMovement() {
       // 创建屏幕空间事件处理器
       this.pointMovementHandler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas)
-
       let selectedPoint = null
       let selectedLineEntity = null
       let pointIndex = -1
       let originalCameraController = null
       let isMoving = false
-
       // 鼠标按下事件：选择点
       this.pointMovementHandler.setInputAction((click) => {
         const pickedObject = this.viewer.scene.pick(click.position)
-
         if (Cesium.defined(pickedObject) && pickedObject.id) {
           const pickedEntity = pickedObject.id
-
           // 检查是否点击了点实体
           if (pickedEntity.point) {
             // 查找包含该点的线实体
@@ -2654,7 +2405,6 @@ export default {
                   selectedLineEntity = lineEntity
                   pointIndex = index
                   isMoving = true
-
                   // 禁用相机控制器，使地图固定
                   originalCameraController = this.viewer.scene.screenSpaceCameraController.enableInputs
                   this.viewer.scene.screenSpaceCameraController.enableInputs = false
@@ -2665,7 +2415,6 @@ export default {
           }
         }
       }, Cesium.ScreenSpaceEventType.LEFT_DOWN)
-
       // 鼠标移动事件：移动点
       this.pointMovementHandler.setInputAction((movement) => {
         if (isMoving && selectedPoint && selectedLineEntity) {
@@ -2673,14 +2422,11 @@ export default {
           if (newPosition) {
             // 更新点的位置
             selectedPoint.position = newPosition
-
             // 创建新的位置数组，确保 Cesium 能够检测到变化
             const newPositions = [...selectedLineEntity.positions]
             newPositions[pointIndex] = newPosition
-
             // 移除旧的线段实体
             this.viewer.entities.remove(selectedLineEntity.entity)
-
             // 清除所有可能存在的重复线段
             const entitiesToRemove = []
             this.viewer.entities.values.forEach(e => {
@@ -2691,7 +2437,6 @@ export default {
             entitiesToRemove.forEach(e => {
               this.viewer.entities.remove(e)
             })
-
             // 创建新的线段实体
             const newEntity = this.viewer.entities.add({
               id: selectedLineEntity.id,
@@ -2703,14 +2448,11 @@ export default {
                 clampToGround: true
               }
             })
-
             // 更新线实体的引用和位置数组
             selectedLineEntity.entity = newEntity
             selectedLineEntity.positions = newPositions
-
             // 更新点数据
             selectedLineEntity.points[pointIndex] = this.cartesianToLatLng(newPosition)
-
             // 重新计算距离
             const length = this.calculateLineLength(selectedLineEntity.positions)
             this.measurementResult = {
@@ -2733,7 +2475,6 @@ export default {
         }
 
 
-
         isMoving = false
         selectedPoint = null
         selectedLineEntity = null
@@ -2799,4 +2540,3 @@ export default {
   display: none !important;
 }
 </style>
-
diff --git a/ruoyi-ui/src/views/childRoom/RightPanel.vue b/ruoyi-ui/src/views/childRoom/RightPanel.vue
index 4548af8..d7be613 100644
--- a/ruoyi-ui/src/views/childRoom/RightPanel.vue
+++ b/ruoyi-ui/src/views/childRoom/RightPanel.vue
@@ -285,6 +285,15 @@ export default {
     }
   },
   watch: {
+    selectedPlanId(newId) {
+      if (newId) {
+        console.log('>>> [子组件同步] 检测到方案切换，自动展开 ID:', newId);
+        // 如果还没展开，就把它塞进展开数组里
+        if (!this.expandedPlans.includes(newId)) {
+          this.expandedPlans.push(newId);
+        }
+      }
+    },
     activeRouteIds: {
       handler(newVal) {
         console.log('activeRouteIds updated:', newVal);
@@ -297,25 +306,33 @@ export default {
     togglePlan(planId) {
       const index = this.expandedPlans.indexOf(planId)
       if (index > -1) {
-        // 折叠方案时，取消选中该方案的所有航线
         this.expandedPlans.splice(index, 1)
         const planRoutes = this.routes.filter(r => r.scenarioId === planId)
         planRoutes.forEach(route => {
           if (this.activeRouteIds.includes(route.id)) {
-            // 触发航线隐藏
             this.handleToggleRouteVisibility(route)
           }
         })
-        // 折叠方案时，取消选中方案
         this.$emit('select-plan', { id: null })
       } else {
-        // 展开方案时，选中该方案
+        // 展开新方案前，先清空所有已显示的航线和已展开的方案
+        // 清除当前地图上显示的所有航线实体（通知父组件清空 activeRouteIds 并调用地图移除方法）
+        this.activeRouteIds.forEach(activeId => {
+          const activeRoute = this.routes.find(r => r.id === activeId);
+          if (activeRoute) {
+            this.$emit('toggle-route-visibility', activeRoute);
+          }
+        });
+        // 重置展开状态，确保只有一个方案是展开的
+        this.expandedPlans = [];
+        this.expandedRoutes = [];
+        // --- 正常的展开逻辑 ---
         this.expandedPlans.push(planId)
         const plan = this.plans.find(p => p.id === planId)
         if (plan) {
           this.$emit('select-plan', plan)
         }
-        // 选中该方案的所有航线
+        // 仅加载并显示当前新方案的航线
         const planRoutes = this.routes.filter(r => r.scenarioId === planId)
         planRoutes.forEach(route => {
           if (!this.activeRouteIds.includes(route.id)) {
@@ -329,25 +346,25 @@ export default {
     toggleRoute(routeId) {
       const route = this.routes.find(r => r.id === routeId)
       if (!route) return
-
+      if (!route.waypoints) {
+        this.$set(route, 'waypoints', []); // 使用 $set 确保新属性是响应式的
+      }
       const isRouteSelected = this.activeRouteIds.includes(routeId)
       const isRouteExpanded = this.expandedRoutes.includes(routeId)
-
       if (isRouteSelected) {
-        // 航线已选中
         if (isRouteExpanded) {
-          // 航线已展开，点击则收回航点
           const index = this.expandedRoutes.indexOf(routeId)
           this.expandedRoutes.splice(index, 1)
         } else {
-          // 航线未展开，点击则展开航点
           this.expandedRoutes.push(routeId)
         }
       } else {
-        // 航线未选中，点击则选中并显示航线和航点
         this.handleSelectRoute(route)
-        // 选中后自动展开航点
         this.$nextTick(() => {
+          // 检查当前方案是否已展开，如果没展开，可能需要先展开方案才能看到航线
+          if (!this.expandedPlans.includes(route.scenarioId)) {
+            this.expandedPlans.push(route.scenarioId);
+          }
           if (!this.expandedRoutes.includes(routeId)) {
             this.expandedRoutes.push(routeId)
           }
@@ -359,11 +376,6 @@ export default {
       this.$emit('hide')
     },
 
-    // 新建航线事件
-    handleSelectPlan(plan) {
-      this.$emit('select-plan', plan)
-    },
-
     handleSelectRoute(route) {
       // 确保航线有航点数据
       this.$emit('select-route', route)
@@ -373,16 +385,19 @@ export default {
       this.$emit('create-plan')
     },
 
-    handleCreateRoute() {
-      this.$emit('create-route')
-    },
-
     handleCreateRouteForPlan(plan) {
       this.$emit('create-route', plan)
     },
 
     handleDeletePlan(plan) {
-      // 暂时留空，后续实现
+      this.$confirm(`是否确认删除方案 "${plan.name}"？这将同时删除该方案下的所有航线。`, "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.$emit('delete-plan', plan);
+      }).catch(() => {
+      });
     },
 
     handleOpenPlanDialog(plan) {
diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue
index de860aa..c7f6792 100644
--- a/ruoyi-ui/src/views/childRoom/index.vue
+++ b/ruoyi-ui/src/views/childRoom/index.vue
@@ -34,7 +34,6 @@
         </div>
       </el-dialog>
     </div>
-
     <!-- 顶部导航栏 -->
     <top-header
       :room-code="roomCode"
@@ -86,7 +85,6 @@
       @route-favorites="routeFavorites"
       @show-online-members="showOnlineMembersDialog"
     />
-
     <!-- 左侧折叠菜单栏 - 蓝色主题 -->
     <left-menu
       :is-hidden="isMenuHidden"
@@ -103,7 +101,6 @@
       @add-items="handleAddMenuItems"
       @delete="handleDeleteMenuItem"
     />
-
     <!-- 右侧实体列表（浮动）- 蓝色主题 -->
     <right-panel
       ref="rightPanel"
@@ -122,11 +119,12 @@
       :sea-platforms="seaPlatforms"
       :ground-platforms="groundPlatforms"
       @hide="hideRightPanel"
-      @select-plan="selectPlan"
       @select-route="selectRoute"
       @create-route="createRoute"
       @delete-route="handleDeleteRoute"
+      @select-plan="selectPlan"
       @create-plan="createPlan"
+      @delete-plan="executeDeletePlan"
       @open-plan-dialog="openPlanDialog"
       @open-route-dialog="openRouteDialog"
       @open-waypoint-dialog="openWaypointDialog"
@@ -138,10 +136,8 @@
       @run-conflict-check="runConflictCheck"
       @open-platform-dialog="openPlatformDialog"
     />
-
     <!-- 左下角工具面板 -->
     <bottom-left-panel />
-
     <!-- 底部时间轴（最初版本的样式）- 蓝色主题 -->
     <div
       class="floating-timeline blue-theme"
@@ -151,13 +147,11 @@
       <div class="popup-hide-btn" @click="hideKTimePopup" title="隐藏K时">
         <i class="el-icon-arrow-down"></i>
       </div>
-
       <div class="timeline-controls">
         <div class="current-time blue-time">
           <i class="el-icon-time"></i>
           <span class="time-text">{{ currentTime }}</span>
         </div>
-
         <div class="timeline-slider">
           <el-slider
             v-model="timeProgress"
@@ -166,7 +160,6 @@
             class="compact-slider blue-slider"
           />
         </div>
-
         <div class="playback-controls">
           <button
             class="control-btn blue-control-btn"
@@ -175,7 +168,6 @@
           >
             <i :class="isPlaying ? 'el-icon-video-pause' : 'el-icon-video-play'"></i>
           </button>
-
           <div class="speed-control">
             <button
               class="control-btn blue-control-btn"
@@ -256,6 +248,23 @@
       v-model="showPageLayoutDialog"
       @save="savePageLayout"
     />
+
+    <el-dialog
+      title="新建方案"
+      :visible.sync="showPlanNameDialog"
+      width="400px"
+      append-to-body
+    >
+      <el-form :model="newPlanForm" ref="newPlanForm" :rules="planRules" label-width="80px">
+        <el-form-item label="方案名称" prop="name">
+          <el-input v-model="newPlanForm.name" placeholder="请输入方案名称"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="showPlanNameDialog = false">取 消</el-button>
+        <el-button type="primary" @click="confirmCreatePlan">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -273,7 +282,7 @@ import LeftMenu from './LeftMenu'
 import RightPanel from './RightPanel'
 import BottomLeftPanel from './BottomLeftPanel'
 import TopHeader from './TopHeader'
-import { listScenario} from "@/api/system/scenario";
+import { listScenario,addScenario,delScenario} from "@/api/system/scenario";
 import { listRoutes, getRoutes, addRoutes,delRoutes } from "@/api/system/routes";
 import { updateWaypoints } from "@/api/system/waypoints";
 export default {
@@ -328,13 +337,20 @@ export default {
       isMenuHidden: true,      // 是否完全隐藏左侧菜单
       activeMenu: 'file',
       isIconEditMode: false,   // 图标编辑模式
-
       // 方案-航线-航点数据
       selectedPlanId: null,
       selectedPlanDetails: null,
+      routes: [],
       selectedRouteId: null,
       selectedRouteDetails: null,
 
+      showPlanNameDialog: false, // 控制新建方案弹窗
+      newPlanForm: {
+        name: ''
+      },
+      planRules: {
+        name: [{ required: true, message: '请输入方案名称', trigger: 'blur' }]
+      },
       // 顶部导航菜单项（用于图标选择）- 只显示指定的菜单项
       topNavItems: [
         { id: 'routeEdit', name: '航线编辑', icon: 'el-icon-edit-outline' },
@@ -370,7 +386,6 @@ export default {
 
       // 右侧面板控制
       isRightPanelHidden: true, // 是否完全隐藏右侧面板
-
       // K时弹出框控制
       showKTimePopup: false,
 
@@ -394,9 +409,10 @@ export default {
       ],
 
       // 右侧面板
+      currentRoomId: null,
+      plans: [],
       activeRightTab: 'plan',
       activeRouteIds: [], // 存储当前所有选中的航线ID
-
       // 冲突数据
       conflictCount: 2,
       conflicts: [
@@ -437,9 +453,6 @@ export default {
         { id: 10, name: '指挥控制车', type: '指挥车', icon: 'el-icon-monitor', color: '#1890ff', status: 'operating' },
       ],
 
-      // 航线数据 - 改为方案-航线-航点三级结构
-      plans: [],
-
       // 时间控制
       timeProgress: 45,
       currentTime: 'K+01:15:30',
@@ -471,24 +484,44 @@ export default {
       this.playbackInterval = null;
     }
   },
+  created() {
+    this.currentRoomId = this.$route.query.roomId;
+    console.log("从路由接收到的真实房间 ID:", this.currentRoomId);
+    this.getList();
+  },
   methods: {
     // 处理从地图点击传来的编辑请求
-    handleOpenWaypointEdit(wpName) {
-      // 1. 确保当前有选中的航线详情
-      if (!this.selectedRouteDetails || !this.selectedRouteDetails.waypoints) {
-        this.$message.warning('请先在右侧列表选择一条航线');
-        return;
+    async handleOpenWaypointEdit(wpId, routeId) {
+      console.log(`>>> [父组件接收] 航点 ID: ${wpId}, 所属航线 ID: ${routeId}`);
+      // 如果点击的点不属于当前选中的航线
+      if (this.selectedRouteId != routeId) {
+        console.log(">>> [自动切换] 正在获取新航线详情...");
+        try {
+          const response = await getRoutes(routeId);
+          if (response.code === 200 && response.data) {
+            const fullRouteData = response.data;
+            // 同步更新父组件状态，保持和 selectRoute 方法一致的结构
+            this.selectedRouteId = fullRouteData.id;
+            this.selectedRouteDetails = {
+              id: fullRouteData.id,
+              name: fullRouteData.callSign,
+              waypoints: fullRouteData.waypoints || []
+            };
+          }
+        } catch (error) {
+          this.$message.error('切换航线数据失败');
+          return;
+        }
       }
-      // 2. 根据点击的航点名称在数据列表中查找
-      const wpData = this.selectedRouteDetails.waypoints.find(item => item.name === wpName);
+      // 此时账本已确保是最新且正确的，开始找点
+      const wpData = this.selectedRouteDetails.waypoints.find(item => item.id == wpId);
       if (wpData) {
-        // 3. 深拷贝给编辑弹窗绑定的变量，防止直接修改原始数组
+        // 成功找到业务数据，深拷贝后打开弹窗
         this.selectedWaypoint = JSON.parse(JSON.stringify(wpData));
-        // 4. 打开弹窗
         this.showWaypointDialog = true;
-      }
-      else {
+      } else {
         this.$message.info('未找到该航点的业务数据');
+        console.error("查找失败！账本内IDs:", this.selectedRouteDetails.waypoints.map(w => w.id));
       }
     },
     // 显示在线成员弹窗
@@ -514,7 +547,7 @@ export default {
       const index = this.routes.findIndex(r => r.id === updatedRoute.id);
       if (index !== -1) {
         // 使用 splice 触发响应式更新
-        const newRouteData = { ...this.routes[index], ...updatedRoute };
+        const newRouteData = {...this.routes[index], ...updatedRoute};
         this.routes.splice(index, 1, newRouteData);
 
         // 如果当前选中的是这条航线，同步更新详情中的名称
@@ -527,15 +560,19 @@ export default {
     },
     // 新建航线
     createRoute(plan) {
-      // 保存当前选中的方案，用于后续新建航线时关联
-      if (plan) {
-        this.selectedPlanId = plan.id;
-        this.selectedPlanDetails = plan;
+      if (!plan || !plan.id) return;
+      console.log(`>>> [新建航线触发] 目标方案: ${plan.name}`);
+      // 只有当目标方案和当前方案不同时，才执行“大扫除”
+      if (this.selectedPlanId !== plan.id) {
+        console.log(">>> [执行跨方案切换] 正在清理旧方案数据...");
+        this.selectPlan(plan);
+      } else {
+        console.log(">>> [同方案内操作] 保持当前航线显示，直接进入规划模式");
       }
-
+      // 进入 Cesium 绘图模式
       if (this.$refs.cesiumMap) {
         this.$refs.cesiumMap.startMissionRouteDrawing();
-        this.$message.success('进入航线规划模式');
+        this.$message.success(`${plan.name}开启航线规划`);
       }
     },
     async handleDeleteRoute(route) {
@@ -571,8 +608,8 @@ export default {
     /** 从数据库拉取最新的航线列表数据 */
     async getList() {
       try {
-        // 1. 获取所有方案
-        const scenarioRes = await listScenario({});
+        const roomId = this.$route.query.roomId || this.currentRoomId;
+        const scenarioRes = await listScenario({ roomId: roomId });
         if (scenarioRes.code === 200) {
           this.plans = scenarioRes.rows.map(s => ({
             id: s.id,
@@ -580,8 +617,7 @@ export default {
             routes: []
           }));
         }
-
-        // 2. 获取所有航线
+        //获取所有航线
         const routeRes = await listRoutes({});
         if (routeRes.code === 200) {
           const allRoutes = routeRes.rows.map(item => ({
@@ -592,14 +628,27 @@ export default {
             conflict: false,
             scenarioId: item.scenarioId
           }));
-
-          // 3. 将航线分配到对应的方案中
+          //分配航线到方案
           this.plans.forEach(plan => {
             plan.routes = allRoutes.filter(r => r.scenarioId === plan.id);
           });
 
-          // 保存一份扁平的 routes 供搜索或其他组件使用
           this.routes = allRoutes;
+          // 直接根据 activeRouteIds 同步地图即可
+          if (this.activeRouteIds.length > 0) {
+            this.$nextTick(() => {
+              this.activeRouteIds.forEach(id => {
+                const route = this.routes.find(r => r.id === id);
+                // 只要数据里有点位，直接指挥地图画线
+                if (route && route.waypoints && route.waypoints.length > 0) {
+                  if (this.$refs.cesiumMap) {
+                    this.$refs.cesiumMap.removeRouteById(id);
+                    this.$refs.cesiumMap.renderRouteWaypoints(route.waypoints, id);
+                  }
+                }
+              });
+            });
+          }
         }
       } catch (error) {
         console.error("数据加载失败:", error);
@@ -617,70 +666,90 @@ export default {
     },
     /** 弹窗点击“确定”：正式将数据保存到后端数据库 */
     async confirmSaveNewRoute() {
-      // 严格校验起名逻辑
+      // 1. 严格校验
       if (!this.newRouteName || this.newRouteName.trim() === '') {
         this.$message.error('新增航线未命名，请输入名称后保存！');
         return;
       }
-      // 获取当前选中的方案 ID
       const currentScenarioId = this.selectedPlanId;
       if (!currentScenarioId) {
         this.$message.warning('请先在左侧选择一个方案，再保存航线！');
         return;
       }
-      // 构造符合后端 Routes 实体类的数据结构
+
+      // 2. 构造数据
+      const finalWaypoints = this.tempMapPoints.map((p, index) => ({
+        name: `WP${index + 1}`,
+        lat: p.lat,
+        lng: p.lng,
+        alt: 5000.0,
+        speed: 800.0,
+        startTime: 'K+00:00:00',
+        turnAngle: 0.0
+      }));
+
       const routeData = {
         callSign: this.newRouteName,
-        scenarioId: currentScenarioId || 1,  // 使用当前选中的方案ID，默认1
+        scenarioId: currentScenarioId,
         platformId: 1,
         attributes: "{}",
-        waypoints: this.tempMapPoints.map((p, index) => ({
-          name: `WP${index + 1}`,
-          lat: p.lat,
-          lng: p.lng,
-          alt: 5000.0,
-          speed: 800.0,
-          startTime: 'K+00:00:00',
-          turnAngle: 0.0
-        }))
+        waypoints: finalWaypoints
       };
 
       try {
-        // 调用后端 API 保存到数据库
         const response = await addRoutes(routeData);
         if (response.code === 200) {
-          this.$message.success('航线及其航点已成功保存至当前方案');
-          // 获取后端生成的正式 ID
           const savedRoute = response.data;
-          const newRouteId = savedRoute ? savedRoute.id : null;
-          if (this.$refs.cesiumMap) {
-            this.$refs.cesiumMap.clearRoute();
-            // 如果拿到了正式 ID，则按照“正式航线”的规则渲染一次
-            if (newRouteId) {
-              if (!this.activeRouteIds.includes(savedRoute.id)) {
-                this.activeRouteIds.push(savedRoute.id);
-              }
-              // 更新当前详情，确保右侧下方航点列表立刻显示
-              this.selectedRouteDetails = {
-                id: newRouteId,
-                name: this.newRouteName,
-                waypoints: routeData.waypoints
-              };
-              //使用正式 ID 渲染点和线
-              this.$refs.cesiumMap.renderRouteWaypoints(routeData.waypoints, newRouteId);
-            }
+          const newRouteId = savedRoute?.id;
+
+          if (!newRouteId || !savedRoute.waypoints) {
+            this.$message.error('保存成功但返回数据结构异常，请手动刷新');
+            return;
           }
-          // 重置 UI 状态
-          this.showNameDialog = false;
+
+          // 1. 更新当前选中详情
+          this.selectedRouteId = newRouteId;
+          this.selectedRouteDetails = JSON.parse(JSON.stringify(savedRoute));
+
+          // 2. 【修复关键 A】：使用 push 而不是赋值
+          // 确保新 ID 进去的同时，activeRouteIds 里原有的老 ID（如 112）还在
+          // 这样右侧列表里，老的航线依然会保持勾选状态
+          if (!this.activeRouteIds.includes(newRouteId)) {
+            this.activeRouteIds.push(newRouteId);
+          }
+
+          // 3. UI 重置
           this.drawDom = false;
+          this.showNameDialog = false;
           this.newRouteName = '';
           this.tempMapPoints = [];
-          // 重新拉取右侧航线列表以保持同步
-          await this.getList();
+
+          // 4. 【修复关键 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. 渲染新航线
+          this.$nextTick(() => {
+            if (this.$refs.cesiumMap) {
+              // 只画这一条新线，旧线因为没被清除，依然会留在地图上
+              this.$refs.cesiumMap.renderRouteWaypoints(savedRoute.waypoints, newRouteId);
+            }
+            this.$message.success('航线及其航点已成功保存并同步');
+          });
+
+          this.getList();
         }
       } catch (error) {
-        console.error("保存航线失败:", error);
-        this.$message.error('保存失败，请检查后端服务');
+        console.error(">>> [保存异常]:", error);
+        this.$message.error('保存失败，请检查网络或后端日志');
       }
     },
     // 航点编辑弹窗相关方法
@@ -690,22 +759,19 @@ export default {
     },
     /** 航点编辑保存：更新数据库并同步地图显示 */
     async updateWaypoint(updatedWaypoint) {
-      // 确保有选中的航线详情
       if (!this.selectedRouteDetails || !this.selectedRouteDetails.waypoints) return;
       try {
-        const response = await updateWaypoints(updatedWaypoint);
+        const response = await updateWaypoints(updatedWaypoint); // 更新数据库
         if (response.code === 200) {
-          // 找到当前编辑点在本地数组中的位置
           const index = this.selectedRouteDetails.waypoints.findIndex(p => p.id === updatedWaypoint.id);
           if (index !== -1) {
-            // 记录旧名称，用于地图组件定位 Entity
-            const oldName = this.selectedRouteDetails.waypoints[index].name;
-            const newName = updatedWaypoint.name;
-            // 使用 splice 触发 Vue 响应式更新右侧面板 UI
-            this.selectedRouteDetails.waypoints.splice(index, 1, { ...updatedWaypoint });
-            // 5. 同步更新地图上的图形
+            // 1. 更新本地 Vue 响应式数据，同步右侧面板 UI
+            this.selectedRouteDetails.waypoints.splice(index, 1, {...updatedWaypoint});
+
+            // 2. 【核心修改】通过 ID 通知地图组件更新图形
             if (this.$refs.cesiumMap) {
-              this.$refs.cesiumMap.updateWaypointGraphic(oldName, newName);
+              // 直接传 ID 和新的名字
+              this.$refs.cesiumMap.updateWaypointGraphicById(updatedWaypoint.id, updatedWaypoint.name);
             }
 
             this.showWaypointDialog = false;
@@ -753,7 +819,6 @@ export default {
     },
 
 
-
     // 右侧面板操作
     showRightPanel() {
       this.isRightPanelHidden = false;
@@ -1103,11 +1168,11 @@ export default {
           this.activeRightTab = 'platform';
           this.isRightPanelHidden = false;
         }
-      } else if(item.id === 'modify'){
+      } else if (item.id === 'modify') {
         this.drawDom = !this.drawDom
         // 点击修改图标进行地图绘制时，自动收起右侧面板
         this.isRightPanelHidden = true;
-        console.log(this.drawDom,999999)
+        console.log(this.drawDom, 999999)
       } else if (item.id === 'deduction') {
         // 点击推演按钮，显示/隐藏K时弹出框
         this.showKTimePopup = !this.showKTimePopup;
@@ -1209,7 +1274,6 @@ export default {
       const minutes = (val % 4) * 15;
       return `K+${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:00`;
     },
-    // 航线操作
     selectPlan(plan) {
       if (plan && plan.id) {
         this.selectedPlanId = plan.id;
@@ -1218,8 +1282,17 @@ export default {
         this.selectedPlanId = null;
         this.selectedPlanDetails = null;
       }
+
+      // 重置状态
       this.selectedRouteId = null;
       this.selectedRouteDetails = null;
+      this.activeRouteIds = [];
+
+      // 物理清场
+      if (this.$refs.cesiumMap && this.$refs.cesiumMap.clearAllWaypoints) {
+        this.$refs.cesiumMap.clearAllWaypoints();
+      }
+      console.log(`>>> [切换成功] 已进入方案: ${plan.name}，地图已清空，列表已展开。`);
     },
     /** 切换航线：实现多选/开关逻辑 */
     async selectRoute(route) {
@@ -1228,8 +1301,6 @@ export default {
       // 航线已在选中列表中
       if (index > -1) {
         if (isRouteExpanded) {
-          // 航线已展开，点击则收回航点（不取消选中）
-          // 这个逻辑在 RightPanel 的 toggleRoute 中处理
           return;
         } else {
           // 航线未展开，点击则取消选中（从地图移除）
@@ -1302,23 +1373,69 @@ export default {
     },
 
     createPlan() {
-      const newId = Date.now();
-      const newPlan = {
-        id: newId,
-        name: `新方案${this.plans.length + 1}`,
-        routes: []
-      };
-      this.plans.push(newPlan);
-      this.selectPlan(newPlan);
+      this.newPlanForm.name = ''; // 重置名称
+      this.showPlanNameDialog = true; // 打开对话框
+    },
+    async confirmCreatePlan() {
+      this.$refs.newPlanForm.validate(async (valid) => {
+        if (!valid) return;
+        try {
+          const postData = {
+            roomId: this.currentRoomId,
+            name: this.newPlanForm.name,
+          };
+          const res = await addScenario(postData);
+          if (res.code === 200) {
+            this.$message.success('方案创建成功');
+            this.showPlanNameDialog = false;
+            // 刷新列表，确保新方案带上后端 ID
+            await this.getList();
+            // 自动选中最新创建的方案
+            if (res.data && res.data.id) {
+              const newPlan = this.plans.find(p => p.id === res.data.id);
+              if (newPlan) this.selectPlan(newPlan);
+            }
+          }
+        } catch (error) {
+          console.error("创建方案失败:", error);
+          this.$message.error('保存方案失败，请检查网络');
+        }
+      });
     },
     openPlanDialog(plan) {
       this.$prompt('请输入方案名称', '编辑方案', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         inputValue: plan.name
-      }).then(({ value }) => {
+      }).then(({value}) => {
         plan.name = value;
-      }).catch(() => {});
+      }).catch(() => {
+      });
+    },
+    async executeDeletePlan(plan) {
+      try {
+        const res = await delScenario(plan.id);
+        if (res.code === 200) {
+          this.$message.success('方案删除成功');
+          const relatedRoutes = this.routes.filter(r => r.scenarioId === plan.id);
+          relatedRoutes.forEach(route => {
+            if (this.$refs.cesiumMap) {
+              this.$refs.cesiumMap.removeRouteById(route.id);
+            }
+            const idx = this.activeRouteIds.indexOf(route.id);
+            if (idx > -1) {
+              this.activeRouteIds.splice(idx, 1);
+            }
+          });
+          //重置方案选中状态
+          if (this.selectedPlanId === plan.id) {
+            this.selectedPlanId = null;
+          }
+          await this.getList(); // 刷新列表
+        }
+      } catch (e) {
+        if (e !== 'cancel') console.error("删除方案失败:", e);
+      }
     },
     addWaypoint() {
       if (this.selectedRouteDetails) {
@@ -1337,7 +1454,6 @@ export default {
         }
       }
     },
-
     cancelRoute() {
       // 清空所有选中的航线
       if (this.$refs.cesiumMap) {
@@ -1381,7 +1497,6 @@ export default {
             this.selectedRouteDetails = null;
           }
         }
-        this.$message.info(`已隐藏航线: ${route.name}`);
       } else {
         // 航线已隐藏，显示它
         this.selectRoute(route);
@@ -1440,6 +1555,7 @@ export default {
   background-position: center;
   z-index: 1;
 }
+
 /* ...其余样式省略，保持不变... */
 .map-overlay-text {
   position: absolute;
diff --git a/ruoyi-ui/src/views/selectRoom/index.vue b/ruoyi-ui/src/views/selectRoom/index.vue
index 13e5de4..6740b94 100644
--- a/ruoyi-ui/src/views/selectRoom/index.vue
+++ b/ruoyi-ui/src/views/selectRoom/index.vue
@@ -192,7 +192,10 @@ export default {
     },
     enterRoom() {
       if (this.selectedRoom) {
-        this.$router.push('/childRoom');
+        this.$router.push({
+          path: '/childRoom',
+          query: { roomId: this.selectedRoom }
+        });
       }
     },
     showContextMenu(event, room) {