-
偏航角度
+
偏航角度:
{{ props.params.aircraftHeading }} °
@@ -12,16 +15,20 @@
\ No newline at end of file
diff --git a/src/views/demo/workmanagement/workplan/components/planList.vue b/src/views/demo/workmanagement/workplan/components/planList.vue
index d9cbc75..0068bd3 100644
--- a/src/views/demo/workmanagement/workplan/components/planList.vue
+++ b/src/views/demo/workmanagement/workplan/components/planList.vue
@@ -225,14 +225,12 @@
}
]
)
-
const onPageChange = (e)=>{
pageQuery.value.page = e;
getTaskList();
}
-
// 任务状态
const planStatusOptions = ref([
{
diff --git a/src/views/demo/workmanagement/workplan/lib/calculateAirLine.ts b/src/views/demo/workmanagement/workplan/lib/calculateAirLine.ts
index 678abd7..eca8fad 100644
--- a/src/views/demo/workmanagement/workplan/lib/calculateAirLine.ts
+++ b/src/views/demo/workmanagement/workplan/lib/calculateAirLine.ts
@@ -16,11 +16,10 @@ export const calculateHeight = (gsd,uavModel) => {
// 飞行高度= GSD(cm)×实际焦距(mm)/像元尺寸(um)
- let abc = (gsd * uavModel['focalLength'] / uavModel['pixelLength']);
+ height = (gsd * uavModel['focalLength'] / uavModel['pixelLength']);
- console.log("abc",abc);
- height = ( (gsd / 100) * (uavModel['focalLength'] / 1000) * uavModel['imageWidth'] ) / ( uavModel['sensorLength'] / 1000 );
+ // height = ( (gsd / 100) * (uavModel['focalLength'] / 1000) * uavModel['imageWidth'] ) / ( uavModel['sensorLength'] / 1000 );
return height.toFixed(2);
}
@@ -30,8 +29,16 @@ export const calculateHeight = (gsd,uavModel) => {
// 输入高度计算gsd
export const calculateGsd = (height,uavModel) => {
+
+
+
let gsd = 0;
- gsd = ( (height*1000) * uavModel['sensorLength'] ) / (uavModel['focalLength'] * uavModel['imageWidth']) / 10;
+
+ gsd = (uavModel['pixelLength'] * height) / uavModel['focalLength'] ;
+
+
+ // gsd = ( (height*1000) * uavModel['sensorLength'] ) / (uavModel['focalLength'] * uavModel['imageWidth']) / 10;
+
return gsd.toFixed(2);
}
diff --git a/src/views/demo/workmanagement/workplan/waylineConfig/action.ts b/src/views/demo/workmanagement/workplan/waylineConfig/actionConfig.ts
similarity index 99%
rename from src/views/demo/workmanagement/workplan/waylineConfig/action.ts
rename to src/views/demo/workmanagement/workplan/waylineConfig/actionConfig.ts
index 8cb2692..62e3353 100644
--- a/src/views/demo/workmanagement/workplan/waylineConfig/action.ts
+++ b/src/views/demo/workmanagement/workplan/waylineConfig/actionConfig.ts
@@ -25,7 +25,7 @@ export const airPointActions = {
"gimbalHeadingYawBase": "north",
"gimbalRotateMode": "absoluteAngle",
"gimbalPitchRotateEnable": 1,
- "gimbalPitchRotateAngle": -65.7,
+ "gimbalPitchRotateAngle": 0,
"gimbalRollRotateEnable": 0,
"gimbalRollRotateAngle": 0,
"gimbalYawRotateEnable": 0,
diff --git a/src/views/demo/workmanagement/workplan/waylineConfig/mapping2dConfig.ts b/src/views/demo/workmanagement/workplan/waylineConfig/mapping2dConfig.ts
new file mode 100644
index 0000000..c4a5d5e
--- /dev/null
+++ b/src/views/demo/workmanagement/workplan/waylineConfig/mapping2dConfig.ts
@@ -0,0 +1,176 @@
+
+// 面状航线默认template.kml数据
+export const templateKml = {
+ "author": 17861857725,
+ "createTime": 1749689844431,
+ "updateTime": 1753241338101,
+ "missionConfig": {
+ "flyToWaylineMode": "pointToPoint",
+ "finishAction": "goHome",
+ "exitOnRCLost": "goContinue",
+ "executeRCLostAction": "goBack",
+ "takeOffSecurityHeight": 20,
+ "takeOffRefPoint": "",
+ "takeOffRefPointAGLHeight": 4.169064385,
+ "globalTransitionalSpeed": 15,
+ "globalRTHHeight": 100,
+ "droneInfo": {
+ "droneEnumValue": 100,
+ "droneSubEnumValue": 1
+ },
+ "autoRerouteInfo": {
+ "transitionalAutoRerouteMode": 1,
+ "missionAutoRerouteMode": 1
+ },
+ "waylineAvoidLimitAreaMode": 0,
+ "payloadInfo": {
+ "payloadEnumValue": 99,
+ "payloadSubEnumValue": 0,
+ "payloadPositionIndex": 0
+ }
+ },
+ "Folder": {
+ "templateType": "mapping2d",
+ "templateId": 0,
+ "waylineCoordinateSysParam": {
+ "coordinateMode": "WGS84",
+ "heightMode": "EGM96",
+ "globalShootHeight": 90,
+ "surfaceFollowModeEnable": 1,
+ "isRealtimeSurfaceFollow": 0,
+ "surfaceRelativeHeight": 90,
+ "dsmFile": "wpmz/res/dsm/wgs84_ASTGTMV003_N35E118_dem_7.tif"
+ },
+ "autoFlightSpeed": 12.7,
+ "Placemark": {
+ "caliFlightEnable": 0,
+ "elevationOptimizeEnable": 1,
+ "smartObliqueEnable": 0,
+ "quickOrthoMappingEnable": 0,
+ "facadeWaylineEnable": 0,
+ "isLookAtSceneSet": 0,
+ "shootType": "time",
+ "direction": 83,
+ "margin": 0,
+ "efficiencyFlightModeEnable": 0,
+ "overlap": {
+ "orthoCameraOverlapH": 80,
+ "orthoCameraOverlapW": 70,
+ "inclinedCameraOverlapH": 80,
+ "inclinedCameraOverlapW": 70
+ },
+ "Polygon": {
+ "outerBoundaryIs": {
+ "LinearRing": {
+ "coordinates": "118.293794766158,35.1353688096117,0\n 118.295429169407,35.1353304409052,0\n 118.295487507293,35.1332925168381,0\n 118.293672196844,35.1331918267775,0"
+ }
+ }
+ },
+ "ellipsoidHeight": 90,
+ "height": 90
+ },
+ "payloadParam": {
+ "payloadPositionIndex": 0,
+ "focusMode": "firstPoint",
+ "meteringMode": "average",
+ "returnMode": "singleReturnStrongest",
+ "samplingRate": 240000,
+ "scanningMode": "repetitive",
+ "imageFormat": "visable",
+ "photoSize": ""
+ }
+ }
+}
+
+// 面状航线默认wayline.wpml数据
+export const waylineWpml = {
+ "missionConfig": {
+ "flyToWaylineMode": "pointToPoint",
+ "finishAction": "goHome",
+ "exitOnRCLost": "goContinue",
+ "executeRCLostAction": "goBack",
+ "takeOffSecurityHeight": 20,
+ "globalTransitionalSpeed": 15,
+ "globalRTHHeight": 100,
+ "droneInfo": {
+ "droneEnumValue": 100,
+ "droneSubEnumValue": 1
+ },
+ "autoRerouteInfo": {
+ "transitionalAutoRerouteMode": 1,
+ "missionAutoRerouteMode": 1
+ },
+ "waylineAvoidLimitAreaMode": 0,
+ "payloadInfo": {
+ "payloadEnumValue": 99,
+ "payloadSubEnumValue": 0,
+ "payloadPositionIndex": 0
+ }
+ },
+ "Folder": {
+ "templateId": 0,
+ "executeHeightMode": "WGS84",
+ "waylineId": 0,
+ "distance": 1259.17163085938,
+ "duration": 145.652896165848,
+ "autoFlightSpeed": 12.7,
+ "startActionGroup": {
+ "action": [
+ {
+ "actionId": 0,
+ "actionActuatorFunc": "gimbalRotate",
+ "actionActuatorFuncParam": {
+ "gimbalHeadingYawBase": "aircraft",
+ "gimbalRotateMode": "absoluteAngle",
+ "gimbalPitchRotateEnable": 1,
+ "gimbalPitchRotateAngle": -90,
+ "gimbalRollRotateEnable": 0,
+ "gimbalRollRotateAngle": 0,
+ "gimbalYawRotateEnable": 1,
+ "gimbalYawRotateAngle": 0,
+ "gimbalRotateTimeEnable": 0,
+ "gimbalRotateTime": 10,
+ "payloadPositionIndex": 0
+ }
+ },
+ {
+ "actionId": 1,
+ "actionActuatorFunc": "hover",
+ "actionActuatorFuncParam": {
+ "hoverTime": 0.5
+ }
+ },
+ {
+ "actionId": 2,
+ "actionActuatorFunc": "setFocusType",
+ "actionActuatorFuncParam": {
+ "cameraFocusType": "manual",
+ "payloadPositionIndex": 0
+ }
+ },
+ {
+ "actionId": 3,
+ "actionActuatorFunc": "focus",
+ "actionActuatorFuncParam": {
+ "focusX": 0,
+ "focusY": 0,
+ "focusRegionWidth": 0,
+ "focusRegionHeight": 0,
+ "isPointFocus": 0,
+ "isInfiniteFocus": 1,
+ "payloadPositionIndex": 0,
+ "isCalibrationFocus": 0
+ }
+ },
+ {
+ "actionId": 4,
+ "actionActuatorFunc": "hover",
+ "actionActuatorFuncParam": {
+ "hoverTime": 1
+ }
+ }
+ ]
+ },
+ "Placemark": []
+ }
+}
\ No newline at end of file
diff --git a/src/views/demo/workmanagement/workplan/waylineConfig/index.ts b/src/views/demo/workmanagement/workplan/waylineConfig/waylineParamsOptions.ts
similarity index 89%
rename from src/views/demo/workmanagement/workplan/waylineConfig/index.ts
rename to src/views/demo/workmanagement/workplan/waylineConfig/waylineParamsOptions.ts
index 42f58dc..a789251 100644
--- a/src/views/demo/workmanagement/workplan/waylineConfig/index.ts
+++ b/src/views/demo/workmanagement/workplan/waylineConfig/waylineParamsOptions.ts
@@ -97,6 +97,18 @@ export const missionConfigOptions = {
label:"悬停",
value:"hover"
}
+ ],
+ globalWaypointTurnMode:[
+ {
+ label:"不过点,提前转弯",
+ value:"coordinateTurn"
+ },{
+ label:"直线飞行,到点停",
+ value:"toPointAndStopWithDiscontinuityCurvature"
+ },{
+ label:"平滑过点,提前转弯",
+ value:"toPointAndStopWithContinuityCurvature"
+ }
]
}
diff --git a/src/views/demo/workmanagement/workplan/waylineConfig/waypointConfig.ts b/src/views/demo/workmanagement/workplan/waylineConfig/waypointConfig.ts
new file mode 100644
index 0000000..53c6c34
--- /dev/null
+++ b/src/views/demo/workmanagement/workplan/waylineConfig/waypointConfig.ts
@@ -0,0 +1,92 @@
+
+// 航点航线默认template.kml数据
+export const templateKml = {
+ "author": 17861857725,
+ "createTime": 1753927747220,
+ "updateTime": 1753928575789,
+ "missionConfig": {
+ "flyToWaylineMode": "safely",
+ "finishAction": "goHome",
+ "exitOnRCLost": "goContinue",
+ "executeRCLostAction": "goBack",
+ "takeOffSecurityHeight": 20,
+ "takeOffRefPoint": "35.134614,118.296656,77.867669",
+ "takeOffRefPointAGLHeight": 0,
+ "globalTransitionalSpeed": 15,
+ "globalRTHHeight": 100,
+ "droneInfo": {
+ "droneEnumValue": 100,
+ "droneSubEnumValue": 1
+ },
+ "waylineAvoidLimitAreaMode": 0,
+ "payloadInfo": {
+ "payloadEnumValue": 99,
+ "payloadSubEnumValue": 2,
+ "payloadPositionIndex": 0
+ }
+ },
+ "Folder": {
+ "templateType": "waypoint",
+ "templateId": 0,
+ "waylineCoordinateSysParam": {
+ "coordinateMode": "WGS84",
+ "heightMode": "EGM96"
+ },
+ "autoFlightSpeed": 10,
+ "globalHeight": 124,
+ "caliFlightEnable": 0,
+ "gimbalPitchMode": "manual",
+ "globalWaypointHeadingParam": {
+ "waypointHeadingMode": "followWayline",
+ "waypointHeadingAngle": 0,
+ "waypointPoiPoint": "0.000000,0.000000,0.000000",
+ "waypointHeadingPathMode": "followBadArc",
+ "waypointHeadingPoiIndex": 0
+ },
+ "globalWaypointTurnMode": "toPointAndStopWithDiscontinuityCurvature",
+ "globalUseStraightLine": 1,
+ "Placemark": [],
+ "payloadParam": {
+ "payloadPositionIndex": 0,
+ "focusMode": "firstPoint",
+ "meteringMode": "average",
+ "returnMode": "singleReturnStrongest",
+ "samplingRate": 240000,
+ "scanningMode": "repetitive",
+ "imageFormat": "visable,ir",
+ "photoSize": ""
+ }
+ }
+}
+
+// 航点航线默认wayline.wpml数据
+export const waylineWpml = {
+ "missionConfig": {
+ "flyToWaylineMode": "safely",
+ "finishAction": "goHome",
+ "exitOnRCLost": "goContinue",
+ "executeRCLostAction": "goBack",
+ "takeOffSecurityHeight": 20,
+ "globalTransitionalSpeed": 15,
+ "globalRTHHeight": 100,
+ "droneInfo": {
+ "droneEnumValue": 100,
+ "droneSubEnumValue": 1
+ },
+ "waylineAvoidLimitAreaMode": 0,
+ "payloadInfo": {
+ "payloadEnumValue": 99,
+ "payloadSubEnumValue": 2,
+ "payloadPositionIndex": 0
+ }
+ },
+ "Folder": {
+ "templateId": 0,
+ "executeHeightMode": "WGS84",
+ "waylineId": 0,
+ "distance": 4453.73876953125,
+ "duration": 636.023902893066,
+ "autoFlightSpeed": 10,
+ "Placemark": []
+ }
+}
\ No newline at end of file