diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PlatformLibController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PlatformLibController.java
index f69aa6d..5354071 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PlatformLibController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PlatformLibController.java
@@ -1,17 +1,11 @@
 package com.ruoyi.web.controller;
 
+import java.io.IOException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -20,6 +14,9 @@ import com.ruoyi.system.domain.PlatformLib;
 import com.ruoyi.system.service.IPlatformLibService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.config.RuoYiConfig;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 平台模版库Controller
@@ -74,9 +71,18 @@ public class PlatformLibController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:lib:add')")
     @Log(title = "平台模版库", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody PlatformLib platformLib)
+    @PostMapping("/add")
+    public AjaxResult add(PlatformLib platformLib, @RequestParam("file") MultipartFile file) throws IOException
     {
+        // 判断前端是否有文件传过来
+        if (file != null && !file.isEmpty())
+        {
+            String fileName = FileUploadUtils.upload(RuoYiConfig.getProfile(), file);
+            // 把这个路径存入实体类的 iconUrl 属性，对应数据库 icon_url 字段
+            platformLib.setIconUrl(fileName);
+        }
+
+        // 执行原有的插入逻辑
         return toAjax(platformLibService.insertPlatformLib(platformLib));
     }
 
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-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index c40f2aa..037db5c 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -8,7 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: A20040303ctw!
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index cc1b6f4..88d3615 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -172,7 +172,9 @@ public class FileUploadUtils
     {
         int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
         String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
-        return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
+        String path = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
+
+        return path.replaceAll("/+", "/");
     }
 
     /**
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 511842b..d5f704e 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -23,19 +23,18 @@ import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
 
 /**
  * spring security配置
- * 
+ *
  * @author ruoyi
  */
 @EnableMethodSecurity(prePostEnabled = true, securedEnabled = true)
 @Configuration
-public class SecurityConfig
-{
+public class SecurityConfig {
     /**
      * 自定义用户认证逻辑
      */
     @Autowired
     private UserDetailsService userDetailsService;
-    
+
     /**
      * 认证失败处理类
      */
@@ -53,7 +52,7 @@ public class SecurityConfig
      */
     @Autowired
     private JwtAuthenticationTokenFilter authenticationTokenFilter;
-    
+
     /**
      * 跨域过滤器
      */
@@ -70,8 +69,7 @@ public class SecurityConfig
      * 身份验证实现
      */
     @Bean
-    public AuthenticationManager authenticationManager()
-    {
+    public AuthenticationManager authenticationManager() {
         DaoAuthenticationProvider daoAuthenticationProvider = new DaoAuthenticationProvider();
         daoAuthenticationProvider.setUserDetailsService(userDetailsService);
         daoAuthenticationProvider.setPasswordEncoder(bCryptPasswordEncoder());
@@ -94,46 +92,45 @@ public class SecurityConfig
      * authenticated       |   用户登录后可访问
      */
     @Bean
-    protected SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception
-    {
+    protected SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
         return httpSecurity
-            // CSRF禁用，因为不使用session
-            .csrf(csrf -> csrf.disable())
-            // 禁用HTTP响应标头
-            .headers((headersCustomizer) -> {
-                headersCustomizer.cacheControl(cache -> cache.disable()).frameOptions(options -> options.sameOrigin());
-            })
-            // 认证失败处理类
-            .exceptionHandling(exception -> exception.authenticationEntryPoint(unauthorizedHandler))
-            // 基于token，所以不需要session
-            .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
-            // 注解标记允许匿名访问的url
-            .authorizeHttpRequests((requests) -> {
-                permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
-                // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
-                    // 静态资源，可匿名访问
-                    .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
-                    .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
-                    // 除上面外的所有请求全部需要鉴权认证
-                    .anyRequest().authenticated();
-            })
-            // 添加Logout filter
-            .logout(logout -> logout.logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler))
-            // 添加JWT filter
-            .addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class)
-            // 添加CORS filter
-            .addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class)
-            .addFilterBefore(corsFilter, LogoutFilter.class)
-            .build();
+                // CSRF禁用，因为不使用session
+                .csrf(csrf -> csrf.disable())
+                // 禁用HTTP响应标头
+                .headers((headersCustomizer) -> {
+                    headersCustomizer.cacheControl(cache -> cache.disable()).frameOptions(options -> options.sameOrigin());
+                })
+                // 认证失败处理类
+                .exceptionHandling(exception -> exception.authenticationEntryPoint(unauthorizedHandler))
+                // 基于token，所以不需要session
+                .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+                // 注解标记允许匿名访问的url
+                .authorizeHttpRequests((requests) -> {
+                    permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
+                    // 对于登录login 注册register 验证码captchaImage 允许匿名访问
+                    requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
+                            // 静态资源，可匿名访问
+                            .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
+                            .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+                            .antMatchers("/profile/**").permitAll()
+                            // 除上面外的所有请求全部需要鉴权认证
+                            .anyRequest().authenticated();
+                })
+                // 添加Logout filter
+                .logout(logout -> logout.logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler))
+                // 添加JWT filter
+                .addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class)
+                // 添加CORS filter
+                .addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class)
+                .addFilterBefore(corsFilter, LogoutFilter.class)
+                .build();
     }
 
     /**
      * 强散列哈希加密实现
      */
     @Bean
