From 9114c295ba4506ae6848f4528ea3b68ba3d07cfe Mon Sep 17 00:00:00 2001
From: ctw <1051735452@qq.com>
Date: Fri, 6 Feb 2026 17:07:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E6=97=8B=E7=9A=84=E4=B8=80=E7=A7=8D?=
=?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/application-druid.yml | 2 +-
.../com/ruoyi/system/domain/RouteWaypoints.java | 26 +
.../mapper/system/RouteWaypointsMapper.xml | 12 +-
ruoyi-ui/src/views/cesiumMap/DrawingToolbar.vue | 3 +
ruoyi-ui/src/views/cesiumMap/index.vue | 1020 ++++++++++++++++++--
ruoyi-ui/src/views/childRoom/RightPanel.vue | 5 +
ruoyi-ui/src/views/childRoom/index.vue | 431 ++++++++-
ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue | 83 +-
8 files changed, 1471 insertions(+), 111 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 037db5c..c40f2aa 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -8,7 +8,7 @@ spring:
master:
url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: 123456
+ password: A20040303ctw!
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RouteWaypoints.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RouteWaypoints.java
index 45bc77e..4d83b21 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RouteWaypoints.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RouteWaypoints.java
@@ -55,6 +55,14 @@ public class RouteWaypoints extends BaseEntity
@Excel(name = "转弯角度 (用于计算转弯半径)")
private Double turnAngle;
+ /** 航点类型: normal-普通, hold_circle-圆形盘旋, hold_ellipse-椭圆盘旋 */
+ @Excel(name = "航点类型")
+ private String pointType;
+
+ /** 盘旋参数JSON: 圆(radius,clockwise) 椭圆(semiMajor,semiMinor,headingDeg,clockwise) */
+ @Excel(name = "盘旋参数")
+ private String holdParams;
+
public void setId(Long id)
{
this.id = id;
@@ -155,6 +163,22 @@ public class RouteWaypoints extends BaseEntity
return turnAngle;
}
+ public void setPointType(String pointType) {
+ this.pointType = pointType;
+ }
+
+ public String getPointType() {
+ return pointType;
+ }
+
+ public void setHoldParams(String holdParams) {
+ this.holdParams = holdParams;
+ }
+
+ public String getHoldParams() {
+ return holdParams;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -168,6 +192,8 @@ public class RouteWaypoints extends BaseEntity
.append("speed", getSpeed())
.append("startTime", getStartTime())
.append("turnAngle", getTurnAngle())
+ .append("pointType", getPointType())
+ .append("holdParams", getHoldParams())
.toString();
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/RouteWaypointsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RouteWaypointsMapper.xml
index 7ccc118..b5d6df5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/RouteWaypointsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/RouteWaypointsMapper.xml
@@ -15,10 +15,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
- select id, route_id, name, seq, lat, lng, alt, speed, start_time, turn_angle from route_waypoints
+ select id, route_id, name, seq, lat, lng, alt, speed, start_time, turn_angle, point_type, hold_params from route_waypoints
@@ -57,6 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
speed,
start_time,
turn_angle,
+ point_type,
+ hold_params,
#{routeId},
@@ -68,6 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{speed},
#{startTime},
#{turnAngle},
+ #{pointType},
+ #{holdParams},
@@ -83,6 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
speed = #{speed},
start_time = #{startTime},
turn_angle = #{turnAngle},
+ point_type = #{pointType},
+ hold_params = #{holdParams},
where id = #{id}
diff --git a/ruoyi-ui/src/views/cesiumMap/DrawingToolbar.vue b/ruoyi-ui/src/views/cesiumMap/DrawingToolbar.vue
index 58d3b46..dcced8d 100644
--- a/ruoyi-ui/src/views/cesiumMap/DrawingToolbar.vue
+++ b/ruoyi-ui/src/views/cesiumMap/DrawingToolbar.vue
@@ -45,6 +45,9 @@ export default {
{ id: 'polygon', name: '面', icon: 'el-icon-house' },
{ id: 'rectangle', name: '矩形', icon: 'jx' },
{ id: 'circle', name: '圆形', icon: 'circle' },
+ { id: 'ellipse', name: '椭圆', icon: 'el-icon-oval' },
+ { id: 'hold_circle', name: '圆形盘旋', icon: 'circle' },
+ { id: 'hold_ellipse', name: '椭圆盘旋', icon: 'el-icon-oval' },
{ id: 'sector', name: '扇形', icon: 'sx' },
{ id: 'arrow', name: '箭头', icon: 'el-icon-right' },
{ id: 'text', name: '文本', icon: 'el-icon-document' },
diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue
index 15f1d19..20b8e6c 100644
--- a/ruoyi-ui/src/views/cesiumMap/index.vue
+++ b/ruoyi-ui/src/views/cesiumMap/index.vue
@@ -130,6 +130,10 @@ export default {
drawingPointEntities: [], // 存储线绘制时的点实体
drawingStartPoint: null,
isDrawing: false,
+ missionHoldParamsByIndex: {},
+ missionPendingHold: null,
+ missionInitialHoldParams: null,
+ tempHoldEntity: null,
activeCursorPosition: null, // 实时鼠标位置
// 实体管理
allEntities: [], // 所有绘制的实体
@@ -156,6 +160,9 @@ export default {
polygon: { color: '#0000FF', opacity: 0.5, width: 2 },
rectangle: { color: '#FFA500', opacity: 0.3, width: 2 },
circle: { color: '#800080', opacity: 0.4, width: 2 },
+ ellipse: { color: '#008080', opacity: 0.4, width: 2 },
+ hold_circle: { color: '#00BFFF', width: 2 },
+ hold_ellipse: { color: '#00BFFF', width: 2 },
sector: { color: '#FF6347', opacity: 0.5, width: 2 },
arrow: { color: '#FF0000', width: 6 },
text: { color: '#000000', font: '48px Microsoft YaHei, PingFang SC, sans-serif', backgroundColor: 'rgba(255, 255, 255, 0.8)' },
@@ -375,6 +382,9 @@ export default {
startMissionRouteDrawing() {
this.stopDrawing(); // 停止其他可能存在的绘制
this.drawingPoints = [];
+ this.missionHoldParamsByIndex = {};
+ this.missionPendingHold = null;
+ this.missionInitialHoldParams = null;
let activeCursorPosition = null;
this.isDrawing = true;
this.viewer.canvas.style.cursor = 'crosshair';
@@ -392,7 +402,24 @@ export default {
const position = this.getClickPosition(click.position);
if (!position) return;
this.drawingPoints.push(position);
+ if (this.missionInitialHoldParams && this.drawingPoints.length === 2) {
+ this.missionPendingHold = {
+ beforeIndex: 1,
+ center: Cesium.Cartesian3.clone(this.drawingPoints[0]),
+ params: this.missionInitialHoldParams
+ };
+ this.missionInitialHoldParams = null;
+ if (this.tempHoldEntity) { try { this.viewer.entities.remove(this.tempHoldEntity); } catch (e) {} this.tempHoldEntity = null; }
+ this.tempHoldEntity = this.viewer.entities.add({
+ id: 'temp_hold_preview',
+ name: 'HOLD',
+ position: this.missionPendingHold.center,
+ point: { pixelSize: 10, color: Cesium.Color.ORANGE, outlineColor: Cesium.Color.WHITE, outlineWidth: 2, disableDepthTestDistance: Number.POSITIVE_INFINITY },
+ label: { text: 'HOLD', font: '12px MicroSoft YaHei', fillColor: Cesium.Color.ORANGE, outlineColor: Cesium.Color.BLACK, outlineWidth: 2 }
+ });
+ }
const wpIndex = this.drawingPoints.length;
+ this.$emit('drawing-points-update', this.drawingPoints.length);
// 绘制业务航点
this.viewer.entities.add({
id: `temp_wp_${wpIndex}`,
@@ -420,15 +447,22 @@ export default {
style: Cesium.LabelStyle.FILL_AND_OUTLINE
}
});
- // 第一次点击后，创建动态黑白斑马线
+ // 第一次点击后，创建动态黑白斑马线（若有盘旋则在连线中插入盘旋点）
if (this.drawingPoints.length === 1) {
this.tempPreviewEntity = this.viewer.entities.add({
polyline: {
positions: new Cesium.CallbackProperty(() => {
- if (this.drawingPoints.length > 0 && activeCursorPosition) {
- return [...this.drawingPoints, activeCursorPosition];
+ let positions = this.drawingPoints;
+ if (this.missionPendingHold && this.drawingPoints.length > 0) {
+ const idx = this.missionPendingHold.beforeIndex;
+ positions = [
+ ...this.drawingPoints.slice(0, idx + 1),
+ this.missionPendingHold.center,
+ ...this.drawingPoints.slice(idx + 1)
+ ];
}
- return this.drawingPoints;
+ if (positions.length > 0 && activeCursorPosition) return [...positions, activeCursorPosition];
+ return positions;
}, false),
width: 4,
// 黑白斑马材质
@@ -445,18 +479,36 @@ export default {
// 右键点击逻辑（结束绘制、抛出数据、恢复右键）
this.drawingHandler.setInputAction(() => {
if (this.drawingPoints.length > 1) {
- // 转换坐标并传回给 childRoom/index.vue
- const latLngPoints = this.drawingPoints.map((p, index) => {
- const coords = this.cartesianToLatLng(p);
- return {
- id: index + 1,
- name: `WP${index + 1}`,
+ const latLngPoints = [];
+ let insertIdx = 0;
+ for (let i = 0; i < this.drawingPoints.length; i++) {
+ const coords = this.cartesianToLatLng(this.drawingPoints[i]);
+ const meta = this.missionHoldParamsByIndex[i];
+ latLngPoints.push({
+ id: insertIdx + 1,
+ name: meta ? 'HOLD' : `WP${insertIdx + 1}`,
lat: coords.lat,
lng: coords.lng,
alt: 5000,
- speed: 800
- };
- });
+ speed: 800,
+ ...(meta && { pointType: meta.radius != null ? 'hold_circle' : 'hold_ellipse', holdParams: JSON.stringify(meta) })
+ });
+ insertIdx++;
+ if (this.missionPendingHold && this.missionPendingHold.beforeIndex === i) {
+ const holdCoords = this.cartesianToLatLng(this.missionPendingHold.center);
+ latLngPoints.push({
+ id: insertIdx + 1,
+ name: 'HOLD',
+ lat: holdCoords.lat,
+ lng: holdCoords.lng,
+ alt: 5000,
+ speed: 800,
+ pointType: this.missionPendingHold.params.radius != null ? 'hold_circle' : 'hold_ellipse',
+ holdParams: JSON.stringify(this.missionPendingHold.params)
+ });
+ insertIdx++;
+ }
+ }
this.$emit('draw-complete', latLngPoints);
} else {
this.$message.info('点数不足，航线已取消');
@@ -468,6 +520,43 @@ export default {
}, 200);
}, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
},
+
+ /** 航线绘制过程中：在最后两航点之间插入盘旋（由父组件在弹窗确认后调用）。插入后“最后一个点”会被移除，下一点击即为盘旋后的下一航点。 */
+ insertHoldBetweenLastTwo(holdParams) {
+ if (!this.drawingPoints || this.drawingPoints.length < 2) return;
+ const last = this.drawingPoints[this.drawingPoints.length - 1];
+ this.drawingPoints.pop();
+ const removedWpId = `temp_wp_${this.drawingPoints.length + 1}`;
+ const lastPointEntity = this.viewer.entities.getById(removedWpId);
+ if (lastPointEntity) this.viewer.entities.remove(lastPointEntity);
+ this.missionPendingHold = {
+ beforeIndex: this.drawingPoints.length - 1,
+ center: Cesium.Cartesian3.clone(last),
+ params: holdParams
+ };
+ if (this.tempHoldEntity) {
+ try { this.viewer.entities.remove(this.tempHoldEntity); } catch (e) {}
+ this.tempHoldEntity = null;
+ }
+ this.tempHoldEntity = this.viewer.entities.add({
+ id: 'temp_hold_preview',
+ name: 'HOLD',
+ position: this.missionPendingHold.center,
+ point: { pixelSize: 10, color: Cesium.Color.ORANGE, outlineColor: Cesium.Color.WHITE, outlineWidth: 2, disableDepthTestDistance: Number.POSITIVE_INFINITY },
+ label: { text: 'HOLD', font: '12px MicroSoft YaHei', fillColor: Cesium.Color.ORANGE, outlineColor: Cesium.Color.BLACK, outlineWidth: 2 }
+ });
+ this.$emit('drawing-points-update', this.drawingPoints.length);
+ },
+
+ getMissionDrawingPointsCount() {
+ return (this.drawingPoints && this.drawingPoints.length) || 0;
+ },
+
+ /** 方式一：先画盘旋再画航线。在开始航线绘制后、用户点击第一个点作为盘旋中心，第二个点后自动插入该盘旋 */
+ setInitialHoldParams(holdParams) {
+ this.missionInitialHoldParams = holdParams;
+ },
+
// 格式化平台图标 URL（与 RouteEditDialog / RightPanel 一致）
formatPlatformIconUrl(url) {
if (!url) return '';
@@ -502,6 +591,11 @@ export default {
if (existingArc) {
this.viewer.entities.remove(existingArc);
}
+ const holdId = `hold-line-${routeId}-${index}`;
+ const existingHold = this.viewer.entities.getById(holdId);
+ if (existingHold) {
+ this.viewer.entities.remove(existingHold);
+ }
});
const wpStyle = (style && style.waypoint) ? style.waypoint : {};
const lineStyle = (style && style.line) ? style.line : {};
@@ -573,39 +667,75 @@ export default {
}
});
}
- // 绘制连线
+ // 绘制连线（含盘旋弧）
if (waypoints.length > 1) {
- let finalPathPositions = [];
- for (let i = 0; i < waypoints.length; i++) {
+ const finalPathPositions = [originalPositions[0]];
+ let lastPos = originalPositions[0];
+ for (let i = 1; i < waypoints.length; i++) {
const currPos = originalPositions[i];
- const radius = this.getWaypointRadius(waypoints[i]);
- // 如果不是首尾点且有半径，我们就画红色的弧线
- if (i > 0 && i < waypoints.length - 1 && radius > 0) {
- const prevPos = originalPositions[i - 1];
- const nextPos = originalPositions[i + 1];
- const arcPoints = this.computeArcPositions(prevPos, currPos, nextPos, radius);
- // 绘制红色实线弧
- this.viewer.entities.add({
- id: `arc-line-${routeId}-${i}`,
- polyline: {
- positions: arcPoints,
- width: 8,
- material: Cesium.Color.RED,
- clampToGround: true,
- zIndex: 20
- },
- properties: {routeId: routeId}
- });
- console.log(`>>> 航点 ${waypoints[i].name} 已渲染红色转弯弧，半径: ${radius}`);
- }
- if (i === 0 || i === waypoints.length - 1 || radius <= 0) {
- finalPathPositions.push(currPos);
+ const wp = waypoints[i];
+ const nextPos = i + 1 < waypoints.length ? originalPositions[i + 1] : null;
+ if (this.isHoldWaypoint(wp)) {
+ const params = this.parseHoldParams(wp);
+ const radius = params && params.radius != null ? params.radius : 500;
+ const semiMajor = params && (params.semiMajor != null || params.semiMajorAxis != null) ? (params.semiMajor ?? params.semiMajorAxis) : 500;
+ const semiMinor = params && (params.semiMinor != null || params.semiMinorAxis != null) ? (params.semiMinor ?? params.semiMinorAxis) : 300;
+ const headingRad = ((params && params.headingDeg != null ? params.headingDeg : 0) * Math.PI) / 180;
+ const clockwise = params && params.clockwise !== false;
+ const entry = params && params.radius != null
+ ? this.getCircleEntryPoint(currPos, lastPos, radius)
+ : this.getEllipseEntryPoint(currPos, lastPos, semiMajor, semiMinor, headingRad);
+ const exit = params && params.radius != null
+ ? this.getCircleTangentExitPoint(currPos, nextPos || currPos, radius, clockwise)
+ : this.getEllipseTangentExitPoint(currPos, nextPos || currPos, semiMajor, semiMinor, headingRad, clockwise);
+ finalPathPositions.push(entry);
+ let arcPoints;
+ if (params && params.radius != null) {
+ const enu = Cesium.Transforms.eastNorthUpToFixedFrame(currPos);
+ const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+ const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+ const toEntry = Cesium.Cartesian3.subtract(entry, currPos, new Cesium.Cartesian3());
+ const entryAngle = Math.atan2(Cesium.Cartesian3.dot(toEntry, east), Cesium.Cartesian3.dot(toEntry, north));
+ arcPoints = this.getCircleFullCircle(currPos, radius, entryAngle, clockwise, 48);
+ } else {
+ const enuE = Cesium.Transforms.eastNorthUpToFixedFrame(currPos);
+ const eastE = Cesium.Matrix4.getColumn(enuE, 0, new Cesium.Cartesian3());
+ const northE = Cesium.Matrix4.getColumn(enuE, 1, new Cesium.Cartesian3());
+ const toEntryE = Cesium.Cartesian3.subtract(entry, currPos, new Cesium.Cartesian3());
+ const thetaE = Math.atan2(Cesium.Cartesian3.dot(toEntryE, eastE), Cesium.Cartesian3.dot(toEntryE, northE));
+ const entryLocalAngle = thetaE - headingRad;
+ arcPoints = this.getEllipseFullCircle(currPos, semiMajor, semiMinor, headingRad, entryLocalAngle, clockwise, 48);
+ }
+ for (let k = 1; k < arcPoints.length; k++) finalPathPositions.push(arcPoints[k]);
+ finalPathPositions.push(exit);
+ this.viewer.entities.add({
+ id: `hold-line-${routeId}-${i}`,
+ polyline: { positions: [entry, ...arcPoints.slice(1), exit], width: 8, material: Cesium.Color.ORANGE, clampToGround: true, zIndex: 20 },
+ properties: { routeId: routeId }
+ });
+ lastPos = exit;
} else {
- const prevPos = originalPositions[i - 1];
- const nextPos = originalPositions[i + 1];
- // 计算弧线点集
- const arcPoints = this.computeArcPositions(prevPos, currPos, nextPos, radius);
- finalPathPositions.push(...arcPoints);
+ const radius = this.getWaypointRadius(wp);
+ let nextLogical = nextPos;
+ if (nextPos && i + 1 < waypoints.length && this.isHoldWaypoint(waypoints[i + 1])) {
+ const holdParams = this.parseHoldParams(waypoints[i + 1]);
+ nextLogical = holdParams && holdParams.radius != null
+ ? this.getCircleEntryPoint(originalPositions[i + 1], currPos, holdParams.radius)
+ : this.getEllipseEntryPoint(originalPositions[i + 1], currPos, holdParams.semiMajor ?? 500, holdParams.semiMinor ?? 300, ((holdParams.headingDeg || 0) * Math.PI) / 180);
+ }
+ if (i < waypoints.length - 1 && radius > 0 && nextLogical) {
+ const arcPoints = this.computeArcPositions(lastPos, currPos, nextLogical, radius);
+ this.viewer.entities.add({
+ id: `arc-line-${routeId}-${i}`,
+ polyline: { positions: arcPoints, width: 8, material: Cesium.Color.RED, clampToGround: true, zIndex: 20 },
+ properties: { routeId: routeId }
+ });
+ finalPathPositions.push(...arcPoints);
+ lastPos = arcPoints[arcPoints.length - 1];
+ } else {
+ finalPathPositions.push(currPos);
+ lastPos = currPos;
+ }
}
}
const lineWidth = lineStyle.width != null ? lineStyle.width : 4;
@@ -648,6 +778,133 @@ export default {
return (v_mps * v_mps) / (g * Math.tan(radians));
},
+ isHoldWaypoint(wp) {
+ const t = (wp && wp.pointType) || (wp && wp.point_type) || 'normal';
+ return t === 'hold_circle' || t === 'hold_ellipse';
+ },
+ parseHoldParams(wp) {
+ const raw = (wp && wp.holdParams) || (wp && wp.hold_params);
+ 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
+ };
+ } catch (e) {
+ return null;
+ }
+ },
+
+ /** 圆上从 entry 到 exit 的弧段（按顺时针/逆时针），采样点数 */
+ getCircleArcEntryToExit(centerCartesian, radiusMeters, entryCartesian, exitCartesian, clockwise, numPoints) {
+ const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+ const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+ const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+ const toEntry = Cesium.Cartesian3.subtract(entryCartesian, centerCartesian, new Cesium.Cartesian3());
+ const toExit = Cesium.Cartesian3.subtract(exitCartesian, centerCartesian, new Cesium.Cartesian3());
+ let entryAngle = Math.atan2(Cesium.Cartesian3.dot(toEntry, east), Cesium.Cartesian3.dot(toEntry, north));
+ let exitAngle = Math.atan2(Cesium.Cartesian3.dot(toExit, east), Cesium.Cartesian3.dot(toExit, north));
+ let diff = exitAngle - entryAngle;
+ const sign = clockwise ? -1 : 1;
+ if (sign * diff <= 0) diff += sign * 2 * Math.PI;
+ const points = [];
+ for (let i = 0; i <= numPoints; i++) {
+ const t = i / numPoints;
+ const angle = entryAngle + sign * t * Math.abs(diff);
+ const offset = Cesium.Cartesian3.add(
+ Cesium.Cartesian3.multiplyByScalar(north, Math.cos(angle) * radiusMeters, new Cesium.Cartesian3()),
+ Cesium.Cartesian3.multiplyByScalar(east, Math.sin(angle) * radiusMeters, new Cesium.Cartesian3()),
+ new Cesium.Cartesian3()
+ );
+ points.push(Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3()));
+ }
+ return points;
+ },
+
+ /** 圆上整圈（360°）采样，从 startAngleRad 起按顺时针/逆时针，用于盘旋段渲染为整圆 */
+ getCircleFullCircle(centerCartesian, radiusMeters, startAngleRad, clockwise, numPoints) {
+ const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+ const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+ const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+ const sign = clockwise ? -1 : 1;
+ const points = [];
+ for (let i = 0; i <= numPoints; i++) {
+ const t = i / numPoints;
+ const angle = startAngleRad + sign * t * 2 * Math.PI;
+ const offset = Cesium.Cartesian3.add(
+ Cesium.Cartesian3.multiplyByScalar(north, Math.cos(angle) * radiusMeters, new Cesium.Cartesian3()),
+ Cesium.Cartesian3.multiplyByScalar(east, Math.sin(angle) * radiusMeters, new Cesium.Cartesian3()),
+ new Cesium.Cartesian3()
+ );
+ points.push(Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3()));
+ }
+ return points;
+ },
+
+ /** 椭圆上从 entry 到 exit 的弧段（按顺时针/逆时针） */
+ getEllipseArcEntryToExit(centerCartesian, semiMajorM, semiMinorM, headingRad, entryCartesian, exitCartesian, clockwise, numPoints) {
+ const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+ const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+ const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+ const toLocalAngle = (cart) => {
+ const toP = Cesium.Cartesian3.subtract(cart, centerCartesian, new Cesium.Cartesian3());
+ const e = Cesium.Cartesian3.dot(toP, east);
+ const n = Cesium.Cartesian3.dot(toP, north);
+ const theta = Math.atan2(e, n);
+ const local = theta - headingRad;
+ return local;
+ };
+ let entryT = toLocalAngle(entryCartesian);
+ let exitT = toLocalAngle(exitCartesian);
+ let diff = exitT - entryT;
+ const sign = clockwise ? -1 : 1;
+ if (sign * diff <= 0) diff += sign * 2 * Math.PI;
+ const c = Math.cos(headingRad);
+ const s = Math.sin(headingRad);
+ const points = [];
+ for (let i = 0; i <= numPoints; i++) {
+ const t = i / numPoints;
+ const angle = entryT + sign * t * Math.abs(diff);
+ const localE = semiMajorM * Math.cos(angle) * c - semiMinorM * Math.sin(angle) * s;
+ const localN = semiMajorM * Math.cos(angle) * s + semiMinorM * Math.sin(angle) * c;
+ const offset = Cesium.Cartesian3.add(
+ Cesium.Cartesian3.multiplyByScalar(north, localN, new Cesium.Cartesian3()),
+ Cesium.Cartesian3.multiplyByScalar(east, localE, new Cesium.Cartesian3()),
+ new Cesium.Cartesian3()
+ );
+ points.push(Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3()));
+ }
+ return points;
+ },
+
+ /** 椭圆上整圈（360°）采样，从 startLocalAngle 起按顺时针/逆时针，用于盘旋段渲染为整椭圆 */
+ getEllipseFullCircle(centerCartesian, semiMajorM, semiMinorM, headingRad, startLocalAngle, clockwise, numPoints) {
+ const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+ const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+ const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+ const sign = clockwise ? -1 : 1;
+ const c = Math.cos(headingRad);
+ const s = Math.sin(headingRad);
+ const points = [];
+ for (let i = 0; i <= numPoints; i++) {
+ const t = i / numPoints;
+ const angle = startLocalAngle + sign * t * 2 * Math.PI;
+ const localE = semiMajorM * Math.cos(angle) * c - semiMinorM * Math.sin(angle) * s;
+ const localN = semiMajorM * Math.cos(angle) * s + semiMinorM * Math.sin(angle) * c;
+ const offset = Cesium.Cartesian3.add(
+ Cesium.Cartesian3.multiplyByScalar(north, localN, new Cesium.Cartesian3()),
+ Cesium.Cartesian3.multiplyByScalar(east, localE, new Cesium.Cartesian3()),
+ new Cesium.Cartesian3()
+ );
+ points.push(Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3()));
+ }
+ return points;
+ },
+
// 计算转弯处的圆弧点集
computeArcPositions(p1, p2, p3, radius) {
const v1 = Cesium.Cartesian3.subtract(p1, p2, new Cesium.Cartesian3());
@@ -676,13 +933,142 @@ export default {
return arc;
},
+ /** 圆：中心( Cartesian3 )、半径(米)、顺时针、采样数 → 世界坐标点数组（从进入点沿圆到出口点需外部指定起止角或由 entry/exit 截取） */
+ computeCirclePositions(centerCartesian, radiusMeters, clockwise, numPoints) {
+ if (!this.viewer || !centerCartesian || radiusMeters <= 0) return [];
+ const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+ const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+ const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+ const points = [];
+ const sign = clockwise ? -1 : 1;
+ for (let i = 0; i <= numPoints; i++) {
+ const t = i / numPoints;
+ const angle = sign * t * 2 * Math.PI;
+ const offset = Cesium.Cartesian3.add(
+ Cesium.Cartesian3.multiplyByScalar(north, Math.cos(angle) * radiusMeters, new Cesium.Cartesian3()),
+ Cesium.Cartesian3.multiplyByScalar(east, Math.sin(angle) * radiusMeters, new Cesium.Cartesian3()),
+ new Cesium.Cartesian3()
+ );
+ points.push(Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3()));
+ }
+ return points;
+ },
+
+ /** 椭圆：中心、半长轴/半短轴(米)、长轴方位(弧度)、顺时针、采样数 → 世界坐标点数组 */
+ computeEllipsePositions(centerCartesian, semiMajorM, semiMinorM, headingRad, clockwise, numPoints) {
+ if (!this.viewer || !centerCartesian || semiMajorM <= 0 || semiMinorM <= 0) return [];
+ const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+ const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+ const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+ const c = Math.cos(headingRad);
+ const s = Math.sin(headingRad);
+ const points = [];
+ const sign = clockwise ? -1 : 1;
+ for (let i = 0; i <= numPoints; i++) {
+ const t = i / numPoints;
+ const angle = sign * t * 2 * Math.PI;
+ const localE = semiMajorM * Math.cos(angle) * c - semiMinorM * Math.sin(angle) * s;
+ const localN = semiMajorM * Math.cos(angle) * s + semiMinorM * Math.sin(angle) * c;
+ const offset = Cesium.Cartesian3.add(
+ Cesium.Cartesian3.multiplyByScalar(north, localN, new Cesium.Cartesian3()),
+ Cesium.Cartesian3.multiplyByScalar(east, localE, new Cesium.Cartesian3()),
+ new Cesium.Cartesian3()
+ );
+ points.push(Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3()));
+ }
+ return points;
+ },
+
+ /** 圆上进入点：从 prev 飞向 center 时与圆的交点（靠近 prev 的那侧） */
+ getCircleEntryPoint(centerCartesian, prevPointCartesian, radiusMeters) {
+ const toCenter = Cesium.Cartesian3.subtract(centerCartesian, prevPointCartesian, new Cesium.Cartesian3());
+ const dist = Cesium.Cartesian3.magnitude(toCenter);
+ if (dist < 1e-6) return centerCartesian;
+ if (radiusMeters >= dist) return Cesium.Cartesian3.clone(prevPointCartesian);
+ const unit = Cesium.Cartesian3.normalize(toCenter, new Cesium.Cartesian3());
+ return Cesium.Cartesian3.add(prevPointCartesian, Cesium.Cartesian3.multiplyByScalar(unit, dist - radiusMeters, new Cesium.Cartesian3()), new Cesium.Cartesian3());
+ },
+
+ /** 圆上切线出口点：从圆飞往 next 时在圆上的切点（选顺时针/逆时针中朝向 next 的那一侧） */
+ getCircleTangentExitPoint(centerCartesian, nextPointCartesian, radiusMeters, clockwise) {
+ const toNext = Cesium.Cartesian3.subtract(nextPointCartesian, centerCartesian, new Cesium.Cartesian3());
+ const d = Cesium.Cartesian3.magnitude(toNext);
+ if (d < 1e-6) return centerCartesian;
+ const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+ const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+ const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+ const e = Cesium.Cartesian3.dot(toNext, east);
+ const n = Cesium.Cartesian3.dot(toNext, north);
+ const theta = Math.atan2(e, n);
+ const alpha = Math.acos(Math.min(1, radiusMeters / d));
+ const sign = clockwise ? 1 : -1;
+ const exitAngle = theta + sign * alpha;
+ const offset = Cesium.Cartesian3.add(
+ Cesium.Cartesian3.multiplyByScalar(north, Math.cos(exitAngle) * radiusMeters, new Cesium.Cartesian3()),
+ Cesium.Cartesian3.multiplyByScalar(east, Math.sin(exitAngle) * radiusMeters, new Cesium.Cartesian3()),
+ new Cesium.Cartesian3()
+ );
+ return Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3());
+ },
+
+ /** 椭圆上进入点：从 prev 指向 center 的方向与椭圆边的交点（靠近 prev 的一侧） */
+ getEllipseEntryPoint(centerCartesian, prevPointCartesian, semiMajorM, semiMinorM, headingRad) {
+ const toPrev = Cesium.Cartesian3.subtract(prevPointCartesian, centerCartesian, new Cesium.Cartesian3());
+ const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+ const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+ const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+ const de = Cesium.Cartesian3.dot(toPrev, east);
+ const dn = Cesium.Cartesian3.dot(toPrev, north);
+ const c = Math.cos(-headingRad);
+ const s = Math.sin(-headingRad);
+ const dx = de * c - dn * s;
+ const dy = de * s + dn * c;
+ const n = Math.sqrt((dx * dx) / (semiMajorM * semiMajorM) + (dy * dy) / (semiMinorM * semiMinorM));
+ if (n < 1e-6) return centerCartesian;
+ const k = 1 / n;
+ const lx = k * dx;
+ const ly = k * dy;
+ const backE = lx * Math.cos(headingRad) - ly * Math.sin(headingRad);
+ const backN = lx * Math.sin(headingRad) + ly * Math.cos(headingRad);
+ const offset = Cesium.Cartesian3.add(
+ Cesium.Cartesian3.multiplyByScalar(north, backN, new Cesium.Cartesian3()),
+ Cesium.Cartesian3.multiplyByScalar(east, backE, new Cesium.Cartesian3()),
+ new Cesium.Cartesian3()
+ );
+ return Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3());
+ },
+
+ /** 椭圆上“出口点”：沿长轴方向近似为下一航点方向的切点（取椭圆上最靠近 next 的点再沿法向微调为切向出口） */
+ getEllipseTangentExitPoint(centerCartesian, nextPointCartesian, semiMajorM, semiMinorM, headingRad, clockwise) {
+ const enu = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian);
+ const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+ const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+ const toNext = Cesium.Cartesian3.subtract(nextPointCartesian, centerCartesian, new Cesium.Cartesian3());
+ const e = Cesium.Cartesian3.dot(toNext, east);
+ const n = Cesium.Cartesian3.dot(toNext, north);
+ const theta = Math.atan2(e, n);
+ const localAngle = theta - headingRad;
+ const cosA = Math.cos(localAngle);
+ const sinA = Math.sin(localAngle);
+ const r = (semiMajorM * semiMinorM) / Math.sqrt((semiMinorM * cosA) ** 2 + (semiMajorM * sinA) ** 2);
+ const sign = clockwise ? -1 : 1;
+ const exitLocal = sign * Math.atan2(semiMinorM * sinA, semiMajorM * cosA);
+ const localE = semiMajorM * Math.cos(exitLocal) * Math.cos(headingRad) - semiMinorM * Math.sin(exitLocal) * Math.sin(headingRad);
+ const localN = semiMajorM * Math.cos(exitLocal) * Math.sin(headingRad) + semiMinorM * Math.sin(exitLocal) * Math.cos(headingRad);
+ const offset = Cesium.Cartesian3.add(
+ Cesium.Cartesian3.multiplyByScalar(north, localN, new Cesium.Cartesian3()),
+ Cesium.Cartesian3.multiplyByScalar(east, localE, new Cesium.Cartesian3()),
+ new Cesium.Cartesian3()
+ );
+ return Cesium.Cartesian3.add(centerCartesian, offset, new Cesium.Cartesian3());
+ },
+
/**
- * 获取与地图绘制一致的带转弯弧的路径（用于推演时图标沿弧线运动）。
- * @param {Array} waypoints - 航点列表，需含 lng, lat, alt, speed, turnAngle
- * @returns {{ path: Array<{lng,lat,alt}>, segmentEndIndices: number[] }} path 为路径点；segmentEndIndices[i] 为第 i 段（航点 i -> i+1）在 path 中的结束下标
+ * 获取与地图绘制一致的带转弯弧与盘旋弧的路径（用于推演时图标沿弧线运动）。
+ * @returns {{ path, segmentEndIndices, holdArcRanges: { [legIndex]: { start, end } } }}
*/
getRoutePathWithSegmentIndices(waypoints) {
- if (!waypoints || waypoints.length === 0) return { path: [], segmentEndIndices: [] };
+ if (!waypoints || waypoints.length === 0) return { path: [], segmentEndIndices: [], holdArcRanges: {} };
const ellipsoid = this.viewer.scene.globe.ellipsoid;
const toLngLatAlt = (cartesian) => {
const carto = Cesium.Cartographic.fromCartesian(cartesian, ellipsoid);
@@ -695,22 +1081,72 @@ export default {
const originalPositions = waypoints.map(wp =>
Cesium.Cartesian3.fromDegrees(parseFloat(wp.lng), parseFloat(wp.lat), Number(wp.alt) || 0)
);
- const path = [];
+ const path = [toLngLatAlt(originalPositions[0])];
const segmentEndIndices = [];
- for (let i = 0; i < waypoints.length; i++) {
+ const holdArcRanges = {};
+ let lastPos = originalPositions[0];
+ for (let i = 1; i < waypoints.length; i++) {
const currPos = originalPositions[i];
- const radius = this.getWaypointRadius(waypoints[i]);
- if (i === 0 || i === waypoints.length - 1 || radius <= 0) {
- path.push(toLngLatAlt(currPos));
+ const wp = waypoints[i];
+ const nextPos = i + 1 < waypoints.length ? originalPositions[i + 1] : null;
+ if (this.isHoldWaypoint(wp)) {
+ const params = this.parseHoldParams(wp);
+ const radius = params && params.radius != null ? params.radius : 500;
+ const semiMajor = params && (params.semiMajor != null || params.semiMajorAxis != null) ? (params.semiMajor ?? params.semiMajorAxis) : 500;
+ const semiMinor = params && (params.semiMinor != null || params.semiMinorAxis != null) ? (params.semiMinor ?? params.semiMinorAxis) : 300;
+ const headingRad = ((params && params.headingDeg != null ? params.headingDeg : 0) * Math.PI) / 180;
+ const clockwise = params && params.clockwise !== false;
+ const entry = params && params.radius != null
+ ? this.getCircleEntryPoint(currPos, lastPos, radius)
+ : this.getEllipseEntryPoint(currPos, lastPos, semiMajor, semiMinor, headingRad);
+ const exit = params && params.radius != null
+ ? this.getCircleTangentExitPoint(currPos, nextPos || currPos, radius, clockwise)
+ : this.getEllipseTangentExitPoint(currPos, nextPos || currPos, semiMajor, semiMinor, headingRad, clockwise);
+ path.push(toLngLatAlt(entry));
+ const arcStartIdx = path.length - 1;
+ let arcPoints;
+ if (params && params.radius != null) {
+ const enu = Cesium.Transforms.eastNorthUpToFixedFrame(currPos);
+ const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+ const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+ const toEntry = Cesium.Cartesian3.subtract(entry, currPos, new Cesium.Cartesian3());
+ const entryAngle = Math.atan2(Cesium.Cartesian3.dot(toEntry, east), Cesium.Cartesian3.dot(toEntry, north));
+ arcPoints = this.getCircleFullCircle(currPos, radius, entryAngle, clockwise, 48);
+ } else {
+ const enuE = Cesium.Transforms.eastNorthUpToFixedFrame(currPos);
+ const eastE = Cesium.Matrix4.getColumn(enuE, 0, new Cesium.Cartesian3());
+ const northE = Cesium.Matrix4.getColumn(enuE, 1, new Cesium.Cartesian3());
+ const toEntryE = Cesium.Cartesian3.subtract(entry, currPos, new Cesium.Cartesian3());
+ const thetaE = Math.atan2(Cesium.Cartesian3.dot(toEntryE, eastE), Cesium.Cartesian3.dot(toEntryE, northE));
+ const entryLocalAngle = thetaE - headingRad;
+ arcPoints = this.getEllipseFullCircle(currPos, semiMajor, semiMinor, headingRad, entryLocalAngle, clockwise, 48);
+ }
+ for (let k = 1; k < arcPoints.length; k++) path.push(toLngLatAlt(arcPoints[k]));
+ path.push(toLngLatAlt(exit));
+ holdArcRanges[i - 1] = { start: arcStartIdx, end: path.length - 1 };
+ segmentEndIndices[i - 1] = path.length - 1;
+ lastPos = exit;
} else {
- const prevPos = originalPositions[i - 1];
- const nextPos = originalPositions[i + 1];
- const arcPoints = this.computeArcPositions(prevPos, currPos, nextPos, radius);
- arcPoints.forEach(p => path.push(toLngLatAlt(p)));
+ let nextLogical = nextPos;
+ if (nextPos && i + 1 < waypoints.length && this.isHoldWaypoint(waypoints[i + 1])) {
+ const holdParams = this.parseHoldParams(waypoints[i + 1]);
+ nextLogical = holdParams && holdParams.radius != null
+ ? this.getCircleEntryPoint(originalPositions[i + 1], currPos, holdParams.radius)
+ : this.getEllipseEntryPoint(originalPositions[i + 1], currPos, holdParams.semiMajor ?? 500, holdParams.semiMinor ?? 300, ((holdParams.headingDeg || 0) * Math.PI) / 180);
+ }
+ const radius = this.getWaypointRadius(wp);
+ if (i < waypoints.length - 1 && radius > 0 && nextLogical) {
+ const arcPoints = this.computeArcPositions(lastPos, currPos, nextLogical, radius);
+ arcPoints.forEach(p => path.push(toLngLatAlt(p)));
+ lastPos = arcPoints[arcPoints.length - 1];
+ } else {
+ path.push(toLngLatAlt(currPos));
+ lastPos = currPos;
+ }
+ segmentEndIndices[i - 1] = path.length - 1;
}
- if (i >= 1) segmentEndIndices[i - 1] = path.length - 1;
}
- return { path, segmentEndIndices };
+ return { path, segmentEndIndices, holdArcRanges };
},
removeRouteById(routeId) {
@@ -1133,6 +1569,15 @@ export default {
case 'circle':
this.startCircleDrawing()
break
+ case 'ellipse':
+ this.startEllipseDrawing()
+ break
+ case 'hold_circle':
+ this.startHoldCircleDrawing()
+ break
+ case 'hold_ellipse':
+ this.startHoldEllipseDrawing()
+ break
case 'sector':
this.startSectorDrawing()
break
@@ -1163,11 +1608,19 @@ export default {
const entity = allEntities[i];
if (entity.id && (
entity.id.toString().startsWith('temp_wp_') ||
- entity.id.toString().includes('temp-preview')
+ entity.id.toString().includes('temp-preview') ||
+ entity.id === 'temp_hold_preview'
)) {
this.viewer.entities.remove(entity);
}
}
+ if (this.tempHoldEntity) {
+ try { this.viewer.entities.remove(this.tempHoldEntity); } catch (e) {}
+ this.tempHoldEntity = null;
+ }
+ this.missionPendingHold = null;
+ this.missionInitialHoldParams = null;
+ this.missionHoldParamsByIndex = {};
//清理已知的预览实体
if (this.tempEntity) {
this.viewer.entities.remove(this.tempEntity);
@@ -1773,6 +2226,365 @@ export default {
this.drawingPoints = [];
this.activeCursorPosition = null;
},
+ // 绘制椭圆：三点（圆心、长轴端点、短轴端点）
+ startEllipseDrawing() {
+ this.drawingPoints = [];
+ this.activeCursorPosition = null;
+ if (this.tempEntity) { this.viewer.entities.remove(this.tempEntity); this.tempEntity = null; }
+ if (this.tempPreviewEntity) { this.viewer.entities.remove(this.tempPreviewEntity); this.tempPreviewEntity = null; }
+ this.drawingHandler.removeInputAction(Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+ this.drawingHandler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
+ this.drawingHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+ this.drawingHandler.setInputAction((movement) => {
+ const newPosition = this.getClickPosition(movement.endPosition);
+ if (newPosition) this.activeCursorPosition = newPosition;
+ }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+ this.drawingHandler.setInputAction((click) => {
+ const position = this.getClickPosition(click.position);
+ if (!position) return;
+ this.drawingPoints.push(position);
+ if (this.drawingPoints.length === 1) {
+ this.activeCursorPosition = position;
+ this.tempEntity = this.viewer.entities.add({
+ position: position,
+ ellipse: {
+ semiMajorAxis: new Cesium.CallbackProperty(() => {
+ let a = 100;
+ let b = 50;
+ if (this.drawingPoints.length >= 2 && this.drawingPoints[0] && this.drawingPoints[1]) {
+ a = Math.max(Cesium.Cartesian3.distance(this.drawingPoints[0], this.drawingPoints[1]), 50);
+ } else if (this.activeCursorPosition && this.drawingPoints.length === 1) {
+ a = Math.max(Cesium.Cartesian3.distance(this.drawingPoints[0], this.activeCursorPosition), 50);
+ }
+ if (this.drawingPoints.length >= 3 && this.drawingPoints[0] && this.drawingPoints[1] && this.drawingPoints[2]) {
+ b = Math.max(this.ellipseSemiMinorFromThreePoints(this.drawingPoints[0], this.drawingPoints[1], this.drawingPoints[2]), 20);
+ } else if (this.drawingPoints.length >= 2 && this.activeCursorPosition) {
+ b = Math.max(this.ellipseSemiMinorFromThreePoints(this.drawingPoints[0], this.drawingPoints[1], this.activeCursorPosition), 20);
+ }
+ return Math.max(a, b);
+ }, false),
+ semiMinorAxis: new Cesium.CallbackProperty(() => {
+ let a = 100;
+ let b = 50;
+ if (this.drawingPoints.length >= 2 && this.drawingPoints[0] && this.drawingPoints[1]) {
+ a = Math.max(Cesium.Cartesian3.distance(this.drawingPoints[0], this.drawingPoints[1]), 50);
+ } else if (this.activeCursorPosition && this.drawingPoints.length === 1) {
+ a = Math.max(Cesium.Cartesian3.distance(this.drawingPoints[0], this.activeCursorPosition), 50);
+ }
+ if (this.drawingPoints.length >= 3 && this.drawingPoints[0] && this.drawingPoints[1] && this.drawingPoints[2]) {
+ b = Math.max(this.ellipseSemiMinorFromThreePoints(this.drawingPoints[0], this.drawingPoints[1], this.drawingPoints[2]), 20);
+ } else if (this.drawingPoints.length >= 2 && this.activeCursorPosition) {
+ b = Math.max(this.ellipseSemiMinorFromThreePoints(this.drawingPoints[0], this.drawingPoints[1], this.activeCursorPosition), 20);
+ }
+ return Math.min(a, b);
+ }, false),
+ rotation: new Cesium.CallbackProperty(() => {
+ if (this.drawingPoints.length >= 2 && this.drawingPoints[0] && this.drawingPoints[1]) {
+ let heading = this.ellipseHeadingFromCenterAndMajor(this.drawingPoints[0], this.drawingPoints[1]);
+ let a = Math.max(Cesium.Cartesian3.distance(this.drawingPoints[0], this.drawingPoints[1]), 50);
+ let b = 50;
+ if (this.drawingPoints.length >= 3 && this.drawingPoints[2]) {
+ b = Math.max(this.ellipseSemiMinorFromThreePoints(this.drawingPoints[0], this.drawingPoints[1], this.drawingPoints[2]), 20);
+ } else if (this.activeCursorPosition) {
+ b = Math.max(this.ellipseSemiMinorFromThreePoints(this.drawingPoints[0], this.drawingPoints[1], this.activeCursorPosition), 20);
+ }
+ if (b > a) heading += Math.PI / 2;
+ return heading;
+ }
+ return 0;
+ }, false),
+ material: Cesium.Color.fromCssColorString(this.defaultStyles.ellipse.color).withAlpha(0.5),
+ outline: true,
+ outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.ellipse.color),
+ outlineWidth: 2
+ }
+ });
+ } else if (this.drawingPoints.length === 2) {
+ this.activeCursorPosition = this.drawingPoints[1];
+ } else if (this.drawingPoints.length === 3) {
+ this.activeCursorPosition = null;
+ if (this.tempEntity) { this.viewer.entities.remove(this.tempEntity); this.tempEntity = null; }
+ this.finishEllipseDrawing();
+ }
+ }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+ this.drawingHandler.setInputAction(() => this.cancelDrawing(), Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+ },
+ ellipseHeadingFromCenterAndMajor(center, majorEnd) {
+ const ellipsoid = this.viewer.scene.globe.ellipsoid;
+ const enu = Cesium.Transforms.eastNorthUpToFixedFrame(center);
+ const toMajor = Cesium.Cartesian3.subtract(majorEnd, center, new Cesium.Cartesian3());
+ const e = Cesium.Cartesian3.dot(toMajor, Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3()));
+ const n = Cesium.Cartesian3.dot(toMajor, Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3()));
+ return Math.atan2(e, n);
+ },
+ ellipseSemiMinorFromThreePoints(center, majorEnd, thirdPoint) {
+ const ellipsoid = this.viewer.scene.globe.ellipsoid;
+ const enu = Cesium.Transforms.eastNorthUpToFixedFrame(center);
+ const east = Cesium.Matrix4.getColumn(enu, 0, new Cesium.Cartesian3());
+ const north = Cesium.Matrix4.getColumn(enu, 1, new Cesium.Cartesian3());
+ const toMajor = Cesium.Cartesian3.subtract(majorEnd, center, new Cesium.Cartesian3());
+ const heading = Math.atan2(Cesium.Cartesian3.dot(toMajor, east), Cesium.Cartesian3.dot(toMajor, north));
+ const toThird = Cesium.Cartesian3.subtract(thirdPoint, center, new Cesium.Cartesian3());
+ const e3 = Cesium.Cartesian3.dot(toThird, east);
+ const n3 = Cesium.Cartesian3.dot(toThird, north);
+ const minorComponent = -e3 * Math.sin(heading) + n3 * Math.cos(heading);
+ return Math.abs(minorComponent);
+ },
+ finishEllipseDrawing() {
+ const center = this.drawingPoints[0];
+ const majorEnd = this.drawingPoints[1];
+ const third = this.drawingPoints[2];
+ let a = Math.max(Cesium.Cartesian3.distance(center, majorEnd), 50);
+ let b = Math.max(this.ellipseSemiMinorFromThreePoints(center, majorEnd, third), 20);
+ let heading = this.ellipseHeadingFromCenterAndMajor(center, majorEnd);
+ if (b > a) {
+ [a, b] = [b, a];
+ heading += Math.PI / 2;
+ }
+ const semiMajor = a;
+ const semiMinor = b;
+ this.entityCounter++;
+ const id = `ellipse_${this.entityCounter}`;
+ const entity = this.viewer.entities.add({
+ id,
+ name: `椭圆 ${this.entityCounter}`,
+ position: center,
+ ellipse: {
+ semiMajorAxis: semiMajor,
+ semiMinorAxis: semiMinor,
+ rotation: heading,
+ material: Cesium.Color.fromCssColorString(this.defaultStyles.ellipse.color).withAlpha(this.defaultStyles.ellipse.opacity),
+ outline: true,
+ outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.ellipse.color),
+ outlineWidth: this.defaultStyles.ellipse.width
+ }
+ });
+ const entityData = {
+ id,
+ type: 'ellipse',
+ points: this.drawingPoints.map(p => this.cartesianToLatLng(p)),
+ positions: [...this.drawingPoints],
+ entity,
+ semiMajorAxis: semiMajor,
+ semiMinorAxis: semiMinor,
+ headingDeg: (heading * 180 / Math.PI),
+ color: this.defaultStyles.ellipse.color,
+ opacity: this.defaultStyles.ellipse.opacity,
+ width: this.defaultStyles.ellipse.width,
+ label: `椭圆 ${this.entityCounter}`
+ };
+ this.allEntities.push(entityData);
+ this.measurementResult = { type: 'ellipse', semiMajorAxis: semiMajor, semiMinorAxis: semiMinor, area: Math.PI * semiMajor * semiMinor };
+ this.drawingPoints = [];
+ this.activeCursorPosition = null;
+ },
+ // 圆形盘旋：仅边框、不填充，交互与圆一致（圆心 + 边缘点）
+ startHoldCircleDrawing() {
+ this.drawingPoints = [];
+ this.activeCursorPosition = null;
+ if (this.tempEntity) { this.viewer.entities.remove(this.tempEntity); this.tempEntity = null; }
+ if (this.tempPreviewEntity) { this.viewer.entities.remove(this.tempPreviewEntity); this.tempPreviewEntity = null; }
+ const initialRadius = 100;
+ this.drawingHandler.setInputAction((movement) => {
+ const newPosition = this.getClickPosition(movement.endPosition);
+ if (newPosition) this.activeCursorPosition = newPosition;
+ }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+ this.drawingHandler.setInputAction((click) => {
+ const position = this.getClickPosition(click.position);
+ if (!position) return;
+ if (this.drawingPoints.length === 0) {
+ this.drawingPoints.push(position);
+ this.activeCursorPosition = position;
+ this.tempEntity = this.viewer.entities.add({
+ position: position,
+ ellipse: {
+ semiMajorAxis: new Cesium.CallbackProperty(() => {
+ if (this.activeCursorPosition && this.drawingPoints[0]) {
+ const d = Cesium.Cartesian3.distance(this.drawingPoints[0], this.activeCursorPosition);
+ return isFinite(d) && d > 0 ? d : initialRadius;
+ }
+ return initialRadius;
+ }, false),
+ semiMinorAxis: new Cesium.CallbackProperty(() => {
+ if (this.activeCursorPosition && this.drawingPoints[0]) {
+ const d = Cesium.Cartesian3.distance(this.drawingPoints[0], this.activeCursorPosition);
+ return isFinite(d) && d > 0 ? d : initialRadius;
+ }
+ return initialRadius;
+ }, false),
+ material: Cesium.Color.TRANSPARENT,
+ outline: true,
+ outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.hold_circle.color),
+ outlineWidth: this.defaultStyles.hold_circle.width || 2
+ }
+ });
+ } else if (this.drawingPoints.length === 1) {
+ this.drawingPoints.push(position);
+ this.activeCursorPosition = null;
+ this.finishHoldCircleDrawing(position);
+ }
+ }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+ this.drawingHandler.setInputAction(() => this.cancelDrawing(), Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+ },
+ finishHoldCircleDrawing(edgePosition) {
+ const centerPoint = this.drawingPoints[0];
+ const radius = Cesium.Cartesian3.distance(centerPoint, edgePosition);
+ if (this.tempEntity) { this.viewer.entities.remove(this.tempEntity); this.tempEntity = null; }
+ this.entityCounter++;
+ const id = `hold_circle_${this.entityCounter}`;
+ const finalEntity = this.viewer.entities.add({
+ id,
+ position: centerPoint,
+ ellipse: {
+ semiMajorAxis: radius,
+ semiMinorAxis: radius,
+ material: Cesium.Color.TRANSPARENT,
+ outline: true,
+ outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.hold_circle.color),
+ outlineWidth: this.defaultStyles.hold_circle.width || 2
+ }
+ });
+ const entityData = {
+ id,
+ type: 'hold_circle',
+ points: [centerPoint, edgePosition].map(p => this.cartesianToLatLng(p)),
+ positions: [centerPoint, edgePosition],
+ entity: finalEntity,
+ color: this.defaultStyles.hold_circle.color,
+ width: this.defaultStyles.hold_circle.width || 2,
+ radius,
+ label: `圆形盘旋 ${this.entityCounter}`
+ };
+ this.allEntities.push(entityData);
+ this.measurementResult = { type: 'hold_circle', radius, area: Math.PI * radius * radius };
+ this.drawingPoints = [];
+ this.activeCursorPosition = null;
+ },
+ // 椭圆盘旋：仅边框、不填充，交互与椭圆一致（圆心、长轴端点、短轴端点）
+ startHoldEllipseDrawing() {
+ this.drawingPoints = [];
+ this.activeCursorPosition = null;
+ if (this.tempEntity) { this.viewer.entities.remove(this.tempEntity); this.tempEntity = null; }
+ if (this.tempPreviewEntity) { this.viewer.entities.remove(this.tempPreviewEntity); this.tempPreviewEntity = null; }
+ this.drawingHandler.setInputAction((movement) => {
+ const newPosition = this.getClickPosition(movement.endPosition);
+ if (newPosition) this.activeCursorPosition = newPosition;
+ }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
+ this.drawingHandler.setInputAction((click) => {
+ const position = this.getClickPosition(click.position);
+ if (!position) return;
+ this.drawingPoints.push(position);
+ if (this.drawingPoints.length === 1) {
+ this.activeCursorPosition = position;
+ this.tempEntity = this.viewer.entities.add({
+ position: position,
+ ellipse: {
+ semiMajorAxis: new Cesium.CallbackProperty(() => {
+ let a = 100, b = 50;
+ if (this.drawingPoints.length >= 2 && this.drawingPoints[0] && this.drawingPoints[1]) {
+ a = Math.max(Cesium.Cartesian3.distance(this.drawingPoints[0], this.drawingPoints[1]), 50);
+ } else if (this.activeCursorPosition && this.drawingPoints.length === 1) {
+ a = Math.max(Cesium.Cartesian3.distance(this.drawingPoints[0], this.activeCursorPosition), 50);
+ }
+ if (this.drawingPoints.length >= 3 && this.drawingPoints[0] && this.drawingPoints[1] && this.drawingPoints[2]) {
+ b = Math.max(this.ellipseSemiMinorFromThreePoints(this.drawingPoints[0], this.drawingPoints[1], this.drawingPoints[2]), 20);
+ } else if (this.drawingPoints.length >= 2 && this.activeCursorPosition) {
+ b = Math.max(this.ellipseSemiMinorFromThreePoints(this.drawingPoints[0], this.drawingPoints[1], this.activeCursorPosition), 20);
+ }
+ return Math.max(a, b);
+ }, false),
+ semiMinorAxis: new Cesium.CallbackProperty(() => {
+ let a = 100, b = 50;
+ if (this.drawingPoints.length >= 2 && this.drawingPoints[0] && this.drawingPoints[1]) {
+ a = Math.max(Cesium.Cartesian3.distance(this.drawingPoints[0], this.drawingPoints[1]), 50);
+ } else if (this.activeCursorPosition && this.drawingPoints.length === 1) {
+ a = Math.max(Cesium.Cartesian3.distance(this.drawingPoints[0], this.activeCursorPosition), 50);
+ }
+ if (this.drawingPoints.length >= 3 && this.drawingPoints[0] && this.drawingPoints[1] && this.drawingPoints[2]) {
+ b = Math.max(this.ellipseSemiMinorFromThreePoints(this.drawingPoints[0], this.drawingPoints[1], this.drawingPoints[2]), 20);
+ } else if (this.drawingPoints.length >= 2 && this.activeCursorPosition) {
+ b = Math.max(this.ellipseSemiMinorFromThreePoints(this.drawingPoints[0], this.drawingPoints[1], this.activeCursorPosition), 20);
+ }
+ return Math.min(a, b);
+ }, false),
+ rotation: new Cesium.CallbackProperty(() => {
+ if (this.drawingPoints.length >= 2 && this.drawingPoints[0] && this.drawingPoints[1]) {
+ let heading = this.ellipseHeadingFromCenterAndMajor(this.drawingPoints[0], this.drawingPoints[1]);
+ let a = Math.max(Cesium.Cartesian3.distance(this.drawingPoints[0], this.drawingPoints[1]), 50);
+ let b = 50;
+ if (this.drawingPoints.length >= 3 && this.drawingPoints[2]) {
+ b = Math.max(this.ellipseSemiMinorFromThreePoints(this.drawingPoints[0], this.drawingPoints[1], this.drawingPoints[2]), 20);
+ } else if (this.activeCursorPosition) {
+ b = Math.max(this.ellipseSemiMinorFromThreePoints(this.drawingPoints[0], this.drawingPoints[1], this.activeCursorPosition), 20);
+ }
+ if (b > a) heading += Math.PI / 2;
+ return heading;
+ }
+ return 0;
+ }, false),
+ material: Cesium.Color.TRANSPARENT,
+ outline: true,
+ outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.hold_ellipse.color),
+ outlineWidth: this.defaultStyles.hold_ellipse.width || 2
+ }
+ });
+ } else if (this.drawingPoints.length === 2) {
+ this.activeCursorPosition = this.drawingPoints[1];
+ } else if (this.drawingPoints.length === 3) {
+ this.activeCursorPosition = null;
+ if (this.tempEntity) { this.viewer.entities.remove(this.tempEntity); this.tempEntity = null; }
+ this.finishHoldEllipseDrawing();
+ }
+ }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+ this.drawingHandler.setInputAction(() => this.cancelDrawing(), Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+ },
+ finishHoldEllipseDrawing() {
+ const center = this.drawingPoints[0];
+ const majorEnd = this.drawingPoints[1];
+ const third = this.drawingPoints[2];
+ let a = Math.max(Cesium.Cartesian3.distance(center, majorEnd), 50);
+ let b = Math.max(this.ellipseSemiMinorFromThreePoints(center, majorEnd, third), 20);
+ let heading = this.ellipseHeadingFromCenterAndMajor(center, majorEnd);
+ if (b > a) {
+ [a, b] = [b, a];
+ heading += Math.PI / 2;
+ }
+ const semiMajor = a;
+ const semiMinor = b;
+ this.entityCounter++;
+ const id = `hold_ellipse_${this.entityCounter}`;
+ const entity = this.viewer.entities.add({
+ id,
+ name: `椭圆盘旋 ${this.entityCounter}`,
+ position: center,
+ ellipse: {
+ semiMajorAxis: semiMajor,
+ semiMinorAxis: semiMinor,
+ rotation: heading,
+ material: Cesium.Color.TRANSPARENT,
+ outline: true,
+ outlineColor: Cesium.Color.fromCssColorString(this.defaultStyles.hold_ellipse.color),
+ outlineWidth: this.defaultStyles.hold_ellipse.width || 2
+ }
+ });
+ const entityData = {
+ id,
+ type: 'hold_ellipse',
+ points: this.drawingPoints.map(p => this.cartesianToLatLng(p)),
+ positions: [...this.drawingPoints],
+ entity,
+ semiMajorAxis: semiMajor,
+ semiMinorAxis: semiMinor,
+ headingDeg: (heading * 180 / Math.PI),
+ color: this.defaultStyles.hold_ellipse.color,
+ width: this.defaultStyles.hold_ellipse.width || 2,
+ label: `椭圆盘旋 ${this.entityCounter}`
+ };
+ this.allEntities.push(entityData);
+ this.measurementResult = { type: 'hold_ellipse', semiMajorAxis: semiMajor, semiMinorAxis: semiMinor, area: Math.PI * semiMajor * semiMinor };
+ this.drawingPoints = [];
+ this.activeCursorPosition = null;
+ },
// 绘制扇形
startSectorDrawing() {
// 重置绘制状态
@@ -2658,6 +3470,21 @@ export default {
entity.ellipse.outlineWidth = data.width
}
break
+ case 'ellipse':
+ if (entity.ellipse) {
+ entity.ellipse.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
+ entity.ellipse.outlineColor = Cesium.Color.fromCssColorString(data.color)
+ entity.ellipse.outlineWidth = data.width
+ }
+ break
+ case 'hold_circle':
+ case 'hold_ellipse':
+ if (entity.ellipse) {
+ entity.ellipse.material = Cesium.Color.TRANSPARENT
+ entity.ellipse.outlineColor = Cesium.Color.fromCssColorString(data.color)
+ entity.ellipse.outlineWidth = data.width || 2
+ }
+ break
case 'sector':
if (entity.polygon) {
entity.polygon.material = Cesium.Color.fromCssColorString(data.color).withAlpha(data.opacity)
@@ -2802,6 +3629,9 @@ export default {
polygon: '面',
rectangle: '矩形',
circle: '圆形',
+ ellipse: '椭圆',
+ hold_circle: '圆形盘旋',
+ hold_ellipse: '椭圆盘旋',
sector: '扇形',
arrow: '箭头',
text: '文本',
@@ -2825,6 +3655,14 @@ export default {
points: entity.points
} : entity.type === 'rectangle' ? {
coordinates: entity.coordinates
+ } : entity.type === 'ellipse' || entity.type === 'hold_ellipse' ? {
+ center: entity.points && entity.points[0] ? entity.points[0] : (entity.positions && entity.positions[0] ? this.cartesianToLatLng(entity.positions[0]) : null),
+ semiMajorAxis: entity.semiMajorAxis,
+ semiMinorAxis: entity.semiMinorAxis,
+ headingDeg: entity.headingDeg
+ } : (entity.type === 'circle' || entity.type === 'hold_circle') ? {
+ center: entity.points && entity.points[0] ? entity.points[0] : (entity.positions && entity.positions[0] ? this.cartesianToLatLng(entity.positions[0]) : null),
+ radius: entity.radius
} : {
center: entity.center,
radius: entity.radius
@@ -2985,6 +3823,70 @@ export default {
}
})
break
+ case 'hold_circle': {
+ const hcRadius = entityData.data.radius || 1000
+ if (hcRadius <= 0) {
+ this.$message.error('圆形盘旋半径必须大于0')
+ return
+ }
+ const hcCenter = entityData.data.center
+ entity = this.viewer.entities.add({
+ position: Cesium.Cartesian3.fromDegrees(hcCenter.lng, hcCenter.lat),
+ ellipse: {
+ semiMinorAxis: hcRadius,
+ semiMajorAxis: hcRadius,
+ material: Cesium.Color.TRANSPARENT,
+ outline: true,
+ outlineColor: Cesium.Color.fromCssColorString(color),
+ outlineWidth: entityData.data.width != null ? entityData.data.width : 2
+ },
+ label: {
+ text: entityData.label || '圆形盘旋',
+ font: '14px sans-serif',
+ fillColor: Cesium.Color.WHITE,
+ outlineColor: Cesium.Color.BLACK,
+ outlineWidth: 2,
+ style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+ verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+ pixelOffset: new Cesium.Cartesian2(0, -10)
+ }
+ })
+ break
+ }
+ case 'hold_ellipse': {
+ const heCenter = entityData.data.center
+ if (!heCenter) {
+ this.$message.error('椭圆盘旋缺少中心点')
+ return
+ }
+ let heA = entityData.data.semiMajorAxis || 1000
+ let heB = entityData.data.semiMinorAxis || 500
+ if (heB > heA) { [heA, heB] = [heB, heA] }
+ const heHeading = entityData.data.headingDeg != null ? (entityData.data.headingDeg * Math.PI / 180) : 0
+ entity = this.viewer.entities.add({
+ position: Cesium.Cartesian3.fromDegrees(heCenter.lng, heCenter.lat),
+ ellipse: {
+ semiMajorAxis: heA,
+ semiMinorAxis: heB,
+ rotation: heHeading,
+ material: Cesium.Color.TRANSPARENT,
+ outline: true,
+ outlineColor: Cesium.Color.fromCssColorString(color),
+ outlineWidth: entityData.data.width != null ? entityData.data.width : 2
+ },
+ label: {
+ text: entityData.label || '椭圆盘旋',
+ font: '14px sans-serif',
+ fillColor: Cesium.Color.WHITE,
+ outlineColor: Cesium.Color.BLACK,
+ outlineWidth: 2,
+ style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+ verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+ pixelOffset: new Cesium.Cartesian2(0, -10)
+ }
+ })
+ break
+ }
}
if (entity) {
this.allEntities.push({
diff --git a/ruoyi-ui/src/views/childRoom/RightPanel.vue b/ruoyi-ui/src/views/childRoom/RightPanel.vue
index 3187dc1..1f3a46b 100644
--- a/ruoyi-ui/src/views/childRoom/RightPanel.vue
+++ b/ruoyi-ui/src/views/childRoom/RightPanel.vue
@@ -42,6 +42,7 @@
+
@@ -452,6 +453,10 @@ export default {
this.$emit('create-route', plan)
},
+ handleCreateRouteWithHold(plan) {
+ this.$emit('create-route-with-hold', plan)
+ },
+
handleDeletePlan(plan) {
this.$confirm(`是否确认删除方案 "${plan.name}"？这将同时删除该方案下的所有航线。`, "警告", {
confirmButtonText: "确定",
diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue
index 9163d51..ae32850 100644
--- a/ruoyi-ui/src/views/childRoom/index.vue
+++ b/ruoyi-ui/src/views/childRoom/index.vue
@@ -8,14 +8,19 @@
:tool-mode="drawDom ? 'ranging' : (airspaceDrawDom ? 'airspace' : 'airspace')"
:scaleConfig="scaleConfig"
@draw-complete="handleMapDrawComplete"
+ @drawing-points-update="missionDrawingPointsCount = $event"
@open-waypoint-dialog="handleOpenWaypointEdit"
+ @open-route-dialog="handleOpenRouteEdit"
@scale-click="handleScaleClick" />
- @open-route-dialog="handleOpenRouteEdit" />
二维GIS地图区域
支持标绘/航线/空域/实时态势
+
+ 已 {{ missionDrawingPointsCount }} 个航点，右键结束
+ 插入盘旋
+
-
+
- {{ deductionWarnings[0] }}
+ {{ deductionWarnings[0] || '存在航段将提前到达下一航点。' }}
等 {{ deductionWarnings.length }} 条
+ 在此添加盘旋
+
+ {{ addHoldDialogTip }}
+
+
+
+ 圆形
+ 椭圆
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 顺时针
+ 逆时针
+
+
+
+
+
+
+
+