From 8eef08f77ae4aa762b1424672d4271a953f4cbf7 Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Wed, 27 May 2026 12:48:17 +0800 Subject: [PATCH] xx --- src/components/devices/WayLinePage.tsx | 43 ++++++++++++++++---------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/src/components/devices/WayLinePage.tsx b/src/components/devices/WayLinePage.tsx index 9a4c95d..8e08504 100644 --- a/src/components/devices/WayLinePage.tsx +++ b/src/components/devices/WayLinePage.tsx @@ -585,7 +585,7 @@ export default function WayLinePage({ planedevices }) { } bordered={false} bodyStyle={{ padding: 0, display: 'flex', flexDirection: 'column', height: "calc(100% - 40px)", overflow: "auto" }} - style={{ ...cardStyle, height: "410px" }} + style={{ ...cardStyle, height: "250px", flex: 1, marginBottom: 0 }} > - +
{[ { label: '飞行高度', value: '35', unit: 'm' }, { label: '速度', value: '6', unit: 'm/s' }, @@ -666,17 +666,27 @@ export default function WayLinePage({ planedevices }) { { label: '除草宽幅', value: '1.2', unit: 'm' }, { label: '巡检采样频率', value: '2', unit: 'Hz' }, ].map((item, idx) => ( -
-
{item.label}
-
- - {item.unit} +
+ {item.label} +
+ {item.value} + {item.unit}
- +
))} - - -
+
+ +
避障开关 @@ -686,7 +696,6 @@ export default function WayLinePage({ planedevices }) {
-
{/* 执行/挂起/继续 逻辑 */} {selectedTask?.status === 'executing' || selectedTask?.status === 'running' || selectedTask?.status === 'restored' ? ( @@ -697,7 +706,7 @@ export default function WayLinePage({ planedevices }) { onClick={() => updateTaskStatus(selectedTask?.uuid, 'suspended')} loading={loading} // 统一样式:高度36 + 圆角18 + 字重600 + 图标文字居中 - style={{ height: 36, borderRadius: 18, fontWeight: 600, display: 'inline-flex', alignItems: 'center', gap: 4 }} + style={{ height: 28, borderRadius: 18, fontWeight: 600, display: 'inline-flex', alignItems: 'center', gap: 4 }} > 挂起任务 @@ -714,7 +723,7 @@ export default function WayLinePage({ planedevices }) { }} loading={loading} // 统一样式:主色#165DFF + 高度36 + 圆角18 + 字重600 - style={{ background: '#165DFF', height: 36, borderRadius: 18, fontWeight: 600, display: 'inline-flex', alignItems: 'center', gap: 4 }} + style={{ background: '#165DFF', height: 28, borderRadius: 18, fontWeight: 600, display: 'inline-flex', alignItems: 'center', gap: 4 }} > {selectedTask?.status === 'suspended' ? '继续任务' : '执行任务'} @@ -726,7 +735,7 @@ export default function WayLinePage({ planedevices }) { icon={isReturningHome ? : } onClick={() => sendFlightCommand(isReturningHome ? 'return_home_cancel' : 'return_home')} loading={flightCommandLoading} - style={{ background: '#165DFF', height: 36, borderRadius: 18, fontWeight: 600, display: 'inline-flex', alignItems: 'center', gap: 4 }} + style={{ background: '#165DFF', height: 28, borderRadius: 18, fontWeight: 600, display: 'inline-flex', alignItems: 'center', gap: 4 }} > {isReturningHome ? '取消返航' : '返航'} @@ -737,7 +746,7 @@ export default function WayLinePage({ planedevices }) { icon={isTaskPaused ? : } onClick={() => sendFlightCommand(isTaskPaused ? 'flighttask_recovery' : 'flighttask_pause')} loading={flightCommandLoading} - style={{ height: 36, borderRadius: 18, fontWeight: 600, display: 'inline-flex', alignItems: 'center', gap: 4 }} + style={{ height: 28, borderRadius: 18, fontWeight: 600, display: 'inline-flex', alignItems: 'center', gap: 4 }} > {isTaskPaused ? '恢复任务' : '暂停任务'} @@ -1286,6 +1295,6 @@ export default function WayLinePage({ planedevices }) {
-
+ ); }