-    public BCryptPasswordEncoder bCryptPasswordEncoder()
-    {
+    public BCryptPasswordEncoder bCryptPasswordEncoder() {
         return new BCryptPasswordEncoder();
     }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/PlatformLib.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/PlatformLib.java
index 902ebd5..b0d1087 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/PlatformLib.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/PlatformLib.java
@@ -7,76 +7,88 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 平台模版库对象 platform_lib
- * 
+ *
  * @author ruoyi
  * @date 2026-01-14
  */
-public class PlatformLib extends BaseEntity
-{
+public class PlatformLib extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 平台库ID */
+    /**
+     * 平台库ID
+     */
     private Long id;
 
-    /** 平台名称 (如: F-22 猛禽) */
+    /**
+     * 平台名称 (如: F-22 猛禽)
+     */
     @Excel(name = "平台名称 (如: F-22 猛禽)")
     private String name;
 
-    /** 类型: Aircraft, Vehicle, Radar, Ship */
-    @Excel(name = "类型: Aircraft, Vehicle, Radar, Ship")
+    /**
+     * 类型: Aircraft, Vehicle, Radar, Ship
+     */
+    @Excel(name = "类型: Air, Sea, Ground")
     private String type;
 
-    /** 核心参数JSON: {icon_url, max_speed, max_fuel, radar_range...} */
+    /**
+     * 核心参数JSON: {icon_url, max_speed, max_fuel, radar_range...}
+     */
     @Excel(name = "核心参数JSON: {icon_url, max_speed, max_fuel, radar_range...}")
     private String specsJson;
 
-    public void setId(Long id) 
-    {
+    @Excel(name = "平台图标路径")
+    private String iconUrl;
+
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
 
-    public void setName(String name) 
-    {
+    public void setName(String name) {
         this.name = name;
     }
 
-    public String getName() 
-    {
+    public String getName() {
         return name;
     }
 
-    public void setType(String type) 
-    {
+    public void setType(String type) {
         this.type = type;
     }
 
-    public String getType() 
-    {
+    public String getType() {
         return type;
     }
 
-    public void setSpecsJson(String specsJson) 
-    {
+    public void setSpecsJson(String specsJson) {
         this.specsJson = specsJson;
     }
 
-    public String getSpecsJson() 
-    {
+    public String getSpecsJson() {
         return specsJson;
     }
 
+    public void setIconUrl(String iconUrl) {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getIconUrl() {
+        return iconUrl;
+    }
+
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("type", getType())
-            .append("specsJson", getSpecsJson())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("name", getName())
+                .append("type", getType())
+                .append("specsJson", getSpecsJson())
+                .append("iconUrl", getIconUrl())
+                .toString();
     }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RouteWaypoints.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RouteWaypoints.java
index f8349fc..45bc77e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RouteWaypoints.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RouteWaypoints.java
@@ -41,11 +41,11 @@ public class RouteWaypoints extends BaseEntity
 
     /** 高度 (米) */
     @Excel(name = "高度 (米)")
-    private Long alt;
+    private Double alt;
 
     /** 速度 (km/h) */
     @Excel(name = "速度 (km/h)")
-    private Long speed;
+    private Double speed;
 
     /** 起始时间 (如: K+00:40:00) */
     @Excel(name = "起始时间 (如: K+00:40:00)")
@@ -53,7 +53,7 @@ public class RouteWaypoints extends BaseEntity
 
     /** 转弯角度 (用于计算转弯半径) */
     @Excel(name = "转弯角度 (用于计算转弯半径)")
-    private Long turnAngle;
+    private Double turnAngle;
 
     public void setId(Long id) 
     {
@@ -115,22 +115,22 @@ public class RouteWaypoints extends BaseEntity
         return lng;
     }
 
-    public void setAlt(Long alt) 
+    public void setAlt(Double alt)
     {
         this.alt = alt;
     }
 
-    public Long getAlt() 
+    public Double getAlt()
     {
         return alt;
     }
 
-    public void setSpeed(Long speed) 
+    public void setSpeed(Double speed)
     {
         this.speed = speed;
     }
 
-    public Long getSpeed() 
+    public Double getSpeed()
     {
         return speed;
     }
@@ -145,12 +145,12 @@ public class RouteWaypoints extends BaseEntity
         return startTime;
     }
 
-    public void setTurnAngle(Long turnAngle) 
+    public void setTurnAngle(Double turnAngle)
     {
         this.turnAngle = turnAngle;
     }
 
-    public Long getTurnAngle() 
+    public Double getTurnAngle()
     {
         return turnAngle;
     }
@@ -183,7 +183,7 @@ public class RouteWaypoints extends BaseEntity
         // 单位换算：速度从 km/h 转为 m/s
         double v_mps = this.speed / 3.6;
         // 单位换算：角度从 度(Degree) 转为 弧度(Radians)
-        double radians = Math.toRadians(this.turnAngle.doubleValue());
+        double radians = Math.toRadians(this.turnAngle);
         // 重力加速度 g
         double g = 9.8;
         // 计算半径
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RouteWaypointsMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RouteWaypointsMapper.java
index 2e77e10..07ff430 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RouteWaypointsMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RouteWaypointsMapper.java
@@ -55,6 +55,14 @@ public interface RouteWaypointsMapper
     public int deleteRouteWaypointsById(Long id);
 
     /**
+     * 删除航线具体航点明细
+     *
+     * @param routeId 航线主键
+     * @return 结果
+     */
+    public int deleteRouteWaypointsByRouteId(Long routeId);
+
+    /**
      * 批量删除航线具体航点明细
      * 
      * @param ids 需要删除的数据主键集合
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRouteWaypointsService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRouteWaypointsService.java
index fc046e8..3e74e8d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRouteWaypointsService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRouteWaypointsService.java
@@ -58,4 +58,12 @@ public interface IRouteWaypointsService
      * @return 结果
      */
     public int deleteRouteWaypointsById(Long id);
+
+    /**
+     * 删除航线具体航点明细信息
+     *
+     * @param routeId 航线具体航点明细主键
+     * @return 结果
+     */
+    public int deleteRouteWaypointsByRouteId(Long routeId);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MissionScenarioServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MissionScenarioServiceImpl.java
index 600effa..ed72252 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MissionScenarioServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MissionScenarioServiceImpl.java
@@ -1,11 +1,15 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.Routes;
+import com.ruoyi.system.service.IRoutesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.MissionScenarioMapper;
 import com.ruoyi.system.domain.MissionScenario;
 import com.ruoyi.system.service.IMissionScenarioService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 任务方案/沙箱Service业务层处理
@@ -19,6 +23,9 @@ public class MissionScenarioServiceImpl implements IMissionScenarioService
     @Autowired
     private MissionScenarioMapper missionScenarioMapper;
 
+    @Autowired
+    private IRoutesService routesService;
+
     /**
      * 查询任务方案/沙箱
      * 
@@ -74,9 +81,15 @@ public class MissionScenarioServiceImpl implements IMissionScenarioService
      * @return 结果
      */
     @Override
+    @Transactional
     public int deleteMissionScenarioByIds(Long[] ids)
     {
-        return missionScenarioMapper.deleteMissionScenarioByIds(ids);
+        int rows = 0;
+        for (Long id : ids) {
+            // 循环调用单条删除逻辑，确保每套方案下的从属数据都被清理干净
+            rows += this.deleteMissionScenarioById(id);
+        }
+        return rows;
     }
 
     /**
@@ -86,8 +99,19 @@ public class MissionScenarioServiceImpl implements IMissionScenarioService
      * @return 结果
      */
     @Override
+    @Transactional
     public int deleteMissionScenarioById(Long id)
     {
+        // 查找属于该方案的所有航线
+        Routes queryRoute = new Routes();
+        queryRoute.setScenarioId(id);
+        List<Routes> relatedRoutes = routesService.selectRoutesList(queryRoute);
+        // 循环删除每一条航线
+        if (relatedRoutes != null) {
+            for (Routes route : relatedRoutes) {
+                routesService.deleteRoutesById(route.getId());
+            }
+        }
         return missionScenarioMapper.deleteMissionScenarioById(id);
     }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RouteWaypointsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RouteWaypointsServiceImpl.java
index fbc0848..63be94c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RouteWaypointsServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RouteWaypointsServiceImpl.java
@@ -101,4 +101,9 @@ public class RouteWaypointsServiceImpl implements IRouteWaypointsService
     {
         return routeWaypointsMapper.deleteRouteWaypointsById(id);
     }
+
+    @Override
+    public int deleteRouteWaypointsByRouteId(Long routeId) {
+        return routeWaypointsMapper.deleteRouteWaypointsByRouteId(routeId);
+    }
 }
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 93b1ded..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
@@ -35,7 +35,18 @@ public class RoutesServiceImpl implements IRoutesService
     @Override
     public Routes selectRoutesById(Long id)
     {
-        return routesMapper.selectRoutesById(id);
+        // 查出航线基本信息
+        Routes routes = routesMapper.selectRoutesById(id);
+        // 如果查到了航线，就再去查属于它的航点
+        if (routes != null) {
+            RouteWaypoints queryWp = new RouteWaypoints();
+            queryWp.setRouteId(id); // 根据航线ID查询
+            List<RouteWaypoints> wpList = routeWaypointsService.selectRouteWaypointsList(queryWp);
+
+            // 把查出来的航点列表塞进 routes 对象的 waypoints 属性里
+            routes.setWaypoints(wpList);
+        }
+        return routes;
     }
 
     /**
@@ -47,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;
     }
 
     /**
@@ -98,9 +118,17 @@ public class RoutesServiceImpl implements IRoutesService
      * @return 结果
      */
     @Override
+    @Transactional
     public int deleteRoutesByIds(Long[] ids)
     {
-        return routesMapper.deleteRoutesByIds(ids);
+        int rows = 0;
+        for (Long id : ids) {
+            // 1. 清理航点
+            routeWaypointsService.deleteRouteWaypointsByRouteId(id);
+            // 2. 累加删除航线的行数
+            rows += routesMapper.deleteRoutesById(id);
+        }
+        return rows;
     }
 
     /**
@@ -110,8 +138,10 @@ public class RoutesServiceImpl implements IRoutesService
      * @return 结果
      */
     @Override
+    @Transactional
     public int deleteRoutesById(Long id)
     {
+        routeWaypointsService.deleteRouteWaypointsByRouteId(id);
         return routesMapper.deleteRoutesById(id);
     }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/PlatformLibMapper.xml b/ruoyi-system/src/main/resources/mapper/system/PlatformLibMapper.xml
index b72202a..7161fdc 100644
--- a/ruoyi-system/src/main/resources/mapper/system/PlatformLibMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/PlatformLibMapper.xml
@@ -9,10 +9,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="name"    column="name"    />
         <result property="type"    column="type"    />
         <result property="specsJson"    column="specs_json"    />
+        <result property="iconUrl"    column="icon_url"    />
     </resultMap>
 
     <sql id="selectPlatformLibVo">
-        select id, name, type, specs_json from platform_lib
+        select id, name, type, specs_json,icon_url from platform_lib
     </sql>
 
     <select id="selectPlatformLibList" parameterType="PlatformLib" resultMap="PlatformLibResult">
@@ -21,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="specsJson != null  and specsJson != ''"> and specs_json = #{specsJson}</if>
+            <if test="iconUrl != null  and iconUrl != ''"> and icon_url = #{iconUrl}</if>
         </where>
     </select>
     
@@ -35,11 +37,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null and name != ''">name,</if>
             <if test="type != null and type != ''">type,</if>
             <if test="specsJson != null and specsJson != ''">specs_json,</if>
+            <if test="iconUrl != null and iconUrl != ''">icon_url,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null and name != ''">#{name},</if>
             <if test="type != null and type != ''">#{type},</if>
             <if test="specsJson != null and specsJson != ''">#{specsJson},</if>
+            <if test="iconUrl != null and iconUrl != ''">#{iconUrl},</if>
          </trim>
     </insert>
 
@@ -49,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null and name != ''">name = #{name},</if>
             <if test="type != null and type != ''">type = #{type},</if>
             <if test="specsJson != null and specsJson != ''">specs_json = #{specsJson},</if>
+            <if test="iconUrl != null and iconUrl != ''">icon_url = #{iconUrl},</if>
         </trim>
         where id = #{id}
     </update>
diff --git a/ruoyi-system/src/main/resources/mapper/system/RouteWaypointsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RouteWaypointsMapper.xml
index f6209fb..7ccc118 100644
--- a/ruoyi-system/src/main/resources/mapper/system/RouteWaypointsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/RouteWaypointsMapper.xml
@@ -91,6 +91,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from route_waypoints where id = #{id}
     </delete>
 
+    <delete id="deleteRouteWaypointsByRouteId" parameterType="Long">
+        delete from route_waypoints where route_id = #{routeId}
+    </delete>
+
     <delete id="deleteRouteWaypointsByIds" parameterType="String">
         delete from route_waypoints where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
diff --git a/ruoyi-system/src/main/resources/mapper/system/RoutesMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RoutesMapper.xml
index e51edf9..2a99e7f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/RoutesMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/RoutesMapper.xml
@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="platformId"    column="platform_id"    />
         <result property="callSign"    column="call_sign"    />
         <result property="attributes"    column="attributes"    />
+        <collection property="waypoints" javaType="java.util.List" resultMap="com.ruoyi.system.mapper.RouteWaypointsMapper.RouteWaypointsResult" />
     </resultMap>
 
     <sql id="selectRoutesVo">
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index 09f4bb3..ebae234 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -7,5 +7,8 @@ ENV = 'development'
 # 若依管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
+# 访问地址（绕过 /dev-api 代理，用于解决静态资源/图片访问 401 认证问题）
+VUE_APP_BACKEND_URL = 'http://192.168.50.145:8080'
+
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 9f0562f..4aa7fcd 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -6,6 +6,7 @@
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",
+    "move-tiles": "node scripts/move-tiles-out-of-public.js",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview"
@@ -61,6 +62,7 @@
     "chalk": "4.1.0",
     "compression-webpack-plugin": "6.1.2",
     "connect": "3.6.6",
+    "express": "^4.18.2",
     "sass": "1.32.13",
     "sass-loader": "10.1.1",
     "script-ext-html-webpack-plugin": "2.1.5",
diff --git a/ruoyi-ui/src/api/system/lib.js b/ruoyi-ui/src/api/system/lib.js
index 89f6aa5..59420c5 100644
--- a/ruoyi-ui/src/api/system/lib.js
+++ b/ruoyi-ui/src/api/system/lib.js
@@ -20,9 +20,12 @@ export function getLib(id) {
 // 新增平台模版库
 export function addLib(data) {
   return request({
-    url: '/system/lib',
+    url: '/system/lib/add',
     method: 'post',
-    data: data
+    data: data,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
   })
 }
 
diff --git a/ruoyi-ui/src/store/getters.js b/ruoyi-ui/src/store/getters.js
index 3680f95..a3906cf 100644
--- a/ruoyi-ui/src/store/getters.js
+++ b/ruoyi-ui/src/store/getters.js
@@ -13,6 +13,7 @@ const getters = {
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,
+  userLevel: state => state.user.userLevel,
   permission_routes: state => state.permission.routes,
   topbarRouters: state => state.permission.topbarRouters,
   defaultRoutes: state => state.permission.defaultRoutes,
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index 6a7b710..5ea90a2 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -13,7 +13,8 @@ const user = {
     nickName: '',
     avatar: '',
     roles: [],
-    permissions: []
+    permissions: [],
+    userLevel: ''
   },
 
   mutations: {
@@ -37,6 +38,9 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
+    },
+    SET_USER_LEVEL: (state, userLevel) => {
+      state.userLevel = userLevel
     }
   },
 
@@ -77,6 +81,7 @@ const user = {
           commit('SET_NAME', user.userName)
           commit('SET_NICK_NAME', user.nickName)
           commit('SET_AVATAR', avatar)
+          commit('SET_USER_LEVEL', user.userLevel || '')
           /* 初始密码提示 */
           if(res.isDefaultModifyPwd) {
             MessageBox.confirm('您的密码还是初始密码，请修改密码！',  '安全提示', {  confirmButtonText: '确定',  cancelButtonText: '取消',  type: 'warning' }).then(() => {
diff --git a/ruoyi-ui/src/views/cesiumMap/DrawingToolbar.vue b/ruoyi-ui/src/views/cesiumMap/DrawingToolbar.vue
index 9acf607..de6a0f0 100644
--- a/ruoyi-ui/src/views/cesiumMap/DrawingToolbar.vue
+++ b/ruoyi-ui/src/views/cesiumMap/DrawingToolbar.vue
@@ -30,23 +30,47 @@ export default {
     hasEntities: {
       type: Boolean,
       default: false
+    },
+    toolMode: {
+      type: String,
+      default: 'airspace' // 'airspace' or 'ranging'
     }
   },
   data() {
     return {
-      toolbarItems: [
-        { id: 'point', name: '点', icon: 'el-icon-location' },
-        { id: 'line', name: '线', icon: 'el-icon-edit-outline' },
-        { id: 'polygon', name: '面', icon: 'el-icon-s-grid' },
-        { id: 'rectangle', name: '矩形', icon: 'el-icon-s-data' },
+      // 完整工具列表（空域模式，移除点和线）
+      allToolbarItems: [
+        { id: 'mouse', name: '鼠标', icon: 'el-icon-position' },
+        { id: 'polygon', name: '面', icon: 'el-icon-house' },
+        { id: 'rectangle', name: '矩形', icon: 'el-icon-crop' },
         { id: 'circle', name: '圆形', icon: 'el-icon-circle-plus-outline' },
+        { id: 'sector', name: '扇形', icon: 'el-icon-pie-chart' },
+        { id: 'arrow', name: '箭头', icon: 'el-icon-right' },
+        { id: 'text', name: '文本', icon: 'el-icon-document' },
+        { id: 'image', name: '图片', icon: 'el-icon-picture-outline' },
         { id: 'locate', name: '定位', icon: 'el-icon-aim' },
         { id: 'clear', name: '清除', icon: 'el-icon-delete' },
         { id: 'import', name: '导入', icon: 'el-icon-upload' },
         { id: 'export', name: '导出', icon: 'el-icon-download' }
+      ],
+      // 测距模式工具列表
+      rangingToolbarItems: [
+        { id: 'mouse', name: '鼠标', icon: 'el-icon-position' },
+        { id: 'point', name: '点', icon: 'el-icon-location' },
+        { id: 'line', name: '线', icon: 'el-icon-edit-outline' },
+        { id: 'clear', name: '清除', icon: 'el-icon-delete' }
       ]
     }
   },
+  computed: {
+    toolbarItems() {
+      if (this.toolMode === 'ranging') {
+        return this.rangingToolbarItems;
+      } else {
+        return this.allToolbarItems;
+      }
+    }
+  },
   methods: {
     handleItemClick(item) {
       if (item.id === 'clear') {
@@ -57,6 +81,8 @@ export default {
         this.$emit('import-data')
       } else if (item.id === 'locate') {
         this.$emit('locate')
+      } else if (item.id === 'mouse') {
+        this.$emit('toggle-drawing', null)
       } else {
         this.$emit('toggle-drawing', item.id)
       }
diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue
index a068ed9..47a57ae 100644
--- a/ruoyi-ui/src/views/cesiumMap/index.vue
+++ b/ruoyi-ui/src/views/cesiumMap/index.vue
@@ -6,26 +6,60 @@
       :draw-dom-click="drawDomClick"
       :drawing-mode="drawingMode"
       :has-entities="allEntities.length > 0"
+      :tool-mode="toolMode"
       @toggle-drawing="toggleDrawing"
       @clear-all="clearAll"
       @export-data="exportData"
       @import-data="importData"
       @locate="handleLocate"
     />
-
     <measurement-panel
       v-if="measurementResult"
       :result="measurementResult"
       @close="measurementResult = null"
     />
+    <hover-tooltip
+      v-if="hoverTooltip.visible"
+      :visible="hoverTooltip.visible"
+      :content="hoverTooltip.content"
+      :style="{
+        left: hoverTooltip.position.x + 'px',
+        top: hoverTooltip.position.y + 'px'
+      }"
+    />
+    <context-menu
+      v-if="contextMenu.visible"
+      :visible="contextMenu.visible"
+      :position="contextMenu.position"
+      :entity-data="contextMenu.entityData"
+      @delete="deleteEntityFromContextMenu"
+      @update-property="updateEntityProperty"
+    />
+    <!-- 地图右下角：比例尺 + 经纬度 -->
+    <div class="map-info-panel">
+      <div class="scale-bar">
+        <span class="scale-bar-text">{{ scaleBarText }}</span>
+        <div class="scale-bar-line" :style="{ width: scaleBarWidthPx + 'px' }">
+          <span class="scale-bar-tick scale-bar-tick-left"></span>
+          <span class="scale-bar-tick scale-bar-tick-right"></span>
+        </div>
+      </div>
+      <div class="coordinates-display">
+        {{ coordinatesText }}
+      </div>
+    </div>
   </div>
 </template>
-
 <script>
 import * as Cesium from 'cesium'
 import 'cesium/Build/Cesium/Widgets/widgets.css'
 import DrawingToolbar from './DrawingToolbar.vue'
 import MeasurementPanel from './MeasurementPanel.vue'
+import HoverTooltip from './HoverTooltip.vue'
+import ContextMenu from './ContextMenu.vue'
+import axios from 'axios'
+import request from '@/utils/request'
+import { getToken } from '@/utils/auth'
 export default {
   name: 'CesiumMap',
   props: {
@@ -41,6 +75,10 @@ export default {
         return isBoolean
       }
     },
+    toolMode: {
+      type: String,
+      default: 'airspace' // 'airspace' or 'ranging'
+    },
   },
   watch: {
     drawDomClick: {
@@ -56,50 +94,418 @@ export default {
   data() {
     return {
       viewer: null,
-      scaleBar: null,
-
       // 绘制相关
       drawingMode: null, // 'point', 'line', 'polygon', 'rectangle', 'circle'
       drawingHandler: null,
       tempEntity: null,      // 最终实体
       tempPreviewEntity: null, // 预览实体（新增）
       drawingPoints: [],
+      drawingPointEntities: [], // 存储线绘制时的点实体
       drawingStartPoint: null,
       isDrawing: false,
-
+      activeCursorPosition: null, // 实时鼠标位置
       // 实体管理
       allEntities: [], // 所有绘制的实体
       entityCounter: 0,
       selectedEntity: null, // 当前选中的实体
-
       // 测量结果
       measurementResult: null,
-
+      // 悬停提示
+      hoverTooltip: {
+        visible: false,
+        content: '',
+        position: { x: 0, y: 0 }
+      },
+      // 右键菜单
+      contextMenu: {
+        visible: false,
+        position: { x: 0, y: 0 },
+        entityData: null
+      },
       // 默认样式
       defaultStyles: {
         point: { color: '#FF0000', size: 12 },
         line: { color: '#00FF00', width: 3 },
         polygon: { color: '#0000FF', opacity: 0.5, width: 2 },
         rectangle: { color: '#FFA500', opacity: 0.3, width: 2 },
-        circle: { color: '#800080', opacity: 0.4, width: 2 }
-      }
+        circle: { color: '#800080', opacity: 0.4, width: 2 },
+        sector: { color: '#FF6347', opacity: 0.5, width: 2 },
+        arrow: { color: '#FF0000', width: 6 },
+        text: { color: '#000000', font: '48px Microsoft YaHei, PingFang SC, sans-serif', backgroundColor: 'rgba(255, 255, 255, 0.8)' },
+        image: { width: 150, height: 150 }
+      },
+      // 鼠标经纬度
+      coordinatesText: '经度: --, 纬度: --',
+      // 比例尺（高德风格）
+      scaleBarText: '--',
+      scaleBarWidthPx: 80
     }
   },
   components: {
     DrawingToolbar,
-    MeasurementPanel
+    MeasurementPanel,
+    HoverTooltip,
+    ContextMenu
   },
   mounted() {
     console.log(this.drawDomClick,999999)
     // this.initMap()
     this.checkCesiumLoaded()
   },
-
   beforeDestroy() {
+    // 销毁鼠标悬停事件处理器
+    if (this.hoverHandler) {
+      this.hoverHandler.destroy();
+      this.hoverHandler = null;
+    }
     this.destroyViewer()
   },
-
   methods: {
+    preventContextMenu(e) {
+      e.preventDefault();
+    },
+    clearAllWaypoints() {
+      console.log(">>> [执行深度清理] 正在清除所有航迹残留...");
+      // 清除所有带业务标记的实体（点和线）
+      const entities = this.viewer.entities.values;
+      for (let i = entities.length - 1; i >= 0; i--) {
+        const entity = entities[i];
+        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 = this.allEntities.filter(item => {
+          // 检查实体是否与航线相关
+          const isRouteRelated = item.type === 'route' || item.routeId ||
+            (item.entity && item.entity.properties &&
+             (item.entity.properties.isMissionWaypoint || item.entity.properties.isMissionRouteLine));
+
+          // 如果是航线相关实体，从地图中移除
+          if (isRouteRelated && item.entity) {
+            this.viewer.entities.remove(item.entity);
+            return false;
+          }
+
+          // 保留非航线相关实体
+          return true;
+        });
+      }
+      // 重置坐标缓存
+      if (this.drawingPoints) {
+        this.drawingPoints = [];
+      }
+
+      console.log(">>> [清理完毕] 航迹已清空，用户绘制的实体已保留。");
+    },
+    updateWaypointGraphicById(dbId, newName) {
+      const entities = this.viewer.entities.values;
+
+      // 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) {
+        // 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);
+      }
+    },
+    // 新建航线绘制
+    startMissionRouteDrawing() {
+      this.stopDrawing(); // 停止其他可能存在的绘制
+      this.drawingPoints = [];
+      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;
+        }
+      }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+      // 左键点击逻辑
+      this.drawingHandler.setInputAction((click) => {
+        const position = this.getClickPosition(click.position);
+        if (!position) return;
+        this.drawingPoints.push(position);
+        const wpIndex = 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: '12px MicroSoft YaHei',
+            pixelOffset: new Cesium.Cartesian2(0, -20),
+            fillColor: Cesium.Color.WHITE,
+            outlineColor: Cesium.Color.BLACK,
+            outlineWidth: 2,
+            style: Cesium.LabelStyle.FILL_AND_OUTLINE
+          }
+        });
+        //  第一次点击后，创建动态黑白斑马线
+        if (this.drawingPoints.length === 1) {
+          this.tempPreviewEntity = this.viewer.entities.add({
+            polyline: {
+              positions: new Cesium.CallbackProperty(() => {
+                if (this.drawingPoints.length > 0 && activeCursorPosition) {
+                  return [...this.drawingPoints, activeCursorPosition];
+                }
+                return this.drawingPoints;
+              }, false),
+              width: 4,
+              // 黑白斑马材质
+              material: new Cesium.PolylineDashMaterialProperty({
+                color: Cesium.Color.WHITE,      // 主色：白
+                gapColor: Cesium.Color.BLACK,   // 间隙色：黑
+                dashLength: 20.0                // 斑马纹长度
+              }),
+              clampToGround: true
+            }
+          });
+        }
+      }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+      // 右键点击逻辑（结束绘制、抛出数据、恢复右键）
+      this.drawingHandler.setInputAction(() => {
+        if (this.drawingPoints.length > 1) {
+          // 转换坐标并传回给 childRoom/index.vue
+          const latLngPoints = this.drawingPoints.map((p, index) => {
+            const coords = this.cartesianToLatLng(p);
+            return {
+              id: index + 1,
+              name: `WP${index + 1}`,
+              lat: coords.lat,
+              lng: coords.lng,
+              alt: 5000,
+              speed: 800
+            };
+          });
+          this.$emit('draw-complete', latLngPoints);
+        } else {
+          this.$message.info('点数不足，航线已取消');
+        }
+        // 清理并恢复环境
+        this.stopDrawing();
+        setTimeout(() => {
+          window.removeEventListener('contextmenu', this.preventContextMenu, true);
+        }, 200);
+      }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+    },
+    //正式航线渲染函数
+    renderRouteWaypoints(waypoints, routeId = 'default') {
+      if (!waypoints || waypoints.length < 1) return;
+      // 清理旧线
+      const lineId = `route-line-${routeId}`;
+      const existingLine = this.viewer.entities.getById(lineId);
+      if (existingLine) {
+        this.viewer.entities.remove(existingLine);
+      }
+      // 清理所有属于该航线的旧点
+      waypoints.forEach((wp,index) => {
+        const waypointEntityId = `wp_${routeId}_${wp.id}`;
+        const existingWaypoint = this.viewer.entities.getById(waypointEntityId);
+        if (existingWaypoint) {
+          this.viewer.entities.remove(existingWaypoint);
+        }
+        const arcId = `arc-line-${routeId}-${index}`;
+        const existingArc = this.viewer.entities.getById(arcId);
+        if (existingArc) {
+          this.viewer.entities.remove(existingArc);
+        }
+      });
+      // 遍历并绘制航点标记
+      const originalPositions = [];
+      waypoints.forEach((wp, index) => {
+        const lon = parseFloat(wp.lng);
+        const lat = parseFloat(wp.lat);
+        // 使用 Number 转换 Double 类型
+        const altValue = Number(wp.alt || 5000);
+        const pos = Cesium.Cartesian3.fromDegrees(lon, lat, altValue);
+        originalPositions.push(pos);
+        this.viewer.entities.add({
+          id: `wp_${routeId}_${wp.id}`,
+          name: wp.name || `WP${index + 1}`,
+          position: pos,
+          properties: {
+            isMissionWaypoint: true,
+            routeId: routeId,
+            dbId: wp.id,
+          },
+          point: {
+            pixelSize: 10,
+            color: Cesium.Color.WHITE,
+            outlineColor: Cesium.Color.fromCssColorString('#0078FF'),
+            outlineWidth: 3,
+            disableDepthTestDistance: Number.POSITIVE_INFINITY
+          },
+          label: {
+            text: wp.name || `WP${index + 1}`,
+            font: '12px MicroSoft YaHei',
+            pixelOffset: new Cesium.Cartesian2(0, -20),
+            fillColor: Cesium.Color.WHITE,
+            outlineColor: Cesium.Color.BLACK,
+            outlineWidth: 2,
+            style: Cesium.LabelStyle.FILL_AND_OUTLINE
+          }
+        });
+      });
+      // 绘制连线
+      if (waypoints.length > 1) {
+        let finalPathPositions = [];
+        for (let i = 0; i < waypoints.length; i++) {
+          const currPos = originalPositions[i];
+          const radius = this.getWaypointRadius(waypoints[i]);
+          // 如果不是首尾点且有半径，我们就画红色的弧线
+          if (i > 0 && i < waypoints.length - 1 && radius > 0) {
+            const prevPos = originalPositions[i - 1];
+            const nextPos = originalPositions[i + 1];
+            const arcPoints = this.computeArcPositions(prevPos, currPos, nextPos, radius);
+            // 绘制红色实线弧
+            this.viewer.entities.add({
+              id: `arc-line-${routeId}-${i}`,
+              polyline: {
+                positions: arcPoints,
+                width: 8,
+                material: Cesium.Color.RED,
+                clampToGround: true,
+                zIndex: 20
+              }
+            });
+            console.log(`>>> 航点 ${waypoints[i].name} 已渲染红色转弯弧，半径: ${radius}`);
+          }
+          if (i === 0 || i === waypoints.length - 1 || radius <= 0) {
+            finalPathPositions.push(currPos);
+          } else {
+            const prevPos = originalPositions[i - 1];
+            const nextPos = originalPositions[i + 1];
+            // 计算弧线点集
+            const arcPoints = this.computeArcPositions(prevPos, currPos, nextPos, radius);
+            finalPathPositions.push(...arcPoints);
+          }
+        }
+        // 绘制包含弧线的 Polyline
+        const routeEntity = this.viewer.entities.add({
+          id: lineId,
+          polyline: {
+            positions: finalPathPositions,
+            width: 4,
+            material: new Cesium.PolylineDashMaterialProperty({
+              color: Cesium.Color.WHITE,
+              gapColor: Cesium.Color.BLACK,
+              dashLength: 20.0
+            }),
+            clampToGround: true,
+            zIndex: 1
+          },
+          properties: {isMissionRouteLine: true, routeId: routeId}
+        });
+        if (this.allEntities) {
+          this.allEntities.push({id: lineId, entity: routeEntity, type: 'line'});
+        }
+      }
+    },
+    // 计算单个点的转弯半径
+    getWaypointRadius(wp) {
+      const speed = wp.speed || 800;
+      const bankAngle = wp.turnAngle || 0;
+      if (bankAngle <= 0) return 0;
+      const v_mps = speed / 3.6;
+      const radians = bankAngle * (Math.PI / 180);
+      const g = 9.8;
+      return (v_mps * v_mps) / (g * Math.tan(radians));
+    },
+
+    // 计算转弯处的圆弧点集
+    computeArcPositions(p1, p2, p3, radius) {
+      const v1 = Cesium.Cartesian3.subtract(p1, p2, new Cesium.Cartesian3());
+      const v2 = Cesium.Cartesian3.subtract(p3, p2, new Cesium.Cartesian3());
+      const dir1 = Cesium.Cartesian3.normalize(v1, new Cesium.Cartesian3());
+      const dir2 = Cesium.Cartesian3.normalize(v2, new Cesium.Cartesian3());
+
+      const angle = Cesium.Cartesian3.angleBetween(dir1, dir2);
+      const dist = radius / Math.tan(angle / 2);
+
+      const t1 = Cesium.Cartesian3.add(p2, Cesium.Cartesian3.multiplyByScalar(dir1, dist, new Cesium.Cartesian3()), new Cesium.Cartesian3());
+      const t2 = Cesium.Cartesian3.add(p2, Cesium.Cartesian3.multiplyByScalar(dir2, dist, new Cesium.Cartesian3()), new Cesium.Cartesian3());
+
+      let arc = [];
+      // 采样15个点让弧线丝滑
+      for (let t = 0; t <= 1; t += 0.07) {
+        const c1 = Math.pow(1 - t, 2);
+        const c2 = 2 * (1 - t) * t;
+        const c3 = Math.pow(t, 2);
+        arc.push(new Cesium.Cartesian3(
+          c1 * t1.x + c2 * p2.x + c3 * t2.x,
+          c1 * t1.y + c2 * p2.y + c3 * t2.y,
+          c1 * t1.z + c2 * p2.z + c3 * t2.z
+        ));
+      }
+      return arc;
+    },
+    removeRouteById(routeId) {
+      // 从地图上移除所有属于该 routeId 的实体
+      const entityList = this.viewer.entities.values;
+      for (let i = entityList.length - 1; i >= 0; i--) {
+        const entity = entityList[i];
+        // 获取 entity 身上绑定的 routeId 属性
+        if (entity.properties && entity.properties.routeId) {
+          // Cesium 的属性系统比较特殊，需要 getValue() 拿原始值
+          const id = entity.properties.routeId.getValue();
+          if (id === routeId) {
+            this.viewer.entities.remove(entity);
+          }
+        }
+      }
+      // 同时清理你本地维护的 allEntities 数组
+      this.allEntities = this.allEntities.filter(item => item.id !== routeId);
+    },
     checkCesiumLoaded() {
       if (typeof Cesium === 'undefined') {
         console.error('Cesium未加载，请检查CDN链接');
@@ -120,7 +526,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,
@@ -139,29 +544,160 @@ 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),
+          destination: Cesium.Cartesian3.fromDegrees(116.3974, 39.9093, 12000000),
           orientation: {
             heading: 0,
             pitch: -Cesium.Math.PI_OVER_TWO,
             roll: 0
           }
         })
-
         this.initScaleBar()
+        this.initPointMovement()
+        this.initRightClickHandler()
+        this.initHoverHandler()
+        this.initMouseCoordinates()
+        console.log('Cesium离线二维地图已加载')
         console.log('Cesium离线二维地图已加载')
+        // 1. 定义全局拾取处理器
+        this.handler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas);
+        this.handler.setInputAction((click) => {
+          // 隐藏右键菜单
+          this.contextMenu.visible = false;
+
+          if (this.isDrawing) return;
+
+          const pickedObject = this.viewer.scene.pick(click.position);
+          if (Cesium.defined(pickedObject) && pickedObject.id) {
+            const entity = pickedObject.id;
 
+            // --- 修正后的安全日志 ---
+            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;
+        }
+
+        // 隐藏之前可能显示的菜单
+        this.contextMenu.visible = false;
+
+        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) {
+            // 检查是否是线段上的点
+            for (const lineEntity of this.allEntities) {
+              if (lineEntity.type === 'line' && lineEntity.pointEntities) {
+                if (lineEntity.pointEntities.includes(pickedEntity)) {
+                  entityData = lineEntity
+                  break
+                }
+              }
+            }
+          }
+          if (entityData) {
+            // 显示上下文菜单
+            this.contextMenu = {
+              visible: true,
+              position: {
+                x: click.position.x,
+                y: click.position.y
+              },
+              entityData: entityData
+            };
+          }
+        }
+      }, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+    },
+    // 初始化鼠标悬停事件处理器
+    initHoverHandler() {
+      // 创建屏幕空间事件处理器
+      this.hoverHandler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas)
+      // 鼠标移动事件：检测是否悬停在线上
+      this.hoverHandler.setInputAction((movement) => {
+        // 如果正在绘制，不处理悬停操作
+        if (this.isDrawing) {
+          this.hoverTooltip.visible = false;
+          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) {
+            // 检查是否是线段上的点
+            for (const lineEntity of this.allEntities) {
+              if (lineEntity.type === 'line' && lineEntity.pointEntities) {
+                if (lineEntity.pointEntities.includes(pickedEntity)) {
+                  entityData = lineEntity
+                  break
+                }
+              }
+            }
+          }
+          // 如果是线实体，显示长度信息
+          if (entityData && entityData.type === 'line') {
+            const length = this.calculateLineLength(entityData.positions)
+            // 根据当前方位角类型计算方位角
+            const bearingType = entityData.bearingType || 'true';
+            const bearing = bearingType === 'magnetic'
+              ? this.calculateMagneticBearing(entityData.positions)
+              : this.calculateTrueBearing(entityData.positions);
+            // 显示小框提示
+            this.hoverTooltip = {
+              visible: true,
+              content: `长度：${length.toFixed(2)} 米\n${bearingType === 'magnetic' ? '磁方位' : '真方位'}：${bearing.toFixed(2)}°`,
+              position: {
+                x: movement.endPosition.x + 10,
+                y: movement.endPosition.y - 10
+              }
+            };
+          } else {
+            // 如果不是线实体，隐藏信息
+            this.hoverTooltip.visible = false;
+          }
+        } else {
+          // 如果没有悬停在任何实体上，隐藏信息
+          this.hoverTooltip.visible = false;
+        }
+      }, Cesium.ScreenSpaceEventType.MOUSE_MOVE)
+    },
     showErrorMessage() {
       const container = document.getElementById('cesiumViewer');
       if (container) {
@@ -199,47 +735,52 @@ 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 {
+        // 使用本地瓦片（tiles 目录，结构：z/x/y.png）替代高德在线地图
+        const origin = typeof window !== 'undefined' ? window.location.origin : ''
+        const tilesUrl = origin + '/tiles/{z}/{x}/{reverseY}.png'
+        const tilingScheme = new Cesium.WebMercatorTilingScheme()
+        const chinaRect = Cesium.Rectangle.fromDegrees(73.5, 18.0, 135.0, 53.5)
+        // 底层：全球 0–8 级（境外和中国在 0–8 级都显示）
+        const worldTiles = new Cesium.UrlTemplateImageryProvider({
+          url: tilesUrl,
+          minimumLevel: 0,
+          maximumLevel: 8,
+          tilingScheme,
+          credit: ''
+        })
+        this.viewer.imageryLayers.addImageryProvider(worldTiles)
+        // 顶层：仅中国范围 0–14 级（中国内可缩放到 14 级，境外不请求）
+        const chinaTiles = new Cesium.UrlTemplateImageryProvider({
+          url: tilesUrl,
+          minimumLevel: 0,
+          maximumLevel: 14,
+          rectangle: chinaRect,
+          tilingScheme,
+          credit: ''
+        })
+        this.viewer.imageryLayers.addImageryProvider(chinaTiles)
+      } 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) {
@@ -259,11 +800,13 @@ export default {
         }
       }
     },
-
     // ================== 绘制功能 ==================
-
     toggleDrawing(mode) {
-      if (this.drawingMode === mode) {
+      if (mode === null) {
+        // 当模式为null时，直接停止绘制
+        this.stopDrawing()
+        this.drawingMode = null
+      } else if (this.drawingMode === mode) {
         // 停止当前绘制
         this.stopDrawing()
         this.drawingMode = null
@@ -272,23 +815,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
@@ -304,34 +843,92 @@ export default {
         case 'circle':
           this.startCircleDrawing()
           break
+        case 'sector':
+          this.startSectorDrawing()
+          break
+        case 'arrow':
+          this.startArrowDrawing()
+          break
+        case 'text':
+          this.startTextDrawing()
+          break
+        case 'image':
+          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;
       }
-
+      //还原鼠标样式
+      this.viewer.scene.canvas.style.cursor = 'default';
+      // 彻底清理临时点
+      const allEntities = this.viewer.entities.values;
+      for (let i = allEntities.length - 1; i >= 0; i--) {
+        const entity = allEntities[i];
+        if (entity.id && (
+          entity.id.toString().startsWith('temp_wp_') ||
+          entity.id.toString().includes('temp-preview')
+        )) {
+          this.viewer.entities.remove(entity);
+        }
+      }
+      //清理已知的预览实体
       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.length > 0) {
+        this.drawingPointEntities.forEach(pointEntity => {
+          this.viewer.entities.remove(pointEntity);
+        });
+        this.drawingPointEntities = [];
+      }
+      // 重置状态
       this.drawingPoints = [];
       this.drawingStartPoint = null;
       this.isDrawing = false;
-
+      this.activeCursorPosition = null;
+      // 重新初始化右键处理器
+      if (!this.rightClickHandler) {
+        this.initRightClickHandler();
+      }
+      // 隐藏测量结果
+      this.measurementResult = null;
+      this.hoverTooltip.visible = false;
       this.viewer.scene.canvas.style.cursor = 'default';
+      console.log(">>> 绘制状态已彻底重置，临时实体已清理");
+    },
+    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;
+      // 隐藏小框提示
+      this.hoverTooltip.visible = false;
     },
     // ********************************************************************
     // 绘制点
@@ -339,70 +936,73 @@ 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 = [];
-      // 记录当前鼠标的实时位置
-      let activeCursorPosition = null;
-
+      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. 鼠标移动事件：仅更新坐标变量，不操作实体
+      // 1. 鼠标移动事件：更新坐标变量并实时计算线段长度
       this.drawingHandler.setInputAction((movement) => {
         const newPosition = this.getClickPosition(movement.endPosition);
         if (newPosition) {
-          activeCursorPosition = newPosition;
+          this.activeCursorPosition = newPosition;
+          // 当已经有至少一个点时，实时计算线段长度
+          if (this.drawingPoints.length > 0) {
+            // 计算从最后一个点到当前鼠标位置的线段长度
+            const tempPositions = [...this.drawingPoints, newPosition];
+            const length = this.calculateLineLength(tempPositions);
+            // 默认为真方位，因为绘制过程中还没有bearingType属性
+            const bearing = this.calculateTrueBearing(tempPositions);
+            // 更新小框提示，显示实时长度和真方位角
+            this.hoverTooltip = {
+              visible: true,
+              content: `长度：${length.toFixed(2)} 米\n真方位：${bearing.toFixed(2)}°`,
+              position: {
+                x: movement.endPosition.x + 10,
+                y: movement.endPosition.y - 10
+              }
+            };
+          } else {
+            // 如果没有点，隐藏提示
+            this.hoverTooltip.visible = false;
+          }
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
-
       // 2. 鼠标点击事件：确定点位
       this.drawingHandler.setInputAction((click) => {
         const position = this.getClickPosition(click.position);
         if (position) {
           this.drawingPoints.push(position);
-
-          // === 第一步：点击第一个点后，立即创建“动态虚线” ===
-          if (this.drawingPoints.length === 1) {
-            activeCursorPosition = position; // 初始化鼠标位置
-
-            // 创建预览虚线（只创建这一次，之后它会自动随数据更新）
-            this.tempPreviewEntity = this.viewer.entities.add({
-              polyline: {
-                // 关键：使用 CallbackProperty 动态获取位置
-                positions: new Cesium.CallbackProperty(() => {
-                  // 只有当有点且鼠标位置存在时才渲染
-                  if (this.drawingPoints.length > 0 && activeCursorPosition) {
-                    // 获取最后一个已确认的点
-                    const lastPoint = this.drawingPoints[this.drawingPoints.length - 1];
-                    // 返回 [最后一个点, 当前鼠标位置]
-                    return [lastPoint, activeCursorPosition];
-                  }
-                  return [];
-                }, false),
-                width: this.defaultStyles.line.width,
-                // 虚线材质
-                material: new Cesium.PolylineDashMaterialProperty({
-                  color: Cesium.Color.fromCssColorString(this.defaultStyles.line.color),
-                  dashLength: 16
-                }),
-                clampToGround: true // 贴地
-              }
-            });
+          // 创建点实体并添加到场景中
+          this.entityCounter++;
+          const pointId = `point_${this.entityCounter}`;
+          const pointEntity = this.viewer.entities.add({
+            id: pointId,
+            position: position,
+            point: {
+              pixelSize: this.defaultStyles.point.size,
+              color: Cesium.Color.fromCssColorString(this.defaultStyles.point.color),
+              outlineColor: Cesium.Color.WHITE,
+              outlineWidth: 2
+            }
+          });
+          this.drawingPointEntities.push(pointEntity);
+          // 移除旧的预览虚线
+          if (this.tempPreviewEntity) {
+            this.viewer.entities.remove(this.tempPreviewEntity);
+            this.tempPreviewEntity = null;
           }
-          // === 第二步：点击后续点时，绘制/延长“固定实线” ===
-          else {
-            // 移除旧的实线，重新画包含新点的实线
+          // 创建或更新实线
+          if (this.drawingPoints.length > 1) {
             if (this.tempEntity) {
               this.viewer.entities.remove(this.tempEntity);
             }
@@ -415,28 +1015,50 @@ export default {
               }
             });
           }
+          // 创建新的预览虚线（使用 CallbackProperty 实现实时更新）
+          this.tempPreviewEntity = this.viewer.entities.add({
+            polyline: {
+              positions: new Cesium.CallbackProperty(() => {
+                if (this.activeCursorPosition) {
+                  return [this.drawingPoints[this.drawingPoints.length - 1], this.activeCursorPosition];
+                }
+                return [this.drawingPoints[this.drawingPoints.length - 1]];
+              }, false),
+              width: this.defaultStyles.line.width,
+              material: new Cesium.PolylineDashMaterialProperty({
+                color: Cesium.Color.fromCssColorString(this.defaultStyles.line.color),
+                dashLength: 16
+              }),
+              clampToGround: true
+            }
+          });
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-
       // 3. 右键完成绘制
       this.drawingHandler.setInputAction(() => {
-        // 完成绘制前，移除那条动态虚线
+        // 移除临时实体
         if (this.tempPreviewEntity) {
           this.viewer.entities.remove(this.tempPreviewEntity);
           this.tempPreviewEntity = null;
         }
-
+        if (this.tempEntity) {
+          this.viewer.entities.remove(this.tempEntity);
+          this.tempEntity = null;
+        }
         if (this.drawingPoints.length > 1) {
           this.finishLineDrawing();
         } else {
+          // 取消绘制时，移除所有点实体
+          this.drawingPointEntities.forEach(pointEntity => {
+            this.viewer.entities.remove(pointEntity);
+          });
+          this.drawingPointEntities = [];
           this.cancelDrawing();
         }
-
-        // 重置局部变量
-        activeCursorPosition = null;
+        // 重置鼠标位置
+        this.activeCursorPosition = null;
       }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
     },
-
     finishLineDrawing() {
       // 将预览线段转换为最终线段
       if (this.drawingPoints.length > 1) {
@@ -445,63 +1067,62 @@ export default {
           this.viewer.entities.remove(this.tempPreviewEntity);
           this.tempPreviewEntity = null;
         }
-
         // 创建最终的实线实体
-        const entity = this.addLineEntity([...this.drawingPoints]);
-
+        const entity = this.addLineEntity([...this.drawingPoints], [...this.drawingPointEntities]);
         // 计算长度
         const length = this.calculateLineLength([...this.drawingPoints]);
-        this.measurementResult = {
-          distance: length,
-          type: 'line'
-        };
-
-        this.stopDrawing();
+        // 不显示测量面板，使用小框提示
+        // this.measurementResult = {
+        //   distance: length,
+        //   type: 'line'
+        // };
+        // 重置绘制点数组，保持绘制状态以继续绘制
+        this.drawingPoints = [];
+        this.drawingPointEntities = [];
+        this.tempEntity = null;
         return entity;
       } else {
+        // 取消绘制时，移除所有点实体
+        this.drawingPointEntities.forEach(pointEntity => {
+          this.viewer.entities.remove(pointEntity);
+        });
+        this.drawingPointEntities = [];
         this.cancelDrawing();
         return null;
       }
     },
-
     // 绘制多边形
     startPolygonDrawing() {
       this.drawingPoints = [];
-      let activeCursorPosition = null; // 存储鼠标实时位置
-
       // 1. 清理旧实体
       // 移除之前可能遗留的实体，确保干净的画布
       if (this.tempEntity) this.viewer.entities.remove(this.tempEntity);
       if (this.tempPreviewEntity) this.viewer.entities.remove(this.tempPreviewEntity);
       this.tempEntity = null;
       this.tempPreviewEntity = null;
-
       // 2. 鼠标移动事件：只负责更新坐标变量，不涉及繁重的绘图逻辑
       this.drawingHandler.setInputAction((movement) => {
         const newPosition = this.getClickPosition(movement.endPosition);
         if (newPosition) {
-          activeCursorPosition = newPosition;
+          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) {
-            activeCursorPosition = position; // 初始化鼠标位置
-
+            this.activeCursorPosition = position; // 初始化鼠标位置
             this.tempEntity = this.viewer.entities.add({
               // --- 填充面配置 ---
               polygon: {
                 // hierarchy 使用 CallbackProperty 实现动态填充
                 hierarchy: new Cesium.CallbackProperty(() => {
                   // 组合：已确定的点 + 当前鼠标位置
-                  if (activeCursorPosition) {
-                    return new Cesium.PolygonHierarchy([...this.drawingPoints, activeCursorPosition]);
+                  if (this.activeCursorPosition) {
+                    return new Cesium.PolygonHierarchy([...this.drawingPoints, this.activeCursorPosition]);
                   }
                   return new Cesium.PolygonHierarchy(this.drawingPoints);
                 }, false),
@@ -514,9 +1135,9 @@ export default {
               polyline: {
                 // positions 使用 CallbackProperty 实现动态闭合线
                 positions: new Cesium.CallbackProperty(() => {
-                  if (activeCursorPosition) {
+                  if (this.activeCursorPosition) {
                     // 闭合回路：[所有点, 鼠标位置, 回到起点]
-                    return [...this.drawingPoints, activeCursorPosition, this.drawingPoints[0]];
+                    return [...this.drawingPoints, this.activeCursorPosition, this.drawingPoints[0]];
                   }
                   return this.drawingPoints;
                 }, false),
@@ -532,7 +1153,6 @@ export default {
           }
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-
       // 4. 右键完成绘制
       this.drawingHandler.setInputAction(() => {
         if (this.drawingPoints.length >= 3) {
@@ -540,63 +1160,57 @@ export default {
         } else {
           this.cancelDrawing(); // 点数不够则取消
         }
-
         // 重置状态
-        activeCursorPosition = null;
+        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.stopDrawing()
+      // 重置绘制点数组，保持绘制状态以继续绘制
+      this.drawingPoints = []
+      if (this.tempEntity) {
+        this.viewer.entities.remove(this.tempEntity)
+        this.tempEntity = null
+      }
       return entity
     },
-
     // 绘制矩形（优化版：两点定矩形，实时预览）
     startRectangleDrawing() {
+      // 重置绘制状态
       this.drawingPoints = []; // 存储起点和终点
-      let activeCursorPosition = null; // 实时鼠标位置
-      let startPoint = null; // 记录起点
-
       // 1. 清理旧实体
       if (this.tempEntity) this.viewer.entities.remove(this.tempEntity);
       this.tempEntity = null;
-
       // 2. 鼠标移动事件：更新鼠标位置
       this.drawingHandler.setInputAction((movement) => {
         const newPosition = this.getClickPosition(movement.endPosition);
         if (newPosition) {
-          activeCursorPosition = newPosition;
+          this.activeCursorPosition = newPosition;
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
-
       // 3. 鼠标点击事件
       this.drawingHandler.setInputAction((click) => {
         const position = this.getClickPosition(click.position);
         if (position) {
           // --- 情况A：第一次点击（确定起点） ---
-          if (!startPoint) {
-            startPoint = position;
-            this.drawingPoints.push(startPoint);
-            activeCursorPosition = startPoint; // 初始化鼠标位置
-
+          if (this.drawingPoints.length === 0) {
+            this.drawingPoints.push(position);
+            this.activeCursorPosition = position; // 初始化鼠标位置
             // 创建动态预览矩形
             this.tempEntity = this.viewer.entities.add({
               rectangle: {
                 // 关键：使用 CallbackProperty 动态计算矩形范围
                 coordinates: new Cesium.CallbackProperty(() => {
-                  if (startPoint && activeCursorPosition) {
+                  if (this.drawingPoints.length > 0 && this.activeCursorPosition) {
                     // 使用 Cesium 内置工具，根据两个点（对角）自动计算矩形范围
-                    return Cesium.Rectangle.fromCartesianArray([startPoint, activeCursorPosition]);
+                    return Cesium.Rectangle.fromCartesianArray([this.drawingPoints[0], this.activeCursorPosition]);
                   }
                   return Cesium.Rectangle.fromDegrees(0, 0, 0, 0);
                 }, false),
@@ -610,217 +1224,800 @@ export default {
             });
           }
           // --- 情况B：第二次点击（确定终点） ---
-          else {
+          else if (this.drawingPoints.length === 1) {
             this.drawingPoints.push(position);
             // 停止监听鼠标移动，因为形状已确定
-            activeCursorPosition = null;
-
+            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. 创建最终显示的静态实体
+      this.entityCounter++;
+      const id = `rectangle_${this.entityCounter}`;
       const finalEntity = this.viewer.entities.add({
-        id: 'rectangle-' + new Date().getTime(), // 给个唯一ID
+        id: id,
         rectangle: {
           coordinates: rect,
-          material: Cesium.Color.fromCssColorString(this.defaultStyles.polygon.color).withAlpha(0.5),
+          material: Cesium.Color.fromCssColorString(this.defaultStyles.polygon.color).withAlpha(this.defaultStyles.polygon.opacity),
           outline: true,
-          outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.line.color),
-          outlineWidth: 2,
+          outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.polygon.color),
+          outlineWidth: this.defaultStyles.polygon.width,
           clampToGround: true
         }
       });
-
       // 4. 记录到实体列表
-      this.allEntities.push(finalEntity);
-
+      const entityData = {
+        id: id,
+        type: 'rectangle',
+        points: this.drawingPoints.map(p => this.cartesianToLatLng(p)),
+        positions: this.drawingPoints,
+        entity: finalEntity,
+        color: this.defaultStyles.polygon.color,
+        opacity: this.defaultStyles.polygon.opacity,
+        width: this.defaultStyles.polygon.width,
+        label: `矩形 ${this.entityCounter}`
+      };
+      this.allEntities.push(entityData);
       // 5. 计算并显示面积
       const area = this.calculateRectangleArea(rect);
       this.measurementResult = {
         area: area,
         type: 'rectangle'
       };
-
-      // 6. 重置状态
-      this.stopDrawing();
+      // 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;
     },
     // 绘制圆形
     startCircleDrawing() {
+      // 重置绘制状态
       this.drawingPoints = []; // 存储圆心
-      let activeCursorPosition = null; // 实时鼠标位置
-      let centerPoint = null; // 圆心坐标
-
+      this.activeCursorPosition = null;
+      // 1. 清理旧实体
+      if (this.tempEntity) {
+        try {
+          this.viewer.entities.remove(this.tempEntity);
+        } catch (e) {
+          console.warn('Failed to remove temp entity:', e);
+        }
+        this.tempEntity = null;
+      }
+      if (this.tempPreviewEntity) {
+        try {
+          this.viewer.entities.remove(this.tempPreviewEntity);
+        } catch (e) {
+          console.warn('Failed to remove temp preview entity:', e);
+        }
+        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 {
+          const newPosition = this.getClickPosition(movement.endPosition);
+          if (newPosition) {
+            this.activeCursorPosition = newPosition;
+          }
+        } catch (e) {
+          console.warn('Mouse move error:', e);
+        }
+      }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+      // 4. 鼠标点击事件
+      this.drawingHandler.setInputAction((click) => {
+        try {
+          const position = this.getClickPosition(click.position);
+          if (position) {
+            // --- 情况A：第一次点击（确定圆心） ---
+            if (this.drawingPoints.length === 0) {
+              this.drawingPoints.push(position);
+              this.activeCursorPosition = position;
+              // 创建动态预览圆形
+              if (this.tempEntity) {
+                try {
+                  this.viewer.entities.remove(this.tempEntity);
+                } catch (e) {
+                  console.warn('Failed to remove existing temp entity:', e);
+                }
+                this.tempEntity = null;
+              }
+              // 确保有有效的圆心位置
+              if (position) {
+                // 先创建一个固定半径的临时圆，避免半径为0的情况
+                const initialRadius = 100; // 初始半径设为100米
+                this.tempEntity = this.viewer.entities.add({
+                  position: position, // 直接使用确定的圆心位置
+                  ellipse: {
+                    // 关键：使用 CallbackProperty 动态计算半径（半长轴和半短轴）
+                    semiMajorAxis: new Cesium.CallbackProperty(() => {
+                      try {
+                        if (this.activeCursorPosition && this.drawingPoints.length > 0 && this.drawingPoints[0]) {
+                          const center = this.drawingPoints[0];
+                          const edge = this.activeCursorPosition;
+                          if (center && edge && typeof center.x === 'number' && typeof edge.x === 'number') {
+                            const distance = Cesium.Cartesian3.distance(center, edge);
+                            return isFinite(distance) && distance > 0 ? distance : initialRadius;
+                          }
+                        }
+                        return initialRadius;
+                      } catch (e) {
+                        return initialRadius;
+                      }
+                    }, false),
+                    semiMinorAxis: new Cesium.CallbackProperty(() => {
+                      try {
+                        if (this.activeCursorPosition && this.drawingPoints.length > 0 && this.drawingPoints[0]) {
+                          const center = this.drawingPoints[0];
+                          const edge = this.activeCursorPosition;
+                          if (center && edge && typeof center.x === 'number' && typeof edge.x === 'number') {
+                            const distance = Cesium.Cartesian3.distance(center, edge);
+                            return isFinite(distance) && distance > 0 ? distance : initialRadius;
+                          }
+                        }
+                        return initialRadius;
+                      } catch (e) {
+                        return initialRadius;
+                      }
+                    }, false),
+                    // 样式设置
+                    material: Cesium.Color.fromCssColorString(this.defaultStyles.polygon.color).withAlpha(0.5),
+                    outline: true,
+                    outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.line.color),
+                    outlineWidth: 2,
+                    // height: 0, // 如果需要贴地可开启或使用 heightReference
+                  }
+                });
+              }
+            }
+            // --- 情况B：第二次点击（确定边缘/半径） ---
+            else if (this.drawingPoints.length === 1) {
+              // 记录边缘点（虽然圆只需要圆心和半径，但记录下来方便后续处理）
+              this.drawingPoints.push(position);
+              this.activeCursorPosition = null; // 停止动态更新
+              // 传递边缘点位置去结束绘制
+              this.finishCircleDrawing(position);
+            }
+          }
+        } catch (e) {
+          console.warn('Mouse click error:', e);
+        }
+      }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+      // 5. 右键取消
+      this.drawingHandler.setInputAction(() => {
+        try {
+          this.cancelDrawing();
+        } catch (e) {
+          console.warn('Right click error:', e);
+        }
+      }, 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. 创建最终显示的静态实体
+      this.entityCounter++;
+      const id = `circle_${this.entityCounter}`;
+      const finalEntity = this.viewer.entities.add({
+        id: id,
+        position: centerPoint,
+        ellipse: {
+          semiMajorAxis: radius,
+          semiMinorAxis: radius,
+          material: Cesium.Color.fromCssColorString(this.defaultStyles.polygon.color).withAlpha(this.defaultStyles.polygon.opacity),
+          outline: true,
+          outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.polygon.color),
+          outlineWidth: this.defaultStyles.polygon.width
+        }
+      });
+      // 4. 记录实体
+      const entityData = {
+        id: id,
+        type: 'circle',
+        points: [centerPoint, edgePosition].map(p => this.cartesianToLatLng(p)),
+        positions: [centerPoint, edgePosition],
+        entity: finalEntity,
+        color: this.defaultStyles.polygon.color,
+        opacity: this.defaultStyles.polygon.opacity,
+        width: this.defaultStyles.polygon.width,
+        radius: radius,
+        label: `圆形 ${this.entityCounter}`
+      };
+      this.allEntities.push(entityData);
+      // 5. 计算面积 (π * r²) 并显示
+      // 半径单位是米，面积单位是平方米
+      const area = Math.PI * Math.pow(radius, 2);
+      this.measurementResult = {
+        radius: radius, // 也可以额外显示半径
+        area: area,
+        type: 'circle'
+      };
+      // 6. 重置状态，保持绘制状态以继续绘制
+      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);
         if (newPosition) {
-          activeCursorPosition = newPosition;
+          this.activeCursorPosition = newPosition;
         }
       }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
-
       // 3. 鼠标点击事件
       this.drawingHandler.setInputAction((click) => {
         const position = this.getClickPosition(click.position);
         if (position) {
           // --- 情况A：第一次点击（确定圆心） ---
-          if (!centerPoint) {
-            centerPoint = position;
-            this.drawingPoints.push(centerPoint);
-            activeCursorPosition = centerPoint;
-
-            // 创建动态预览圆形
-            this.tempEntity = this.viewer.entities.add({
-              position: centerPoint, // 圆心固定
-              ellipse: {
-                // 关键：使用 CallbackProperty 动态计算半径（半长轴和半短轴）
-                semiMajorAxis: new Cesium.CallbackProperty(() => {
-                  if (centerPoint && activeCursorPosition) {
-                    const distance = Cesium.Cartesian3.distance(centerPoint, activeCursorPosition);
-                    return Math.max(distance, 1); // 最小半径为1米，避免0值错误
+          if (this.drawingPoints.length === 0) {
+            this.drawingPoints.push(position);
+            this.activeCursorPosition = position;
+            // 创建动态预览半径线
+            this.tempPreviewEntity = this.viewer.entities.add({
+              polyline: {
+                positions: new Cesium.CallbackProperty(() => {
+                  if (this.drawingPoints.length > 0 && this.activeCursorPosition) {
+                    return [this.drawingPoints[0], this.activeCursorPosition];
                   }
-                  return 1;
+                  return [];
                 }, false),
-                semiMinorAxis: new Cesium.CallbackProperty(() => {
-                  if (centerPoint && activeCursorPosition) {
-                    const distance = Cesium.Cartesian3.distance(centerPoint, activeCursorPosition);
-                    return Math.max(distance, 1); // 最小半径为1米，避免0值错误
+                width: this.defaultStyles.sector.width,
+                material: new Cesium.PolylineDashMaterialProperty({
+                  color: Cesium.Color.fromCssColorString(this.defaultStyles.sector.color),
+                  dashLength: 16
+                }),
+                clampToGround: true
+              }
+            });
+          }
+          // --- 情况B：第二次点击（确定半径） ---
+          else if (this.drawingPoints.length === 1) {
+            this.drawingPoints.push(position);
+            this.activeCursorPosition = position; // 更新 activeCursorPosition 为实际点击位置
+            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: {
+                hierarchy: new Cesium.CallbackProperty(() => {
+                  if (this.drawingPoints.length > 1 && this.activeCursorPosition) {
+                    const centerPoint = this.drawingPoints[0];
+                    const radiusPoint = this.drawingPoints[1];
+                    if (!isFinite(fixedRadius) || fixedRadius === 0) {
+                      return new Cesium.PolygonHierarchy([]);
+                    }
+                    const startAngle = this.calculatePointAngle(centerPoint, radiusPoint);
+                    const endAngle = this.calculatePointAngle(centerPoint, this.activeCursorPosition);
+                    const positions = this.generateSectorPositions(centerPoint, fixedRadius, startAngle, endAngle);
+                    return new Cesium.PolygonHierarchy(positions);
                   }
-                  return 1;
+                  return new Cesium.PolygonHierarchy([]);
                 }, false),
-                // 样式设置
-                material: Cesium.Color.fromCssColorString(this.defaultStyles.polygon.color).withAlpha(0.5),
+                material: Cesium.Color.fromCssColorString(this.defaultStyles.sector.color).withAlpha(0.5),
                 outline: true,
-                outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.line.color),
-                outlineWidth: 2,
-                // height: 0, // 如果需要贴地可开启或使用 heightReference
+                outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.sector.color),
+                outlineWidth: this.defaultStyles.sector.width
               }
             });
           }
-          // --- 情况B：第二次点击（确定边缘/半径） ---
-          else {
-            // 记录边缘点（虽然圆只需要圆心和半径，但记录下来方便后续处理）
+          // --- 情况C：第三次点击（确定角度） ---
+          else if (this.drawingPoints.length === 2) {
             this.drawingPoints.push(position);
-            activeCursorPosition = null; // 停止动态更新
-
-            // 传递边缘点位置去结束绘制
-            this.finishCircleDrawing(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);
     },
-
-    finishCircleDrawing(edgePosition) {
-      const centerPoint = this.drawingPoints[0];
-
-      // 1. 计算最终半径
-      let radius = Cesium.Cartesian3.distance(centerPoint, edgePosition);
-      radius = Math.max(radius, 1); // 最小半径为1米，避免0值错误
-
-      // 2. 移除动态预览实体
+    // 完成扇形绘制
+    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;
       }
-
-      // 3. 创建最终显示的静态实体
-      const finalEntity = this.viewer.entities.add({
-        id: 'circle-' + new Date().getTime(),
-        position: centerPoint,
-        ellipse: {
-          semiMajorAxis: radius,
-          semiMinorAxis: radius,
-          material: Cesium.Color.fromCssColorString(this.defaultStyles.polygon.color).withAlpha(0.5),
-          outline: true,
-          outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.line.color),
-          outlineWidth: 2
+      // 2. 生成扇形顶点
+      const positions = this.generateSectorPositions(centerPoint, radius, startAngle, endAngle);
+      // 3. 创建最终显示的静态实体
+      const finalEntity = this.viewer.entities.add({
+        id: 'sector-' + new Date().getTime(),
+        name: `扇形 ${this.entityCounter}`,
+        polygon: {
+          hierarchy: new Cesium.PolygonHierarchy(positions),
+          material: Cesium.Color.fromCssColorString(this.defaultStyles.sector.color).withAlpha(0.5),
+          outline: true,
+          outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.sector.color),
+          outlineWidth: this.defaultStyles.sector.width,
+          perPositionHeight: false
+        }
+      });
+      // 4. 记录实体
+      this.entityCounter++;
+      const entityData = {
+        id: `sector_${this.entityCounter}`,
+        type: 'sector',
+        center: this.cartesianToLatLng(centerPoint),
+        radius: radius,
+        startAngle: startAngle,
+        endAngle: endAngle,
+        positions: positions,
+        entity: finalEntity,
+        color: this.defaultStyles.sector.color,
+        opacity: 0.5,
+        width: this.defaultStyles.sector.width,
+        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);
+        if (newPosition) {
+          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: {
+                // 使用 CallbackProperty 动态获取位置
+                positions: new Cesium.CallbackProperty(() => {
+                  // 只有当有点且鼠标位置存在时才渲染
+                  if (this.drawingPoints.length > 0 && this.activeCursorPosition) {
+                    // 获取最后一个已确认的点
+                    const lastPoint = this.drawingPoints[this.drawingPoints.length - 1];
+                    // 返回 [最后一个点, 当前鼠标位置]
+                    return [lastPoint, this.activeCursorPosition];
+                  }
+                  return [];
+                }, false),
+                width: 8, // 增加宽度以获得更大的箭头头部
+                // 使用箭头材质
+                material: new Cesium.PolylineArrowMaterialProperty(
+                  Cesium.Color.fromCssColorString(this.defaultStyles.arrow.color)
+                ),
+                clampToGround: true, // 贴地
+                widthInMeters: false // 使用像素宽度模式
+              }
+            });
+          }
+          // --- 情况B：第二次点击（确定终点） ---
+          else {
+            // 停止监听鼠标移动，因为形状已确定
+            this.activeCursorPosition = null;
+            // 调用完成逻辑
+            this.finishArrowDrawing();
+          }
+        }
+      }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+      // 4. 右键取消
+      this.drawingHandler.setInputAction(() => {
+        this.cancelDrawing();
+      }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+    },
+    // 完成箭头绘制
+    finishArrowDrawing() {
+      // 将预览箭头转换为最终箭头
+      if (this.drawingPoints.length > 1) {
+        // 移除预览箭头
+        if (this.tempPreviewEntity) {
+          this.viewer.entities.remove(this.tempPreviewEntity);
+          this.tempPreviewEntity = null;
+        }
+        // 创建最终的箭头实体
+        const entity = this.addArrowEntity([...this.drawingPoints]);
+        // 重置绘制点数组，保持绘制状态以继续绘制
+        this.drawingPoints = [];
+        return entity;
+      } else {
+        this.cancelDrawing();
+        return null;
+      }
+    },
+    // 添加箭头实体
+    addArrowEntity(positions) {
+      this.entityCounter++
+      const id = `arrow_${this.entityCounter}`
+      // 创建箭头实体，使用固定宽度以确保等比例放大
+      const entity = this.viewer.entities.add({
+        id: id,
+        name: `箭头 ${this.entityCounter}`,
+        polyline: {
+          positions: positions,
+          width: 8, // 增加宽度以获得更大的箭头头部
+          material: new Cesium.PolylineArrowMaterialProperty(
+            Cesium.Color.fromCssColorString(this.defaultStyles.arrow.color)
+          ),
+          clampToGround: true,
+          // 使用像素宽度模式，确保箭头在缩放时保持比例
+          widthInMeters: false
+        }
+      })
+      const entityData = {
+        id,
+        type: 'arrow',
+        points: positions.map(p => this.cartesianToLatLng(p)),
+        positions: positions,
+        entity: entity,
+        color: this.defaultStyles.arrow.color,
+        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);
+        if (position) {
+          // 弹出输入框，让用户输入文本内容
+          const text = prompt('请输入文本内容:', '文本');
+          if (text) {
+            // 创建文本实体
+            this.addTextEntity(position, text);
+          }
+        }
+      }, 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 entity = this.viewer.entities.add({
+        id: id,
+        name: `文本 ${this.entityCounter}`,
+        position: position,
+        label: {
+          text: text,
+          font: this.defaultStyles.text.font,
+          fillColor: Cesium.Color.fromCssColorString(this.defaultStyles.text.color),
+          outlineColor: Cesium.Color.BLACK,
+          outlineWidth: 2,
+          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),
+          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    // 远距离时的透明度
+          )
+        }
+      })
+      const entityData = {
+        id,
+        type: 'text',
+        lat,
+        lng,
+        text: text,
+        position: position,
+        entity: entity,
+        color: this.defaultStyles.text.color,
+        font: this.defaultStyles.text.font,
+        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);
+        if (position) {
+          // 创建一个隐藏的文件输入元素
+          const fileInput = document.createElement('input');
+          fileInput.type = 'file';
+          fileInput.accept = 'image/*';
+          // 监听文件选择事件
+          fileInput.onchange = (e) => {
+            const file = e.target.files[0];
+            if (file) {
+              // 创建 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 = {
+          headers: {
+            '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;
+              // 创建图片实体
+              this.addImageEntity(position, imageUrl);
+            } else {
+              this.$modal.msgError('图片上传失败：' + (response.msg || '未知错误'));
+            }
+          })
+          .catch((error) => {
+            this.$modal.closeLoading();
+            if (error.response) {
+              // 服务器返回错误
+              if (error.response.data && error.response.data.msg) {
+                this.$modal.msgError('图片上传失败：' + error.response.data.msg);
+              } else {
+                this.$modal.msgError('图片上传失败：服务器返回错误 ' + error.response.status);
+              }
+            } else if (error.request) {
+              // 请求发送但没有收到响应
+              this.$modal.msgError('图片上传失败：无法连接到服务器，请检查网络');
+            } else {
+              // 请求配置错误
+              this.$modal.msgError('图片上传失败：' + error.message);
+            }
+          });
+      } catch (error) {
+        this.$modal.closeLoading();
+        this.$modal.msgError('图片上传失败：' + error.message);
+      }
+    },
+    // 添加图片实体
+    addImageEntity(position, imageUrl) {
+      this.entityCounter++
+      const id = `image_${this.entityCounter}`
+      // 获取经纬度坐标
+      const {lat, lng} = this.cartesianToLatLng(position)
+      const entity = this.viewer.entities.add({
+        id: id,
+        name: `图片 ${this.entityCounter}`,
+        position: position,
+        billboard: {
+          image: imageUrl,
+          width: this.defaultStyles.image.width,
+          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    // 远距离时的透明度
+          )
         }
-      });
-
-      // 4. 记录实体
-      this.allEntities.push(finalEntity);
-
-      // 5. 计算面积 (π * r²) 并显示
-      // 半径单位是米，面积单位是平方米
-      const area = Math.PI * Math.pow(radius, 2);
-
-      this.measurementResult = {
-        radius: radius, // 也可以额外显示半径
-        area: area,
-        type: 'circle'
-      };
-
-      // 6. 结束绘制状态
-      this.stopDrawing();
+      })
+      const entityData = {
+        id,
+        type: 'image',
+        lat,
+        lng,
+        imageUrl: imageUrl,
+        position: position,
+        entity: entity,
+        width: this.defaultStyles.image.width,
+        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}`,
@@ -842,7 +2039,6 @@ export default {
           horizontalOrigin: Cesium.HorizontalOrigin.CENTER
         }
       })
-
       const entityData = {
         id,
         type: 'point',
@@ -853,22 +2049,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) {
+    addLineEntity(positions, pointEntities = []) {
       this.entityCounter++
       const id = `line_${this.entityCounter}`
-
       const entity = this.viewer.entities.add({
         id: id,
         name: `线 ${this.entityCounter}`,
@@ -879,35 +2070,30 @@ export default {
           clampToGround: true
         }
       })
-
       const entityData = {
         id,
         type: 'line',
         points: positions.map(p => this.cartesianToLatLng(p)),
         positions: positions,
         entity: entity,
+        pointEntities: pointEntities, // 存储点实体
         color: this.defaultStyles.line.color,
         width: this.defaultStyles.line.width,
-        label: `线 ${this.entityCounter}`
+        label: `线 ${this.entityCounter}`,
+        bearingType: 'true' // 默认真方位
       }
-
       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}`,
@@ -920,7 +2106,6 @@ export default {
           outlineWidth: this.defaultStyles.polygon.width
         }
       })
-
       const entityData = {
         id,
         type: 'polygon',
@@ -932,51 +2117,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, // 半短轴 = 半径
@@ -988,20 +2163,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 {
@@ -1009,11 +2179,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),
@@ -1021,67 +2189,131 @@ 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 (!positions || positions.length < 2) {
+        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
     },
+    calculateTrueBearing(positions) {
+      if (!positions || positions.length < 2) {
+        return 0;
+      }
+      // 获取最后一段线段的两个端点
+      const startPos = positions[positions.length - 2];
+      const endPos = positions[positions.length - 1];
+
+      // 将笛卡尔坐标转换为地理坐标
+      const startCartographic = Cesium.Cartographic.fromCartesian(startPos);
+      const endCartographic = Cesium.Cartographic.fromCartesian(endPos);
+
+      // 转换为弧度
+      const startLat = startCartographic.latitude;
+      const startLng = startCartographic.longitude;
+      const endLat = endCartographic.latitude;
+      const endLng = endCartographic.longitude;
+
+      // 计算真方位角
+      const dLng = endLng - startLng;
+      const y = Math.sin(dLng) * Math.cos(endLat);
+      const x = Math.cos(startLat) * Math.sin(endLat) - Math.sin(startLat) * Math.cos(endLat) * Math.cos(dLng);
+      let bearing = Math.atan2(y, x);
+
+      // 转换为角度并调整到0-360范围
+      bearing = Cesium.Math.toDegrees(bearing);
+      return (bearing + 360) % 360;
+    },
+    // 计算磁偏角（简化模型）
+    calculateMagneticDeclination(lat, lng) {
+      // 注意：这是一个简化的磁偏角计算模型
+      // 实际应用中，应该使用更精确的模型，如 WMM (World Magnetic Model)
+
+      // 转换为角度
+      const latDeg = Cesium.Math.toDegrees(lat);
+      const lngDeg = Cesium.Math.toDegrees(lng);
+
+      // 简化的磁偏角计算（仅适用于中国地区）
+      // 实际值会随时间变化，此处为近似值
+      let declination;
+
+      if (lngDeg >= 73 && lngDeg <= 135 && latDeg >= 18 && latDeg <= 53) {
+        // 中国地区简化磁偏角模型
+        // 基于2020年数据，每年约变化0.1度
+        const year = new Date().getFullYear();
+        const yearOffset = (year - 2020) * 0.1;
+
+        if (lngDeg < 100) {
+          // 西部地区
+          declination = 2.0 - yearOffset;
+        } else if (lngDeg < 115) {
+          // 中部地区
+          declination = 1.0 - yearOffset;
+        } else {
+          // 东部地区
+          declination = 0.5 - yearOffset;
+        }
+      } else {
+        // 其他地区默认磁偏角为0
+        declination = 0;
+      }
+
+      return declination;
+    },
+    // 计算磁方位角
+    calculateMagneticBearing(positions) {
+      if (!positions || positions.length < 2) {
+        return 0;
+      }
 
+      // 计算真方位角
+      const trueBearing = this.calculateTrueBearing(positions);
+
+      // 获取线段起点的地理坐标
+      const startPos = positions[positions.length - 2];
+      const startCartographic = Cesium.Cartographic.fromCartesian(startPos);
+      const startLat = startCartographic.latitude;
+      const startLng = startCartographic.longitude;
+
+      // 计算磁偏角
+      const declination = this.calculateMagneticDeclination(startLat, startLng);
+
+      // 计算磁方位角（真方位角加上磁偏角）
+      let magneticBearing = trueBearing + declination;
+
+      // 调整到0-360范围
+      return (magneticBearing + 360) % 360;
+    },
     calculatePolygonArea(positions) {
       if (positions.length < 3) return 0
-
       let area = 0
       const n = positions.length
-
       for (let i = 0; i < n; i++) {
         const j = (i + 1) % n
         const p1 = Cesium.Cartographic.fromCartesian(positions[i])
         const p2 = Cesium.Cartographic.fromCartesian(positions[j])
-
         area += p1.longitude * p2.latitude - p2.longitude * p1.latitude
       }
-
       area = Math.abs(area) * 6378137 * 6378137 / 2
       return area
     },
-
-    calculateRectangleArea(coordinates) {
-      const rect = coordinates.getValue ? coordinates.getValue() : coordinates
-      const width = Cesium.Cartesian3.distance(
-        Cesium.Cartesian3.fromRadians(rect.west, rect.north),
-        Cesium.Cartesian3.fromRadians(rect.east, rect.north)
-      )
-      const height = Cesium.Cartesian3.distance(
-        Cesium.Cartesian3.fromRadians(rect.west, rect.north),
-        Cesium.Cartesian3.fromRadians(rect.west, rect.south)
-      )
-
-      return width * height
-    },
-
     // ================== 实体管理 ==================
-
     selectEntity(entity) {
       this.selectedEntity = entity
-
       // 居中显示
       if (entity.type === 'point') {
         this.viewer.camera.flyTo({
@@ -1098,135 +2330,195 @@ export default {
         })
       }
     },
-
-    updateEntityStyle() {
-      if (!this.selectedEntity || !this.selectedEntity.entity) return
-
-      const entity = this.selectedEntity.entity
-      const data = this.selectedEntity
-
-      switch(data.type) {
+    updateEntityStyle(entityData = null) {
+      const data = entityData || this.selectedEntity
+      if (!data || !data.entity) return
+      const entity = data.entity
+      switch (data.type) {
         case 'point':
-          entity.point.color = Cesium.Color.fromCssColorString(data.color)
-          entity.point.pixelSize = data.size
+          if (entity.point) {
+            entity.point.color = Cesium.Color.fromCssColorString(data.color)
+            entity.point.pixelSize = data.size
+          }
           break
         case 'line':
-          entity.polyline.material = Cesium.Color.fromCssColorString(data.color)
-          entity.polyline.width = data.width
+          if (entity.polyline) {
+            entity.polyline.material = Cesium.Color.fromCssColorString(data.color)
+            entity.polyline.width = data.width
+          }
           break
         case 'polygon':
-          entity.polygon.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
-          entity.polygon.outlineColor = Cesium.Color.fromCssColorString(data.color)
-          entity.polygon.outlineWidth = data.width
+          if (entity.polygon) {
+            entity.polygon.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
+            entity.polygon.outlineColor = Cesium.Color.fromCssColorString(data.color)
+            entity.polygon.outlineWidth = data.width
+          }
           break
         case 'rectangle':
-          entity.rectangle.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
-          entity.rectangle.outlineColor = Cesium.Color.fromCssColorString(data.color)
-          entity.rectangle.outlineWidth = data.width
+          if (entity.rectangle) {
+            entity.rectangle.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
+            entity.rectangle.outlineColor = Cesium.Color.fromCssColorString(data.color)
+            entity.rectangle.outlineWidth = data.width
+          }
           break
         case 'circle':
-          entity.polygon.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
-          entity.polygon.outlineColor = Cesium.Color.fromCssColorString(data.color)
-          entity.polygon.outlineWidth = data.width
+          if (entity.ellipse) {
+            entity.ellipse.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
+            entity.ellipse.outlineColor = Cesium.Color.fromCssColorString(data.color)
+            entity.ellipse.outlineWidth = data.width
+          }
+          break
+        case 'sector':
+          if (entity.polygon) {
+            entity.polygon.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
+            entity.polygon.outlineColor = Cesium.Color.fromCssColorString(data.color)
+            entity.polygon.outlineWidth = data.width
+          }
+          break
+        case 'arrow':
+          if (entity.polyline) {
+            entity.polyline.material = new Cesium.PolylineArrowMaterialProperty(Cesium.Color.fromCssColorString(data.color))
+            entity.polyline.width = data.width
+          }
+          break
+        case 'text':
+          if (entity.label) {
+            entity.label.fillColor = Cesium.Color.fromCssColorString(data.color)
+            entity.label.font = data.font
+          }
           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
       }
     },
-
+    // 从右键菜单删除实体
+    deleteEntityFromContextMenu() {
+      if (this.contextMenu.entityData) {
+        const entityData = this.contextMenu.entityData
+        if (entityData.id) {
+          this.removeEntity(entityData.id)
+        } else if (entityData.entity && entityData.entity.id) {
+          this.removeEntity(entityData.entity.id)
+        }
+        // 隐藏右键菜单
+        this.contextMenu.visible = false
+      }
+    },
+    // 更新实体属性
+    updateEntityProperty(property, value) {
+      if (this.contextMenu.entityData) {
+        const entityData = this.contextMenu.entityData
+        // 更新实体数据
+        entityData[property] = value
+        // 更新实体样式
+        this.updateEntityStyle(entityData)
+        // 隐藏右键菜单
+        this.contextMenu.visible = false
+      }
+    },
     removeEntity(id) {
-      const index = this.allEntities.findIndex(e => e.id === id)
+      // 查找对应的实体数据
+      const index = this.allEntities.findIndex(e =>
+        e.id === id ||
+        (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.entity) {
+        if (entity instanceof Cesium.Entity) {
+          // 情况 A: 直接是 Cesium Entity 对象
+          this.viewer.entities.remove(entity)
+        } else if (entity.entity) {
+          // 情况 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) {
+        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);
-        }
-      } 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: '点',
         line: '线',
         polygon: '面',
         rectangle: '矩形',
-        circle: '圆形'
+        circle: '圆形',
+        sector: '扇形',
+        arrow: '箭头',
+        text: '文本',
+        image: '图片'
       }
       return names[type] || type
     },
-
     exportData() {
       const data = {
         version: '1.0',
@@ -1249,18 +2541,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'
@@ -1268,7 +2557,6 @@ export default {
       input.onchange = (e) => {
         const file = e.target.files[0]
         if (!file) return
-
         const reader = new FileReader()
         reader.onload = (event) => {
           try {
@@ -1291,11 +2579,9 @@ export default {
       }
       input.click()
     },
-
     importEntity(entityData) {
       let entity
       const color = entityData.color || '#008aff'
-
       switch (entityData.type) {
         case 'point':
           entity = this.viewer.entities.add({
@@ -1318,7 +2604,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({
@@ -1339,7 +2624,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({
@@ -1361,7 +2645,6 @@ export default {
             }
           })
           break
-
         case 'rectangle':
           const rectCoords = entityData.data.coordinates
           entity = this.viewer.entities.add({
@@ -1383,15 +2666,13 @@ export default {
             }
           })
           break
-
         case 'circle':
           // 检查半径是否有效
-          let radius = entityData.data.radius || 1000
+          const radius = entityData.data.radius || 1000
           if (radius <= 0) {
             this.$message.error('圆形半径必须大于0')
             return
           }
-          radius = Math.max(radius, 1); // 最小半径为1米，避免0值错误
           entity = this.viewer.entities.add({
             position: Cesium.Cartesian3.fromDegrees(entityData.data.center.lng, entityData.data.center.lat),
             ellipse: {
@@ -1415,7 +2696,6 @@ export default {
           })
           break
       }
-
       if (entity) {
         this.allEntities.push({
           id: entity.id,
@@ -1426,14 +2706,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',
@@ -1446,7 +2725,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',
@@ -1468,7 +2747,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
@@ -1477,7 +2755,6 @@ export default {
               this.$message.error('经纬度超出有效范围！')
               return
             }
-
             if (this.viewer) {
               this.viewer.camera.flyTo({
                 destination: Cesium.Cartesian3.fromDegrees(lng, lat, 5000),
@@ -1500,19 +2777,241 @@ export default {
         this.$message.info('已取消定位')
       })
     },
-
     initScaleBar() {
-      // ... 原有的比例尺代码保持不变
+      const that = this
+      const update = () => {
+        that.updateScaleBar()
+      }
+      update()
+      this.viewer.camera.changed.addEventListener(update)
+      this.viewer.camera.moveEnd.addEventListener(update)
+      this.scaleBarCleanup = () => {
+        that.viewer.camera.changed.removeEventListener(update)
+        that.viewer.camera.moveEnd.removeEventListener(update)
+      }
+    },
+    /** 根据当前视口计算比例尺（兼容 2D/WebMercator，多位置尝试 pick + 视口宽度备用） */
+    getScaleBarInfo() {
+      if (!this.viewer || !this.viewer.scene.canvas) return null
+      const canvas = this.viewer.scene.canvas
+      const w = canvas.clientWidth
+      const h = canvas.clientHeight
+      if (w <= 0 || h <= 0) return null
+      const ellipsoid = this.viewer.scene.globe.ellipsoid
+      const camera = this.viewer.camera
+      const barPx = 80
+      const centerX = w / 2
+      // 多组参考点尝试（2D 下 pickEllipsoid 可能只在部分区域有效）
+      const tryPoints = [
+        [centerX - barPx / 2, h - 50],
+        [centerX + barPx / 2, h - 50]
+      ].concat([
+        [centerX - barPx / 2, h / 2],
+        [centerX + barPx / 2, h / 2]
+      ])
+      let leftCartesian = null
+      let rightCartesian = null
+      leftCartesian = camera.pickEllipsoid(new Cesium.Cartesian2(tryPoints[0][0], tryPoints[0][1]), ellipsoid)
+      rightCartesian = camera.pickEllipsoid(new Cesium.Cartesian2(tryPoints[1][0], tryPoints[1][1]), ellipsoid)
+      if (!leftCartesian || !rightCartesian) {
+        leftCartesian = camera.pickEllipsoid(new Cesium.Cartesian2(tryPoints[2][0], tryPoints[2][1]), ellipsoid)
+        rightCartesian = camera.pickEllipsoid(new Cesium.Cartesian2(tryPoints[3][0], tryPoints[3][1]), ellipsoid)
+      }
+      if (leftCartesian && rightCartesian) {
+        const rawMeters = Cesium.Cartesian3.distance(leftCartesian, rightCartesian)
+        if (rawMeters > 0) {
+          const niceMeters = this.niceScaleValue(rawMeters)
+          const widthPx = Math.round((niceMeters / rawMeters) * barPx)
+          const text = niceMeters >= 1000 ? `${(niceMeters / 1000).toFixed(0)} 公里` : `${Math.round(niceMeters)} 米`
+          return { text, widthPx, niceMeters }
+        }
+      }
+      // 2D/WebMercator 备用：用整屏宽度对应的地理范围计算（四角 pick 得到视口矩形）
+      const leftBottom = camera.pickEllipsoid(new Cesium.Cartesian2(0, h - 20), ellipsoid)
+      const rightBottom = camera.pickEllipsoid(new Cesium.Cartesian2(w, h - 20), ellipsoid)
+      if (leftBottom && rightBottom) {
+        const widthMeters = Cesium.Cartesian3.distance(leftBottom, rightBottom)
+        if (widthMeters > 0) {
+          const metersPerPx = widthMeters / w
+          const rawMeters = metersPerPx * barPx
+          const niceMeters = this.niceScaleValue(rawMeters)
+          const widthPx = Math.round(niceMeters / metersPerPx)
+          const text = niceMeters >= 1000 ? `${(niceMeters / 1000).toFixed(0)} 公里` : `${Math.round(niceMeters)} 米`
+          return { text, widthPx: Math.min(120, Math.max(40, widthPx)), niceMeters }
+        }
+      }
+      // 最后备用：从 2D 相机视锥估算（正交宽度 -> 米）
+      if (this.viewer.scene.mode === Cesium.SceneMode.SCENE2D && camera.frustum && camera.frustum.right !== undefined) {
+        const frustumWidth = camera.frustum.right - camera.frustum.left
+        if (frustumWidth > 0) {
+          const metersPerPx = frustumWidth / w
+          const rawMeters = metersPerPx * barPx
+          const niceMeters = this.niceScaleValue(rawMeters)
+          const widthPx = Math.round(niceMeters / metersPerPx)
+          const text = niceMeters >= 1000 ? `${(niceMeters / 1000).toFixed(0)} 公里` : `${Math.round(niceMeters)} 米`
+          return { text, widthPx: Math.min(120, Math.max(40, widthPx)), niceMeters }
+        }
+      }
+      return null
+    },
+    /** 将实际距离圆整为易读的刻度值（米） */
+    niceScaleValue(meters) {
+      const candidates = [10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000]
+      let best = candidates[0]
+      for (let i = 0; i < candidates.length; i++) {
+        if (candidates[i] <= meters * 1.5) best = candidates[i]
+      }
+      return best
     },
-
     updateScaleBar() {
-      // ... 原有的比例尺更新代码保持不变
+      const info = this.getScaleBarInfo()
+      if (info) {
+        this.scaleBarText = info.text
+        this.scaleBarWidthPx = Math.min(120, Math.max(40, info.widthPx))
+      } else {
+        this.scaleBarText = '--'
+        this.scaleBarWidthPx = 80
+      }
+      this.$nextTick()
+    },
+    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) {
+            // 查找包含该点的线实体
+            for (const lineEntity of this.allEntities) {
+              if (lineEntity.type === 'line' && lineEntity.pointEntities) {
+                const index = lineEntity.pointEntities.indexOf(pickedEntity)
+                if (index !== -1) {
+                  selectedPoint = pickedEntity
+                  selectedLineEntity = lineEntity
+                  pointIndex = index
+                  isMoving = true
+                  // 禁用相机控制器，使地图固定
+                  originalCameraController = this.viewer.scene.screenSpaceCameraController.enableInputs
+                  this.viewer.scene.screenSpaceCameraController.enableInputs = false
+                  break
+                }
+              }
+            }
+          }
+        }
+      }, Cesium.ScreenSpaceEventType.LEFT_DOWN)
+      // 鼠标移动事件：移动点
+      this.pointMovementHandler.setInputAction((movement) => {
+        if (isMoving && selectedPoint && selectedLineEntity) {
+          const newPosition = this.getClickPosition(movement.endPosition)
+          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 => {
+              if (e.id && e.id === selectedLineEntity.id) {
+                entitiesToRemove.push(e)
+              }
+            })
+            entitiesToRemove.forEach(e => {
+              this.viewer.entities.remove(e)
+            })
+            // 创建新的线段实体
+            const newEntity = this.viewer.entities.add({
+              id: selectedLineEntity.id,
+              name: selectedLineEntity.label,
+              polyline: {
+                positions: newPositions,
+                width: selectedLineEntity.width,
+                material: Cesium.Color.fromCssColorString(selectedLineEntity.color),
+                clampToGround: true
+              }
+            })
+            // 更新线实体的引用和位置数组
+            selectedLineEntity.entity = newEntity
+            selectedLineEntity.positions = newPositions
+            // 更新点数据
+            selectedLineEntity.points[pointIndex] = this.cartesianToLatLng(newPosition)
+            // 重新计算距离
+            const length = this.calculateLineLength(selectedLineEntity.positions)
+
+            // 强制刷新地图渲染
+            this.viewer.scene.requestRender()
+          }
+        }
+      }, Cesium.ScreenSpaceEventType.MOUSE_MOVE)
+
+      // 鼠标释放事件：结束移动
+      this.pointMovementHandler.setInputAction(() => {
+        // 恢复相机控制器
+        if (originalCameraController !== null) {
+          this.viewer.scene.screenSpaceCameraController.enableInputs = originalCameraController
+          originalCameraController = null
+        }
+
+
+        isMoving = false
+        selectedPoint = null
+        selectedLineEntity = null
+        pointIndex = -1
+      }, Cesium.ScreenSpaceEventType.LEFT_UP)
     },
 
+    // 初始化鼠标经纬度显示
+    initMouseCoordinates() {
+      // 创建屏幕空间事件处理器
+      this.mouseCoordinatesHandler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas)
+      // 鼠标移动事件：更新经纬度
+      this.mouseCoordinatesHandler.setInputAction((movement) => {
+        const cartesian = this.viewer.camera.pickEllipsoid(movement.endPosition, this.viewer.scene.globe.ellipsoid)
+        if (cartesian) {
+          const cartographic = Cesium.Cartographic.fromCartesian(cartesian)
+          const longitude = Cesium.Math.toDegrees(cartographic.longitude)
+          const latitude = Cesium.Math.toDegrees(cartographic.latitude)
+          this.coordinatesText = `经度: ${longitude.toFixed(6)}, 纬度: ${latitude.toFixed(6)}`
+        } else {
+          this.coordinatesText = '经度: --, 纬度: --'
+        }
+      }, Cesium.ScreenSpaceEventType.MOUSE_MOVE)
+    },
     destroyViewer() {
       this.stopDrawing()
       this.clearAll()
 
+      if (this.pointMovementHandler) {
+        this.pointMovementHandler.destroy()
+        this.pointMovementHandler = null
+      }
+
+      if (this.rightClickHandler) {
+        this.rightClickHandler.destroy()
+        this.rightClickHandler = null
+      }
+
+      if (this.mouseCoordinatesHandler) {
+        this.mouseCoordinatesHandler.destroy()
+        this.mouseCoordinatesHandler = null
+      }
+
+      if (typeof this.scaleBarCleanup === 'function') {
+        this.scaleBarCleanup()
+        this.scaleBarCleanup = null
+      }
+
       if (this.viewer) {
         this.viewer.destroy()
         this.viewer = null
@@ -1552,5 +3051,74 @@ export default {
 :deep(.cesium-credit-textContainer) {
   display: none !important;
 }
-</style>
 
+/* 地图右下角信息面板：比例尺在上、经纬度在下，整体略下移减少遮挡 */
+.map-info-panel {
+  position: absolute;
+  bottom: 10px;
+  right: 12px;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  gap: 6px;
+  z-index: 1000;
+  pointer-events: none;
+}
+
+/* 比例尺：高德风格，浅色底、圆角、刻度线 */
+.scale-bar {
+  background: rgba(255, 255, 255, 0.65);
+  color: #333;
+  padding: 4px 8px 6px;
+  border-radius: 4px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  min-width: 60px;
+}
+.scale-bar-text {
+  font-size: 12px;
+  font-family: 'Microsoft YaHei', 'PingFang SC', sans-serif;
+  margin-bottom: 4px;
+  color: #555;
+}
+.scale-bar-line {
+  height: 2px;
+  background: #555;
+  position: relative;
+  flex-shrink: 0;
+}
+.scale-bar-tick {
+  position: absolute;
+  top: 0;
+  width: 2px;
+  height: 6px;
+  background: #555;
+}
+.scale-bar-tick-left {
+  left: 0;
+  top: -4px;
+}
+.scale-bar-tick-right {
+  right: 0;
+  left: auto;
+  top: -4px;
+}
+
+/* 经纬度显示（在比例尺下方） */
+.map-info-panel .coordinates-display {
+  position: static;
+  bottom: auto;
+  right: auto;
+  background-color: rgba(0, 0, 0, 0.7);
+  color: white;
+  padding: 6px 10px;
+  border-radius: 4px;
+  font-size: 13px;
+  font-family: Arial, sans-serif;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+  min-width: 200px;
+  text-align: right;
+}
+</style>
diff --git a/ruoyi-ui/src/views/childRoom/RightPanel.vue b/ruoyi-ui/src/views/childRoom/RightPanel.vue
index 4b3eeb2..380e4ea 100644
--- a/ruoyi-ui/src/views/childRoom/RightPanel.vue
+++ b/ruoyi-ui/src/views/childRoom/RightPanel.vue
@@ -26,99 +26,79 @@
               {{ $t('rightPanel.createPlan') }}
             </el-button>
           </div>
-
-          <div class="route-list">
+          <div class="tree-list">
+            <!-- 方案列表 -->
             <div
               v-for="plan in plans"
               :key="plan.id"
-              class="route-item"
+              class="tree-item plan-item"
               :class="{ selected: selectedPlanId === plan.id }"
-              @click="handleSelectPlan(plan)"
-            >
-              <i class="el-icon-folder-opened"></i>
-              <div class="route-info">
-                <div class="route-name">{{ plan.name }}</div>
-                <div class="route-meta">{{ plan.routes.length }}{{ $t('rightPanel.routes') }}</div>
-              </div>
-              <div class="route-actions">
-                <i class="el-icon-edit" :title="$t('topHeader.edit.iconEdit')" @click.stop="handleOpenPlanDialog(plan)"></i>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div v-if="selectedPlanDetails" class="section">
-          <div class="section-header">
-            <div class="section-title">{{ $t('rightPanel.routeList') }}</div>
-            <el-button
-              type="primary"
-              size="mini"
-              @click="handleCreateRoute"
-              class="create-route-btn-new"
-            >
-              {{ $t('rightPanel.createRoute') }}
-            </el-button>
-          </div>
-
-          <div class="route-list">
-            <div
-              v-for="route in selectedPlanDetails.routes"
-              :key="route.id"
-              class="route-item"
-              :class="{ selected: selectedRouteId === route.id }"
-              @click="handleSelectRoute(route)"
             >
-              <i class="el-icon-map-location"></i>
-              <div class="route-info">
-                <div class="route-name">{{ route.name }}</div>
-                <div class="route-meta">{{ route.points }}{{ $t('rightPanel.points') }}</div>
-              </div>
-              <el-tag
-                v-if="route.conflict"
-                size="mini"
-                type="danger"
-                class="conflict-tag"
-              >
-                {{ $t('rightPanel.conflict') }}
-              </el-tag>
-              <div class="route-actions">
-                <i class="el-icon-edit" :title="$t('topHeader.edit.iconEdit')" @click.stop="handleOpenRouteDialog(route)"></i>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div v-if="selectedRouteDetails" class="section">
-          <div class="section-title">{{ $t('rightPanel.waypointList') }}</div>
-          <div class="waypoint-list">
-            <div
-              v-for="point in selectedRouteDetails.waypoints"
-              :key="point.name"
-              class="waypoint-item"
-            >
-              <i class="el-icon-location"></i>
-              <div class="waypoint-info">
-                <div class="waypoint-name">{{ point.name }}</div>
-                <div class="waypoint-meta">{{ $t('rightPanel.altitude') }}: {{ point.altitude }}m | {{ $t('rightPanel.speed') }}: {{ point.speed }}</div>
+              <div class="tree-item-header" @click="togglePlan(plan.id)">
+                <i :class="expandedPlans.includes(plan.id) ? 'el-icon-folder-opened' : 'el-icon-folder'" class="tree-icon"></i>
+                <div class="tree-item-info">
+                  <div class="tree-item-name">{{ plan.name }}</div>
+                  <div class="tree-item-meta">{{ routes.filter(r => r.scenarioId === plan.id).length }}个航线</div>
+                </div>
+                <div class="tree-item-actions">
+                  <i class="el-icon-plus" title="新建航线" @click.stop="handleCreateRouteForPlan(plan)"></i>
+                  <i class="el-icon-edit" title="编辑" @click.stop="handleOpenPlanDialog(plan)"></i>
+                  <i class="el-icon-delete" title="删除" @click.stop="handleDeletePlan(plan)"></i>
+                </div>
               </div>
-              <div class="waypoint-actions">
-                <i class="el-icon-edit" :title="$t('topHeader.edit.iconEdit')" @click.stop="handleOpenWaypointDialog(point)"></i>
-                <i class="el-icon-delete" :title="$t('leftMenu.delete')"></i>
+              <!-- 航线列表 -->
+              <div v-if="expandedPlans.includes(plan.id)" class="tree-children route-children">
+                <div
+                  v-for="route in routes.filter(r => r.scenarioId === plan.id)"
+                  :key="route.id"
+                  class="tree-item route-item"
+                  :class="getRouteClasses(route.id)"
+                >
+                  <div class="tree-item-header" @click="toggleRoute(route.id)">
+                    <i :class="expandedRoutes.includes(route.id) ? 'el-icon-map-location' : 'el-icon-map-location'" class="tree-icon"></i>
+                    <div class="tree-item-info">
+                      <div class="tree-item-name">{{ route.name }}</div>
+                      <div class="tree-item-meta">{{ route.points }}{{ $t('rightPanel.points') }}</div>
+                    </div>
+                    <el-tag
+                      v-if="route.conflict"
+                      size="mini"
+                      type="danger"
+                      class="conflict-tag"
+                    >
+                      {{ $t('rightPanel.conflict') }}
+                    </el-tag>
+                    <div class="tree-item-actions">
+                      <i class="el-icon-view" title="显示/隐藏" @click.stop="handleToggleRouteVisibility(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>
+                  </div>
+                  <!-- 航点列表 -->
+                  <div v-if="expandedRoutes.includes(route.id)" class="tree-children waypoint-children">
+                    <div
+                      v-for="(point,index) in (expandedRoutes.includes(route.id) && route.waypoints ? route.waypoints : [])"
+                      :key="point.name"
+                      class="tree-item waypoint-item"
+                    >
+                      <div class="tree-item-header">
+                        <i class="el-icon-location tree-icon"></i>
+                        <div class="tree-item-info">
+                          <div class="tree-item-name">{{ point.name }}</div>
+                          <div class="tree-item-meta">高度: {{ point.alt }}m | 速度: {{ point.speed }}</div>
+                        </div>
+                        <div class="tree-item-actions">
+                          <i class="el-icon-edit" title="编辑" @click.stop="handleOpenWaypointDialog(point, index, route.waypoints.length)"></i>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
-
-        <div class="action-buttons">
-          <el-button type="primary" size="mini" icon="el-icon-circle-plus" class="blue-btn" @click="handleAddWaypoint">
-            {{ $t('rightPanel.addWaypoint') }}
-          </el-button>
-          <el-button size="mini" class="blue-btn" @click="handleCancelRoute">
-            {{ $t('rightPanel.cancelRoute') }}
-          </el-button>
-        </div>
       </div>
-
       <div v-if="activeTab === 'conflict'" class="tab-content conflict-content">
         <div v-if="conflicts.length > 0" class="conflict-list">
           <div
@@ -163,8 +143,20 @@
           </el-button>
         </div>
       </div>
-
       <div v-if="activeTab === 'platform'" class="tab-content platform-content">
+        <div class="section-header" style="padding: 10px 0; display: flex; justify-content: space-between; align-items: center;">
+          <div class="section-title">平台列表</div>
+          <el-button
+            type="primary"
+            size="mini"
+            icon="el-icon-upload2"
+            @click="handleImportPlatform"
+            class="create-route-btn-new"
+            style="width: 90px;height: 25px;line-height: 25px;padding: 0;font-size: 14px;"
+          >
+            导入平台
+          </el-button>
+        </div>
         <div class="platform-categories">
           <el-tabs v-model="activePlatformTab" type="card" size="mini" class="blue-tabs">
             <el-tab-pane :label="$t('rightPanel.air')" name="air">
@@ -176,7 +168,11 @@
                   @click="handleOpenPlatformDialog(platform)"
                 >
                   <div class="platform-icon" :style="{ color: platform.color }">
-                    <i :class="platform.icon"></i>
+                    <img v-if="isImg(platform.imageUrl)"
+                         :src="formatImg(platform.imageUrl)"
+                         class="platform-img"
+                    />
+                    <i v-else :class="platform.icon || 'el-icon-picture-outline'"></i>
                   </div>
                   <div class="platform-info">
                     <div class="platform-name">{{ platform.name }}</div>
@@ -198,7 +194,11 @@
                   @click="handleOpenPlatformDialog(platform)"
                 >
                   <div class="platform-icon" :style="{ color: platform.color }">
-                    <i :class="platform.icon"></i>
+                    <img v-if="isImg(platform.imageUrl)"
+                         :src="formatImg(platform.imageUrl)"
+                         class="platform-img"
+                    />
+                    <i v-else :class="platform.icon || 'el-icon-picture-outline'"></i>
                   </div>
                   <div class="platform-info">
                     <div class="platform-name">{{ platform.name }}</div>
@@ -220,7 +220,11 @@
                   @click="handleOpenPlatformDialog(platform)"
                 >
                   <div class="platform-icon" :style="{ color: platform.color }">
-                    <i :class="platform.icon"></i>
+                    <img v-if="isImg(platform.imageUrl)"
+                         :src="formatImg(platform.imageUrl)"
+                         class="platform-img"
+                    />
+                    <i v-else :class="platform.icon || 'el-icon-picture-outline'"></i>
                   </div>
                   <div class="platform-info">
                     <div class="platform-name">{{ platform.name }}</div>
@@ -255,6 +259,14 @@ export default {
       type: Array,
       default: () => []
     },
+    routes: {
+      type: Array,
+      default: () => []
+    },
+    activeRouteIds: {
+      type: Array,
+      default: () => []
+    },
     selectedPlanId: {
       type: [String, Number],
       default: null
@@ -290,23 +302,129 @@ export default {
     groundPlatforms: {
       type: Array,
       default: () => []
-    }
+    },
   },
   data() {
     return {
-      activePlatformTab: 'air'
+      activePlatformTab: 'air',
+      expandedPlans: [], // 展开的方案列表
+      expandedRoutes: [] // 展开的航线列表
+    }
+  },
+  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);
+      },
+      deep: true
     }
   },
   methods: {
-    handleHide() {
-      this.$emit('hide')
+    // 切换方案展开/折叠
+    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)) {
+            this.handleSelectRoute(route)
+          }
+        })
+      }
     },
 
-    handleSelectPlan(plan) {
-      this.$emit('select-plan', plan)
+    // 切换航线展开/折叠
+    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)
+          }
+        })
+      }
+    },
+
+    // 判断是否是图片路径
+    isImg(path) {
+      if (!path) return false;
+      return path.includes('/') || path.includes('data:image');
+    },
+
+    // 格式化图片地址
+    formatImg(url) {
+      if (!url) return '';
+      // 清理路径中的双斜杠
+      const cleanPath = url.replace(/\/+/g, '/');
+      const backendUrl = process.env.VUE_APP_BACKEND_URL;
+      const finalUrl = backendUrl + cleanPath;
+
+      // 👈 核心排查日志：按 F12 在控制台看这个输出！
+      console.log('>>> [图片渲染调试] 最终拼接地址:', finalUrl);
+
+      return finalUrl;
+    },
+
+    handleHide() {
+      this.$emit('hide')
     },
 
     handleSelectRoute(route) {
+      // 确保航线有航点数据
       this.$emit('select-route', route)
     },
 
@@ -314,28 +432,53 @@ 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) {
       this.$emit('open-plan-dialog', plan)
     },
 
+    handleImportPlatform() {
+      this.$emit('open-import-dialog');
+    },
+
     handleOpenRouteDialog(route) {
       this.$emit('open-route-dialog', route)
     },
 
-    handleOpenWaypointDialog(point) {
-      this.$emit('open-waypoint-dialog', point)
+    handleToggleRouteVisibility(route) {
+      this.$emit('toggle-route-visibility', route)
+      // 当隐藏航线时，自动收回航点列表
+      const routeIndex = this.expandedRoutes.indexOf(route.id)
+      if (routeIndex > -1) {
+        this.expandedRoutes.splice(routeIndex, 1)
+      }
     },
 
-    handleAddWaypoint() {
-      this.$emit('add-waypoint')
+    getRouteClasses(routeId) {
+      return {
+        active: this.activeRouteIds.includes(routeId)
+      }
     },
-
-    handleCancelRoute() {
-      this.$emit('cancel-route')
+    handleOpenWaypointDialog(point,index,total) {
+      this.$emit('open-waypoint-dialog', {
+        ...point,
+        currentIndex: index,
+        totalPoints: total
+      });
     },
 
     handleViewConflict(conflict) {
@@ -459,115 +602,90 @@ export default {
   opacity: 0.9;
 }
 
-.route-list {
+.tree-list {
   display: flex;
   flex-direction: column;
   gap: 8px;
 }
 
-.route-item {
+.tree-item {
+  border-radius: 6px;
+  transition: all 0.3s;
+  border: 1px solid rgba(0, 138, 255, 0.1);
+}
+
+.tree-item-header {
   display: flex;
   align-items: center;
   gap: 10px;
   padding: 10px;
   background: rgba(255, 255, 255, 0.8);
-  border-radius: 6px;
   cursor: pointer;
   transition: all 0.3s;
-  border: 1px solid rgba(0, 138, 255, 0.1);
-  position: relative;
+  border-radius: 6px;
 }
 
-.route-item:hover {
+.tree-item-header:hover {
   background: rgba(0, 138, 255, 0.1);
   transform: translateX(-2px);
   box-shadow: 0 2px 8px rgba(0, 138, 255, 0.15);
 }
 
-.route-item.selected {
-  background: rgba(0, 138, 255, 0.15);
-  border-color: rgba(0, 138, 255, 0.3);
-  box-shadow: 0 2px 10px rgba(0, 138, 255, 0.25);
+.tree-item.plan-item .tree-item-header {
+  background: rgba(255, 255, 255, 0.9) !important;
 }
 
-.route-info {
-  flex: 1;
+.tree-item.route-item .tree-item-header {
+  background: rgba(255, 255, 255, 0.8) !important;
 }
 
-.route-name {
-  font-size: 14px;
-  font-weight: 500;
-  color: #333;
+.tree-item.route-item:not(.active) .tree-item-header {
+  background: rgba(255, 255, 255, 0.8) !important;
 }
 
-.route-meta {
-  font-size: 12px;
-  color: #999;
+.tree-item.waypoint-item .tree-item-header {
+  background: rgba(224, 238, 255, 0.8);
 }
 
-.route-actions {
-  display: flex;
-  gap: 8px;
-}
-
-.route-actions i {
-  cursor: pointer;
-  color: #008aff;
-  font-size: 14px;
-  padding: 4px;
-  border-radius: 4px;
-  transition: all 0.2s;
-}
-
-.route-actions i:hover {
-  background: rgba(0, 138, 255, 0.1);
-  transform: scale(1.2);
-}
-
-.waypoint-list {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
+.tree-item.active .tree-item-header {
+  background: rgba(0, 138, 255, 0.15) !important;
+  border-color: rgba(0, 138, 255, 0.3);
+  box-shadow: 0 2px 10px rgba(0, 138, 255, 0.25);
 }
 
-.waypoint-item {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  padding: 10px;
-  background: rgba(255, 255, 255, 0.8);
-  border-radius: 6px;
-  transition: all 0.3s;
-  border: 1px solid rgba(0, 138, 255, 0.1);
+.tree-item.selected .tree-item-header {
+  background: rgba(0, 138, 255, 0.1) !important;
+  border-color: rgba(0, 138, 255, 0.2);
 }
 
-.waypoint-item:hover {
-  background: rgba(0, 138, 255, 0.1);
-  transform: translateX(-2px);
-  box-shadow: 0 2px 8px rgba(0, 138, 255, 0.15);
+.tree-icon {
+  font-size: 16px;
+  color: #008aff;
+  flex-shrink: 0;
 }
 
-.waypoint-info {
+.tree-item-info {
   flex: 1;
 }
 
-.waypoint-name {
+.tree-item-name {
   font-size: 14px;
   font-weight: 500;
   color: #333;
 }
 
-.waypoint-meta {
+.tree-item-meta {
   font-size: 12px;
   color: #999;
 }
 
-.waypoint-actions {
+.tree-item-actions {
   display: flex;
   gap: 8px;
+  flex-shrink: 0;
 }
 
-.waypoint-actions i {
+.tree-item-actions i {
   cursor: pointer;
   color: #008aff;
   font-size: 14px;
@@ -576,11 +694,27 @@ export default {
   transition: all 0.2s;
 }
 
-.waypoint-actions i:hover {
+.tree-item-actions i:hover {
   background: rgba(0, 138, 255, 0.1);
   transform: scale(1.2);
 }
 
+.tree-children {
+  margin-left: 20px;
+  margin-top: 4px;
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.route-children {
+  margin-left: 25px;
+}
+
+.waypoint-children {
+  margin-left: 50px;
+}
+
 .action-buttons {
   display: flex;
   gap: 10px;
@@ -804,4 +938,20 @@ export default {
 .blue-warning {
   color: #e6a23c;
 }
+
+.platform-icon {
+  width: 40px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden; /* 裁剪超出部分 */
+}
+
+.platform-img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover; /* 关键：图片自动填充不拉伸 */
+  border-radius: 4px;
+}
 </style>
diff --git a/ruoyi-ui/src/views/childRoom/TopHeader.vue b/ruoyi-ui/src/views/childRoom/TopHeader.vue
index 2443238..b3e3b34 100644
--- a/ruoyi-ui/src/views/childRoom/TopHeader.vue
+++ b/ruoyi-ui/src/views/childRoom/TopHeader.vue
@@ -3,19 +3,19 @@
     <div class="header-left">
       <div class="system-title">
         <!-- 按照实际路径引入logo.jpg -->
-        <img 
-          src="@/views/childRoom/logo.png" 
-          class="logo-icon mr-2" 
+        <img
+          src="@/views/childRoom/logo.png"
+          class="logo-icon mr-2"
           alt="系统logo"
-          style="width:24px; height:24px; object-fit:contain;"  
+          style="width:24px; height:24px; object-fit:contain;"
         >
         <span class="title-text blue-title">{{ $t('topHeader.systemTitle') }}</span>
       </div>
-      
+
       <!-- 顶部导航菜单 -->
       <div class="top-nav-menu">
-        <div 
-            v-for="item in topNavItems" 
+        <div
+            v-for="item in topNavItems"
             :key="item.id"
             class="top-nav-item"
             :class="{ active: activeTopNav === item.id }"
@@ -23,11 +23,11 @@
           >
             <i :class="item.icon" class="nav-icon"></i>
             <span class="nav-text">{{ item.name }}</span>
-            
+
             <!-- 文件下拉菜单 -->
-            <el-dropdown 
-              v-if="item.id === 'file'" 
-              trigger="click" 
+            <el-dropdown
+              v-if="item.id === 'file'"
+              trigger="click"
               placement="bottom-start"
               :hide-on-click="false"
               class="file-dropdown"
@@ -37,11 +37,11 @@
                 <el-dropdown-item @click.native="newPlan">{{ $t('topHeader.file.newPlan') }}</el-dropdown-item>
                 <el-dropdown-item @click.native="openPlan">{{ $t('topHeader.file.open') }}</el-dropdown-item>
                 <el-dropdown-item @click.native="savePlan">{{ $t('topHeader.file.save') }}</el-dropdown-item>
-                
+
                 <el-dropdown-item class="submenu-item">
                   <span>{{ $t('topHeader.file.import') }}</span>
-                  <el-dropdown 
-                    trigger="hover" 
+                  <el-dropdown
+                    trigger="hover"
                     placement="right-start"
                     class="submenu-dropdown"
                   >
@@ -55,15 +55,15 @@
                     </el-dropdown-menu>
                   </el-dropdown>
                 </el-dropdown-item>
-                
+
                 <el-dropdown-item @click.native="exportPlan">{{ $t('topHeader.file.export') }}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-            
+
             <!-- 编辑下拉菜单 -->
-            <el-dropdown 
-              v-if="item.id === 'edit'" 
-              trigger="click" 
+            <el-dropdown
+              v-if="item.id === 'edit'"
+              trigger="click"
               placement="bottom-start"
               :hide-on-click="false"
               class="file-dropdown"
@@ -74,11 +74,11 @@
                 <el-dropdown-item @click.native="militaryMarking">{{ $t('topHeader.edit.militaryMarking') }}</el-dropdown-item>
                 <el-dropdown-item @click.native="iconEdit">{{ $t('topHeader.edit.iconEdit') }}</el-dropdown-item>
                 <el-dropdown-item @click.native="attributeEdit">{{ $t('topHeader.edit.attributeEdit') }}</el-dropdown-item>
-                
+
                 <el-dropdown-item class="submenu-item">
                   <span>{{ $t('topHeader.edit.deductionEdit') }}</span>
-                  <el-dropdown 
-                    trigger="hover" 
+                  <el-dropdown
+                    trigger="hover"
                     placement="right-start"
                     class="submenu-dropdown"
                   >
@@ -93,11 +93,11 @@
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-            
+
             <!-- 视图下拉菜单 -->
-            <el-dropdown 
-              v-if="item.id === 'view'" 
-              trigger="click" 
+            <el-dropdown
+              v-if="item.id === 'view'"
+              trigger="click"
               placement="bottom-start"
               :hide-on-click="false"
               class="file-dropdown"
@@ -110,11 +110,11 @@
                 <el-dropdown-item @click.native="toggleScale">{{ $t('topHeader.view.scale') }}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-            
+
             <!-- 地图下拉菜单 -->
-            <el-dropdown 
-              v-if="item.id === 'map'" 
-              trigger="click" 
+            <el-dropdown
+              v-if="item.id === 'map'"
+              trigger="click"
               placement="bottom-start"
               :hide-on-click="false"
               class="file-dropdown"
@@ -126,11 +126,11 @@
                 <el-dropdown-item @click.native="loadAeroChart">{{ $t('topHeader.map.aeroChart') }}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-            
+
             <!-- 空域下拉菜单 -->
-            <el-dropdown 
-              v-if="item.id === 'airspace'" 
-              trigger="click" 
+            <el-dropdown
+              v-if="item.id === 'airspace'"
+              trigger="click"
               placement="bottom-start"
               :hide-on-click="false"
               class="file-dropdown"
@@ -141,11 +141,11 @@
                 <el-dropdown-item @click.native="threatZone">{{ $t('topHeader.airspace.threatZone') }}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-            
+
             <!-- 工具下拉菜单 -->
-            <el-dropdown 
-              v-if="item.id === 'tools'" 
-              trigger="click" 
+            <el-dropdown
+              v-if="item.id === 'tools'"
+              trigger="click"
               placement="bottom-start"
               :hide-on-click="false"
               class="file-dropdown"
@@ -158,11 +158,11 @@
                 <el-dropdown-item @click.native="coordinateConversion">{{ $t('topHeader.tools.coordinateConversion') }}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-            
+
             <!-- 选项下拉菜单 -->
-            <el-dropdown 
-              v-if="item.id === 'options'" 
-              trigger="click" 
+            <el-dropdown
+              v-if="item.id === 'options'"
+              trigger="click"
               placement="bottom-start"
               :hide-on-click="false"
               class="file-dropdown"
@@ -171,8 +171,8 @@
               <el-dropdown-menu slot="dropdown" class="file-dropdown-menu">
                 <el-dropdown-item class="submenu-item">
                   <span>{{ $t('topHeader.options.settings') }}</span>
-                  <el-dropdown 
-                    trigger="hover" 
+                  <el-dropdown
+                    trigger="hover"
                     placement="right-start"
                     class="submenu-dropdown"
                   >
@@ -195,11 +195,11 @@
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-            
+
             <!-- 收藏下拉菜单 -->
-            <el-dropdown 
-              v-if="item.id === 'favorites'" 
-              trigger="click" 
+            <el-dropdown
+              v-if="item.id === 'favorites'"
+              trigger="click"
               placement="bottom-start"
               :hide-on-click="false"
               class="file-dropdown"
@@ -224,7 +224,7 @@
               <div class="info-value">{{ roomCode }}</div>
             </div>
           </div>
-          
+
           <div class="info-box" @click="showOnlineMembersDialog">
             <i class="el-icon-user info-icon"></i>
             <div class="info-content">
@@ -232,7 +232,7 @@
               <div class="info-value">{{ onlineCount }}{{ $t('topHeader.info.people') }}</div>
             </div>
           </div>
-          
+
           <div class="info-box">
             <i class="el-icon-timer info-icon"></i>
             <div class="info-content">
@@ -240,7 +240,7 @@
               <div class="info-value">{{ combatTime }}</div>
             </div>
           </div>
-          
+
           <div class="info-box">
             <i class="el-icon-sunny info-icon"></i>
             <div class="info-content">
@@ -249,31 +249,31 @@
             </div>
           </div>
         </div>
-        
+
         <!-- 用户状态区域 -->
         <div class="user-status-area">
           <!-- 用户头像 -->
           <el-avatar :size="32" :src="userAvatar" class="user-avatar" />
         </div>
       </div>
-      
+
       <!-- 威力区弹窗 -->
-      <power-zone-dialog 
-        v-model="powerZoneDialogVisible" 
+      <power-zone-dialog
+        v-model="powerZoneDialogVisible"
         :power-zone="currentPowerZone"
         @save="savePowerZone"
       />
-      
+
       <!-- 比例尺弹窗 -->
-      <scale-dialog 
-        v-model="scaleDialogVisible" 
+      <scale-dialog
+        v-model="scaleDialogVisible"
         :scale="currentScale"
         @save="saveScale"
       />
-      
+
       <!-- 外部参数弹窗 -->
-      <external-params-dialog 
-        v-model="externalParamsDialogVisible" 
+      <external-params-dialog
+        v-model="externalParamsDialogVisible"
         :external-params="currentExternalParams"
         @save="saveExternalParams"
         @import-airport="importAirport"
@@ -355,7 +355,7 @@ export default {
     selectTopNav(item) {
       this.$emit('select-nav', item)
     },
-    
+
     // 文件下拉菜单新增方法
     newPlan() {
       this.$emit('new-plan')
@@ -363,7 +363,7 @@ export default {
     openPlan() {
       this.$emit('open-plan')
     },
-    
+
     // 文件下拉菜单方法
     savePlan() {
       if (this.isIconEditMode) {
@@ -372,40 +372,40 @@ export default {
         this.$emit('save-plan')
       }
     },
-    
+
     importPlanFile() {
       this.$emit('import-plan-file')
     },
-    
+
     importACD() {
       this.$emit('import-acd')
     },
-    
+
     importATO() {
       this.$emit('import-ato')
     },
-    
+
     importLayer() {
       this.$emit('import-layer')
     },
-    
+
     importRoute() {
       this.$emit('import-route')
     },
-    
+
     exportPlan() {
       this.$emit('export-plan')
     },
-    
+
     // 编辑下拉菜单方法
     routeEdit() {
       this.$emit('route-edit')
     },
-    
+
     militaryMarking() {
       this.$emit('military-marking')
     },
-    
+
     iconEdit() {
       if (this.isIconEditMode) {
         this.$emit('toggle-icon-edit', false)
@@ -413,163 +413,163 @@ export default {
         this.$emit('toggle-icon-edit', true)
       }
     },
-    
+
     attributeEdit() {
       this.$emit('attribute-edit')
     },
-    
+
     timeSettings() {
       this.$emit('time-settings')
     },
-    
+
     aircraftSettings() {
       this.$emit('aircraft-settings')
     },
-    
+
     keyEventEdit() {
       this.$emit('key-event-edit')
     },
-    
+
     missileLaunch() {
       this.$emit('missile-launch')
     },
-    
+
     // 视图下拉菜单方法
     toggle2D3D() {
       this.is2DMode = !this.is2DMode
       this.$emit('toggle-2d-3d', this.is2DMode)
     },
-    
+
     toggleRuler() {
       this.isRulerVisible = !this.isRulerVisible
       this.$emit('toggle-ruler', this.isRulerVisible)
     },
-    
+
     toggleGrid() {
       this.$emit('toggle-grid')
     },
-    
+
     toggleScale() {
       this.scaleDialogVisible = true
       this.currentScale = {}
     },
-    
+
     // 地图下拉菜单方法
     loadTerrain() {
       this.$emit('load-terrain')
     },
-    
+
     changeProjection() {
       this.$emit('change-projection')
     },
-    
+
     loadAeroChart() {
       this.$emit('load-aero-chart')
     },
-    
+
     // 空域下拉菜单方法
     powerZone() {
       this.powerZoneDialogVisible = true
       this.currentPowerZone = {}
     },
-    
+
     threatZone() {
       this.$emit('threat-zone')
     },
-    
+
     // 工具下拉菜单方法
     routeCalculation() {
       this.$emit('route-calculation')
     },
-    
+
     conflictDisplay() {
       this.$emit('conflict-display')
     },
-    
+
     dataMaterials() {
       this.$emit('data-materials')
     },
-    
+
     coordinateConversion() {
       this.$emit('coordinate-conversion')
     },
-    
+
     // 选项下拉菜单方法
     pageLayout() {
       this.$emit('page-layout')
     },
-    
+
     dataStoragePath() {
       this.$emit('data-storage-path')
     },
-    
+
     externalParams() {
       this.externalParamsDialogVisible = true
       this.currentExternalParams = {}
     },
-    
+
     toggleAirport() {
       this.isAirportVisible = !this.isAirportVisible
       this.$emit('toggle-airport', this.isAirportVisible)
     },
-    
+
     toggleLandmark() {
       this.isLandmarkVisible = !this.isLandmarkVisible
       this.$emit('toggle-landmark', this.isLandmarkVisible)
     },
-    
+
     toggleRoute() {
       this.isRouteVisible = !this.isRouteVisible
       this.$emit('toggle-route', this.isRouteVisible)
     },
-    
+
     systemDescription() {
       this.$emit('system-description')
     },
-    
+
     toggleLanguage() {
       const newLocale = this.$i18n.locale === 'zh' ? 'en' : 'zh'
       this.$i18n.locale = newLocale
       localStorage.setItem('language', newLocale)
       this.$emit('language-changed', newLocale)
     },
-    
+
     // 收藏下拉菜单方法
     layerFavorites() {
       this.$emit('layer-favorites')
     },
-    
+
     routeFavorites() {
       this.$emit('route-favorites')
     },
-    
+
     showOnlineMembersDialog() {
       this.$emit('show-online-members')
     },
-    
+
     // 威力区弹窗方法
     savePowerZone(powerZone) {
       this.$emit('save-power-zone', powerZone)
     },
-    
+
     // 比例尺弹窗方法
     saveScale(scale) {
       this.$emit('save-scale', scale)
     },
-    
+
     // 外部参数弹窗方法
     saveExternalParams(externalParams) {
       this.$emit('save-external-params', externalParams)
     },
-    
+
     importAirport(path) {
       this.$emit('import-airport', path)
     },
-    
+
     importRoute(path) {
       this.$emit('import-route-data', path)
     },
-    
+
     importLandmark(path) {
       this.$emit('import-landmark', path)
     }
@@ -892,4 +892,4 @@ export default {
   transform: scale(1.1);
   box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue
index 3b0f38b..b3956c1 100644
--- a/ruoyi-ui/src/views/childRoom/index.vue
+++ b/ruoyi-ui/src/views/childRoom/index.vue
@@ -4,7 +4,10 @@
     <!-- 地图背景 -->
     <div id="gis-map-background" class="map-background">
       <!-- cesiummap组件 -->
-      <cesiumMap :drawDomClick="drawDom"/>
+      <cesiumMap ref="cesiumMap" :drawDomClick="drawDom || airspaceDrawDom"
+                 :tool-mode="drawDom ? 'ranging' : (airspaceDrawDom ? 'airspace' : 'airspace')"
+                 @draw-complete="handleMapDrawComplete"
+                 @open-waypoint-dialog="handleOpenWaypointEdit" />
       <div class="map-overlay-text">
         <i class="el-icon-location-outline text-3xl mb-2 block"></i>
         <p>二维GIS地图区域</p>
@@ -21,8 +24,18 @@
         <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-form label-width="80px">
+          <el-form-item label="航线名称">
+            <el-input v-model="newRouteName" placeholder="例如：航线一"></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="showNameDialog = false">取 消</el-button>
+          <el-button type="primary" @click="confirmSaveNewRoute">确 定</el-button>
+        </div>
+      </el-dialog>
     </div>
-
     <!-- 顶部导航栏 -->
     <top-header
       :room-code="roomCode"
@@ -75,7 +88,6 @@
       @route-favorites="routeFavorites"
       @show-online-members="showOnlineMembersDialog"
     />
-
     <!-- 左侧折叠菜单栏 - 蓝色主题 -->
     <left-menu
       :is-hidden="isMenuHidden"
@@ -95,15 +107,17 @@
       @exit-icon-edit="exitIconEdit"
       @reset-menu-items="handleResetMenuItems"
     />
-
     <!-- 右侧实体列表（浮动）- 蓝色主题 -->
     <right-panel
+      ref="rightPanel"
       :is-hidden="isRightPanelHidden"
       :active-tab="activeRightTab"
       :plans="plans"
       :selected-plan-id="selectedPlanId"
       :selected-plan-details="selectedPlanDetails"
       :selected-route-id="selectedRouteId"
+      :routes="routes"
+      :active-route-ids="activeRouteIds"
       :selected-route-details="selectedRouteDetails"
       :conflicts="conflicts"
       :conflict-count="conflictCount"
@@ -111,24 +125,26 @@
       :sea-platforms="seaPlatforms"
       :ground-platforms="groundPlatforms"
       @hide="hideRightPanel"
-      @select-plan="selectPlan"
       @select-route="selectRoute"
-      @create-plan="createPlan"
       @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"
       @add-waypoint="addWaypoint"
       @cancel-route="cancelRoute"
+      @toggle-route-visibility="toggleRouteVisibility"
       @view-conflict="viewConflict"
       @resolve-conflict="resolveConflict"
       @run-conflict-check="runConflictCheck"
       @open-platform-dialog="openPlatformDialog"
+      @open-import-dialog="showImportDialog = true"
     />
-
     <!-- 左下角工具面板 -->
     <bottom-left-panel />
-
     <!-- 底部时间轴（最初版本的样式）- 蓝色主题 -->
     <div
       class="floating-timeline blue-theme"
@@ -138,13 +154,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"
@@ -153,7 +167,6 @@
             class="compact-slider blue-slider"
           />
         </div>
-
         <div class="playback-controls">
           <button
             class="control-btn blue-control-btn"
@@ -162,7 +175,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"
@@ -215,34 +227,57 @@
     />
 
     <!-- 威力区弹窗 -->
-    <power-zone-dialog 
-      v-model="showPowerZoneDialog" 
+    <power-zone-dialog
+      v-model="showPowerZoneDialog"
       :power-zone="currentPowerZone"
       @save="savePowerZone"
     />
-    
+
     <!-- 比例尺弹窗 -->
-    <scale-dialog 
-      v-model="showScaleDialog" 
+    <scale-dialog
+      v-model="showScaleDialog"
       :scale="currentScale"
       @save="saveScale"
     />
-    
+
     <!-- 外部参数弹窗 -->
-    <external-params-dialog 
-      v-model="showExternalParamsDialog" 
+    <external-params-dialog
+      v-model="showExternalParamsDialog"
       :external-params="currentExternalParams"
       @save="saveExternalParams"
       @import-airport="importAirport"
       @import-route-data="importRoute"
       @import-landmark="importLandmark"
     />
-    
+
     <!-- 页面布局弹窗 -->
-    <page-layout-dialog 
-      v-model="showPageLayoutDialog" 
+    <page-layout-dialog
+      v-model="showPageLayoutDialog"
       @save="savePageLayout"
     />
+
+    <!-- 导入平台弹窗  -->
+    <PlatformImportDialog
+      :visible.sync="showImportDialog"
+      @confirm="handleImportConfirm"
+    />
+
+    <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>
 
@@ -260,9 +295,15 @@ 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 { listRoutes, getRoutes, addRoutes,delRoutes } from "@/api/system/routes";
+import { updateWaypoints } from "@/api/system/waypoints";
+import { listLib,addLib } from "@/api/system/lib";
+import PlatformImportDialog from "@/views/dialogs/PlatformImportDialog.vue";
 export default {
   name: 'MissionPlanningView',
   components: {
+    PlatformImportDialog,
     cesiumMap,
     OnlineMembersDialog,
     PlatformEditDialog,
@@ -280,6 +321,7 @@ export default {
   data() {
     return {
       drawDom:false,
+      airspaceDrawDom:false,
       // 在线成员弹窗
       showOnlineMembers: false,
       // 编辑弹窗控制
@@ -298,6 +340,11 @@ export default {
       currentExternalParams: {},
       showPageLayoutDialog: false,
       menuPosition: 'left',
+      showNameDialog: false,
+      newRouteName: '',
+      tempMapPoints: [],
+      //导入平台弹窗
+      showImportDialog: false,
 
       // 作战信息
       roomCode: 'JTF-7-ALPHA',
@@ -309,7 +356,7 @@ export default {
       isMenuHidden: true,      // 是否完全隐藏左侧菜单
       activeMenu: 'file',
       isIconEditMode: false,   // 图标编辑模式
-      
+
       // 默认菜单项配置
       defaultMenuItems: [
         { id: 'file', name: '方案', icon: 'el-icon-folder-opened' },
@@ -324,13 +371,21 @@ export default {
         { id: 'import', name: '导入', icon: 'el-icon-upload2' },
         { id: 'export', name: '导出', icon: 'el-icon-download' }
       ],
-      
+
       // 方案-航线-航点数据
       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' },
@@ -366,7 +421,6 @@ export default {
 
       // 右侧面板控制
       isRightPanelHidden: true, // 是否完全隐藏右侧面板
-
       // K时弹出框控制
       showKTimePopup: false,
 
@@ -378,8 +432,10 @@ export default {
       menuItems: [],
 
       // 右侧面板
+      currentRoomId: null,
+      plans: [],
       activeRightTab: 'plan',
-
+      activeRouteIds: [], // 存储当前所有选中的航线ID
       // 冲突数据
       conflictCount: 2,
       conflicts: [
@@ -403,43 +459,9 @@ export default {
 
       // 平台数据
       activePlatformTab: 'air',
-      airPlatforms: [
-        { id: 1, name: 'J-20 歼击机', type: '战斗机', icon: 'el-icon-fighter', color: '#52c41a', status: 'ready' },
-        { id: 2, name: 'KJ-2000 预警机', type: '预警机', icon: 'el-icon-s-promotion', color: '#1890ff', status: 'flying' },
-        { id: 3, name: 'UAV-01 无人机', type: '侦察无人机', icon: 'el-icon-drone', color: '#fa8c16', status: 'scouting' },
-        { id: 4, name: 'H-6K 轰炸机', type: '轰炸机', icon: 'el-icon-bomb', color: '#722ed1', status: 'ready' },
-      ],
-      seaPlatforms: [
-        { id: 5, name: '辽宁舰', type: '航空母舰', icon: 'el-icon-s-cooperation', color: '#1890ff', status: 'sailing' },
-        { id: 6, name: '055型驱逐舰', type: '驱逐舰', icon: 'el-icon-ship', color: '#52c41a', status: 'patrol' },
-        { id: 7, name: '093型潜艇', type: '核潜艇', icon: 'el-icon-s-help', color: '#333', status: 'hidden' },
-      ],
-      groundPlatforms: [
-        { id: 8, name: 'HQ-9防空系统', type: '防空导弹', icon: 'el-icon-mic', color: '#f5222d', status: 'alert' },
-        { id: 9, name: 'PLZ-05自行火炮', type: '自行火炮', icon: 'el-icon-aim', color: '#fa8c16', status: 'ready' },
-        { id: 10, name: '指挥控制车', type: '指挥车', icon: 'el-icon-monitor', color: '#1890ff', status: 'operating' },
-      ],
-
-      // 航线数据 - 改为方案-航线-航点三级结构
-      plans: [
-        {
-          id: 1,
-          name: '方案A',
-          routes: [
-            { id: 101, name: 'Alpha进场航线', points: 8, conflict: true },
-            { id: 102, name: 'Beta巡逻航线', points: 6, conflict: false },
-            { id: 103, name: '侦察覆盖区', points: 4, conflict: false },
-          ]
-        },
-        {
-          id: 2,
-          name: '方案B',
-          routes: [
-            { id: 201, name: 'Gamma突击航线', points: 10, conflict: false },
-            { id: 202, name: 'Delta支援航线', points: 5, conflict: true },
-          ]
-        }
-      ],
+      airPlatforms: [],
+      seaPlatforms: [],
+      groundPlatforms: [],
 
       // 时间控制
       timeProgress: 45,
@@ -453,14 +475,13 @@ export default {
     };
   },
   mounted() {
+    this.getList();
     // 初始化时左侧菜单隐藏
     this.isMenuHidden = true;
     // 初始化时右侧面板隐藏
     this.isRightPanelHidden = true;
     // 初始化菜单项为默认配置
     this.menuItems = [...this.defaultMenuItems];
-    // 初始化选中的方案
-    this.selectPlan(this.plans[0]);
 
     // 更新时间
     this.updateTime();
@@ -475,7 +496,65 @@ export default {
       this.playbackInterval = null;
     }
   },
+  created() {
+    this.currentRoomId = this.$route.query.roomId;
+    console.log("从路由接收到的真实房间 ID:", this.currentRoomId);
+    this.getList();
+    this.getPlatformList();
+  },
   methods: {
+    // 处理从地图点击传来的编辑请求
+    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;
+        }
+      }
+      // 此时账本已确保是最新且正确的，开始找点
+      const wpData = this.selectedRouteDetails.waypoints.find(item => item.id == wpId);
+      if (wpData) {
+        // 成功找到业务数据，深拷贝后打开弹窗
+        this.selectedWaypoint = JSON.parse(JSON.stringify(wpData));
+        this.showWaypointDialog = true;
+      } else {
+        this.$message.info('未找到该航点的业务数据');
+        console.error("查找失败！账本内IDs:", this.selectedRouteDetails.waypoints.map(w => w.id));
+      }
+      // 获取当前最新的航点列表
+      const waypointsList = this.selectedRouteDetails.waypoints;
+      // 找到点在数组里的索引
+      const index = waypointsList.findIndex(item => item.id == wpId);
+      const total = waypointsList.length;
+      if (index !== -1) {
+        const wpData = waypointsList[index];
+        this.selectedWaypoint = {
+          ...JSON.parse(JSON.stringify(wpData)),
+          currentIndex: index,
+          totalPoints: total
+        };
+        console.log(`>>> [地图触发锁定] 序号: ${index}, 总数: ${total}, 数据已装载`);
+        this.showWaypointDialog = true;
+      } else {
+        this.$message.info('未找到该航点的业务数据');
+        console.error("查找失败！账本内IDs:", waypointsList.map(w => w.id));
+      }
+    },
     // 显示在线成员弹窗
     showOnlineMembersDialog() {
       this.showOnlineMembers = true;
@@ -485,6 +564,61 @@ export default {
       this.selectedPlatform = platform;
       this.showPlatformDialog = true;
     },
+    /** 从数据库查询并分拣平台库数据 */
+    getPlatformList() {
+      listLib().then(res => {
+        const allData = res.rows || [];
+        this.airPlatforms = [];
+        this.seaPlatforms = [];
+        this.groundPlatforms = [];
+        allData.forEach(item => {
+          const platform = {
+            id: item.id,
+            name: item.name,
+            type: item.type,
+            imageUrl: item.iconUrl || '',
+            icon: item.iconUrl ? '' : 'el-icon-picture-outline',
+            status: 'ready'
+          };
+          if (item.type === 'Air') {
+            this.airPlatforms.push(platform);
+          } else if (item.type === 'Sea') {
+            this.seaPlatforms.push(platform);
+          } else if (item.type === 'Ground') {
+            this.groundPlatforms.push(platform);
+          }
+        });
+
+      });
+    },
+    /** 导入确认：将弹窗填写的模版数据存入数据库 */
+    handleImportConfirm(formData) {
+      if (!formData.name || !formData.type) {
+        this.$modal.msgError("请填写完整的平台信息");
+        return;
+      }
+      // 创建 FormData 对象，这是传输二进制文件的标准格式
+      let data = new FormData();
+      // 把文件塞进去
+      if (formData.icon_file) {
+        data.append("file", formData.icon_file);
+      }
+      // 把其他文本字段也塞进去
+      data.append("name", formData.name);
+      data.append("type", formData.type);
+      data.append("specsJson", JSON.stringify({
+        scenarioId: this.selectedPlanId,
+        createTime: new Date().getTime()
+      }));
+      addLib(data).then(response => {
+        this.$modal.msgSuccess("导入成功");
+        this.showImportDialog = false;
+        this.getPlatformList();
+      }).catch(err => {
+        // 增加错误提示，防止请求失败时没有任何反应
+        console.error("上传出错：", err);
+      });
+    },
     updatePlatform(updatedPlatform) {
       // 这里可以添加实际的更新逻辑
       this.$message.success('平台更新成功');
@@ -494,12 +628,12 @@ export default {
       this.selectedRoute = route;
       this.showRouteDialog = true;
     },
-    // 更新航线数据（修改后）
+    // 更新航线数据
     updateRoute(updatedRoute) {
       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);
 
         // 如果当前选中的是这条航线，同步更新详情中的名称
@@ -510,41 +644,240 @@ export default {
         this.$message.success('航线名称更新成功');
       }
     },
-    // 新建航线（占位）
-    createRoute() {
-      this.$message.info('新建航线功能开发中...');
+    // 新建航线
+    createRoute(plan) {
+      if (!plan || !plan.id) return;
+      // 只有当目标方案和当前方案不同时，才执行“大扫除”
+      if (this.selectedPlanId !== plan.id) {
+        this.selectPlan(plan);
+      } else {
+        console.log(">>> 保持当前航线显示，直接进入规划模式");
+      }
+      // 进入 Cesium 绘图模式
+      if (this.$refs.cesiumMap) {
+        this.$refs.cesiumMap.startMissionRouteDrawing();
+        this.$message.success(`${plan.name}开启航线规划`);
+      }
+    },
+    async handleDeleteRoute(route) {
+      try {
+        // 二次确认，防止误删
+        await this.$confirm(`确定要彻底删除航线 "${route.name}" 吗？`, '提示', {
+          type: 'warning'
+        });
+        if (this.selectedRouteDetails && this.selectedRouteDetails.id === route.id) {
+          this.selectedRouteDetails = null;
+        }
+        const res = await delRoutes(route.id);
+        if (res.code === 200) {
+          this.$message.success('删除成功');
+          // 同步地图：如果该航线正在显示，立即清除
+          if (this.$refs.cesiumMap) {
+            this.$refs.cesiumMap.removeRouteById(route.id);
+          }
+          // 同步状态：从选中列表中移除该 ID
+          const idx = this.activeRouteIds.indexOf(route.id);
+          if (idx > -1) {
+            this.activeRouteIds.splice(idx, 1);
+          }
+          await this.getList();
+        }
+      } catch (e) {
+        if (e !== 'cancel') {
+          console.error("删除航线失败:", e);
+          this.$message.error('删除操作失败');
+        }
+      }
     },
-    // 航点编辑弹窗相关方法
-    openWaypointDialog(waypoint) {
-      this.selectedWaypoint = waypoint;
-      this.showWaypointDialog = true;
+    /** 从数据库拉取最新的航线列表数据 */
+    async getList() {
+      try {
+        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,
+            name: s.name,
+            routes: []
+          }));
+        }
+        //获取所有航线
+        const routeRes = await listRoutes({});
+        if (routeRes.code === 200) {
+          const allRoutes = routeRes.rows.map(item => ({
+            id: item.id,
+            name: item.callSign,
+            points: item.waypoints ? item.waypoints.length : 0,
+            waypoints: item.waypoints || [],
+            conflict: false,
+            scenarioId: item.scenarioId
+          }));
+          //分配航线到方案
+          this.plans.forEach(plan => {
+            plan.routes = allRoutes.filter(r => r.scenarioId === plan.id);
+          });
+
+          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);
+        this.$message.error("获取方案列表失败");
+      }
     },
-    updateWaypoint(updatedWaypoint) {
-      // 1. 检查是否有正在编辑的航线详情
-      if (this.selectedRouteDetails && this.selectedRouteDetails.waypoints) {
+    handleMapDrawComplete(points) {
+      if (!points || points.length < 2) {
+        this.$message.error('航点太少，无法生成航线');
+        this.drawDom = false;
+        return;
+      }
+      this.tempMapPoints = points; // 暂存坐标点
+      this.showNameDialog = true;  // 弹出对话框起名
+    },
+    /** 弹窗点击“确定”：正式将数据保存到后端数据库 */
+    async confirmSaveNewRoute() {
+      // 1. 严格校验
+      if (!this.newRouteName || this.newRouteName.trim() === '') {
+        this.$message.error('新增航线未命名，请输入名称后保存！');
+        return;
+      }
+      const currentScenarioId = this.selectedPlanId;
+      if (!currentScenarioId) {
+        this.$message.warning('请先在左侧选择一个方案，再保存航线！');
+        return;
+      }
+
+      // 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,
+        platformId: 1,
+        attributes: "{}",
+        waypoints: finalWaypoints
+      };
+
+      try {
+        const response = await addRoutes(routeData);
+        if (response.code === 200) {
+          const savedRoute = response.data;
+          const newRouteId = savedRoute?.id;
 
-        // 2. 找到当前被编辑的这个航点在数组中的位置
-        const index = this.selectedRouteDetails.waypoints.indexOf(this.selectedWaypoint);
+          if (!newRouteId || !savedRoute.waypoints) {
+            this.$message.error('保存成功但返回数据结构异常，请手动刷新');
+            return;
+          }
+
+          // 1. 更新当前选中详情
+          this.selectedRouteId = newRouteId;
+          this.selectedRouteDetails = JSON.parse(JSON.stringify(savedRoute));
 
-        if (index !== -1) {
-          // 3. 使用 splice 方法替换数据
-          this.selectedRouteDetails.waypoints.splice(index, 1, updatedWaypoint);
+          // 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 = [];
+
+          // 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 会清空所有，那这里就不能调用它
+          }
 
-          // 4. 更新当前的选中引用，以便连续编辑
-          this.selectedWaypoint = updatedWaypoint;
+          // 5. 渲染新航线
+          this.$nextTick(() => {
+            if (this.$refs.cesiumMap) {
+              // 只画这一条新线，旧线因为没被清除，依然会留在地图上
+              this.$refs.cesiumMap.renderRouteWaypoints(savedRoute.waypoints, newRouteId);
+            }
+            this.$message.success('航线及其航点已成功保存并同步');
+          });
 
-          this.$message.success('航点更新成功');
+          this.getList();
+        }
+      } catch (error) {
+        console.error(">>> [保存异常]:", error);
+        this.$message.error('保存失败，请检查网络或后端日志');
+      }
+    },
+    // 航点编辑弹窗相关方法
+    openWaypointDialog(data) {
+      console.log(">>> [父组件接收] 编辑航点详情:", data);
+      // 将整个对象赋值给弹窗绑定的变量
+      this.selectedWaypoint = data;
+      this.showWaypointDialog = true;
+    },
+    /** 航点编辑保存：更新数据库并同步地图显示 */
+    async updateWaypoint(updatedWaypoint) {
+      if (!this.selectedRouteDetails || !this.selectedRouteDetails.waypoints) return;
+      try {
+        if (this.$refs.cesiumMap && updatedWaypoint.turnAngle > 0) {
+          updatedWaypoint.turnRadius = this.$refs.cesiumMap.getWaypointRadius(updatedWaypoint);
         } else {
-          // 如果用 indexOf 没找到，尝试用名字匹配兜底
-          const nameIndex = this.selectedRouteDetails.waypoints.findIndex(p => p.name === this.selectedWaypoint.name);
-          if (nameIndex !== -1) {
-            this.selectedRouteDetails.waypoints.splice(nameIndex, 1, updatedWaypoint);
-            this.selectedWaypoint = updatedWaypoint;
-            this.$message.success('航点更新成功');
-          } else {
-            this.$message.error('更新失败：未找到对应航点');
+          updatedWaypoint.turnRadius = 0;
+        }
+        const response = await updateWaypoints(updatedWaypoint);
+        if (response.code === 200) {
+          const index = this.selectedRouteDetails.waypoints.findIndex(p => p.id === updatedWaypoint.id);
+          if (index !== -1) {
+            // 更新本地数据
+            this.selectedRouteDetails.waypoints.splice(index, 1, { ...updatedWaypoint });
+            // 通知地图组件同步更新
+            if (this.$refs.cesiumMap) {
+              // 更新航点图标
+              this.$refs.cesiumMap.updateWaypointGraphicById(updatedWaypoint.id, updatedWaypoint.name);
+              // 重新触发航线渲染
+              this.$refs.cesiumMap.renderRouteWaypoints(
+                this.selectedRouteDetails.waypoints,
+                this.selectedRouteDetails.id
+              );
+            }
+            this.showWaypointDialog = false;
+            this.$message.success('航点信息已持久化至数据库');
           }
+        } else {
+          // 如果 code 不是 200，手动抛出错误进入catch
+          throw new Error(response.msg || '后端业务逻辑校验失败');
         }
+      } catch (error) {
+        console.error("更新航点失败:", error);
+        this.$message.error(error.message || '数据库更新失败，请重试');
       }
     },
     updateTime() {
@@ -582,9 +915,6 @@ export default {
       this.isMenuHidden = true;
     },
 
-    selectTopNav(item) {
-      console.log('选中顶部导航:', item);
-    },
 
     // 右侧面板操作
     showRightPanel() {
@@ -592,6 +922,11 @@ export default {
       this.$message.info('显示右侧面板');
     },
 
+    // 顶部导航栏操作
+    selectTopNav(item) {
+      this.activeMenu = item.id;
+    },
+
     // 文件下拉菜单方法
     savePlan() {
       this.$message.success('保存计划');
@@ -717,7 +1052,7 @@ export default {
         'layerFavorites': () => this.layerFavorites(),
         'routeFavorites': () => this.routeFavorites()
       }
-      
+
       if (actionMap[actionId]) {
         actionMap[actionId]()
       }
@@ -740,6 +1075,7 @@ export default {
 
     timeSettings() {
       this.$message.success('时间设置');
+      // 这里可以添加时间设置的逻辑
     },
 
     aircraftSettings() {
@@ -899,6 +1235,7 @@ export default {
       this.$message.success('航线收藏');
     },
 
+
     hideRightPanel() {
       this.isRightPanelHidden = true;
       this.$message.info('隐藏右侧面板');
@@ -910,6 +1247,12 @@ export default {
         this.handleMenuAction(item.action)
       }
 
+      // 点击方案、平台、冲突等菜单项时，停止地图绘制状态
+      if (item.id === 'file' || item.id === 'start' || item.id === 'insert') {
+        this.drawDom = false;
+        this.airspaceDrawDom = false;
+      }
+
       // 点击左侧的方案、冲突、平台时，切换右侧面板内容
       if (item.id === 'file') {
         // 如果当前已经是方案标签页，则关闭右侧面板
@@ -935,16 +1278,32 @@ export default {
           this.activeRightTab = 'platform';
           this.isRightPanelHidden = false;
         }
-      } else if(item.id === 'modify'){
+      } else if (item.id === 'modify') {
+        // 点击测距时，启用测距绘制模式，关闭空域绘制模式
         this.drawDom = !this.drawDom
-        console.log(this.drawDom,999999)
-      }
-      if (item.id === 'deduction') {
+        this.airspaceDrawDom = false
+        // 点击测距图标进行地图绘制时，自动收起右侧面板
+        this.isRightPanelHidden = true;
+        console.log('测距绘制模式:', this.drawDom, 999999)
+      } else if (item.id === 'pattern') {
+        // 点击空域时，启用空域绘制模式，关闭测距绘制模式
+        this.airspaceDrawDom = !this.airspaceDrawDom
+        this.drawDom = false
+        // 点击空域图标进行地图绘制时，自动收起右侧面板
+        this.isRightPanelHidden = true;
+        console.log('空域绘制模式:', this.airspaceDrawDom, 999999)
+      } else if (item.id === 'deduction') {
         // 点击推演按钮，显示/隐藏K时弹出框
         this.showKTimePopup = !this.showKTimePopup;
-      }
-      if (item.id === 'save') {
-        this.savePlan();
+        // 点击推演时，也停止地图绘制状态
+        this.drawDom = false;
+        this.airspaceDrawDom = false;
+      } else {
+        // 点击其他菜单项时，也自动收起右侧面板
+        this.isRightPanelHidden = true;
+        // 点击其他菜单项时，也停止地图绘制状态
+        this.drawDom = false;
+        this.airspaceDrawDom = false;
       }
     },
 
@@ -1036,78 +1395,177 @@ export default {
       const minutes = (val % 4) * 15;
       return `K+${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:00`;
     },
-
-    // 航线操作
     selectPlan(plan) {
-      this.selectedPlanId = plan.id;
-      this.selectedPlanDetails = plan;
+      if (plan && plan.id) {
+        this.selectedPlanId = plan.id;
+        this.selectedPlanDetails = plan;
+      } else {
+        this.selectedPlanId = null;
+        this.selectedPlanDetails = null;
+      }
+
+      // 重置状态
       this.selectedRouteId = null;
       this.selectedRouteDetails = null;
-    },
+      this.activeRouteIds = [];
 
-    selectRoute(route) {
-      this.selectedRouteId = route.id;
-      // 模拟获取航点数据
-      this.selectedRouteDetails = {
-        id: route.id,
-        name: route.name,
-        waypoints: [
-          { name: 'WP1', altitude: 1000, speed: 250 },
-          { name: 'WP2', altitude: 1500, speed: 300 },
-          { name: 'WP3', altitude: 2000, speed: 350 },
-          { name: 'WP4', altitude: 1800, speed: 320 },
-          { name: 'WP5', altitude: 1200, speed: 280 },
-          { name: 'WP6', altitude: 1000, speed: 250 },
-          { name: 'WP7', altitude: 800, speed: 220 },
-          { name: 'WP8', altitude: 600, speed: 200 },
-        ]
-      };
+      // 物理清场
+      if (this.$refs.cesiumMap && this.$refs.cesiumMap.clearAllWaypoints) {
+        this.$refs.cesiumMap.clearAllWaypoints();
+      }
+      console.log(`>>> [切换成功] 已进入方案: ${plan.name}，地图已清空，列表已展开。`);
     },
+    /** 切换航线：实现多选/开关逻辑 */
+    async selectRoute(route) {
+      const index = this.activeRouteIds.indexOf(route.id);
+      const isRouteExpanded = this.$refs.rightPanel ? this.$refs.rightPanel.expandedRoutes.includes(route.id) : false;
+      // 航线已在选中列表中
+      if (index > -1) {
+        if (isRouteExpanded) {
+          return;
+        } else {
+          // 航线未展开，点击则取消选中（从地图移除）
+          this.activeRouteIds.splice(index, 1);
+          if (this.$refs.cesiumMap) {
+            this.$refs.cesiumMap.removeRouteById(route.id);
+          }
+          if (this.selectedRouteDetails && this.selectedRouteDetails.id === route.id) {
+            if (this.activeRouteIds.length > 0) {
+              const lastId = this.activeRouteIds[this.activeRouteIds.length - 1];
+              try {
+                const res = await getRoutes(lastId);
+                if (res.code === 200 && res.data) {
+                  this.selectedRouteId = res.data.id;
+                  this.selectedRouteDetails = {
+                    id: res.data.id,
+                    name: res.data.callSign,
+                    waypoints: res.data.waypoints || []
+                  };
+                }
+              } catch (e) {
+                console.error("回显剩余航线失败", e);
+              }
+            } else {
+              this.selectedRouteId = null;
+              this.selectedRouteDetails = null;
+            }
+          }
+          this.$message.info(`已取消航线: ${route.name}`);
+          return;
+        }
+      }
 
-    createPlan() {
-      const newId = Date.now();
-      const newPlan = {
-        id: newId,
-        name: `新方案${this.plans.length + 1}`,
-        routes: []
-      };
-      this.plans.push(newPlan);
-      this.selectPlan(newPlan);
-    },
+      // 航线未被选中，点击则选中并显示航线和航点
+      try {
+        const response = await getRoutes(route.id);
+        if (response.code === 200 && response.data) {
+          const fullRouteData = response.data;
+          const waypoints = fullRouteData.waypoints || [];
+          this.activeRouteIds.push(route.id);
+          this.selectedRouteId = fullRouteData.id;
+          this.selectedRouteDetails = {
+            id: fullRouteData.id,
+            name: fullRouteData.callSign,
+            waypoints: waypoints
+          };
+
+          // 更新 routes 数组中对应航线的 waypoints 字段
+          const routeIndex = this.routes.findIndex(r => r.id === route.id);
+          if (routeIndex > -1) {
+            this.$set(this.routes, routeIndex, {
+              ...this.routes[routeIndex],
+              waypoints: waypoints
+            });
+          }
 
-    createRoute() {
-      if (!this.selectedPlanDetails) {
-        this.$message.warning('请先选择一个方案');
-        return;
+          if (waypoints.length > 0) {
+            // 通知地图渲染
+            if (this.$refs.cesiumMap) {
+              this.$refs.cesiumMap.renderRouteWaypoints(waypoints, route.id);
+            }
+          } else {
+            this.$message.warning('该航线暂无坐标数据，无法在地图展示');
+          }
+        }
+      } catch (error) {
+        console.error("获取航线详情失败:", error);
+        this.$message.error('无法加载该航线的详细航点数据');
       }
-      const newId = Date.now();
-      const newRoute = {
-        id: newId,
-        name: `新航线${this.selectedPlanDetails.routes.length + 1}`,
-        points: 0,
-        conflict: false
-      };
-      this.selectedPlanDetails.routes.push(newRoute);
-      this.selectRoute(newRoute);
     },
 
+    createPlan() {
+      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) {
         const count = this.selectedRouteDetails.waypoints.length + 1;
         this.selectedRouteDetails.waypoints.push({
           name: `WP${count}`,
-          altitude: 1000,
-          speed: 250
+          alt: 5000,
+          speed: '800km/h',
+          eta: `K+01:${(count * 15).toString().padStart(2, '0')}:00`
         });
         if (this.selectedPlanDetails) {
           const route = this.selectedPlanDetails.routes.find(r => r.id === this.selectedRouteId);
@@ -1117,11 +1575,53 @@ export default {
         }
       }
     },
-
     cancelRoute() {
-      this.selectedRouteId = null;
+      // 清空所有选中的航线
+      if (this.$refs.cesiumMap) {
+        this.activeRouteIds.forEach(id => {
+          this.$refs.cesiumMap.removeRouteById(id);
+        });
+      }
+      this.activeRouteIds = [];
       this.selectedRouteDetails = null;
-      this.$message.info('已取消选中');
+      this.$message.info('已清空所有选中航线');
+    },
+
+    // 切换航线显示/隐藏
+    toggleRouteVisibility(route) {
+      const index = this.activeRouteIds.indexOf(route.id);
+
+      if (index > -1) {
+        // 航线已显示，隐藏它
+        // 使用过滤创建新数组，确保 Vue 能够检测到变化
+        this.activeRouteIds = this.activeRouteIds.filter(id => id !== route.id);
+        if (this.$refs.cesiumMap) {
+          this.$refs.cesiumMap.removeRouteById(route.id);
+        }
+        if (this.selectedRouteDetails && this.selectedRouteDetails.id === route.id) {
+          if (this.activeRouteIds.length > 0) {
+            const lastId = this.activeRouteIds[this.activeRouteIds.length - 1];
+            getRoutes(lastId).then(res => {
+              if (res.code === 200 && res.data) {
+                this.selectedRouteId = res.data.id;
+                this.selectedRouteDetails = {
+                  id: res.data.id,
+                  name: res.data.callSign,
+                  waypoints: res.data.waypoints || []
+                };
+              }
+            }).catch(e => {
+              console.error("获取航线详情失败", e);
+            });
+          } else {
+            this.selectedRouteId = null;
+            this.selectedRouteDetails = null;
+          }
+        }
+      } else {
+        // 航线已隐藏，显示它
+        this.selectRoute(route);
+      }
     },
 
     // 冲突操作
@@ -1155,7 +1655,6 @@ export default {
 </script>
 
 <style scoped>
-/* 保持原有样式不变，仅修复背景图语法的注释部分 */
 .mission-planning-container {
   position: relative;
   width: 100vw;
@@ -1172,11 +1671,12 @@ export default {
   height: 100%;
   background: linear-gradient(135deg, #1a2f4b 0%, #2c3e50 100%);
   /* 正确的写法，直接复制这行替换 */
-background: url('~@/assets/map-background.png');
+  background: url('~@/assets/map-background.png');
   background-size: cover;
   background-position: center;
   z-index: 1;
 }
+
 /* ...其余样式省略，保持不变... */
 .map-overlay-text {
   position: absolute;
@@ -1315,6 +1815,7 @@ background: url('~@/assets/map-background.png');
   box-shadow: 0 0 10px rgba(0, 138, 255, 0.8);
 }
 
+/* 蓝色主题标签页 */
 .blue-tabs >>> .el-tabs__item {
   color: #666;
   transition: all 0.3s;
diff --git a/ruoyi-ui/src/views/dialogs/PlatformEditDialog.vue b/ruoyi-ui/src/views/dialogs/PlatformEditDialog.vue
index 7a6d722..0c12bea 100644
--- a/ruoyi-ui/src/views/dialogs/PlatformEditDialog.vue
+++ b/ruoyi-ui/src/views/dialogs/PlatformEditDialog.vue
@@ -2,21 +2,21 @@
   <div v-if="value" class="platform-edit-dialog">
     <!-- 遮罩层 -->
     <div class="dialog-overlay" @click="closeDialog"></div>
-    
+
     <!-- 弹窗内容 -->
     <div class="dialog-content">
       <div class="dialog-header">
         <h3>平台编辑</h3>
         <div class="close-btn" @click="closeDialog">×</div>
       </div>
-      
+
       <div class="dialog-body">
         <el-form :model="formData" :rules="rules" ref="formRef" label-width="80px" size="small">
           <!-- 基本信息 -->
           <el-form-item label="名称" prop="name">
             <el-input v-model="formData.name" placeholder="请输入平台名称"></el-input>
           </el-form-item>
-          
+
           <el-form-item label="位置">
             <div class="location-inputs">
               <el-input v-model="formData.location.lat" placeholder="纬度" style="width: 120px;"></el-input>
@@ -24,54 +24,54 @@
               <el-input v-model="formData.location.lng" placeholder="经度" style="width: 120px;"></el-input>
             </div>
           </el-form-item>
-          
+
           <el-form-item label="速度" prop="speed">
             <el-input v-model="formData.speed" placeholder="请输入速度" suffix="km/h"></el-input>
           </el-form-item>
-          
+
           <el-form-item label="油耗表" prop="fuelConsumption">
-            <el-input-number 
-              v-model="formData.fuelConsumption" 
-              :min="0" 
-              :precision="2" 
+            <el-input-number
+              v-model="formData.fuelConsumption"
+              :min="0"
+              :precision="2"
               placeholder="请输入油耗"
               style="width: 100%;"
               suffix="L/km"
             ></el-input-number>
           </el-form-item>
-          
+
           <el-form-item label="高度限制">
             <div class="altitude-inputs">
-              <el-input-number 
-                v-model="formData.altitude.min" 
-                :min="0" 
+              <el-input-number
+                v-model="formData.altitude.min"
+                :min="0"
                 placeholder="最低高度"
                 style="width: 120px;"
                 suffix="m"
               ></el-input-number>
               <span class="altitude-separator">~</span>
-              <el-input-number 
-                v-model="formData.altitude.max" 
-                :min="0" 
+              <el-input-number
+                v-model="formData.altitude.max"
+                :min="0"
                 placeholder="最高高度"
                 style="width: 120px;"
                 suffix="m"
               ></el-input-number>
             </div>
           </el-form-item>
-          
+
           <el-form-item label="威力区/扇区">
             <div class="sector-inputs">
-              <el-input-number 
-                v-model="formData.sector.radius" 
-                :min="0" 
+              <el-input-number
+                v-model="formData.sector.radius"
+                :min="0"
                 placeholder="半径"
                 style="width: 100px;"
                 suffix="km"
               ></el-input-number>
-              <el-input-number 
-                v-model="formData.sector.angle" 
-                :min="0" 
+              <el-input-number
+                v-model="formData.sector.angle"
+                :min="0"
                 :max="360"
                 placeholder="角度"
                 style="width: 100px;"
@@ -81,7 +81,7 @@
           </el-form-item>
         </el-form>
       </div>
-      
+
       <div class="dialog-footer">
         <el-button @click="closeDialog">取消</el-button>
         <el-button type="primary" @click="savePlatform">保存</el-button>
@@ -292,4 +292,4 @@ export default {
   border-top: 1px solid #e8e8e8;
   gap: 10px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/ruoyi-ui/src/views/dialogs/PlatformImportDialog.vue b/ruoyi-ui/src/views/dialogs/PlatformImportDialog.vue
new file mode 100644
index 0000000..0efc954
--- /dev/null
+++ b/ruoyi-ui/src/views/dialogs/PlatformImportDialog.vue
@@ -0,0 +1,128 @@
+<template>
+  <el-dialog
+    title="新增平台"
+    :visible="visible"
+    width="500px"
+    @close="handleClose"
+    custom-class="blue-dialog"
+  >
+    <el-form :model="formData" :rules="rules" ref="importForm" label-width="100px" size="small">
+      <el-form-item label="平台名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入平台名称"></el-input>
+      </el-form-item>
+
+      <el-form-item label="平台分类" prop="type">
+        <el-select v-model="formData.type" placeholder="请选择分类" style="width: 100%">
+          <el-option label="空中" value="Air"></el-option>
+          <el-option label="海上" value="Sea"></el-option>
+          <el-option label="地面" value="Ground"></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="平台图标">
+        <el-upload
+          class="icon-uploader"
+          action="#"
+          :auto-upload="false"
+          :show-file-list="false"
+          :on-change="handleIconChange"
+        >
+          <div v-if="imageUrl" class="preview-container">
+            <img :src="imageUrl" class="platform-icon-preview">
+            <div class="re-upload-mask">修改图标</div>
+          </div>
+          <i v-else class="el-icon-plus uploader-icon"></i>
+        </el-upload>
+        <div class="upload-tip">建议尺寸: 64x64, 支持 png/jpg</div>
+      </el-form-item>
+    </el-form>
+
+    <div slot="footer">
+      <el-button @click="handleClose">取消</el-button>
+      <el-button type="primary" @click="handleConfirm">确认新增</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'PlatformImportDialog',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      imageUrl: '',
+      formData: {
+        name: '',
+        type: '',
+        icon_file: null
+      },
+      rules: {
+        name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+        type: [{ required: true, message: '请选择分类', trigger: 'change' }]
+      }
+    }
+  },
+  methods: {
+    handleIconChange(file) {
+      // 生成本地预览图
+      this.imageUrl = URL.createObjectURL(file.raw);
+      this.formData.icon_file = file.raw;
+    },
+
+    handleClose() {
+      this.imageUrl = '';
+      // 重置数据
+      this.formData = {
+        name: '',
+        type: '',
+        icon_file: null
+      };
+      this.$emit('update:visible', false);
+    },
+
+    handleConfirm() {
+      this.$refs.importForm.validate((valid) => {
+        if (valid) {
+          // 将包含原始 File 对象的 formData 传给父组件
+          this.$emit('confirm', { ...this.formData });
+          this.handleClose();
+        }
+      });
+    }
+  }
+}
+</script>
+
+<style scoped>
+/* 简单的上传样式 */
+.icon-uploader {
+  border: 1px dashed #409EFF;
+  border-radius: 6px;
+  width: 80px;
+  height: 80px;
+  cursor: pointer;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+}
+.platform-icon-preview {
+  width: 60px;
+  height: 60px;
+  object-fit: contain;
+}
+.uploader-icon {
+  font-size: 24px;
+  color: #8c939d;
+}
+.upload-tip {
+  font-size: 12px;
+  color: #999;
+  line-height: 20px;
+}
+</style>
diff --git a/ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue b/ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue
index 57e05d4..6bb0006 100644
--- a/ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue
+++ b/ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue
@@ -14,9 +14,9 @@
             <el-input v-model="formData.name" placeholder="请输入航点名称"></el-input>
           </el-form-item>
 
-          <el-form-item label="高度" prop="altitude">
+          <el-form-item label="高度" prop="alt">
             <el-input-number
-              v-model="formData.altitude"
+              v-model="formData.alt"
               :min="0"
               controls-position="right"
               placeholder="请输入高度"
@@ -34,13 +34,17 @@
             ></el-input-number>
           </el-form-item>
 
-          <el-form-item label="转弯坡度" prop="turnBank">
+          <el-form-item label="转弯坡度" prop="turnAngle">
             <el-input-number
-              v-model="formData.turnBank"
+              v-model="formData.turnAngle"
               controls-position="right"
               placeholder="请输入转弯坡度"
               style="width: 100%;"
+              :disabled="formData.isBankDisabled"
             ></el-input-number>
+            <div v-if="formData.isBankDisabled" style="color: #909399; font-size: 12px; margin-top: 4px;">
+              ⚠️ 首尾航点坡度已锁定为 0，不可编辑
+            </div>
           </el-form-item>
 
           <el-form-item label="起始时间" prop="startTime">
@@ -78,7 +82,6 @@ export default {
     }
   },
   data() {
-    // 定义一个通用的数字校验函数，允许 0
     const validateNumber = (rule, value, callback) => {
       // 检查 value 是否为 undefined, null 或 空字符串
       // 注意：这里不能简单用 !value，因为 !0 是 true
@@ -92,16 +95,19 @@ export default {
     return {
       formData: {
         name: '',
-        altitude: 0,
-        speed: 0,
-        turnBank: 0,
-        startTime: ''
+        alt: 5000,
+        speed: 800,
+        turnAngle: 0,
+        startTime: '',
+        currentIndex: -1,
+        totalPoints: 0,
+        isBankDisabled: false
       },
       rules: {
         name: [
           { required: true, message: '请输入航点名称', trigger: 'blur' }
         ],
-        altitude: [
+        alt: [
           // 使用自定义 validator 替代 type: 'number' 组合，确保 0 被接受
           { required: true, validator: validateNumber, message: '请输入有效高度', trigger: ['blur', 'change'] }
         ],
@@ -109,7 +115,7 @@ export default {
           // 重点修改：使用自定义 validator，允许速度为 0
           { required: true, validator: validateNumber, message: '请输入有效速度', trigger: ['blur', 'change'] }
         ],
-        turnBank: [
+        turnAngle: [
           // 同样应用到转弯坡度
           { required: true, validator: validateNumber, message: '请输入有效转弯坡度', trigger: ['blur', 'change'] }
         ],
@@ -133,17 +139,21 @@ export default {
   },
   methods: {
     initFormData() {
-      // 保持数据类型正确，确保是 Number 类型
+      const index = this.waypoint.currentIndex !== undefined ? this.waypoint.currentIndex : -1;
+      const total = this.waypoint.totalPoints || 0;
+      const locked = (index === 0) || (total > 0 && index === total - 1);
+
       this.formData = {
         name: this.waypoint.name || '',
-        // 确保初始化时也是数字类型
-        altitude: this.waypoint.altitude !== undefined && this.waypoint.altitude !== null ? Number(this.waypoint.altitude) : 0,
+        alt: this.waypoint.alt !== undefined && this.waypoint.alt !== null ? Number(this.waypoint.alt) : 0,
         speed: this.waypoint.speed !== undefined && this.waypoint.speed !== null ? Number(this.waypoint.speed) : 0,
-        turnBank: this.waypoint.turnBank !== undefined && this.waypoint.turnBank !== null ? Number(this.waypoint.turnBank) : 0,
-        startTime: this.waypoint.startTime || ''
+        startTime: this.waypoint.startTime || '',
+        currentIndex: index,
+        totalPoints: total,
+        isBankDisabled: locked,
+        turnAngle: locked ? 0 : (Number(this.waypoint.turnAngle) || 0)
       };
 
-      // 弹窗打开时，尝试清除之前的校验痕迹
       this.$nextTick(() => {
         if (this.$refs.formRef) {
           this.$refs.formRef.clearValidate();
diff --git a/ruoyi-ui/src/views/selectRoom/index.vue b/ruoyi-ui/src/views/selectRoom/index.vue
index 0f4daef..6740b94 100644
--- a/ruoyi-ui/src/views/selectRoom/index.vue
+++ b/ruoyi-ui/src/views/selectRoom/index.vue
@@ -46,7 +46,6 @@
                 </div>
               </div>
             </div>
-
             <div v-if="expandedRooms.includes(room.id)" class="child-rooms">
               <div
                 v-for="childRoom in getChildRooms(room.id)"
@@ -75,14 +74,12 @@
               </div>
             </div>
           </div>
-
           <div v-if="getParentRooms.length === 0" class="empty-state">
             <i class="fa fa-sitemap"></i>
             <h3>暂无房间</h3>
             <p>点击下方按钮创建您的第一个房间</p>
           </div>
         </div>
-
         <div class="action-buttons">
           <button @click="showAddRoomDialog" class="btn-secondary">
             <i class="fa fa-plus"></i> 新增大房间
@@ -97,12 +94,10 @@
           </button>
         </div>
       </div>
-
       <div class="footer-info">
         <p>© 2026 网络化任务规划系统 | 支持Windows/国产化系统互通</p>
       </div>
     </div>
-
     <div
       v-if="contextMenu.visible"
       :style="{ left: contextMenu.x + 'px', top: contextMenu.y + 'px' }"
@@ -117,7 +112,6 @@
         <span>删除房间</span>
       </div>
     </div>
-
     <el-dialog
       :title="dialog.mode === 'add' ? '新增房间' : '修改房间'"
       :visible.sync="dialog.visible"
@@ -198,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) {
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 0488a18..fa4cddd 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -1,10 +1,15 @@
 'use strict'
 const path = require('path')
+const fs = require('fs')
 
 function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
+// 离线瓦片目录：放在 public 外避免构建时复制导致 EMFILE（too many open files）
+const tilesDir = path.join(__dirname, 'tiles')
+const tilesInPublic = path.join(__dirname, 'public', 'tiles')
+
 const CompressionPlugin = require('compression-webpack-plugin')
 // 引入 CopyWebpackPlugin 用于复制 Cesium 静态资源
 const CopyWebpackPlugin = require('copy-webpack-plugin')
@@ -37,6 +42,12 @@ module.exports = {
     host: '0.0.0.0',
     port: port,
     open: true,
+    // 从 public 外提供 /tiles，避免 2 万+ 瓦片参与 public 复制触发 EMFILE
+    before(app) {
+      const express = require('express')
+      const serveAt = fs.existsSync(tilesDir) ? tilesDir : tilesInPublic
+      app.use('/tiles', express.static(serveAt))
+    },
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
         target: baseUrl,