盘旋圆、椭圆轨迹，时间轴悬浮展示时间，顺时针逆时针方向修正，定时定速点

ruoyi-system/src/main/java/com/ruoyi/system/domain/RouteWaypoints.java

@@ -245,6 +245,33 @@ public class RouteWaypoints extends BaseEntity
         return displayStyle != null && displayStyle.getOutlineColor() != null ? displayStyle.getOutlineColor() : "#000000";
     }
 
+    /** 航段模式：fixed_speed-定速，fixed_time-定时，空或null-普通 */
+    public String getSegmentMode() {
+        return displayStyle != null ? displayStyle.getSegmentMode() : null;
+    }
+
+    public void setSegmentMode(String segmentMode) {
+        getOrCreateDisplayStyle().setSegmentMode(segmentMode);
+    }
+
+    /** 定时目标(分)：fixed_time 时表示期望到达本航点的相对K时，可与相对K时分离支持“定时到达+盘旋至相对K时出发” */
+    public Double getSegmentTargetMinutes() {
+        return displayStyle != null ? displayStyle.getSegmentTargetMinutes() : null;
+    }
+
+    public void setSegmentTargetMinutes(Double segmentTargetMinutes) {
+        getOrCreateDisplayStyle().setSegmentTargetMinutes(segmentTargetMinutes);
+    }
+
+    /** 定速目标(km/h)：fixed_speed 时表示本航段固定速度 */
+    public Double getSegmentTargetSpeed() {
+        return displayStyle != null ? displayStyle.getSegmentTargetSpeed() : null;
+    }
+
+    public void setSegmentTargetSpeed(Double segmentTargetSpeed) {
+        getOrCreateDisplayStyle().setSegmentTargetSpeed(segmentTargetSpeed);
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-system/src/main/java/com/ruoyi/system/domain/WaypointDisplayStyle.java

@@ -19,6 +19,12 @@ public class WaypointDisplayStyle implements Serializable {
     private Integer pixelSize;
     /** 航点圆点边框颜色，默认 #000000 */
     private String outlineColor;
+    /** 航段模式：fixed_speed-定速(移动下一航点改下一航点相对K时), fixed_time-定时(移动本航点改上一航点速度), 空或null-普通 */
+    private String segmentMode;
+    /** 定时目标(分)：fixed_time 时表示期望到达本航点的相对K时(分)，与相对K时分离后可支持“定时到达+盘旋至相对K时出发” */
+    private Double segmentTargetMinutes;
+    /** 定速目标(km/h)：fixed_speed 时表示本航段使用的固定速度，用于重算下一航点相对K时 */
+    private Double segmentTargetSpeed;
 
     public Integer getLabelFontSize() {
         return labelFontSize;
@@ -59,4 +65,28 @@ public class WaypointDisplayStyle implements Serializable {
     public void setOutlineColor(String outlineColor) {
         this.outlineColor = outlineColor;
     }
+
+    public String getSegmentMode() {
+        return segmentMode;
+    }
+
+    public void setSegmentMode(String segmentMode) {
+        this.segmentMode = segmentMode;
+    }
+
+    public Double getSegmentTargetMinutes() {
+        return segmentTargetMinutes;
+    }
+
+    public void setSegmentTargetMinutes(Double segmentTargetMinutes) {
+        this.segmentTargetMinutes = segmentTargetMinutes;
+    }
+
+    public Double getSegmentTargetSpeed() {
+        return segmentTargetSpeed;
+    }
+
+    public void setSegmentTargetSpeed(Double segmentTargetSpeed) {
+        this.segmentTargetSpeed = segmentTargetSpeed;
+    }
 }

ruoyi-system/src/main/resources/mapper/system/route_waypoints_display_style_json.sql

@@ -1,27 +0,0 @@
--- 将航点显示相关字段合并为单列 JSON：display_style
--- 执行前请备份。若表带 schema（如 ry.route_waypoints）请自行替换表名。
-
--- 1. 新增 JSON 列
-ALTER TABLE route_waypoints
-  ADD COLUMN display_style JSON DEFAULT NULL COMMENT '航点显示样式JSON: labelFontSize,labelColor,color,pixelSize,outlineColor';
-
--- 2. 从旧列回填（仅存在 label_font_size / label_color 时）
-UPDATE route_waypoints
-SET display_style = JSON_OBJECT(
-  'labelFontSize', COALESCE(label_font_size, 16),
-  'labelColor', COALESCE(label_color, '#000000'),
-  'color', '#ffffff',
-  'pixelSize', 12,
-  'outlineColor', '#000000'
-)
-WHERE display_style IS NULL;
-
--- 3. 删除旧列（若你曾加过 color/pixel_size/outline_color 三列，也一并删除）
-ALTER TABLE route_waypoints
-  DROP COLUMN label_font_size,
-  DROP COLUMN label_color;
-
--- 若存在以下列则逐条执行（没有则跳过）：
--- ALTER TABLE route_waypoints DROP COLUMN color;
--- ALTER TABLE route_waypoints DROP COLUMN pixel_size;
--- ALTER TABLE route_waypoints DROP COLUMN outline_color;

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

@@ -227,7 +227,19 @@
           <i class="el-icon-time"></i>
           <span class="time-text">{{ currentTime }}</span>
         </div>
-        <div class="timeline-slider">
+        <div
+          ref="timelineSliderWrap"
+          class="timeline-slider"
+          @mousemove="onTimelineHover"
+          @mouseleave="onTimelineLeave"
+        >
+          <div
+            v-show="timelineHoverVisible"
+            class="timeline-hover-time"
+            :style="{ left: timelineHoverPercent + '%' }"
+          >
+            {{ timelineHoverTime }}
+          </div>
           <el-slider
             v-model="timeProgress"
             :max="100"
@@ -243,25 +255,12 @@
           >
             <i :class="isPlaying ? 'el-icon-video-pause' : 'el-icon-video-play'"></i>
           </button>
-          <div class="speed-control">
-            <button
-              class="control-btn blue-control-btn"
-              @click="decreaseSpeed"
-              :disabled="playbackSpeed <= 1"
-              title="减速"
-            >
-              <i class="el-icon-arrow-down"></i>
-            </button>
-            <span class="speed-text">{{ playbackSpeed }}x</span>
-            <button
-              class="control-btn blue-control-btn"
-              @click="increaseSpeed"
-              :disabled="playbackSpeed >= 25"
-              title="加速"
-            >
-              <i class="el-icon-arrow-up"></i>
-            </button>
-          </div>
+          <el-dropdown trigger="click" @command="setPlaybackSpeed" class="speed-control">
+            <span class="speed-text clickable">{{ playbackSpeed }}x<i class="el-icon-arrow-down el-icon--right"></i></span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item v-for="s in speedOptions" :key="s" :command="s">{{ s }}x</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </div>
       </div>
       <el-dialog :title="addHoldDialogTitle" :visible.sync="showAddHoldDialog" width="420px" append-to-body>
@@ -277,14 +276,8 @@
             <el-input-number v-model="addHoldForm.radius" :min="100" :max="50000" style="width:100%" />
           </el-form-item>
           <template v-if="addHoldForm.holdType === 'hold_ellipse'">
-            <el-form-item label="长半轴(米)">
-              <el-input-number v-model="addHoldForm.semiMajor" :min="100" :max="50000" style="width:100%" />
-            </el-form-item>
-            <el-form-item label="短半轴(米)">
-              <el-input-number v-model="addHoldForm.semiMinor" :min="50" :max="50000" style="width:100%" />
-            </el-form-item>
-            <el-form-item label="长轴方位(度)">
-              <el-input-number v-model="addHoldForm.headingDeg" :min="-180" :max="180" style="width:100%" />
+            <el-form-item label="跑道边长(km)">
+              <el-input-number v-model="addHoldForm.edgeLengthKm" :min="1" :max="200" :step="1" style="width:100%" />
             </el-form-item>
           </template>
           <el-form-item label="盘旋方向">
@@ -653,12 +646,18 @@ export default {
       deductionEarlyArrivalByRoute: {}, // routeId -> earlyArrivalLegs
       showAddHoldDialog: false,
       addHoldContext: null, // { routeId, routeName, legIndex, fromName, toName }
-      addHoldForm: { holdType: 'hold_circle', radius: 15000, semiMajor: 500, semiMinor: 300, headingDeg: 0, clockwise: true, startTime: '', startTimeMinutes: null },
+      addHoldForm: { holdType: 'hold_circle', radius: 15000, edgeLengthKm: 20, clockwise: true, startTime: '', startTimeMinutes: null },
       missionDrawingActive: false,
       missionDrawingPointsCount: 0,
       isPlaying: false,
       playbackSpeed: 1,
+      speedOptions: [64, 32, 16, 8, 4, 2, 1],
       playbackInterval: null,
+      /** 播放时上一帧时间戳（毫秒），用于按真实经过时间推进，避免 setInterval 不准导致时间轴变慢 */
+      _playbackLastTickTime: null,
+      timelineHoverTime: '',
+      timelineHoverVisible: false,
+      timelineHoverPercent: 0,
       /** 导弹从 Redis 加载过的房间+航线组合 key，避免重复加载 */
       _missilesLoadKey: null,
 
@@ -1094,14 +1093,15 @@ export default {
       let pointType;
       let holdParams;
       let turnAngle;
+      const preserveTurnAngle = () => isFirstOrLast ? 0 : (wp.turnAngle != null && wp.turnAngle !== '' ? Number(wp.turnAngle) : 0);
       if (isHold) {
         pointType = 'normal';
         holdParams = null;
-        turnAngle = isFirstOrLast ? 0 : (Number(wp.turnAngle) || 45);
+        turnAngle = preserveTurnAngle();
       } else {
         pointType = 'hold_circle';
         holdParams = JSON.stringify({ radius: 15000, clockwise: true });
-        turnAngle = 0;
+        turnAngle = preserveTurnAngle();
       }
       try {
         const payload = {
@@ -1148,6 +1148,10 @@ export default {
                 if (styleRes.data) this.$refs.cesiumMap.setPlatformStyle(routeId, styleRes.data);
               } catch (_) {}
             }
+            const { minMinutes, maxMinutes } = this.getDeductionTimeRange();
+            if (r.waypoints.some(wp => this.isHoldWaypoint(wp))) {
+              this.getPositionAtMinutesFromK(r.waypoints, minMinutes, minMinutes, maxMinutes, routeId);
+            }
             this.$refs.cesiumMap.removeRouteById(routeId);
             this.$refs.cesiumMap.renderRouteWaypoints(r.waypoints, routeId, r.platformId, r.platform, this.parseRouteStyle(r.attributes));
             this.$nextTick(() => this.updateDeductionPositions());
@@ -1238,6 +1242,10 @@ export default {
       if (wp.holdParams != null) payload.holdParams = wp.holdParams;
       if (wp.labelFontSize != null) payload.labelFontSize = wp.labelFontSize;
       if (wp.labelColor != null) payload.labelColor = wp.labelColor;
+      if (wp.segmentMode != null) payload.segmentMode = wp.segmentMode;
+      if (wp.color != null) payload.color = wp.color;
+      if (wp.pixelSize != null) payload.pixelSize = wp.pixelSize;
+      if (wp.outlineColor != null) payload.outlineColor = wp.outlineColor;
       try {
         const response = await updateWaypoints(payload);
         if (response.code === 200) {
@@ -1248,7 +1256,96 @@ export default {
             const i = this.selectedRouteDetails.waypoints.findIndex(p => p.id === dbId);
             if (i !== -1) this.selectedRouteDetails.waypoints.splice(i, 1, merged);
           }
+          // 定速/定时：根据拖拽后的新位置重算相对K时或上一航点速度
           const routeForPlatform = this.routes.find(r => r.id === routeId) || route;
+          if (idx > 0) {
+            const prev = waypoints[idx - 1];
+            const distM = this.segmentDistance(
+              { lat: prev.lat, lng: prev.lng, alt: prev.alt },
+              { lat: merged.lat, lng: merged.lng, alt: merged.alt }
+            );
+            const prevMinutes = this.waypointStartTimeToMinutesDecimal(prev.startTime);
+            if (prev.segmentMode === 'fixed_speed') {
+              const speedKmh = Number(prev.segmentTargetSpeed ?? prev.speed) || 800;
+              const newMinutesFromK = prevMinutes + (distM / 1000) / speedKmh * 60;
+              const newStartTime = this.minutesToStartTimeWithSeconds(newMinutesFromK);
+              const startPayload = { ...merged, startTime: newStartTime };
+              if (merged.segmentMode != null) startPayload.segmentMode = merged.segmentMode;
+              try {
+                const r2 = await updateWaypoints(startPayload);
+                if (r2.code === 200) {
+                  Object.assign(merged, { startTime: newStartTime });
+                  if (idx !== -1) waypoints.splice(idx, 1, merged);
+                  if (this.selectedRouteDetails && this.selectedRouteDetails.id === routeId) {
+                    const i = this.selectedRouteDetails.waypoints.findIndex(p => p.id === dbId);
+                    if (i !== -1) this.selectedRouteDetails.waypoints.splice(i, 1, merged);
+                  }
+                }
+              } catch (e) {
+                console.warn('定速重算相对K时失败', e);
+              }
+            } else if (merged.segmentMode === 'fixed_time') {
+              const currMinutes = (merged.segmentTargetMinutes != null && merged.segmentTargetMinutes !== '') ? Number(merged.segmentTargetMinutes) : this.waypointStartTimeToMinutesDecimal(merged.startTime);
+              const deltaMin = currMinutes - prevMinutes;
+              if (deltaMin > 0.001) {
+                const newSpeedKmh = (distM / 1000) / (deltaMin / 60);
+                const speedVal = Math.round(newSpeedKmh * 10) / 10;
+                const speedPayload = { ...prev, speed: speedVal };
+                if (prev.segmentMode != null) speedPayload.segmentMode = prev.segmentMode;
+                try {
+                  const r2 = await updateWaypoints(speedPayload);
+                  if (r2.code === 200) {
+                    Object.assign(prev, { speed: speedVal });
+                    const prevIdx = idx - 1;
+                    waypoints.splice(prevIdx, 1, prev);
+                    if (this.selectedRouteDetails && this.selectedRouteDetails.id === routeId) {
+                      const i = this.selectedRouteDetails.waypoints.findIndex(p => p.id === prev.id);
+                      if (i !== -1) this.selectedRouteDetails.waypoints.splice(i, 1, prev);
+                    }
+                  }
+                } catch (e) {
+                  console.warn('定时重算上一航点速度失败', e);
+                }
+              }
+            }
+          }
+          // 下一航点是定时点时：重算本航点（被拖动的）速度，使平台能在下一航点的 K 时到达
+          if (idx >= 0 && idx < waypoints.length - 1) {
+            const next = waypoints[idx + 1];
+            if (next.segmentMode === 'fixed_time') {
+              const distToNextM = this.segmentDistance(
+                { lat: merged.lat, lng: merged.lng, alt: merged.alt },
+                { lat: next.lat, lng: next.lng, alt: next.alt }
+              );
+              const currMinutes = this.waypointStartTimeToMinutesDecimal(merged.startTime);
+              const nextMinutes = (next.segmentTargetMinutes != null && next.segmentTargetMinutes !== '') ? Number(next.segmentTargetMinutes) : this.waypointStartTimeToMinutesDecimal(next.startTime);
+              const deltaMin = nextMinutes - currMinutes;
+              if (deltaMin > 0.001) {
+                const newSpeedKmh = (distToNextM / 1000) / (deltaMin / 60);
+                const speedVal = Math.round(newSpeedKmh * 10) / 10;
+                const currPayload = { ...merged, speed: speedVal };
+                if (merged.segmentMode != null) currPayload.segmentMode = merged.segmentMode;
+                if (merged.labelFontSize != null) currPayload.labelFontSize = merged.labelFontSize;
+                if (merged.labelColor != null) currPayload.labelColor = merged.labelColor;
+                if (merged.color != null) currPayload.color = merged.color;
+                if (merged.pixelSize != null) currPayload.pixelSize = merged.pixelSize;
+                if (merged.outlineColor != null) currPayload.outlineColor = merged.outlineColor;
+                try {
+                  const r2 = await updateWaypoints(currPayload);
+                  if (r2.code === 200) {
+                    Object.assign(merged, { speed: speedVal });
+                    waypoints.splice(idx, 1, merged);
+                    if (this.selectedRouteDetails && this.selectedRouteDetails.id === routeId) {
+                      const i = this.selectedRouteDetails.waypoints.findIndex(p => p.id === dbId);
+                      if (i !== -1) this.selectedRouteDetails.waypoints.splice(i, 1, merged);
+                    }
+                  }
+                } catch (e) {
+                  console.warn('下一航点为定时点重算本航点速度失败', e);
+                }
+              }
+            }
+          }
           if (this.$refs.cesiumMap) {
             const roomId = this.currentRoomId;
             if (roomId && routeForPlatform.platformId) {
@@ -1560,6 +1657,10 @@ export default {
         if (this.activeRouteIds.includes(routeId) && this.$refs.cesiumMap && waypoints.length > 0) {
           const r = this.routes.find(rr => rr.id === routeId);
           if (r) {
+            if (waypoints.some(wp => this.isHoldWaypoint(wp))) {
+              const { minMinutes, maxMinutes } = this.getDeductionTimeRange();
+              this.getPositionAtMinutesFromK(waypoints, minMinutes, minMinutes, maxMinutes, routeId);
+            }
             this.$refs.cesiumMap.removeRouteById(routeId);
             this.$refs.cesiumMap.renderRouteWaypoints(waypoints, routeId, r.platformId, r.platform, this.parseRouteStyle(r.attributes));
             this.$nextTick(() => this.updateDeductionPositions());
@@ -1938,9 +2039,14 @@ export default {
               }
             }));
             this.$nextTick(() => {
+              const { minMinutes, maxMinutes } = this.getDeductionTimeRange();
               this.activeRouteIds.forEach(id => {
                 const route = this.routes.find(r => r.id === id);
                 if (route && route.waypoints && route.waypoints.length > 0 && this.$refs.cesiumMap) {
+                  // 含盘旋航点时先预计算半径/长短轴（根据相对K时与距离），再渲染，使圆/椭圆尺寸正确
+                  if (route.waypoints.some(wp => this.isHoldWaypoint(wp))) {
+                    this.getPositionAtMinutesFromK(route.waypoints, minMinutes, minMinutes, maxMinutes, id);
+                  }
                   this.$refs.cesiumMap.removeRouteById(id);
                   this.$refs.cesiumMap.renderRouteWaypoints(route.waypoints, id, route.platformId, route.platform, this.parseRouteStyle(route.attributes));
                 }
@@ -1981,7 +2087,7 @@ export default {
 
     openAddHoldDuringDrawing() {
       this.addHoldContext = { mode: 'drawing' };
-      this.addHoldForm = { holdType: 'hold_circle', radius: 15000, semiMajor: 500, semiMinor: 300, headingDeg: 0, clockwise: true, startTime: '', startTimeMinutes: 60 };
+      this.addHoldForm = { holdType: 'hold_circle', radius: 15000, edgeLengthKm: 20, clockwise: true, startTime: '', startTimeMinutes: 60 };
       this.showAddHoldDialog = true;
     },
 
@@ -2152,6 +2258,9 @@ export default {
         if (updatedWaypoint.holdParams != null) payload.holdParams = updatedWaypoint.holdParams;
         if (updatedWaypoint.labelFontSize != null) payload.labelFontSize = updatedWaypoint.labelFontSize;
         if (updatedWaypoint.labelColor != null) payload.labelColor = updatedWaypoint.labelColor;
+        if (updatedWaypoint.segmentMode != null) payload.segmentMode = updatedWaypoint.segmentMode;
+        if (updatedWaypoint.segmentTargetMinutes !== undefined) payload.segmentTargetMinutes = updatedWaypoint.segmentTargetMinutes;
+        if (updatedWaypoint.segmentTargetSpeed !== undefined) payload.segmentTargetSpeed = updatedWaypoint.segmentTargetSpeed;
         if (updatedWaypoint.pixelSize != null) payload.pixelSize = updatedWaypoint.pixelSize;
         if (updatedWaypoint.color != null) payload.color = updatedWaypoint.color;
         if (updatedWaypoint.outlineColor != null) payload.outlineColor = updatedWaypoint.outlineColor;
@@ -2169,6 +2278,78 @@ export default {
               const idxInList = routeInList.waypoints.findIndex(p => p.id === updatedWaypoint.id);
               if (idxInList !== -1) routeInList.waypoints.splice(idxInList, 1, merged);
             }
+            // 定时点：根据“本航点相对K时”反算上一航点速度，使平台能在 K+本点时间 到达本点并出发（或提前到达后盘旋至该时刻）
+            if (merged.segmentMode === 'fixed_time' && index > 0) {
+              const prev = sd.waypoints[index - 1];
+              const distM = this.segmentDistance(
+                { lat: prev.lat, lng: prev.lng, alt: prev.alt },
+                { lat: merged.lat, lng: merged.lng, alt: merged.alt }
+              );
+              const prevMinutes = this.waypointStartTimeToMinutesDecimal(prev.startTime);
+              const currMinutes = (merged.segmentTargetMinutes != null && merged.segmentTargetMinutes !== '') ? Number(merged.segmentTargetMinutes) : this.waypointStartTimeToMinutesDecimal(merged.startTime);
+              const deltaMin = currMinutes - prevMinutes;
+              if (deltaMin > 0.001) {
+                const newSpeedKmh = (distM / 1000) / (deltaMin / 60);
+                const speedVal = Math.round(newSpeedKmh * 10) / 10;
+                const prevPayload = { ...prev, speed: speedVal };
+                if (prev.segmentMode != null) prevPayload.segmentMode = prev.segmentMode;
+                if (prev.labelFontSize != null) prevPayload.labelFontSize = prev.labelFontSize;
+                if (prev.labelColor != null) prevPayload.labelColor = prev.labelColor;
+                if (prev.color != null) prevPayload.color = prev.color;
+                if (prev.pixelSize != null) prevPayload.pixelSize = prev.pixelSize;
+                if (prev.outlineColor != null) prevPayload.outlineColor = prev.outlineColor;
+                try {
+                  const r2 = await updateWaypoints(prevPayload);
+                  if (r2.code === 200) {
+                    Object.assign(prev, { speed: speedVal });
+                    sd.waypoints.splice(index - 1, 1, prev);
+                    if (routeInList && routeInList.waypoints) {
+                      const prevIdxInList = routeInList.waypoints.findIndex(p => p.id === prev.id);
+                      if (prevIdxInList !== -1) routeInList.waypoints.splice(prevIdxInList, 1, prev);
+                    }
+                  }
+                } catch (e) {
+                  console.warn('定时点重算上一航点速度失败', e);
+                }
+              }
+            }
+            // 下一航点是定时点时：重算本航点速度，使平台能在下一航点的 K 时到达
+            if (index < sd.waypoints.length - 1) {
+              const next = sd.waypoints[index + 1];
+              if (next.segmentMode === 'fixed_time') {
+                const distToNextM = this.segmentDistance(
+                  { lat: merged.lat, lng: merged.lng, alt: merged.alt },
+                  { lat: next.lat, lng: next.lng, alt: next.alt }
+                );
+                const currMinutes = this.waypointStartTimeToMinutesDecimal(merged.startTime);
+                const nextMinutes = (next.segmentTargetMinutes != null && next.segmentTargetMinutes !== '') ? Number(next.segmentTargetMinutes) : this.waypointStartTimeToMinutesDecimal(next.startTime);
+                const deltaMin = nextMinutes - currMinutes;
+                if (deltaMin > 0.001) {
+                  const newSpeedKmh = (distToNextM / 1000) / (deltaMin / 60);
+                  const speedVal = Math.round(newSpeedKmh * 10) / 10;
+                  const currPayload = { ...merged, speed: speedVal };
+                  if (merged.segmentMode != null) currPayload.segmentMode = merged.segmentMode;
+                  if (merged.labelFontSize != null) currPayload.labelFontSize = merged.labelFontSize;
+                  if (merged.labelColor != null) currPayload.labelColor = merged.labelColor;
+                  if (merged.pixelSize != null) currPayload.pixelSize = merged.pixelSize;
+                  if (merged.color != null) currPayload.color = merged.color;
+                  if (merged.outlineColor != null) currPayload.outlineColor = merged.outlineColor;
+                  try {
+                    const r2 = await updateWaypoints(currPayload);
+                    if (r2.code === 200) {
+                      Object.assign(merged, { speed: speedVal });
+                      sd.waypoints.splice(index, 1, merged);
+                      if (routeInList && routeInList.waypoints) {
+                        const idxInList = routeInList.waypoints.findIndex(p => p.id === merged.id);
+                        if (idxInList !== -1) routeInList.waypoints.splice(idxInList, 1, merged);
+                      }
+                    }
+                  } catch (e) {
+                    console.warn('下一航点为定时点重算本航点速度失败', e);
+                  }
+                }
+              }
+            }
             if (this.$refs.cesiumMap) {
               if (roomId && sd.platformId) {
                 try {
@@ -2187,6 +2368,11 @@ export default {
             }
             this.showWaypointDialog = false;
             this.$message.success('航点信息已持久化至数据库');
+            if (this.$refs.cesiumMap && (this.$refs.cesiumMap.setRouteHoldRadii || this.$refs.cesiumMap.setRouteHoldEllipseParams)) {
+              const rid = sd.id;
+              if (this.$refs.cesiumMap.setRouteHoldRadii) this.$refs.cesiumMap.setRouteHoldRadii(rid, {});
+              if (this.$refs.cesiumMap.setRouteHoldEllipseParams) this.$refs.cesiumMap.setRouteHoldEllipseParams(rid, {});
+            }
             this.$nextTick(() => this.updateDeductionPositions());
             this.wsConnection?.sendSyncWaypoints?.(this.selectedRouteDetails.id);
             // 航点编辑后，根据新位置重算导弹发射位置并更新 Redis
@@ -3007,8 +3193,17 @@ export default {
       if (this.playbackInterval) {
         clearInterval(this.playbackInterval);
       }
+      this._playbackLastTickTime = Date.now();
+      // 按真实经过时间推进：1 实机秒 = playbackSpeed 推演秒，避免 setInterval 不准导致“现实两秒对应时间轴一秒”
       this.playbackInterval = setInterval(() => {
-        this.timeProgress += this.playbackSpeed * 0.1;
+        const now = Date.now();
+        const elapsedSec = (now - (this._playbackLastTickTime || now)) / 1000;
+        this._playbackLastTickTime = now;
+        const { minMinutes, maxMinutes } = this.getDeductionTimeRange();
+        const span = Math.max(0, maxMinutes - minMinutes) || 120;
+        const spanSeconds = span * 60;
+        // 经过 elapsedSec 实机秒 → 推进 playbackSpeed * elapsedSec 推演秒 → 进度增量 (elapsedSec * playbackSpeed / spanSeconds) * 100
+        this.timeProgress += (elapsedSec * this.playbackSpeed / spanSeconds) * 100;
         if (this.timeProgress >= 100) {
           this.timeProgress = 0;
         }
@@ -3023,18 +3218,9 @@ export default {
       }
     },
 
-    increaseSpeed() {
-      if (this.playbackSpeed < 25) {
-        this.playbackSpeed++;
-        if (this.isPlaying) {
-          this.startPlayback();
-        }
-      }
-    },
-
-    decreaseSpeed() {
-      if (this.playbackSpeed > 1) {
-        this.playbackSpeed--;
+    setPlaybackSpeed(speed) {
+      if (this.speedOptions.includes(speed)) {
+        this.playbackSpeed = speed;
         if (this.isPlaying) {
           this.startPlayback();
         }
@@ -3048,10 +3234,11 @@ export default {
       this.deductionMinutesFromK = currentMinutesFromK;
 
       const sign = currentMinutesFromK >= 0 ? '+' : '-';
-      const absMin = Math.abs(Math.floor(currentMinutesFromK));
-      const hours = Math.floor(absMin / 60);
-      const minutes = absMin % 60;
-      this.currentTime = `K${sign}${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}:00`;
+      const totalSeconds = Math.floor(Math.abs(currentMinutesFromK) * 60);
+      const hours = Math.floor(totalSeconds / 3600);
+      const minutes = Math.floor((totalSeconds % 3600) / 60);
+      const seconds = totalSeconds % 60;
+      this.currentTime = `K${sign}${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}:${String(seconds).padStart(2, '0')}`;
       // 右上角作战时间随时与推演时间轴同步（无论是否展示航线）
       this.combatTime = this.currentTime;
       this.updateDeductionPositions();
@@ -3155,6 +3342,17 @@ export default {
       const min = parseInt(m[3], 10);
       return sign * (h * 60 + min);
     },
+    /** 将 startTime（如 K+00:19:30）转为相对 K 的分钟数（含秒，保留小数） */
+    waypointStartTimeToMinutesDecimal(s) {
+      if (!s || typeof s !== 'string') return 0;
+      const m = s.match(/K([+-])(\d{2}):(\d{2})(?::(\d{2}))?/);
+      if (!m) return 0;
+      const sign = m[1] === '+' ? 1 : -1;
+      const h = parseInt(m[2], 10);
+      const min = parseInt(m[3], 10);
+      const sec = m[4] != null ? parseInt(m[4], 10) : 0;
+      return sign * (h * 60 + min + sec / 60);
+    },
     /** 将相对 K 的分钟数转为 startTime 字符串（如 K+01:00、K-00:30） */
     minutesToStartTime(minutes) {
       const m = Math.floor(Number(minutes));
@@ -3165,6 +3363,18 @@ export default {
       const min = abs % 60;
       return `K${sign}${String(h).padStart(2, '0')}:${String(min).padStart(2, '0')}`;
     },
+    /** 将相对 K 的分钟数（可含小数）转为 startTime，精确到秒（如 K+00:19:30） */
+    minutesToStartTimeWithSeconds(minutes) {
+      const num = Number(minutes);
+      if (!Number.isFinite(num)) return 'K+00:00:00';
+      const sign = num >= 0 ? '+' : '-';
+      const abs = Math.abs(num);
+      const totalSec = Math.round(abs * 60);
+      const h = Math.floor(totalSec / 3600);
+      const min = Math.floor((totalSec % 3600) / 60);
+      const sec = totalSec % 60;
+      return `K${sign}${String(h).padStart(2, '0')}:${String(min).padStart(2, '0')}:${String(sec).padStart(2, '0')}`;
+    },
 
     isHoldWaypoint(wp) {
       const t = (wp && wp.pointType) || (wp && wp.point_type) || 'normal';
@@ -3175,7 +3385,14 @@ export default {
       if (!raw) return null;
       try {
         const p = typeof raw === 'string' ? JSON.parse(raw) : raw;
-        return { radius: p.radius, semiMajor: p.semiMajor ?? p.semiMajorAxis, semiMinor: p.semiMinor ?? p.semiMinorAxis, headingDeg: p.headingDeg ?? 0, clockwise: p.clockwise !== false };
+        return {
+          radius: p.radius,
+          semiMajor: p.semiMajor ?? p.semiMajorAxis,
+          semiMinor: p.semiMinor ?? p.semiMinorAxis,
+          headingDeg: p.headingDeg ?? 0,
+          clockwise: p.clockwise !== false,
+          edgeLength: p.edgeLength != null ? Number(p.edgeLength) : 20000
+        };
       } catch (e) {
         return null;
       }
@@ -3278,25 +3495,44 @@ export default {
           const exitIdx = segmentEndIndices[i];
           const toNextSlice = path.slice(exitIdx, (segmentEndIndices[i + 1] != null ? segmentEndIndices[i + 1] : path.length - 1) + 1);
           const distToEntry = this.pathSliceDistance(toEntrySlice);
-          const speedKmh = points[i].speed || 800;
-          const travelToEntryMin = (distToEntry / 1000) * (60 / speedKmh);
-          const arrivalEntry = effectiveTime[i] + travelToEntryMin;
+          const holdWpForSegment = waypoints[i + 1];
+          const segTarget = holdWpForSegment && (holdWpForSegment.segmentTargetMinutes ?? holdWpForSegment.displayStyle?.segmentTargetMinutes);
+          const hasFixedTime = holdWpForSegment && holdWpForSegment.segmentMode === 'fixed_time' && (segTarget != null && segTarget !== '');
+          let arrivalEntry;
+          let speedKmhForLeg = points[i].speed || 800;
+          if (hasFixedTime) {
+            const targetMin = Number(segTarget);
+            const deltaMin = targetMin - effectiveTime[i];
+            if (deltaMin > 0.001 && distToEntry > 0) {
+              arrivalEntry = targetMin;
+              speedKmhForLeg = (distToEntry / 1000) / (deltaMin / 60);
+              speedKmhForLeg = Math.round(speedKmhForLeg * 10) / 10;
+            } else {
+              arrivalEntry = effectiveTime[i] + (distToEntry / 1000) * (60 / speedKmhForLeg);
+            }
+          } else {
+            const travelToEntryMin = (distToEntry / 1000) * (60 / speedKmhForLeg);
+            arrivalEntry = effectiveTime[i] + travelToEntryMin;
+          }
           const holdEndTime = points[i + 1].minutes; // 用户设定的切出时间（如 K+10）
           const exitPos = holdPathSlice.length ? holdPathSlice[holdPathSlice.length - 1] : (toEntrySlice.length ? toEntrySlice[toEntrySlice.length - 1] : { lng: points[i].lng, lat: points[i].lat, alt: points[i].alt });
           let loopEndIdx = 1;
-          for (let k = 1; k < Math.min(holdPathSlice.length, 120); k++) {
+          for (let k = 1; k < Math.min(holdPathSlice.length, 200); k++) {
             if (this.segmentDistance(holdPathSlice[0], holdPathSlice[k]) < 80) { loopEndIdx = k; break; }
           }
           const holdClosedLoopPath = holdPathSlice.slice(0, loopEndIdx + 1);
           const holdLoopLength = this.pathSliceDistance(holdClosedLoopPath) || 1;
-          let exitIdxOnLoop = 0;
+          // 出口必须在整条盘旋路径上找，不能只在“整圈”段内找，否则会误把圈上某点当出口导致飞半圈就停或折回
+          let exitIdxOnLoop = holdPathSlice.length - 1;
           let minD = 1e9;
-          for (let k = 0; k <= loopEndIdx; k++) {
+          for (let k = 0; k < holdPathSlice.length; k++) {
             const d = this.segmentDistance(holdPathSlice[k], exitPos);
             if (d < minD) { minD = d; exitIdxOnLoop = k; }
           }
           const holdExitDistanceOnLoop = this.pathSliceDistance(holdPathSlice.slice(0, exitIdxOnLoop + 1));
-          const speedMpMin = (speedKmh * 1000) / 60;
+          const holdSpeedKmh = points[i + 1].speed || 800;
+          const HOLD_SPEED_KMH = 800;
+          const speedMpMin = (HOLD_SPEED_KMH * 1000) / 60;
           const requiredDistAtK10 = (holdEndTime - arrivalEntry) * speedMpMin;
           let n = Math.ceil((requiredDistAtK10 - holdExitDistanceOnLoop) / holdLoopLength);
           if (n < 0 || !Number.isFinite(n)) n = 0;
@@ -3317,7 +3553,7 @@ export default {
             });
           }
           const distExitToNext = this.pathSliceDistance(toNextSlice);
-          const travelExitMin = (distExitToNext / 1000) * (60 / speedKmh);
+          const travelExitMin = (distExitToNext / 1000) * (60 / holdSpeedKmh);
           const arrivalNext = segmentEndTime + travelExitMin;
           effectiveTime[i + 1] = holdEndTime;
           if (i + 2 < points.length) effectiveTime[i + 2] = arrivalNext;
@@ -3333,7 +3569,8 @@ export default {
           const holdEntryAngle = holdCenter && entryPos && holdRadius != null
             ? this.angleFromCenterToPoint(holdCenter.lng, holdCenter.lat, entryPos.lng, entryPos.lat)
             : null;
-          segments.push({ startTime: effectiveTime[i], endTime: arrivalEntry, startPos: posCur, endPos: entryPos, type: 'fly', legIndex: i, pathSlice: toEntrySlice });
+          segments.push({ startTime: effectiveTime[i], endTime: arrivalEntry, startPos: posCur, endPos: entryPos, type: 'fly', legIndex: i, pathSlice: toEntrySlice, speedKmh: speedKmhForLeg });
+          const holdEntryToExitPath = holdClosedLoopPath.slice(0, exitIdxOnLoop + 1);
           segments.push({
             startTime: arrivalEntry,
             endTime: segmentEndTime,
@@ -3345,16 +3582,18 @@ export default {
             holdClosedLoopPath,
             holdLoopLength,
             holdExitDistanceOnLoop,
-            speedKmh: points[i].speed || 800,
+            holdEntryToExitPath,
+            holdN: n,
+            speedKmh: HOLD_SPEED_KMH,
+            holdEndTime,
             holdCenter,
             holdRadius,
             holdCircumference,
             holdClockwise,
             holdEntryAngle
           });
-          segments.push({ startTime: segmentEndTime, endTime: arrivalNext, startPos: exitPos, endPos: toNextSlice.length ? toNextSlice[toNextSlice.length - 1] : exitPos, type: 'fly', legIndex: i, pathSlice: toNextSlice });
-          i++;
-          continue;
+          segments.push({ startTime: segmentEndTime, endTime: arrivalNext, startPos: exitPos, endPos: toNextSlice.length ? toNextSlice[toNextSlice.length - 1] : exitPos, type: 'fly', legIndex: i, pathSlice: toNextSlice, speedKmh: holdSpeedKmh });
+          continue; // 不 i++，让下次迭代处理下一航段（含连续盘旋点如 WP2→WP3 均为盘旋）
         }
         const dist = this.segmentDistance(points[i], points[i + 1]);
         const speedKmh = points[i].speed || 800;
@@ -3381,7 +3620,7 @@ export default {
         effectiveTime[i + 1] = Math.max(actualArrival, scheduled);
         const posCur = { lng: points[i].lng, lat: points[i].lat, alt: points[i].alt };
         const posNext = { lng: points[i + 1].lng, lat: points[i + 1].lat, alt: points[i + 1].alt };
-        segments.push({ startTime: effectiveTime[i], endTime: actualArrival, startPos: posCur, endPos: posNext, type: 'fly', legIndex: i });
+        segments.push({ startTime: effectiveTime[i], endTime: actualArrival, startPos: posCur, endPos: posNext, type: 'fly', legIndex: i, speedKmh: speedKmh });
         if (actualArrival < effectiveTime[i + 1]) {
           segments.push({ startTime: actualArrival, endTime: effectiveTime[i + 1], startPos: posNext, endPos: posNext, type: 'wait', legIndex: i });
         }
@@ -3450,12 +3689,24 @@ export default {
             return s.startPos;
           }
           if (s.type === 'hold' && s.holdPath && s.holdPath.length) {
-            // 飞机一直绕闭合环盘旋，不静止；到设定K时若在切出点则切出，否则继续飞到切出点再切出并报冲突
             if (s.holdClosedLoopPath && s.holdClosedLoopPath.length >= 2 && s.holdLoopLength > 0 && s.speedKmh != null) {
               const distM = (minutesFromK - s.startTime) * (s.speedKmh * 1000 / 60);
-              const distOnLoop = ((distM % s.holdLoopLength) + s.holdLoopLength) % s.holdLoopLength;
-              const tPath = distOnLoop / s.holdLoopLength;
-              return this.getPositionAlongPathSlice(s.holdClosedLoopPath, tPath);
+              const n = Math.max(0, s.holdN != null ? s.holdN : 0);
+              const totalFly = (s.holdExitDistanceOnLoop || 0) + n * s.holdLoopLength;
+              if (totalFly <= 0) return s.startPos;
+              if (distM >= totalFly) return s.endPos;
+              if (distM < n * s.holdLoopLength) {
+                const distOnLoop = ((distM % s.holdLoopLength) + s.holdLoopLength) % s.holdLoopLength;
+                const tPath = distOnLoop / s.holdLoopLength;
+                return this.getPositionAlongPathSlice(s.holdClosedLoopPath, tPath);
+              }
+              const distToExit = distM - n * s.holdLoopLength;
+              const exitDist = s.holdExitDistanceOnLoop || 1;
+              const tPath = Math.min(1, distToExit / exitDist);
+              if (s.holdEntryToExitPath && s.holdEntryToExitPath.length > 0) {
+                return this.getPositionAlongPathSlice(s.holdEntryToExitPath, tPath);
+              }
+              return this.getPositionAlongPathSlice(s.holdClosedLoopPath, distToExit / s.holdLoopLength);
             }
             return this.getPositionAlongPathSlice(s.holdPath, t);
           }
@@ -3484,7 +3735,10 @@ export default {
       const cesiumMap = this.$refs.cesiumMap;
       let pathData = null;
       if (cesiumMap && cesiumMap.getRoutePathWithSegmentIndices) {
-        const ret = cesiumMap.getRoutePathWithSegmentIndices(waypoints);
+        const cachedRadii = (routeId != null && cesiumMap._routeHoldRadiiByRoute && cesiumMap._routeHoldRadiiByRoute[routeId]) ? cesiumMap._routeHoldRadiiByRoute[routeId] : {};
+        const cachedEllipse = (routeId != null && cesiumMap._routeHoldEllipseParamsByRoute && cesiumMap._routeHoldEllipseParamsByRoute[routeId]) ? cesiumMap._routeHoldEllipseParamsByRoute[routeId] : {};
+        const opts = (Object.keys(cachedRadii).length > 0 || Object.keys(cachedEllipse).length > 0) ? { holdRadiusByLegIndex: cachedRadii, holdEllipseParamsByLegIndex: cachedEllipse } : {};
+        const ret = cesiumMap.getRoutePathWithSegmentIndices(waypoints, opts);
         if (ret.path && ret.path.length > 0 && ret.segmentEndIndices && ret.segmentEndIndices.length > 0) {
           pathData = { path: ret.path, segmentEndIndices: ret.segmentEndIndices, holdArcRanges: ret.holdArcRanges || {} };
         }
@@ -3497,28 +3751,44 @@ export default {
           const s = segments[idx];
           if (s.type !== 'hold' || s.holdCenter == null) continue;
           const i = s.legIndex;
-          const holdDurationMin = s.holdDurationMin != null ? s.holdDurationMin : (s.endTime - s.startTime);
-          const speedKmh = s.speedKmh != null ? s.speedKmh : 800;
+          const holdEndTime = s.holdEndTime != null ? s.holdEndTime : this.waypointStartTimeToMinutesDecimal(waypoints[i + 1]?.startTime);
+          const holdWp = waypoints[i + 1];
+          const segTarget = holdWp && (holdWp.segmentTargetMinutes ?? holdWp.displayStyle?.segmentTargetMinutes);
+          const arrivalAtHold = (holdWp && holdWp.segmentMode === 'fixed_time' && segTarget != null && segTarget !== '')
+            ? Number(segTarget) : s.startTime;
+          const holdDurationMin = Math.max(0, holdEndTime - arrivalAtHold);
+          const speedKmh = s.speedKmh != null ? s.speedKmh : (Number(holdWp?.speed) || 800);
           const totalHoldDistM = speedKmh * (holdDurationMin / 60) * 1000;
           const prevWp = waypoints[i];
-          const holdWp = waypoints[i + 1];
           const nextWp = (i + 2) < waypoints.length ? waypoints[i + 2] : holdWp;
           if (!prevWp || !holdWp) continue;
           const centerCartesian = Cesium.Cartesian3.fromDegrees(parseFloat(holdWp.lng), parseFloat(holdWp.lat), Number(holdWp.alt) || 0);
           const prevCartesian = Cesium.Cartesian3.fromDegrees(parseFloat(prevWp.lng), parseFloat(prevWp.lat), Number(prevWp.alt) || 0);
           const nextCartesian = nextWp ? Cesium.Cartesian3.fromDegrees(parseFloat(nextWp.lng), parseFloat(nextWp.lat), Number(nextWp.alt) || 0) : centerCartesian;
           const clockwise = s.holdClockwise !== false;
-          const isEllipse = (waypoints[i + 1] && (waypoints[i + 1].pointType || waypoints[i + 1].point_type) === 'hold_ellipse') || s.holdRadius == null;
-          if (isEllipse && cesiumMap.computeEllipseParamsForDuration) {
+          const isHoldEllipse = waypoints[i + 1] && (waypoints[i + 1].pointType || waypoints[i + 1].point_type) === 'hold_ellipse';
+          const isEllipse = isHoldEllipse || s.holdRadius == null;
+          if (isEllipse && !isHoldEllipse && cesiumMap.computeEllipseParamsForDuration) {
             const holdParams = this.parseHoldParams(holdWp);
             const headingDeg = holdParams && holdParams.headingDeg != null ? holdParams.headingDeg : 0;
             const a0 = holdParams && (holdParams.semiMajor != null || holdParams.semiMajorAxis != null) ? (holdParams.semiMajor ?? holdParams.semiMajorAxis) : 500;
             const b0 = holdParams && (holdParams.semiMinor != null || holdParams.semiMinorAxis != null) ? (holdParams.semiMinor ?? holdParams.semiMinorAxis) : 300;
             const out = cesiumMap.computeEllipseParamsForDuration(centerCartesian, prevCartesian, nextCartesian, clockwise, totalHoldDistM, headingDeg, a0, b0);
-            if (out && out.semiMajor != null && out.semiMinor != null) holdEllipseParamsByLegIndex[i] = { semiMajor: out.semiMajor, semiMinor: out.semiMinor, headingDeg: headingDeg };
+            if (out && out.semiMajor != null && out.semiMinor != null) {
+              holdEllipseParamsByLegIndex[i] = {
+                semiMajor: out.semiMajor,
+                semiMinor: out.semiMinor,
+                headingDeg
+              };
+            }
           } else if (!isEllipse && cesiumMap.computeHoldRadiusForDuration) {
-            const R = cesiumMap.computeHoldRadiusForDuration(centerCartesian, prevCartesian, nextCartesian, clockwise, totalHoldDistM);
-            if (R != null && Number.isFinite(R)) holdRadiusByLegIndex[i] = R;
+            let R = cesiumMap.computeHoldRadiusForDuration(centerCartesian, prevCartesian, nextCartesian, clockwise, totalHoldDistM);
+            if (R == null || !Number.isFinite(R)) {
+              R = totalHoldDistM / (2 * Math.PI);
+            }
+            if (R != null && Number.isFinite(R) && R > 0) {
+              holdRadiusByLegIndex[i] = R;
+            }
           }
         }
         const hasCircle = Object.keys(holdRadiusByLegIndex).length > 0;
@@ -3526,7 +3796,7 @@ export default {
         if (hasCircle || hasEllipse) {
           let pathData2 = null;
           let segments2 = null;
-          for (let iter = 0; iter < 2; iter++) {
+          for (let iter = 0; iter < 4; iter++) {
             const ret2 = cesiumMap.getRoutePathWithSegmentIndices(waypoints, { holdRadiusByLegIndex, holdEllipseParamsByLegIndex });
             if (!ret2.path || ret2.path.length === 0 || !ret2.segmentEndIndices || ret2.segmentEndIndices.length === 0) break;
             pathData2 = { path: ret2.path, segmentEndIndices: ret2.segmentEndIndices, holdArcRanges: ret2.holdArcRanges || {} };
@@ -3539,20 +3809,26 @@ export default {
                 const s = segments2[idx];
                 if (s.type !== 'hold' || s.holdRadius == null || s.holdCenter == null) continue;
                 const i = s.legIndex;
-                const holdDurationMin = s.holdDurationMin != null ? s.holdDurationMin : (s.endTime - s.startTime);
-                const speedKmh = s.speedKmh != null ? s.speedKmh : 800;
+                const holdWpCircle = waypoints[i + 1];
+                const holdEndTimeCircle = s.holdEndTime != null ? s.holdEndTime : this.waypointStartTimeToMinutesDecimal(holdWpCircle?.startTime);
+                const segTargetCircle = holdWpCircle && (holdWpCircle.segmentTargetMinutes ?? holdWpCircle.displayStyle?.segmentTargetMinutes);
+                const arrivalAtHoldCircle = (holdWpCircle && holdWpCircle.segmentMode === 'fixed_time' && segTargetCircle != null && segTargetCircle !== '')
+                  ? Number(segTargetCircle) : s.startTime;
+                const holdDurationMin = Math.max(0, holdEndTimeCircle - arrivalAtHoldCircle);
+                const speedKmh = s.speedKmh != null ? s.speedKmh : (Number(holdWpCircle?.speed) || 800);
                 const totalHoldDistM = speedKmh * (holdDurationMin / 60) * 1000;
                 const prevWp = waypoints[i];
-                const holdWp = waypoints[i + 1];
+                const holdWp = holdWpCircle;
                 const nextWp = (i + 2) < waypoints.length ? waypoints[i + 2] : holdWp;
                 if (!prevWp || !holdWp) continue;
                 const centerCartesian = Cesium.Cartesian3.fromDegrees(parseFloat(holdWp.lng), parseFloat(holdWp.lat), Number(holdWp.alt) || 0);
                 const prevCartesian = Cesium.Cartesian3.fromDegrees(parseFloat(prevWp.lng), parseFloat(prevWp.lat), Number(prevWp.alt) || 0);
                 const nextCartesian = nextWp ? Cesium.Cartesian3.fromDegrees(parseFloat(nextWp.lng), parseFloat(nextWp.lat), Number(nextWp.alt) || 0) : centerCartesian;
-                const Rnew = cesiumMap.computeHoldRadiusForDuration(centerCartesian, prevCartesian, nextCartesian, s.holdClockwise !== false, totalHoldDistM);
-                if (Rnew != null && Number.isFinite(Rnew)) {
-                  if (holdRadiusByLegIndex[i] == null || Math.abs(Rnew - holdRadiusByLegIndex[i]) > 1) changed = true;
+                let Rnew = cesiumMap.computeHoldRadiusForDuration(centerCartesian, prevCartesian, nextCartesian, s.holdClockwise !== false, totalHoldDistM);
+                if (Rnew == null || !Number.isFinite(Rnew)) Rnew = totalHoldDistM / (2 * Math.PI);
+                if (Rnew != null && Number.isFinite(Rnew) && Rnew > 0) {
                   nextRadii[i] = Rnew;
+                  if (holdRadiusByLegIndex[i] == null || Math.abs(nextRadii[i] - holdRadiusByLegIndex[i]) > 1) changed = true;
                 }
               }
               Object.assign(holdRadiusByLegIndex, nextRadii);
@@ -3563,9 +3839,14 @@ export default {
                 if (s.type !== 'hold' || s.holdRadius != null || s.holdCenter == null) continue;
                 const i = s.legIndex;
                 const holdWp = waypoints[i + 1];
+                if ((holdWp && (holdWp.pointType || holdWp.point_type) === 'hold_ellipse')) continue;
                 const holdParams = this.parseHoldParams(holdWp);
-                const holdDurationMin = s.holdDurationMin != null ? s.holdDurationMin : (s.endTime - s.startTime);
-                const speedKmh = s.speedKmh != null ? s.speedKmh : 800;
+                const holdEndTime = s.holdEndTime != null ? s.holdEndTime : this.waypointStartTimeToMinutesDecimal(holdWp?.startTime);
+                const segTargetEllipse = holdWp && (holdWp.segmentTargetMinutes ?? holdWp.displayStyle?.segmentTargetMinutes);
+                const arrivalAtHold = (holdWp && holdWp.segmentMode === 'fixed_time' && segTargetEllipse != null && segTargetEllipse !== '')
+                  ? Number(segTargetEllipse) : s.startTime;
+                const holdDurationMin = Math.max(0, holdEndTime - arrivalAtHold);
+                const speedKmh = s.speedKmh != null ? s.speedKmh : (Number(holdWp?.speed) || 800);
                 const totalHoldDistM = speedKmh * (holdDurationMin / 60) * 1000;
                 const prevWp = waypoints[i];
                 const nextWp = (i + 2) < waypoints.length ? waypoints[i + 2] : holdWp;
@@ -3578,13 +3859,15 @@ export default {
                 const b0 = holdParams && (holdParams.semiMinor != null || holdParams.semiMinorAxis != null) ? (holdParams.semiMinor ?? holdParams.semiMinorAxis) : 300;
                 const out = cesiumMap.computeEllipseParamsForDuration(centerCartesian, prevCartesian, nextCartesian, s.holdClockwise !== false, totalHoldDistM, headingDeg, a0, b0);
                 if (out && out.semiMajor != null) {
+                  const smj = out.semiMajor;
+                  const smn = out.semiMinor;
                   const old = holdEllipseParamsByLegIndex[i];
-                  if (!old || Math.abs(out.semiMajor - old.semiMajor) > 1) changed = true;
-                  holdEllipseParamsByLegIndex[i] = { semiMajor: out.semiMajor, semiMinor: out.semiMinor, headingDeg: headingDeg };
+                  if (!old || Math.abs(smj - old.semiMajor) > 1) changed = true;
+                  holdEllipseParamsByLegIndex[i] = { semiMajor: smj, semiMinor: smn, headingDeg };
                 }
               }
             }
-            if (!changed || iter === 1) break;
+            if (!changed || iter === 3) break;
           }
           if (pathData2) pathData = pathData2;
           if (segments2) segments = segments2;
@@ -3690,7 +3973,7 @@ export default {
       if (this.addHoldContext.mode === 'drawing') {
         const holdParams = this.addHoldForm.holdType === 'hold_circle'
           ? { radius: this.addHoldForm.radius, clockwise: this.addHoldForm.clockwise }
-          : { semiMajor: this.addHoldForm.semiMajor, semiMinor: this.addHoldForm.semiMinor, headingDeg: this.addHoldForm.headingDeg, clockwise: this.addHoldForm.clockwise };
+          : { edgeLength: (this.addHoldForm.edgeLengthKm != null ? this.addHoldForm.edgeLengthKm : 20) * 1000, clockwise: this.addHoldForm.clockwise };
         if (this.$refs.cesiumMap && this.$refs.cesiumMap.insertHoldBetweenLastTwo) {
           this.$refs.cesiumMap.insertHoldBetweenLastTwo(holdParams);
         }
@@ -3712,7 +3995,7 @@ export default {
       const baseSeq = prevWp.seq != null ? Number(prevWp.seq) : legIndex + 1;
       const holdParams = this.addHoldForm.holdType === 'hold_circle'
         ? { radius: this.addHoldForm.radius, clockwise: this.addHoldForm.clockwise }
-        : { semiMajor: this.addHoldForm.semiMajor, semiMinor: this.addHoldForm.semiMinor, headingDeg: this.addHoldForm.headingDeg, clockwise: this.addHoldForm.clockwise };
+        : { edgeLength: (this.addHoldForm.edgeLengthKm != null ? this.addHoldForm.edgeLengthKm : 20) * 1000, clockwise: this.addHoldForm.clockwise };
       const startTime = this.addHoldForm.startTimeMinutes !== '' && this.addHoldForm.startTimeMinutes != null && !Number.isNaN(Number(this.addHoldForm.startTimeMinutes))
           ? this.minutesToStartTime(Number(this.addHoldForm.startTimeMinutes))
           : (nextWp.startTime || 'K+01:00');
@@ -3783,10 +4066,24 @@ export default {
       const span = Math.max(0, maxMinutes - minMinutes) || 120;
       const minutesFromK = minMinutes + (val / 100) * span;
       const sign = minutesFromK >= 0 ? '+' : '-';
-      const absMin = Math.abs(Math.floor(minutesFromK));
-      const hours = Math.floor(absMin / 60);
-      const minutes = absMin % 60;
-      return `K${sign}${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}:00`;
+      const totalSeconds = Math.floor(Math.abs(minutesFromK) * 60);
+      const hours = Math.floor(totalSeconds / 3600);
+      const minutes = Math.floor((totalSeconds % 3600) / 60);
+      const seconds = totalSeconds % 60;
+      return `K${sign}${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}:${String(seconds).padStart(2, '0')}`;
+    },
+
+    onTimelineHover(e) {
+      const wrap = this.$refs.timelineSliderWrap;
+      if (!wrap) return;
+      const rect = wrap.getBoundingClientRect();
+      const percent = Math.max(0, Math.min(100, ((e.clientX - rect.left) / rect.width) * 100));
+      this.timelineHoverPercent = percent;
+      this.timelineHoverTime = this.formatTimeTooltip(percent);
+      this.timelineHoverVisible = true;
+    },
+    onTimelineLeave() {
+      this.timelineHoverVisible = false;
     },
     async selectPlan(plan) {
       if (plan && plan.id) {
@@ -3936,6 +4233,10 @@ export default {
                   if (styleRes.data) this.$refs.cesiumMap.setPlatformStyle(route.id, styleRes.data);
                 } catch (_) {}
               }
+              if (waypoints.some(wp => this.isHoldWaypoint(wp))) {
+                const { minMinutes, maxMinutes } = this.getDeductionTimeRange();
+                this.getPositionAtMinutesFromK(waypoints, minMinutes, minMinutes, maxMinutes, route.id);
+              }
               this.$refs.cesiumMap.renderRouteWaypoints(waypoints, route.id, route.platformId, route.platform, this.parseRouteStyle(route.attributes));
               this.$nextTick(() => this.updateDeductionPositions());
             }
@@ -4481,6 +4782,33 @@ export default {
 .timeline-slider {
   flex: 1;
   margin: 0 20px;
+  position: relative;
+}
+
+.timeline-hover-time {
+  position: absolute;
+  bottom: calc(100% + 8px);
+  left: 0;
+  transform: translateX(-50%);
+  padding: 4px 10px;
+  background: rgba(0, 0, 0, 0.85);
+  color: #fff;
+  font-size: 12px;
+  font-weight: 500;
+  border-radius: 4px;
+  white-space: nowrap;
+  pointer-events: none;
+  z-index: 10;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
+}
+.timeline-hover-time::after {
+  content: '';
+  position: absolute;
+  top: 100%;
+  left: 50%;
+  transform: translateX(-50%);
+  border: 5px solid transparent;
+  border-top-color: rgba(0, 0, 0, 0.85);
 }
 
 .compact-slider {
@@ -4547,6 +4875,16 @@ export default {
   min-width: 24px;
   text-align: center;
 }
+.speed-text.clickable {
+  cursor: pointer;
+  padding: 2px 4px;
+  display: inline-flex;
+  align-items: center;
+}
+.speed-text .el-icon--right {
+  margin-left: 4px;
+  font-size: 10px;
+}
 
 .system-status {
   display: flex;

ruoyi-ui/src/views/dialogs/RouteEditDialog.vue

@@ -231,10 +231,20 @@
                   <el-input v-else v-model.number="scope.row.alt" size="mini" placeholder="高度" />
                 </template>
               </el-table-column>
-              <el-table-column label="速度" min-width="80">
+              <el-table-column label="定速/定时" width="100" align="center">
                 <template slot-scope="scope">
-                  <span v-if="!waypointsEditMode">{{ formatNum(scope.row.speed) }}</span>
-                  <el-input v-else v-model.number="scope.row.speed" size="mini" placeholder="速度" />
+                  <span v-if="!waypointsEditMode">{{ segmentModeLabel(scope.row.segmentMode) }}</span>
+                  <el-select v-else v-model="scope.row.segmentMode" size="mini" placeholder="无" clearable style="width: 100%">
+                    <el-option label="无" :value="null" />
+                    <el-option label="定速" value="fixed_speed" />
+                    <el-option label="定时" value="fixed_time" />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="速度(km/h)" min-width="100">
+                <template slot-scope="scope">
+                  <span v-if="!waypointsEditMode">{{ formatNumOneDecimal(scope.row.speed) }}</span>
+                  <el-input-number v-else v-model.number="scope.row.speed" size="mini" :precision="1" :min="0" :controls="false" placeholder="速度" style="width: 100%" />
                 </template>
               </el-table-column>
               <el-table-column label="转弯坡度(°)" min-width="100">
@@ -252,8 +262,8 @@
               </el-table-column>
               <el-table-column label="相对K时(分)" min-width="110">
                 <template slot-scope="scope">
-                  <span v-if="!waypointsEditMode">{{ formatNum(scope.row.minutesFromK) }}</span>
-                  <el-input v-else v-model.number="scope.row.minutesFromK" size="mini" placeholder="0" />
+                  <span v-if="!waypointsEditMode">{{ formatNumOneDecimal(scope.row.minutesFromK) }}</span>
+                  <el-input-number v-else v-model.number="scope.row.minutesFromK" size="mini" :precision="1" :controls="false" placeholder="0" style="width: 100%" />
                 </template>
               </el-table-column>
               <el-table-column label="字号" width="70">
@@ -601,44 +611,79 @@ export default {
       attrs.lineStyle = { ...this.styleForm.line }
       return JSON.stringify(attrs)
     },
-    /** 将 startTime 字符串（如 K+00:40:00）转为相对 K 的分钟数 */
+    /** 将 startTime 字符串（如 K+00:40:00 或 K+00:19:30）转为相对 K 的分钟数（支持秒，保留一位小数精度） */
     startTimeToMinutes(s) {
       if (!s || typeof s !== 'string') return 0
-      const m = s.match(/K([+-])(\d{2}):(\d{2})/)
+      const m = s.match(/K([+-])(\d{2}):(\d{2})(?::(\d{2}))?/)
       if (!m) return 0
       const sign = m[1] === '+' ? 1 : -1
       const h = parseInt(m[2], 10)
       const min = parseInt(m[3], 10)
-      return sign * (h * 60 + min)
+      const sec = m[4] != null ? parseInt(m[4], 10) : 0
+      return sign * (h * 60 + min + sec / 60)
     },
-    /** 将相对 K 的分钟数转为 startTime 字符串 */
+    /** 将相对 K 的分钟数（可含小数）转为 startTime 字符串，最小单位秒 */
     minutesToStartTime(m) {
       const num = Number(m)
       if (isNaN(num)) return 'K+00:00:00'
       if (num >= 0) {
-        const h = Math.floor(num / 60)
-        const min = num % 60
-        return `K+${String(h).padStart(2, '0')}:${String(min).padStart(2, '0')}:00`
+        const totalSec = Math.round(num * 60)
+        const h = Math.floor(totalSec / 3600)
+        const min = Math.floor((totalSec % 3600) / 60)
+        const sec = totalSec % 60
+        return `K+${String(h).padStart(2, '0')}:${String(min).padStart(2, '0')}:${String(sec).padStart(2, '0')}`
       }
       const abs = Math.abs(num)
-      const h = Math.floor(abs / 60)
-      const min = abs % 60
-      return `K-${String(h).padStart(2, '0')}:${String(min).padStart(2, '0')}:00`
+      const totalSec = Math.round(abs * 60)
+      const h = Math.floor(totalSec / 3600)
+      const min = Math.floor((totalSec % 3600) / 60)
+      const sec = totalSec % 60
+      return `K-${String(h).padStart(2, '0')}:${String(min).padStart(2, '0')}:${String(sec).padStart(2, '0')}`
+    },
+    segmentModeLabel(mode) {
+      if (mode === 'fixed_speed') return '定速'
+      if (mode === 'fixed_time') return '定时'
+      return '无'
+    },
+    /** 数值保留一位小数显示，空/非数字显示 — */
+    formatNumOneDecimal(val) {
+      if (val === undefined || val === null || val === '') return '—'
+      const n = Number(val)
+      return isNaN(n) ? String(val) : Number(n.toFixed(1))
+    },
+    /** 两航点间近似距离（米），含高度差，用于定时点反算上一航点速度 */
+    segmentDistance(wp1, wp2) {
+      const R = 6371000
+      const lat1 = (wp1.lat * Math.PI) / 180
+      const lat2 = (wp2.lat * Math.PI) / 180
+      const dlat = ((wp2.lat - wp1.lat) * Math.PI) / 180
+      const dlng = ((wp2.lng - wp1.lng) * Math.PI) / 180
+      const a = Math.sin(dlat / 2) ** 2 + Math.cos(lat1) * Math.cos(lat2) * Math.sin(dlng / 2) ** 2
+      const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a))
+      const horizontal = R * c
+      const dalt = (wp2.alt || 0) - (wp1.alt || 0)
+      return Math.sqrt(horizontal * horizontal + dalt * dalt)
     },
     isHoldRow(row) {
       const t = (row && (row.pointType || row.point_type)) || 'normal'
       return t === 'hold_circle' || t === 'hold_ellipse'
     },
     syncWaypointsTableData(waypoints) {
-      this.waypointsTableData = (waypoints || []).map(wp => ({
-        ...wp,
-        minutesFromK: this.startTimeToMinutes(wp.startTime),
+      this.waypointsTableData = (waypoints || []).map(wp => {
+        const disp = wp.displayStyle;
+        return {
+          ...wp,
+          minutesFromK: this.startTimeToMinutes(wp.startTime),
+          segmentMode: wp.segmentMode || (disp && disp.segmentMode) || null,
+          segmentTargetMinutes: (disp && disp.segmentTargetMinutes != null) ? Number(disp.segmentTargetMinutes) : (wp.segmentTargetMinutes != null ? Number(wp.segmentTargetMinutes) : null),
+          segmentTargetSpeed: (disp && disp.segmentTargetSpeed != null) ? Number(disp.segmentTargetSpeed) : (wp.segmentTargetSpeed != null ? Number(wp.segmentTargetSpeed) : null),
         labelFontSize: wp.labelFontSize != null ? Number(wp.labelFontSize) : 14,
         labelColor: wp.labelColor || '#333333',
         pixelSize: wp.pixelSize != null ? Number(wp.pixelSize) : 10,
         color: wp.color || '#f1f5f9',
         outlineColor: wp.outlineColor || '#64748b'
-      }))
+        };
+      });
       this.waypointsEditMode = false
     },
     formatNum(val) {
@@ -656,7 +701,23 @@ export default {
     },
     getWaypointsPayloadForSave() {
       const routeId = this.form.id
-      return this.waypointsTableData.map(row => ({
+      const rows = this.waypointsTableData
+      // 定时点：根据“本航点定时到达(或相对K时)”反算上一航点速度，可与相对K时分离支持“定时到达+盘旋至相对K时出发”
+      const prevSpeedByIndex = {}
+      for (let i = 1; i < rows.length; i++) {
+        if (rows[i].segmentMode === 'fixed_time') {
+          const prev = rows[i - 1]
+          const curr = rows[i]
+          const currArrivalMin = (curr.segmentTargetMinutes != null && curr.segmentTargetMinutes !== '') ? Number(curr.segmentTargetMinutes) : Number(curr.minutesFromK)
+          const deltaMin = currArrivalMin - Number(prev.minutesFromK)
+          if (deltaMin > 0.001) {
+            const distM = this.segmentDistance(prev, curr)
+            const speedKmh = (distM / 1000) / (deltaMin / 60)
+            prevSpeedByIndex[i - 1] = Math.round(speedKmh * 10) / 10
+          }
+        }
+      }
+      return rows.map((row, idx) => ({
         id: row.id,
         routeId,
         seq: row.seq,
@@ -664,11 +725,14 @@ export default {
         lng: row.lng,
         lat: row.lat,
         alt: row.alt,
-        speed: row.speed,
+        speed: prevSpeedByIndex[idx] != null ? prevSpeedByIndex[idx] : (row.speed != null ? Math.round(Number(row.speed) * 10) / 10 : null),
         startTime: this.minutesToStartTime(row.minutesFromK),
         turnAngle: row.turnAngle != null ? row.turnAngle : 0,
         pointType: row.pointType || null,
         holdParams: row.holdParams || null,
+        segmentMode: row.segmentMode || null,
+        segmentTargetMinutes: row.segmentTargetMinutes != null ? row.segmentTargetMinutes : null,
+        segmentTargetSpeed: row.segmentTargetSpeed != null ? row.segmentTargetSpeed : null,
         labelFontSize: row.labelFontSize != null ? row.labelFontSize : 14,
         labelColor: row.labelColor || '#333333',
         color: row.color != null && row.color !== '' ? row.color : '#f1f5f9',

ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue

@@ -66,16 +66,52 @@
             ></el-input-number>
           </el-form-item>
 
-          <el-form-item label="速度" prop="speed">
+          <el-form-item label="速度(km/h)" prop="speed">
             <el-input-number
               v-model="formData.speed"
               :min="0"
+              :precision="1"
               controls-position="right"
               placeholder="请输入速度"
               class="full-width-input"
             ></el-input-number>
           </el-form-item>
 
+          <el-form-item label="定速/定时">
+            <el-radio-group v-model="formData.segmentMode" class="segment-mode-group">
+              <el-radio :label="null">无</el-radio>
+              <el-radio label="fixed_speed">定速</el-radio>
+              <el-radio label="fixed_time">定时</el-radio>
+            </el-radio-group>
+            <div class="form-tip form-hold-tip">定速：移动下一航点会按距离÷速度重算下一航点的相对K时；定时：移动本航点会按距离÷时间重算上一航点的速度。</div>
+            <template v-if="formData.segmentMode === 'fixed_time'">
+              <el-form-item label="定时到达(分)" class="segment-target-item">
+                <el-input-number
+                  v-model="formData.segmentTargetMinutes"
+                  :min="-9999"
+                  :max="9999"
+                  :precision="1"
+                  controls-position="right"
+                  placeholder="到达本航点的相对K时，可与下方相对K时分离以支持“定时到达+盘旋至相对K时出发”"
+                  class="full-width-input"
+                />
+                <div class="form-tip form-hold-tip">定时到达时间，可与相对K时不同。如盘旋点：到达K+5，盘旋至K+10再前往下一航点，则此处填5，相对K时填10。</div>
+              </el-form-item>
+            </template>
+            <template v-else-if="formData.segmentMode === 'fixed_speed'">
+              <el-form-item label="定速(km/h)" class="segment-target-item">
+                <el-input-number
+                  v-model="formData.segmentTargetSpeed"
+                  :min="0"
+                  :precision="1"
+                  controls-position="right"
+                  placeholder="本航段使用的固定速度"
+                  class="full-width-input"
+                />
+              </el-form-item>
+            </template>
+          </el-form-item>
+
           <el-form-item v-if="!isHoldWaypoint" label="转弯坡度" prop="turnAngle">
             <el-input-number
               v-model="formData.turnAngle"
@@ -95,26 +131,27 @@
                 <el-radio label="hold_ellipse">椭圆</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item v-if="formData.pointType === 'hold_circle'" label="半径(米)">
-              <el-input-number v-model="formData.holdRadius" :min="100" :max="50000" class="full-width-input" />
-            </el-form-item>
-            <template v-if="formData.pointType === 'hold_ellipse'">
-              <el-form-item label="长半轴(米)">
-                <el-input-number v-model="formData.holdSemiMajor" :min="100" :max="50000" class="full-width-input" />
-              </el-form-item>
-              <el-form-item label="短半轴(米)">
-                <el-input-number v-model="formData.holdSemiMinor" :min="50" :max="50000" class="full-width-input" />
-              </el-form-item>
-              <el-form-item label="长轴方位(度)">
-                <el-input-number v-model="formData.holdHeadingDeg" :min="-180" :max="180" class="full-width-input" />
-              </el-form-item>
-            </template>
             <el-form-item label="盘旋方向">
               <el-radio-group v-model="formData.holdClockwise">
                 <el-radio :label="true">顺时针</el-radio>
                 <el-radio :label="false">逆时针</el-radio>
               </el-radio-group>
             </el-form-item>
+            <template v-if="isHoldWaypoint && formData.pointType === 'hold_ellipse'">
+              <el-form-item label="跑道边长(km)">
+                <el-input-number
+                  v-model="formData.holdEdgeLengthKm"
+                  :min="1"
+                  :max="200"
+                  :step="1"
+                  controls-position="right"
+                  placeholder="默认 20"
+                  class="full-width-input"
+                />
+                <div class="form-tip form-hold-tip">两条直边每边长度，默认 20km。两端弧的转弯半径由本航点转弯坡度与速度自动计算。</div>
+              </el-form-item>
+            </template>
+            <div v-if="isHoldWaypoint" class="form-tip form-hold-tip">盘旋点需设置定时且定时 &lt; 相对K时（到达时间早于切出时间才有盘旋时长）。半径/长短轴由相对K时、定时与速度自动计算，并与最小值比较；若计算值小于最小值将提示冲突，请调整相对K时或速度。</div>
           </template>
 
           <el-form-item label="相对K时(分)" prop="minutesFromK">
@@ -122,6 +159,7 @@
               v-model="formData.minutesFromK"
               :min="-9999"
               :max="9999"
+              :precision="1"
               controls-position="right"
               placeholder="正数 K 后，负数 K 前"
               class="full-width-input"
@@ -170,15 +208,15 @@ export default {
         speed: 800,
         turnAngle: 0,
         minutesFromK: 0,
+        segmentMode: null,
+        segmentTargetMinutes: null,
+        segmentTargetSpeed: null,
         currentIndex: -1,
         totalPoints: 0,
         isBankDisabled: false,
         pointType: 'normal',
-        holdRadius: 500,
-        holdSemiMajor: 500,
-        holdSemiMinor: 300,
-        holdHeadingDeg: 0,
         holdClockwise: true,
+        holdEdgeLengthKm: 20,
         labelFontSize: 14,
         labelColor: '#334155',
         pixelSize: 10,
@@ -229,16 +267,14 @@ export default {
       const locked = (index === 0) || (total > 0 && index === total - 1);
 
       const pt = (this.waypoint.pointType || this.waypoint.point_type) || 'normal';
-      let holdRadius = 500, holdSemiMajor = 500, holdSemiMinor = 300, holdHeadingDeg = 0, holdClockwise = true;
+      let holdClockwise = true;
+      let holdEdgeLengthKm = 20;
       try {
         const raw = this.waypoint.holdParams || this.waypoint.hold_params;
         if (raw) {
           const p = typeof raw === 'string' ? JSON.parse(raw) : raw;
-          holdRadius = p.radius != null ? p.radius : 500;
-          holdSemiMajor = p.semiMajor ?? p.semiMajorAxis ?? 500;
-          holdSemiMinor = p.semiMinor ?? p.semiMinorAxis ?? 300;
-          holdHeadingDeg = p.headingDeg ?? 0;
           holdClockwise = p.clockwise !== false;
+          if (p.edgeLength != null) holdEdgeLengthKm = Math.max(1, Math.min(200, Number(p.edgeLength) / 1000));
         }
       } catch (e) {}
       const labelFontSize = this.waypoint.labelFontSize != null ? Number(this.waypoint.labelFontSize) : 14;
@@ -246,21 +282,23 @@ export default {
       const pixelSize = this.waypoint.pixelSize != null ? Number(this.waypoint.pixelSize) : 10;
       const color = this.waypoint.color || '#f1f5f9';
       const outlineColor = this.waypoint.outlineColor != null ? this.waypoint.outlineColor : '#64748b';
+      const segmentMode = this.waypoint.segmentMode || (this.waypoint.displayStyle && this.waypoint.displayStyle.segmentMode) || null;
+      const disp = this.waypoint.displayStyle;
       this.formData = {
         name: this.waypoint.name || '',
         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,
         minutesFromK: this.startTimeToMinutes(this.waypoint.startTime),
+        segmentMode: segmentMode === 'fixed_speed' || segmentMode === 'fixed_time' ? segmentMode : null,
+        segmentTargetMinutes: (disp && disp.segmentTargetMinutes != null) ? Number(disp.segmentTargetMinutes) : (this.waypoint.segmentTargetMinutes != null ? Number(this.waypoint.segmentTargetMinutes) : null),
+        segmentTargetSpeed: (disp && disp.segmentTargetSpeed != null) ? Number(disp.segmentTargetSpeed) : (this.waypoint.segmentTargetSpeed != null ? Number(this.waypoint.segmentTargetSpeed) : (this.waypoint.speed != null ? Number(this.waypoint.speed) : null)),
         currentIndex: index,
         totalPoints: total,
         isBankDisabled: locked,
-        turnAngle: locked ? 0 : (Number(this.waypoint.turnAngle) || 0),
+        turnAngle: locked ? 0 : (this.waypoint.turnAngle != null ? Number(this.waypoint.turnAngle) : 45),
         pointType: pt,
-        holdRadius,
-        holdSemiMajor,
-        holdSemiMinor,
-        holdHeadingDeg,
         holdClockwise,
+        holdEdgeLengthKm,
         labelFontSize: Math.min(28, Math.max(10, labelFontSize)),
         labelColor,
         pixelSize: Math.min(24, Math.max(4, pixelSize)),
@@ -279,33 +317,46 @@ export default {
     },
     saveWaypoint() {
       this.$refs.formRef.validate((valid) => {
-        if (valid) {
-          const { minutesFromK, ...rest } = this.formData;
-          const startTimeStr = this.minutesToStartTime(minutesFromK);
-          const payload = {
-            ...this.waypoint,
-            ...rest,
-            startTime: startTimeStr,
-            labelFontSize: this.formData.labelFontSize,
-            labelColor: this.formData.labelColor,
-            pixelSize: this.formData.pixelSize,
-            color: this.formData.color,
-            outlineColor: this.formData.outlineColor
-          };
-          if (this.formData.pointType && this.formData.pointType !== 'normal') {
-            payload.pointType = this.formData.pointType;
-            payload.holdParams = this.formData.pointType === 'hold_circle'
-              ? JSON.stringify({ radius: this.formData.holdRadius, clockwise: this.formData.holdClockwise })
-              : JSON.stringify({
-                  semiMajor: this.formData.holdSemiMajor,
-                  semiMinor: this.formData.holdSemiMinor,
-                  headingDeg: this.formData.holdHeadingDeg,
-                  clockwise: this.formData.holdClockwise
-                });
+        if (!valid) return;
+        const { minutesFromK, ...rest } = this.formData;
+        if (this.isHoldWaypoint && this.formData.segmentMode === 'fixed_time') {
+          const target = this.formData.segmentTargetMinutes;
+          if (target == null || target === '') {
+            this.$message.warning('盘旋点需设置定时到达时间，以便计算盘旋半径/长短轴');
+            return;
+          }
+          if (Number(target) >= Number(minutesFromK)) {
+            this.$message.warning('盘旋点要求定时 < 相对K时（到达时间须早于切出时间），请调整定时或相对K时');
+            return;
+          }
+        }
+        const startTimeStr = this.minutesToStartTime(minutesFromK);
+        const segmentTargetMinutes = this.formData.segmentMode === 'fixed_time' && this.formData.segmentTargetMinutes != null ? this.formData.segmentTargetMinutes : null;
+        const segmentTargetSpeed = this.formData.segmentMode === 'fixed_speed' && this.formData.segmentTargetSpeed != null ? this.formData.segmentTargetSpeed : null;
+        const payload = {
+          ...this.waypoint,
+          ...rest,
+          startTime: startTimeStr,
+          segmentMode: this.formData.segmentMode || null,
+          segmentTargetMinutes,
+          segmentTargetSpeed,
+          displayStyle: { ...(this.waypoint.displayStyle || {}), segmentMode: this.formData.segmentMode, segmentTargetMinutes, segmentTargetSpeed },
+          labelFontSize: this.formData.labelFontSize,
+          labelColor: this.formData.labelColor,
+          pixelSize: this.formData.pixelSize,
+          color: this.formData.color,
+          outlineColor: this.formData.outlineColor
+        };
+        if (this.formData.pointType && this.formData.pointType !== 'normal') {
+          payload.pointType = this.formData.pointType;
+          const holdParams = { clockwise: this.formData.holdClockwise };
+          if (this.formData.pointType === 'hold_ellipse') {
+            holdParams.edgeLength = (this.formData.holdEdgeLengthKm != null ? this.formData.holdEdgeLengthKm : 20) * 1000;
           }
-          this.$emit('save', payload);
-          this.closeDialog();
+          payload.holdParams = JSON.stringify(holdParams);
         }
+        this.$emit('save', payload);
+        this.closeDialog();
       });
     },
     /** 将 startTime 字符串（如 K+00:40:00）转为相对 K 的分钟数 */
@@ -448,6 +499,21 @@ export default {
   color: #e6a23c;
 }
 
+.form-hold-tip {
+  margin-bottom: 12px;
+  padding: 6px 0;
+}
+
+.segment-mode-group {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 12px;
+}
+
+.segment-target-item {
+  margin-top: 8px;
+}
+
 .color-value {
   margin-left: 8px;
   font-size: 12px;