机器人状态界面 在线状态实时更新 i修复返航物和障碍物保存和新增 互斥 障碍物支持矩形 手柄拖拽

This commit is contained in:
mmc
2026-11-03 12:42:07 +08:00
parent 82a7ec1f40
commit 36b6856a90
4 changed files with 502 additions and 521 deletions

View File

@@ -29,6 +29,9 @@ interface MarkedPoint {
name: string;
deviceId?: string;
radius?: number;
shapeType?: 'circle' | 'rect';
size_x?: number;
size_y?: number;
}
interface ReturnTaskForm {
@@ -121,7 +124,7 @@ export default function MapEditorPage() {
// 传给Cesium地图渲染的点位
const drawingPoints = useMemo(() => {
return currentList.map(p => ({ id: p.id, lon: p.lon, lat: p.lat, radius: p.radius }));
return currentList.map(p => ({ id: p.id, lon: p.lon, lat: p.lat, radius: p.radius, shapeType: p.shapeType, size_x: p.size_x, size_y: p.size_y }));
}, [currentList]);
// 切换到非路径生成类型时清除预设路径预览
@@ -149,36 +152,58 @@ export default function MapEditorPage() {
getSiteMapInfo({ siteId: stationId }).then((res: any) => {
if (res?.code === 200 && res.data) {
setSiteMapInfoId(res.data.id ?? null);
setReturnPointConfigList(res?.data?.restPoints || []);
// 同时加载已保存的障碍物点(tempObstaclePoints),方便编辑
const savedObstacles = (res?.data?.tempObstaclePoints || []).map((op: any) => ({
id: genId(),
lon: Number(op.position?.lng ?? op.position?.lon ?? 0),
lat: Number(op.position?.lat ?? 0),
name: op.alias || '',
radius: Number(op.radius) || 2.0,
//shapeType:
// op.shapeType === 'rect' || op.shape_type === 'aabb'
// ? 'rect'
// : 'circle',
//width: Number(op.width ?? op.size?.[0]) || (Number(op.radius) || 2) * 2,
//height: Number(op.height ?? op.size?.[1]) || (Number(op.radius) || 2) * 2,
}));
// 同步到已配置列表(仅用于显示/删除)
const restPoints = res?.data?.restPoints || [];
setReturnPointConfigList(restPoints);
// 同步到编辑列表(用于编辑/保存)
const mappedReturnPoints = restPoints.map((p: any, idx: number) => {
const lon = Number(p.position?.lng ?? p.position?.lon ?? p.position?.longitude ?? p.longitude ?? 0);
const lat = Number(p.position?.lat ?? p.position?.latitude ?? p.latitude ?? 0);
return {
id: genId(),
lon,
lat,
name: (p.alias || '').trim() || `返航点-${String(idx + 1).padStart(2, '0')}`,
deviceId: p.bindDeviceId || undefined,
};
});
setReturnPoints(mappedReturnPoints);
// 同时加载已保存的障碍物点(tempObstaclePoints),同步到编辑列表和已配置列表
const savedObstacles = (res?.data?.tempObstaclePoints || []).map((op: any, idx: number) => {
const lon = Number(op.position?.lng ?? op.position?.lon ?? op.position?.longitude ?? op.center?.lng ?? op.center?.lon ?? op.center?.longitude ?? op.longitude ?? 0);
const lat = Number(op.position?.lat ?? op.position?.latitude ?? op.center?.lat ?? op.center?.latitude ?? op.latitude ?? 0);
const name = (op.alias || op.name || '').trim() || `障碍物点-${idx + 1}`;
return {
id: op.id || genId(),
lon,
lat,
name,
alias: name,
radius: Number(op.radius) || 0.5,
shapeType: op.shapeType === 'circle' ? 'circle' : 'rect',
size_x: Number(op.size_x) || Number(op.sizeX) || 0.5,
size_y: Number(op.size_y) || Number(op.sizeY) || 0.5,
};
});
setObstaclePointConfigList(savedObstacles);
setObstaclePoints(savedObstacles);
} else {
setSiteMapInfoId(null);
setReturnPointConfigList([]);
setReturnPoints([]);
setObstaclePointConfigList([]);
setObstaclePoints([]);
}
}).catch(() => {
setSiteMapInfoId(null);
setReturnPointConfigList([]);
setReturnPoints([]);
setObstaclePointConfigList([]);
setObstaclePoints([]);
});
}
@@ -295,7 +320,10 @@ export default function MapEditorPage() {
{
...point,
name: `障碍物点-${prev.length + 1}`,
radius: ""
radius: 0.5,
shapeType: 'rect',
size_x: 0.5,
size_y: 0.5,
},
]);
}
@@ -363,82 +391,69 @@ export default function MapEditorPage() {
else if (activeType === 'restArea') setRestAreas(prev => prev.map(p => p.id === id ? { ...p, deviceId } : p));
};
// ========== 保存返航点 / 分区 ==========
// ========== 保存返航点 / 障碍物点 (统一保存接口) ==========
const handleSaveReturnOrRest = () => {
if (activeType === 'returnPoint') {
// 返航点:走 saveSiteMapInfo
console.log('[MapEditor] 保存返航点 currentList:', currentList);
const restPoints = currentList.map(p => ({
position: { lat: p.lat, lng: p.lon },
bindDeviceId: p.deviceId,
if (activeType === 'returnPoint' || activeType === 'obstaclePoint') {
// 1. 构造返航点数据
const restPoints = returnPoints.map(p => ({
position: { lat: Number(p.lat), lng: Number(p.lon) },
bindDeviceId: p.deviceId || null,
alias: p.name,
}));
const idArr = restPoints.map(item => item.bindDeviceId);
const repeatIds: string[] = [];
const seen = new Set();
for (const id of idArr) {
if (seen.has(id)) {
repeatIds.push(id);
} else {
seen.add(id);
}
}
if (repeatIds.length > 0) {
// 去重展示重复id
const dupSet = [...new Set(repeatIds)];
// 校验绑定设备重复
const bindDeviceIds = restPoints.map(p => p.bindDeviceId).filter(id => id);
if (new Set(bindDeviceIds).size !== bindDeviceIds.length) {
messageApi.warning(t('devices.mapEditor.duplicateBindDevice'));
return;
}
console.log(obstaclePoints, "obstaclePoints")
//return;
// 2. 构造障碍物点数据
const tempObstaclePoints = obstaclePoints.map(p => {
const item: Record<string, any> = {
center: { lat: Number(p.lat), lng: Number(p.lon) },
position: { lat: Number(p.lat), lng: Number(p.lon) }, // 同时传 position 和 center 确保兼容性
shapeType: p.shapeType || 'rect',
alias: p.name,
source: 'platform'
};
if (p.shapeType === 'circle' && p.radius) {
item.radius = p.radius;
}
if (p.shapeType === 'rect') {
if (p.size_x) item.size_x = p.size_x;
if (p.size_y) item.size_y = p.size_y;
}
return item;
});
// 3. 构造保存 Payload
const payload: any = {
restPoints,
siteId: stationId,
orgId: currentStation?.orgId,
};
// 编辑时带上站点地图信息主键 id
if (siteMapInfoId != null) payload.id = siteMapInfoId;
console.log(payload, "保存返航点payload");
saveSiteMapInfo(payload).then((res: any) => {
if (res?.code == 200) {
utils.message.success(t('devices.mapEditor.saveSuccess'));
setOverlayRefreshKey(k => k + 1);
// 保存后刷新返航点列表
getSiteMapInfoFn();
} else {
utils.message.error(res?.msg || t('common.saveFail'));
}
});
} else if (activeType === 'obstaclePoint') {
// 障碍物点:走 saveSiteMapInfo,用 tempObstaclePoints 字段
console.log('[MapEditor] 保存障碍物点 currentList:', currentList);
const tempObstaclePoints = currentList.map(p => ({
position: { lat: p.lat, lng: p.lon },
radius: p.radius ?? 2.0,
alias: p.name,
}));
const payload: any = {
restPoints: [],
tempObstaclePoints,
siteId: stationId,
orgId: currentStation?.orgId,
};
if (siteMapInfoId != null) payload.id = siteMapInfoId;
console.log(payload, "保存障碍物点 payload");
console.log('[MapEditor] 统一保存 Payload:', payload);
saveSiteMapInfo(payload).then((res: any) => {
if (res?.code == 200) {
utils.message.success(t('devices.mapEditor.saveSuccess'));
setOverlayRefreshKey(k => k + 1);
setObstaclePoints([]);
// 保存后重新拉取数据以同步所有状态
getSiteMapInfoFn();
} else {
utils.message.error(res?.msg || t('common.saveFail'));
}
}).catch(err => {
console.error('[MapEditor] save failed:', err);
utils.message.error(t('common.saveFail'));
});
} else {
// 分区:弹出 Modal 让用户填写 regionName / bindRoutes 等,再调 saveRegion
// 分区保存逻辑不变
if (currentList.length === 0) {
messageApi.warning(t('devices.mapEditor.needAtLeast2Points'));
return;
@@ -591,11 +606,12 @@ export default function MapEditorPage() {
) => {
const updated = obstaclePointConfigList.map((point: any) =>
String(point.id) === String(item.id)
? { ...point, name: alias }
? { ...point, alias: alias, name: alias }
: point
);
setObstaclePointConfigList(updated);
setObstaclePoints(updated); // 同时更新编辑中的列表,触发地图重绘
const payload: any = {
tempObstaclePoints: updated.map((point: any) => ({
@@ -608,8 +624,12 @@ export default function MapEditorPage() {
0
),
},
radius: Number(point.radius) || 2,
alias: point.name || '',
radius: Number(point.radius) || 0,
size_x: Number(point.size_x) || 0,
size_y: Number(point.size_y) || 0,
shapeType: point.shapeType || 'rect',
alias: point.alias || point.name || '',
source: 'platform'
})),
siteId: stationId,
orgId: currentStation?.orgId,
@@ -750,59 +770,22 @@ export default function MapEditorPage() {
idFromMap: number | null = null
) => {
const roundedRadius = Number(radius.toFixed(2));
setObstaclePoints(prev => prev.map((p, i) => i === index ? { ...p, radius: roundedRadius } : p));
};
// 以服务端最新数据为准:本地列表可能为空,或顺序与地图上的不一致
let infoRes: any = null;
try {
infoRes = await getSiteMapInfo({ siteId: stationId });
} catch (e) {
infoRes = null;
}
const remoteList: any[] =
infoRes?.code === 200 && Array.isArray(infoRes.data?.tempObstaclePoints)
? infoRes.data.tempObstaclePoints
: [];
const infoId: number | null =
(infoRes?.code === 200 ? infoRes.data?.id : null) ?? idFromMap ?? null;
// 远端列表优先,为空时退回本地已配置列表
const baseList: any[] = remoteList.length > 0 ? remoteList : obstaclePointConfigList;
if (!baseList.length || index < 0 || index >= baseList.length) {
messageApi.error('未找到障碍物点数据,请刷新后重试');
return;
}
const nextPoints = baseList.map((item: any, idx: number) => ({
radius: idx === index ? roundedRadius : Number(item.radius) || 0,
position: {
lat: Number(item.position?.lat ?? item.lat ?? 0),
lng: Number(item.position?.lng ?? item.position?.lon ?? item.lon ?? 0),
},
alias: item.alias ?? item.name ?? '',
}));
const payload: any = {
tempObstaclePoints: nextPoints,
siteId: stationId,
orgId: currentStation?.orgId,
};
// id 为空时不要传 id 字段,否则后端会把 null 主键当成非法新增
if (infoId != null) payload.id = infoId;
const res: any = await saveSiteMapInfo(payload);
if (res?.code === 200) {
messageApi.success('障碍物点半径修改成功');
getSiteMapInfoFn();
setOverlayRefreshKey(k => k + 1);
} else {
messageApi.error(
res?.msg || '障碍物点半径修改失败'
);
// ========== 地图拖拽矩形障碍物尺寸回调 ==========
const handleObstacleRectResize = async (index: number, width: number, height: number) => {
setObstaclePoints(prev => prev.map((p, i) => i === index ? { ...p, size_x: width, size_y: height } : p));
};
// ========== 地图飞到指定点位 ==========
const handleFlyToPoint = (point: { lon?: number; lat?: number; lng?: number }) => {
const lon = point.lon ?? point.lng;
const lat = point.lat;
if (lon != null && lat != null && !isNaN(Number(lon)) && !isNaN(Number(lat))) {
mapRef.current?.flyToPosition?.({ lon: Number(lon), lat: Number(lat) }, { height: 300 });
}
};
// ========== 点击预设路径在地图上预览(覆盖=框,单点=线) ==========
const handlePreviewRoute = async (route: any) => {
setSelectedRouteId(route.id);
@@ -881,8 +864,12 @@ export default function MapEditorPage() {
0
),
},
radius: Number(point.radius) || 2,
radius: Number(point.radius) || 0,
size_x: Number(point.size_x) || 0,
size_y: Number(point.size_y) || 0,
shapeType: point.shapeType || 'rect',
alias: point.name ?? point.alias ?? '',
source: 'platform'
})),
siteId: stationId,
orgId: currentStation?.orgId,
@@ -911,32 +898,29 @@ export default function MapEditorPage() {
}
},
});
}; // 修改已配置障碍物点的半径
const handleUpdateObstacleRadius = async (
}; // 修改已配置障碍物点的尺寸
const handleUpdateObstacleDimensions = async (
item: any,
radius: number
dimensions: { radius?: number; size_x?: number; size_y?: number; shapeType?: 'circle' | 'rect' }
) => {
try {
// 保留其他已配置障碍物点的数据,只修改当前项半径
// 保留其他已配置障碍物点的数据,只修改当前项
const tempObstaclePoints = obstaclePointConfigList.map(
(point: any) => ({
position: {
lat: Number(
point.position?.lat ?? point.lat ?? 0
),
lng: Number(
point.position?.lng ??
point.position?.lon ??
point.lon ??
0
),
},
radius:
String(point.id) === String(item.id)
? radius
: Number(point.radius),
alias: point.alias ?? point.name ?? '',
})
(point: any) => {
const isTarget = String(point.id) === String(item.id);
return {
position: {
lat: Number(point.position?.lat ?? point.lat ?? 0),
lng: Number(point.position?.lng ?? point.position?.lon ?? point.lon ?? 0),
},
radius: isTarget ? (dimensions.radius ?? point.radius) : Number(point.radius),
size_x: isTarget ? (dimensions.size_x ?? point.size_x) : Number(point.size_x),
size_y: isTarget ? (dimensions.size_y ?? point.size_y) : Number(point.size_y),
shapeType: isTarget ? (dimensions.shapeType ?? point.shapeType) : (point.shapeType || 'rect'),
alias: point.alias ?? point.name ?? '',
source: 'platform'
};
}
);
const payload: any = {
@@ -945,7 +929,6 @@ export default function MapEditorPage() {
orgId: currentStation?.orgId,
};
// 更新站点地图信息时传入接口返回的主键 ID
if (siteMapInfoId != null) {
payload.id = siteMapInfoId;
}
@@ -953,22 +936,15 @@ export default function MapEditorPage() {
const res: any = await saveSiteMapInfo(payload);
if (res?.code === 200) {
messageApi.success('障碍物点半径修改成功');
messageApi.success('障碍物点修改成功');
getSiteMapInfoFn();
setOverlayRefreshKey(k => k + 1);
} else {
messageApi.error(
res?.msg || '障碍物点半径修改失败'
);
messageApi.error(res?.msg || '障碍物点修改失败');
}
} catch (error) {
console.error(
'[MapEditor] update obstacle radius failed:',
error
);
messageApi.error('障碍物点半径修改失败');
console.error('[MapEditor] update obstacle dimensions failed:', error);
messageApi.error('障碍物点修改失败');
}
};
@@ -1202,7 +1178,7 @@ export default function MapEditorPage() {
focusOverlay={focusOverlay}
onObstacleRadiusChange={handleObstacleRadiusChange}
onObstacleRectResize={handleObstacleRectResize}
siteMapInfoId={siteMapInfoId}
@@ -1473,15 +1449,12 @@ export default function MapEditorPage() {
}
extra={
<Space size={6}>
<Button size="small" onClick={handleClearAll} disabled={currentList.length === 0 && points.length === 0}>
{t('common.cancel')}
</Button>
<Button
size="small"
type="primary"
icon={<SaveOutlined />}
onClick={handleSaveReturnOrRest}
disabled={currentList.length === 0}
//disabled={currentList.length === 0}
>
{t('common.save')}
</Button>
@@ -1501,6 +1474,7 @@ export default function MapEditorPage() {
{currentList.map((p) => (
<div
key={p.id}
onClick={() => handleFlyToPoint(p)}
style={{
padding: '8px 10px',
borderRadius: 6,
@@ -1509,13 +1483,14 @@ export default function MapEditorPage() {
display: 'flex',
alignItems: 'center',
gap: 8,
cursor: 'pointer'
}}
>
{activeType === 'returnPoint'
? <Navigation size={16} color="#165DFF" />
: <MapPinned size={16} color="#13C2C2" />}
<div style={{ flex: 1, minWidth: 0 }}>
<div style={{ flex: 1, minWidth: 0 }} onClick={(e) => e.stopPropagation()}>
<Input
size="small"
value={p.name}
@@ -1523,18 +1498,67 @@ export default function MapEditorPage() {
style={{ fontSize: 13 }}
/>
{activeType === 'obstaclePoint' && (
<Input
size="small"
value={p.radius}
type="number"
step="0.01"
onChange={(e) => {
const val = parseFloat(e.target.value);
const radius = Math.max(0.01, val);
setObstaclePoints(prev => prev.map(pt => pt.id === p.id ? { ...pt, radius } : pt));
}} style={{ width: '100%', marginTop: 4 }}
/>
<div style={{ marginTop: 4 }}>
<Radio.Group
size="small"
value={p.shapeType || 'rect'}
onChange={(e) => {
const shapeType = e.target.value;
setObstaclePoints(prev => prev.map(pt => pt.id === p.id ? { ...pt, shapeType } : pt));
}}
style={{ marginBottom: 4 }}
>
<Radio value="rect">矩形</Radio>
{/*<Radio value="circle">圆形</Radio>*/}
</Radio.Group>
{p.shapeType === 'circle' ? (
<Input
size="small"
value={p.radius}
type="number"
step="0.01"
prefix="半径:"
suffix="m"
onChange={(e) => {
const val = parseFloat(e.target.value);
const radius = isNaN(val) ? 0 : Math.max(0, val);
setObstaclePoints(prev => prev.map(pt => pt.id === p.id ? { ...pt, radius } : pt));
}}
style={{ width: '100%' }}
/>
) : (
<div style={{ display: 'flex', gap: 4 }}>
<Input
size="small"
value={p.size_x}
type="number"
step="0.01"
prefix="X:"
suffix="m"
onChange={(e) => {
const val = parseFloat(e.target.value);
const size_x = isNaN(val) ? 0 : Math.max(0, val);
setObstaclePoints(prev => prev.map(pt => pt.id === p.id ? { ...pt, size_x } : pt));
}}
style={{ flex: 1 }}
/>
<Input
size="small"
value={p.size_y}
type="number"
step="0.01"
prefix="Y:"
suffix="m"
onChange={(e) => {
const val = parseFloat(e.target.value);
const size_y = isNaN(val) ? 0 : Math.max(0, val);
setObstaclePoints(prev => prev.map(pt => pt.id === p.id ? { ...pt, size_y } : pt));
}}
style={{ flex: 1 }}
/>
</div>
)}
</div>
)}
{activeType === 'returnPoint' && (
@@ -1558,7 +1582,10 @@ export default function MapEditorPage() {
type="text"
danger
icon={<DeleteOutlined />}
onClick={() => removePoint(p.id)}
onClick={(e) => {
e.stopPropagation();
removePoint(p.id);
}}
/>
</div>
))}
@@ -1776,88 +1803,15 @@ export default function MapEditorPage() {
minWidth: 0,
}}
>
<div onClick={(e) => e.stopPropagation()}>
<Input
size="small"
value={
isReturnPoint
? (item.alias ?? '')
: isObstaclePoint
? (item.name ?? item.alias ?? '')
: (item.regionName ?? '')
}
placeholder={
isReturnPoint
? `返航点-${idx + 1}`
: isObstaclePoint
? `障碍物点-${idx + 1}`
: `分区-${idx + 1}`
}
onChange={(e) => {
const value = e.target.value;
if (isReturnPoint) {
setReturnPointConfigList(prev =>
prev.map((p: any, i: number) =>
i === idx ? { ...p, alias: value } : p
)
);
} else if (isObstaclePoint) {
setObstaclePointConfigList(prev =>
prev.map((p: any, i: number) =>
i === idx ? { ...p, name: value } : p
)
);
} else {
setRegionList(prev =>
prev.map((p: any) =>
String(p.id) === String(item.id)
? { ...p, regionName: value }
: p
)
);
}
}}
onBlur={(e) => {
const value = e.target.value.trim();
// 名称不能为空
if (!value) {
messageApi.warning('名称不能为空');
getSiteMapInfoFn();
if (!isReturnPoint && !isObstaclePoint) {
getStationRegions({ siteId: stationId }).then((r: any) => {
if (r?.code === 200) {
const list = r.data || r.rows || [];
setRegionList(Array.isArray(list) ? list : []);
}
});
}
return;
}
if (isReturnPoint) {
console.log(value, "43424", item.alias)
handleUpdateReturnPointAlias(idx, value);
} else if (isObstaclePoint) {
handleUpdateObstacleAlias(item, value);
} else {
handleUpdateRegionName(item, value);
}
}}
onPressEnter={(e) => {
(e.target as HTMLInputElement).blur();
}}
style={{
fontSize: 13,
fontWeight: 500,
}}
/>
<div onClick={(e) => e.stopPropagation()} style={{ fontSize: 13, fontWeight: 500, padding: '4px 0' }}>
{isReturnPoint
? (item.alias || `返航点-${idx + 1}`)
: isObstaclePoint
? (item.name || item.alias || `障碍物点-${idx + 1}`)
: (item.regionName || `分区-${idx + 1}`)}
</div>
{/* 已配置障碍物点:展示半径与坐标 */}
{/* 已配置障碍物点:展示类型、尺寸与坐标 */}
{isObstaclePoint && (
<div
style={{
@@ -1867,100 +1821,30 @@ export default function MapEditorPage() {
marginTop: 2,
}}
>
<div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
<span style={{ flexShrink: 0 }}>半径:</span>
<Input
size="small"
type="number"
min={0.1}
step={0.1}
suffix="m"
value={item.radius}
style={{ width: '100%' }}
onChange={(e) => {
const value = e.target.value;
setObstaclePointConfigList(prev =>
prev.map((pt, i) =>
i === idx
? {
...pt,
radius: value === '' ? '' : Number(value),
}
: pt
)
);
}}
onBlur={() => {
const radius = Number(item.radius);
if (!Number.isFinite(radius)) {
//messageApi.warning('半径不能小于 0.1');
return;
}
handleUpdateObstacleRadius(item, radius);
}}
onPressEnter={(e) => {
(e.target as HTMLInputElement).blur();
}}
/>
</div>
{/*<div>
半径:{Number(item.radius ?? 2)} m
</div>*/}
<div>
经度:{Number(
item?.position?.lng?.toFixed(2) ??
item?.position?.lon?.toFixed(2) ??
item?.lon?.toFixed(2) ??
0
)}
</div>
<div>
纬度:{Number(
item?.position?.lat?.toFixed(2) ??
item?.lat?.toFixed(2) ??
0
)}
<div>类型: {item.shapeType === 'circle' ? '圆形' : '矩形'}</div>
{item.shapeType === 'circle' ? (
<div>半径: {item.radius}m</div>
) : (
<div>尺寸: {item.size_x}m x {item.size_y}m</div>
)}
<div style={{ color: '#C9CDD4', marginTop: 2 }}>
经度: {Number(item.lon ?? item.position?.lng ?? item.position?.lon ?? 0).toFixed(6)}
纬度: {Number(item.lat ?? item.position?.lat ?? 0).toFixed(6)}
</div>
</div>
)}
{/* 已配置返航点:保留设备绑定功能 */}
{isReturnPoint && (
<span
onClick={(e) =>
e.stopPropagation()
}
>
<Select
size="small"
value={
item.bindDeviceId ||
undefined
}
allowClear
placeholder={t('devices.mapEditor.unbind')}
onChange={(v) =>
handleUpdateReturnPointBind(
idx,
v
)
}
style={{
width: '100%',
marginTop: 4,
}}
options={robots.map(
(r) => ({
value: r.serialNumber,
label: `${r.deviceAlias ||
r.deviceName
}(${r.serialNumber})`,
})
)}
/>
</span>
<div style={{ fontSize: 11, color: '#C9CDD4', marginTop: 2 }}>
经度: {Number(item.lon ?? item.position?.lng ?? item.position?.lon ?? 0).toFixed(6)}
纬度: {Number(item.lat ?? item.position?.lat ?? 0).toFixed(6)}
</div>
)}
{/* 已配置返航点:展示绑定信息 */}
{isReturnPoint && item.bindDeviceId && (
<div style={{ fontSize: 11, color: '#86909C', marginTop: 2 }}>
绑定设备: {item.bindDeviceId}
</div>
)}
{/* 已配置分区:保留原有信息 */}
@@ -2016,45 +1900,21 @@ export default function MapEditorPage() {
</>
)}
</div>
{activeType === 'restArea' && (
<>
<Button
size="small"
type="text"
icon={<EditOutlined />}
onClick={(e) => {
e.stopPropagation();
handleEditRegion(item);
}}
/>
<Button
size="small"
type="text"
danger
icon={<DeleteOutlined />}
onClick={(e) => {
e.stopPropagation();
handleDeleteConfig(item);
}}
/>
</>
)}
{/* 返航点 / 障碍物点:增加删除按钮 */}
{(isReturnPoint || isObstaclePoint) && (
<Button
size="small"
type="text"
danger
icon={<DeleteOutlined />}
title={t('common.delete')}
onClick={(e) => {
// 防止触发行项目的地图聚焦事件
e.stopPropagation();
<Button
size="small"
type="text"
danger
icon={<DeleteOutlined />}
title={t('common.delete')}
onClick={(e) => {
e.stopPropagation();
if (activeType === 'restArea') {
handleDeleteConfig(item);
} else {
handleDeleteMapPoint(item, idx);
}}
/>
)}
}
}}
/>
</div>
);
})}