diff --git a/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue b/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue index dac82db..595124a 100644 --- a/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue +++ b/ruoyi-ui/src/views/cesiumMap/ContextMenu.vue @@ -7,20 +7,38 @@ - +
航点
📝 编辑航点
-
+
⬅️ 向前增加航点 + {{ expandedAddWaypoint === 'before' ? '▼' : '▶' }}
-
+
+
+ ·默认航点 +
+
+ ·定时点 +
+
+
➡️ 向后增加航点 + {{ expandedAddWaypoint === 'after' ? '▼' : '▶' }} +
+
+
+ ·默认航点 +
+
+ ·定时点 +
🔄 @@ -28,6 +46,43 @@
+ + + + + +
飞行时间，如10表示飞10分钟到达。相对K时=上一航点+10，速度将根据距离自动计算
+ + + +
上一航点到新航点之间使用的固定速度
+ + + + 取消 + 确定 + + +
航线编辑
@@ -480,6 +535,11 @@ export default { }, data() { return { + expandedAddWaypoint: null, + showAddWaypointDialog: false, + addWaypointDialogMode: null, + addWaypointDialogSegmentMode: null, + addWaypointForm: { segmentTargetMinutes: 10, segmentTargetSpeed: 800 }, showColorPickerFor: null, showWidthPicker: false, showSizePicker: false, @@ -522,6 +582,12 @@ export default { isRouteLocked() { if (!this.entityData || this.entityData.routeId == null) return false return !!this.routeLocked[this.entityData.routeId] + }, + addWaypointDialogTitle() { + if (!this.addWaypointDialogMode) return '设置参数' + const dir = this.addWaypointDialogMode === 'before' ? '向前' : '向后' + const type = this.addWaypointDialogSegmentMode === 'fixed_time' ? '定时点' : '定速点' + return `${dir}增加${type} - 设置参数` } }, methods: { @@ -591,12 +657,59 @@ export default { this.$emit('open-waypoint-dialog', this.entityData.dbId, this.entityData.routeId, this.entityData.waypointIndex) }, - handleAddWaypointBefore() { - this.$emit('add-waypoint-at', { routeId: this.entityData.routeId, waypointIndex: this.entityData.waypointIndex, mode: 'before' }) + toggleAddWaypointExpand(which) { + this.expandedAddWaypoint = this.expandedAddWaypoint === which ? null : which }, - handleAddWaypointAfter() { - this.$emit('add-waypoint-at', { routeId: this.entityData.routeId, waypointIndex: this.entityData.waypointIndex, mode: 'after' }) + handleAddWaypointWithMode(mode, segmentMode) { + this.expandedAddWaypoint = null + if (segmentMode === 'fixed_time' || segmentMode === 'fixed_speed') { + this.addWaypointDialogMode = mode + this.addWaypointDialogSegmentMode = segmentMode + this.addWaypointForm = { + segmentTargetMinutes: 10, + segmentTargetSpeed: 800 + } + this.showAddWaypointDialog = true + } else { + this.emitAddWaypointAt(mode, segmentMode, null, null) + } + }, + + confirmAddWaypointParams() { + const segmentMode = this.addWaypointDialogSegmentMode + if (segmentMode === 'fixed_time') { + const v = this.addWaypointForm.segmentTargetMinutes + if (v == null || v === '' || Number(v) <= 0) { + this.$message && this.$message.warning('请填写距上一航点的飞行时间(分)，且必须大于0') + return + } + } else if (segmentMode === 'fixed_speed') { + const v = this.addWaypointForm.segmentTargetSpeed + if (v == null || v === '' || Number(v) <= 0) { + this.$message && this.$message.warning('请填写定速(km/h)，且必须大于0') + return + } + } + this.showAddWaypointDialog = false + const mode = this.addWaypointDialogMode + const segmentTargetMinutes = segmentMode === 'fixed_time' ? this.addWaypointForm.segmentTargetMinutes : null + const segmentTargetSpeed = segmentMode === 'fixed_speed' ? Number(this.addWaypointForm.segmentTargetSpeed) : null + this.emitAddWaypointAt(mode, segmentMode, segmentTargetMinutes, segmentTargetSpeed) + this.addWaypointDialogMode = null + this.addWaypointDialogSegmentMode = null + }, + + emitAddWaypointAt(mode, segmentMode, segmentTargetMinutes, segmentTargetSpeed) { + const payload = { + routeId: this.entityData.routeId, + waypointIndex: this.entityData.waypointIndex, + mode, + segmentMode + } + if (segmentTargetMinutes != null) payload.segmentTargetMinutes = segmentTargetMinutes + if (segmentTargetSpeed != null) payload.segmentTargetSpeed = segmentTargetSpeed + this.$emit('add-waypoint-at', payload) }, handleToggleWaypointHold() { @@ -818,6 +931,26 @@ export default { flex: 1; } +.menu-expand-icon { + margin-left: auto; + font-size: 10px; + color: #999; + flex: none; +} + +.menu-sub-group { + padding-left: 0; + background-color: #fafafa; + border-left: 2px solid #e0e0e0; + margin-left: 8px; +} + +.menu-icon-sub { + margin-right: 6px; + font-size: 12px; + color: #999; +} + .menu-item-sub { padding: 6px 16px 6px 24px; font-size: 12px; @@ -829,6 +962,13 @@ export default { color: #333; } +.form-tip-small { + font-size: 11px; + color: #999; + margin-top: 4px; + line-height: 1.3; +} + /* 颜色选择器样式 */ .color-picker-container { padding: 8px 16px; diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue index 702a91f..0a1cefd 100644 --- a/ruoyi-ui/src/views/cesiumMap/index.vue +++ b/ruoyi-ui/src/views/cesiumMap/index.vue @@ -1116,7 +1116,7 @@ export default { lng: coords.lng, alt: 5000, speed: 800, - ...(meta && { pointType: meta.radius != null ? 'hold_circle' : 'hold_ellipse', holdParams: JSON.stringify(meta) }) + ...(meta && { pointType: (meta.radius != null || meta.type === 'hold_circle') ? 'hold_circle' : 'hold_ellipse', holdParams: JSON.stringify(meta) }) }); insertIdx++; if (this.missionPendingHold && this.missionPendingHold.beforeIndex === i) { @@ -1128,7 +1128,7 @@ export default { lng: holdCoords.lng, alt: 5000, speed: 800, - pointType: this.missionPendingHold.params.radius != null ? 'hold_circle' : 'hold_ellipse', + pointType: (this.missionPendingHold.params.radius != null || this.missionPendingHold.params.type === 'hold_circle') ? 'hold_circle' : 'hold_ellipse', holdParams: JSON.stringify(this.missionPendingHold.params) }); insertIdx++; @@ -1390,7 +1390,7 @@ export default { alt: 5000, speed: 800, ...(isHold && { - pointType: this.missionPendingHold.params.radius != null ? 'hold_circle' : 'hold_ellipse', + pointType: (this.missionPendingHold.params.radius != null || this.missionPendingHold.params.type === 'hold_circle') ? 'hold_circle' : 'hold_ellipse', holdParams: JSON.stringify(this.missionPendingHold.params) }) }); @@ -1425,9 +1425,9 @@ export default { } const center = this.missionPendingHold.center; const p = holdParams; - const isCircle = p.radius != null; + const isCircle = p.radius != null || p.type === 'hold_circle'; const isRaceTrack = !isCircle && p.edgeLength != null; - const radius = isCircle ? (p.radius || 500) : 500; + const radius = isCircle ? (this.getWaypointRadius({ speed: p.speed ?? 800, turnAngle: p.turnAngle ?? 45 }) || 500) : 500; const semiMajor = !isCircle ? (p.semiMajor ?? p.semiMajorAxis ?? 500) : radius; const semiMinor = !isCircle ? (p.semiMinor ?? p.semiMinorAxis ?? 300) : radius; const headingRad = !isCircle ? ((p.headingDeg ?? 0) * Math.PI) / 180 : 0; @@ -2113,7 +2113,8 @@ export default { if (i < 1 || i >= waypoints.length - 1) return false; const wp = waypoints[i]; const effectiveAngle = this.getEffectiveTurnAngle(wp, i, waypoints.length); - if (this.getWaypointRadius({ ...wp, turnAngle: effectiveAngle }) <= 0) return false; + const prevWp = waypoints[i - 1]; + if (this.getTurnRadiusFromPrevSpeed(prevWp, effectiveAngle) <= 0) return false; const nextPos = originalPositions[i + 1]; return !!nextPos; }; @@ -2409,7 +2410,8 @@ export default { const pt = wp.pointType || wp.point_type; const useCircle = pt === 'hold_circle'; const effectiveTurnAngle = this.getEffectiveTurnAngle(wp, i, waypoints.length); - const turnRadius = this.getWaypointRadius({ ...wp, turnAngle: effectiveTurnAngle }) || 500; + const prevWpForHold = i > 0 ? waypoints[i - 1] : null; + const turnRadius = this.getHoldRadiusFromPrevSpeed(wp, prevWpForHold, effectiveTurnAngle) || 500; // 地图显示半径始终用速度+坡度公式计算，推演反算半径仅用于推演内部，不影响显示 const radius = turnRadius; const turnRadiusForHold = turnRadius; @@ -2494,7 +2496,8 @@ export default { lastPos = holdPositions[holdPositions.length - 1]; } else { const effectiveAngle = this.getEffectiveTurnAngle(wp, i, waypoints.length); - const radius = this.getWaypointRadius({ ...wp, turnAngle: effectiveAngle }); + const prevWpForTurn = waypoints[i - 1]; + const radius = this.getTurnRadiusFromPrevSpeed(prevWpForTurn, effectiveAngle); let nextLogical = nextPos; if (nextPos && i + 1 < waypoints.length && this.isHoldWaypoint(waypoints[i + 1])) { const nextWp = waypoints[i + 1]; @@ -2502,7 +2505,8 @@ export default { const nextHoldIsCircle = (nextWp.pointType || nextWp.point_type) === 'hold_circle'; if (nextHoldIsCircle) { const holdPos = originalPositions[i + 1]; - const computedNextR = this.getWaypointRadius({ ...nextWp, turnAngle: this.getEffectiveTurnAngle(nextWp, i + 1, waypoints.length) }); + const nextHoldTurnAngle = this.getEffectiveTurnAngle(nextWp, i + 1, waypoints.length); + const computedNextR = this.getHoldRadiusFromPrevSpeed(nextWp, wp, nextHoldTurnAngle); const r = (computedNextR > 0) ? computedNextR : 500; const clock = holdParams && holdParams.clockwise !== false; const center = this.getHoldCenterFromPrevNext(currPos, holdPos, r, clock); @@ -2511,7 +2515,8 @@ export default { const nextNext = i + 2 < waypoints.length ? originalPositions[i + 2] : null; const nextDir = this.getRaceTrackDirectionRad(originalPositions[i + 1], currPos, nextNext, holdParams && holdParams.headingDeg != null ? holdParams.headingDeg : 0); const nextEdge = Math.max(1000, holdParams && holdParams.edgeLength != null ? holdParams.edgeLength : this.DEFAULT_RACE_TRACK_EDGE_LENGTH_M); - const nextArcR = this.getWaypointRadius({ ...nextWp, turnAngle: this.getEffectiveTurnAngle(nextWp, i + 1, waypoints.length) }) || 500; + const nextHoldTurnAngle = this.getEffectiveTurnAngle(nextWp, i + 1, waypoints.length); + const nextArcR = this.getHoldRadiusFromPrevSpeed(nextWp, wp, nextHoldTurnAngle) || 500; nextLogical = this.getRaceTrackTangentEntryPoint(originalPositions[i + 1], lastPos, nextDir, nextEdge, nextArcR, holdParams && holdParams.clockwise !== false); } } @@ -2690,14 +2695,30 @@ export default { }, /** 转弯半径 R = v²/(g·tanθ)，v 为速度(m/s)，g=9.8，θ 为转弯坡度/坡度角(弧度) */ getWaypointRadius(wp) { - const speed = wp.speed || 800; - const bankAngle = wp.turnAngle || 0; + const speed = (wp && wp.segmentMode === 'fixed_speed' && (wp.segmentTargetSpeed != null && wp.segmentTargetSpeed !== '')) + ? Number(wp.segmentTargetSpeed) : (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)); }, + /** 转弯/盘旋半径使用上一航点速度计算，因飞机以进入转弯前的速度转弯 */ + getHoldRadiusFromPrevSpeed(holdWp, prevWp, holdTurnAngle) { + const prevSpeed = (prevWp && prevWp.segmentMode === 'fixed_speed' && (prevWp.segmentTargetSpeed != null && prevWp.segmentTargetSpeed !== '')) + ? Number(prevWp.segmentTargetSpeed) : (prevWp?.speed || 800); + const bankAngle = holdTurnAngle ?? holdWp?.turnAngle ?? 45; + if (bankAngle <= 0) return 0; + const v_mps = prevSpeed / 3.6; + const radians = bankAngle * (Math.PI / 180); + const g = 9.8; + return (v_mps * v_mps) / (g * Math.tan(radians)); + }, + /** 普通航点转弯半径也使用上一航点速度 */ + getTurnRadiusFromPrevSpeed(prevWp, turnAngle) { + return this.getHoldRadiusFromPrevSpeed(null, prevWp, turnAngle); + }, isHoldWaypoint(wp) { const t = (wp && wp.pointType) || (wp && wp.point_type) || 'normal'; @@ -4056,7 +4077,9 @@ export default { const arcStartIdx = path.length; let holdPositions; if (useCircle) { - const turnRadius = this.getWaypointRadius({ ...wp, turnAngle: this.getEffectiveTurnAngle(wp, i, waypoints.length) }) || 500; + const prevWp = waypoints[i - 1]; + const holdTurnAngle = this.getEffectiveTurnAngle(wp, i, waypoints.length); + const turnRadius = this.getHoldRadiusFromPrevSpeed(wp, prevWp, holdTurnAngle) || 500; const radius = (holdRadiusByLegIndex[legIndex] != null && Number.isFinite(holdRadiusByLegIndex[legIndex])) ? holdRadiusByLegIndex[legIndex] : turnRadius; @@ -4076,7 +4099,9 @@ export default { lastPos = exit; } else { const edgeLengthM = Math.max(1000, params && params.edgeLength != null ? params.edgeLength : this.DEFAULT_RACE_TRACK_EDGE_LENGTH_M); - const arcRadiusM = this.getWaypointRadius({ ...wp, turnAngle: this.getEffectiveTurnAngle(wp, i, waypoints.length) }) || 500; + const prevWp = waypoints[i - 1]; + const holdTurnAngle = this.getEffectiveTurnAngle(wp, i, waypoints.length); + const arcRadiusM = this.getHoldRadiusFromPrevSpeed(wp, prevWp, holdTurnAngle) || 500; const directionRad = this.getRaceTrackDirectionRad( currPos, lastPos, @@ -4103,7 +4128,9 @@ export default { const nextHoldIsCircle = (nextWp.pointType || nextWp.point_type) === 'hold_circle'; if (nextHoldIsCircle) { const holdPos = originalPositions[i + 1]; - const computedNextR2 = this.getWaypointRadius({ ...nextWp, turnAngle: this.getEffectiveTurnAngle(nextWp, i + 1, waypoints.length) }); + const currWp = waypoints[i]; + const nextHoldTurnAngle = this.getEffectiveTurnAngle(nextWp, i + 1, waypoints.length); + const computedNextR2 = this.getHoldRadiusFromPrevSpeed(nextWp, currWp, nextHoldTurnAngle); const r = (computedNextR2 > 0) ? computedNextR2 : 500; const clock = holdParams && holdParams.clockwise !== false; const center = this.getHoldCenterFromPrevNext(currPos, holdPos, r, clock); @@ -4112,12 +4139,15 @@ export default { const nextNext = i + 2 < waypoints.length ? originalPositions[i + 2] : null; const nextDir = this.getRaceTrackDirectionRad(originalPositions[i + 1], currPos, nextNext, holdParams && holdParams.headingDeg != null ? holdParams.headingDeg : 0); const nextEdge = Math.max(1000, holdParams && holdParams.edgeLength != null ? holdParams.edgeLength : this.DEFAULT_RACE_TRACK_EDGE_LENGTH_M); - const nextArcR = this.getWaypointRadius({ ...nextWp, turnAngle: this.getEffectiveTurnAngle(nextWp, i + 1, waypoints.length) }) || 500; + const currWp = waypoints[i]; + const nextHoldTurnAngle = this.getEffectiveTurnAngle(nextWp, i + 1, waypoints.length); + const nextArcR = this.getHoldRadiusFromPrevSpeed(nextWp, currWp, nextHoldTurnAngle) || 500; nextLogical = this.getRaceTrackTangentEntryPoint(originalPositions[i + 1], lastPos, nextDir, nextEdge, nextArcR, holdParams && holdParams.clockwise !== false); } } const effectiveAngle = this.getEffectiveTurnAngle(wp, i, waypoints.length); - const radius = this.getWaypointRadius({ ...wp, turnAngle: effectiveAngle }); + const prevWpForTurn = i > 0 ? waypoints[i - 1] : null; + const radius = this.getTurnRadiusFromPrevSpeed(prevWpForTurn, effectiveAngle); if (i < waypoints.length - 1 && nextLogical) { if (prevWasHold) { // 上一航点为盘旋时：先把盘旋出口加入路径，再按转弯半径处理 @@ -4797,7 +4827,10 @@ export default { routeId: ctx.routeId, waypointIndex: ctx.waypointIndex, mode: ctx.mode, - position: { lng, lat, alt } + position: { lng, lat, alt }, + segmentMode: ctx.segmentMode, + segmentTargetMinutes: ctx.segmentTargetMinutes, + segmentTargetSpeed: ctx.segmentTargetSpeed }); } this.clearAddWaypointContext(); @@ -7965,8 +7998,8 @@ export default { this.contextMenu.visible = false; this.$emit('toggle-waypoint-hold', payload); }, - /** 开始“在航点前/后增加航点”模式：显示预览折线，左键放置、右键取消。waypoints 为当前航线航点数组。 */ - startAddWaypointAt(routeId, waypointIndex, mode, waypoints) { + /** 开始“在航点前/后增加航点”模式：显示预览折线，左键放置、右键取消。segmentMode 可选：null(默认)、fixed_time(定时点)、fixed_speed(定速点)。segmentTargetMinutes/segmentTargetSpeed 为用户填写的固定值。 */ + startAddWaypointAt(routeId, waypointIndex, mode, waypoints, segmentMode, segmentTargetMinutes, segmentTargetSpeed) { if (!waypoints || waypoints.length === 0) return; this.clearAddWaypointContext(); const ctx = { @@ -7974,12 +8007,16 @@ export default { waypointIndex: Math.max(0, Math.min(waypointIndex, waypoints.length - 1)), mode, waypoints, + segmentMode: segmentMode || null, + segmentTargetMinutes: segmentTargetMinutes != null ? segmentTargetMinutes : null, + segmentTargetSpeed: segmentTargetSpeed != null ? segmentTargetSpeed : null, mouseCartesian: null }; const toCartesian = (wp) => Cesium.Cartesian3.fromDegrees(parseFloat(wp.lng), parseFloat(wp.lat), Number(wp.alt) || 5000); ctx.mouseCartesian = toCartesian(waypoints[ctx.waypointIndex]); this.addWaypointContext = ctx; - this.$message && this.$message.info(mode === 'before' ? '点击地图在当前位置前插入新航点，右键取消' : '点击地图在当前位置后插入新航点，右键取消'); + const modeLabel = segmentMode === 'fixed_time' ? '定时点' : (segmentMode === 'fixed_speed' ? '定速点' : '默认航点'); + this.$message && this.$message.info(`${mode === 'before' ? '在当前位置前' : '在当前位置后'}插入${modeLabel}，点击地图放置，右键取消`); this.updateAddWaypointPreview(); }, /** 更新“增加航点”预览折线：上一/当前/下一与鼠标位置连线，含盘旋段视觉效果 */ diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue index 4f0cae1..6c57a7d 100644 --- a/ruoyi-ui/src/views/childRoom/index.vue +++ b/ruoyi-ui/src/views/childRoom/index.vue @@ -282,9 +282,7 @@ 椭圆 - - - +