1

ruoyi-ui/src/views/cesiumMap/index.vue

@@ -40,14 +40,11 @@
       @show-transform-box="showPlatformIconTransformBox"
       @toggle-route-label="toggleRouteLabelVisibility"
       @toggle-route-lock="toggleRouteLock"
-<<<<<<< HEAD
-      @edit-platform="openEditPlatformDialog"
-      @power-zone="openPowerZoneDialog"
-=======
       @start-route-before-platform="handleStartRouteBeforePlatform"
       @start-route-after-platform="handleStartRouteAfterPlatform"
       @copy-route="handleCopyRouteFromMenu"
->>>>>>> 9363256d79ba1d213479769fa0a97c737d179e32
+      @edit-platform="openEditPlatformDialog"
+      @power-zone="openPowerZoneDialog"
     />
 
     <!-- 定位弹窗 -->
@@ -291,16 +288,13 @@ export default {
       },
       // 航线飞机标牌显示状态：routeId -> true 显示 / false 隐藏，不设则默认显示
       routeLabelVisible: {},
-<<<<<<< HEAD
       // 航线飞机标牌样式：routeId -> { fontSize, fontColor }
       routeLabelStyles: {},
       // 航线上锁状态：routeId -> true 上锁（不可编辑）/ false 或未设 可编辑
       routeLocked: {},
-=======
       // 航线上锁状态由父组件通过 prop routeLocked 传入，与右侧列表锁图标同步
       // 从平台右键进入的航线绘制：{ platformInfo: { platformId, platform }, mode: 'before'|'after' }
       platformRouteDrawing: null,
->>>>>>> 9363256d79ba1d213479769fa0a97c737d179e32
       // 默认样式
       defaultStyles: {
         point: { color: '#FF0000', size: 12 },