From f63b8d16a6508c6b07b5a128c4669d14dd5eb566 Mon Sep 17 00:00:00 2001
From: menghao <1584479611@qq.com>
Date: Wed, 25 Feb 2026 08:41:23 +0800
Subject: [PATCH] 1
---
ruoyi-ui/src/views/cesiumMap/index.vue | 212 ++++++++++++++++-----------------
1 file changed, 103 insertions(+), 109 deletions(-)
diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue
index e34114c..d5b2077 100644
--- a/ruoyi-ui/src/views/cesiumMap/index.vue
+++ b/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"
/>
@@ -136,7 +133,7 @@
/>
-
+