累计作业面积 时长实现 急停全局数据接入 局部内联样式 换为 外联 优化控制模式和系统模式的切换 功能控制面板加入急停 任务界面 加入急停

This commit is contained in:
mmc
2026-11-17 15:52:58 +08:00
parent 2a429722d9
commit 3fedf466eb
19 changed files with 1753 additions and 408 deletions

View File

@@ -3,7 +3,7 @@ import { Row, Col, Card, Button, Space, Table, Tag, Typography, Badge, Tabs, Inp
import { PlusOutlined, ImportOutlined, NodeIndexOutlined, SaveOutlined, DeleteOutlined, CloseOutlined, ReloadOutlined, ExclamationCircleOutlined, EnvironmentOutlined, EnvironmentFilled } from '@ant-design/icons';
import { Car, Navigation, MapPinned, Route, Satellite, LayoutGrid, CheckCircle2, AlertCircle, TrendingUp, Maximize2 } from 'lucide-react';
import TaskTypeRadio from '../taskRadio/taskRadio';
import { getRobotRouteList, getSingleRouteList, saveDeviceTask, getRobotTaskList, deleteDeviceTask, getSiteDevice, excuetRoute, cancelRoute, pauseRoute, recoverRoute, getDeviceTastPool, getSiteDeviceTaskHistory, getRouteByTask, deleteRoute, getTaskPath, createConsecutiveTasks, cancelConsecutiveTask, getConsecutiveTask, modeChage } from '../../api/device';
import { getRobotRouteList, getSingleRouteList, saveDeviceTask, getRobotTaskList, deleteDeviceTask, getSiteDevice, excuetRoute, cancelRoute, pauseRoute, recoverRoute, getDeviceTastPool, getSiteDeviceTaskHistory, getRouteByTask, deleteRoute, getTaskPath, createConsecutiveTasks, cancelConsecutiveTask, getConsecutiveTask, modeChage, getDeviceTotalData } from '../../api/device';
import dayjs from 'dayjs';
import DraggableBox from '../Draggable';
import utils from '../../lib/utils';
@@ -18,6 +18,7 @@ import { Reorder } from 'motion/react';
import { MapEditorView } from './MapEditorView';
import type { ViewStats } from './WayLineView';
import { backToRestPointCommand } from '@/api/mapEdit';
import { sendEmergencyStop, subscribeEmergencyStop, syncEmergencyStop } from './emergencyStopControl';
const { Text, Title } = Typography;
@@ -50,6 +51,9 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
const [excuteStatus, setExcuteStatus] = useState("stop"); //"stop" "running" "pause"
// 全量设备实时状态(mapPush),实时数据统一从这里取
const [realtimeMap, setRealtimeMap] = useState<any>({});
// 急停锁存状态:与 DPad / 手柄 / 设备控制页共用同一份状态
const [eStopActive, setEStopActive] = useState(false);
useEffect(() => subscribeEmergencyStop(setEStopActive), []);
const [execute, setExecute] = useState(false); // 是否执行任务
const [taskList, setTaskList] = useState([]);
const { modal } = App.useApp();
@@ -57,6 +61,7 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
const [detectReportInfo, setDeportInfo] = useState<any>(null);
const [selectedDeviceMap, setSelectedDeviceMap] = useState<Record<string, string>>({});
const [consecutiveTaskList, setConsecutiveTaskList] = useState([]);
const [deviceStatistics, setDeviceStatistics] = useState<any>({});
@@ -389,6 +394,8 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
};
}, [userInfo, stationId]);
// 监听任务列表和设备列表变化,自动连接正在执行中的机器人(仅在没有选择任务时)
useEffect(() => {
if (!taskPoolList || taskPoolList.length == 0) {
@@ -462,8 +469,9 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
longitude: rt?.lng,
latitude: rt?.lat,
fix_status: rt?.fixStatus,
controlMode: rt?.controlMode ?? targetRobot?.lastRunningStatus?.controlMode,
controlMode: rt?.controlMode ?? rt?.control_mode ?? targetRobot?.lastRunningStatus?.controlMode,
sm: rt?.sm,
e: rt?.emergencyStop,
};
}, [realtimeMap, targetRobot]);
@@ -757,6 +765,10 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
});
};
useEffect(() => {
syncEmergencyStop(robotRealtimePosition?.emergencyStop);
}, [robotRealtimePosition?.emergencyStop]);
@@ -1359,16 +1371,40 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
}];
// 向合并页面汇报统计口径(与无人机任务统计合并展示)
useEffect(() => {
const workingCount = taskPoolList?.filter(item => ['EXECUTING', 'PAUSE'].includes(item.taskStaus))?.length || 0;
if (!selectedMachineSn) return;
const params = {
deviceId: selectedMachineSn,
};
getDeviceTotalData(params).then((res) => {
if (res.code === 200) {
setDeviceStatistics(res.data || {});
}
});
}, [selectedMachineSn]);
useEffect(() => {
const workingCount = taskPoolList?.filter(item =>
['EXECUTING', 'PAUSE'].includes(item.taskStaus)
)?.length || 0;
onStatsChange?.({
planTotal: taskList.length,
working: workingCount,
finishCount: successfulTaskList.length,
totalCount: taskHistoryList.length,
...deviceStatistics,
});
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [taskList.length, taskPoolList, successfulTaskList.length, taskHistoryList.length]);
}, [
taskList.length,
taskPoolList,
successfulTaskList.length,
taskHistoryList.length,
deviceStatistics,
]);
// ===== 分区列表 =====
useEffect(() => {
@@ -1408,6 +1444,11 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
})
}
// 急停:与 DPad 保持一致,调用共享锁存接口(再次点击解除)
const handleEmergencyStop = () => {
sendEmergencyStop(selectedMachineSn || targetRobot?.serialNumber || '');
};
// 选中的路径对象列表(用于拖拽排序显示)
const selectedRouteObjects = useMemo(() => {
// 根据 dispatchRouteIds 的顺序返回路径对象
@@ -1812,7 +1853,9 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
<span>
{t('devices.controlMode')}
{(() => {
const mode = robotRealtimePosition?.controlMode || robotRealtimePosition?.control_mode;
const mode =
robotRealtimePosition?.controlMode ??
robotRealtimePosition?.control_mode;
const modeConfig: Record<string, { label: string; color: string }> = {
'0': {
@@ -1839,11 +1882,11 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
: undefined;
return config ? (
<span style={{ color: config.color }}>{config.label}</span>
) : (
<span style={{ color: '#999999' }}>
-
<span style={{ color: config.color }}>
{config.label}
</span>
) : (
<span style={{ color: '#999999' }}>-</span>
);
})()}
</span>
@@ -1938,6 +1981,27 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
{t('devices.features.autoback')}
</span>
<span
onClick={handleEmergencyStop}
style={{
display: 'flex',
alignItems: 'center',
gap: 4,
padding: '3px 10px',
background: eStopActive ? '#cf1322' : 'rgba(255,255,255,0.18)',
borderRadius: 12,
cursor: 'pointer',
whiteSpace: 'nowrap',
fontWeight: 600,
transition: 'background 0.2s',
}}
onMouseEnter={e => { if (!eStopActive) e.currentTarget.style.background = 'rgba(255,255,255,0.3)'; }}
onMouseLeave={e => { e.currentTarget.style.background = eStopActive ? '#cf1322' : 'rgba(255,255,255,0.18)'; }}
>
<ExclamationCircleOutlined />
{eStopActive ? t('devices.estopTriggered') : t('devices.features.emergencyStop')}
</span>
</div>
)}