页面显示定位质量等数据,接收到结束信号并显示机器人下发任务 执行 暂停恢复成功 控制地图是否绘制实时轨迹

This commit is contained in:
mmc
2026-06-10 17:22:55 +08:00
parent 9e6280866c
commit c9bc863354
7 changed files with 275 additions and 86 deletions

View File

@@ -10,7 +10,8 @@ import {
PlusOutlined, ImportOutlined, NodeIndexOutlined,
SaveOutlined, PlayCircleOutlined, EyeOutlined,
DeleteOutlined,
CloseOutlined
CloseOutlined,
ReloadOutlined
} from '@ant-design/icons';
import {
Car, Navigation, Wind, Thermometer, Droplets, Satellite,
@@ -31,7 +32,7 @@ import {
getSiteDeviceTaskHistory,
} from '../../api/device';
import dayjs from 'dayjs';
import utils from '../../lib/utils';
import utils, { getLocationQuality } from '../../lib/utils';
import CesiumMap from '../Map';
import { fix2, getVal } from '../../lib/utils';
import { useSelector } from 'react-redux';
@@ -46,41 +47,12 @@ export default function RobotTaskPage() {
const { userInfo } = useSelector((state: RootState) => state.user);
const { stationId } = useSelector((state: RootState) => state.station);
const [excuteStatus, setExcuteStatus] = useState("stop"); //"stop" "running" "pause"
const fontSmall = 'clamp(10px, 0.7vw, 11px)';
const fontNormal = 'clamp(12px, 0.75vw, 13px)';
const fontTitle = 'clamp(14px, 0.85vw, 16px)';
const fontLarge = 'clamp(18px, 1.1vw, 24px)';
const cardStyle = { borderRadius: 12, border: 'none', boxShadow: '0 2px 12px rgba(0,0,0,0.04)' };
// 任务列表 独立筛选状态
// 统一用 form 管理筛选条件
const [filterForm, setFilterForm] = useState({
dateRange: null, // 时间范围
taskStatus: null, // 任务状态
robot: null // 机器人设备
});
const [messageApi, contextHolder] = message.useMessage();
const controllerRef = useRef<DeviceController | null>(null);
useEffect(() => {
const controller = new DeviceController(userInfo, messageApi);
controller.init();
controllerRef.current = controller;
return () => {
if (controllerRef.current) {
controllerRef.current.destroy?.();
}
controllerRef.current = null;
};
}, [])
// 机器人实时位置
const [robotRealtimePosition, setRobotRealtimePosition] = useState(null);
const [execute, setExecute] = useState(false); // 是否执行任务
const [taskList, setTaskList] = useState([]);
// 设备数据
const [devices, setDevices] = useState([]);
@@ -96,8 +68,7 @@ export default function RobotTaskPage() {
const [selectedRouteForExecute, setSelectedRouteForExecute] = useState(null);
const [selectedRobotForExecute, setSelectedRobotForExecute] = useState(null);
// 机器人实时位置
const [robotRealtimePosition, setRobotRealtimePosition] = useState(null);
// 当前执行任务的机器人
const [executingRobot, setExecutingRobot] = useState(null);
@@ -122,6 +93,84 @@ export default function RobotTaskPage() {
});
const fontSmall = 'clamp(10px, 0.7vw, 11px)';
const fontNormal = 'clamp(12px, 0.75vw, 13px)';
const fontTitle = 'clamp(14px, 0.85vw, 16px)';
const fontLarge = 'clamp(18px, 1.1vw, 24px)';
const cardStyle = { borderRadius: 12, border: 'none', boxShadow: '0 2px 12px rgba(0,0,0,0.04)' };
// 任务列表 独立筛选状态
// 统一用 form 管理筛选条件
const [filterForm, setFilterForm] = useState({
dateRange: null, // 时间范围
taskStatus: null, // 任务状态
robot: null // 机器人设备
});
const [messageApi, contextHolder] = message.useMessage();
const controllerRef = useRef<DeviceController | null>(null);
const handleFinish = (data) => {
setExecute(false);
utils.message.success('任务已完成');
if (controllerRef.current) {
controllerRef.current.destroy?.();
}
controllerRef.current = null;
setSelectedRobotForExecute(null);
setSelectedRouteForExecute(null);
}
useEffect(() => {
const controller = new DeviceController(userInfo, messageApi);
controller.onDeviceInfoUpdate = setRobotRealtimePosition;
controller.onIsFinished = handleFinish;
controller.init();
controllerRef.current = controller;
return () => {
if (controllerRef.current) {
controllerRef.current.destroy?.();
}
controllerRef.current = null;
};
}, [])
const realtimePosition = useMemo(() => {
const data = {
lon: robotRealtimePosition?.longitude || 0,
lat: robotRealtimePosition?.latitude || 0,
//heading: robotRealtimePosition?.yaw || 0,
}
return data;
}, [robotRealtimePosition])
useEffect(() => {
if (robotRealtimePosition && execute) {
let warningMsg = '';
if (robotRealtimePosition?.controlMode != "3") {
warningMsg = `请切换到远程模式 ${robotRealtimePosition?.controlMode}`;
} else if (robotRealtimePosition?.qual != "4") {
warningMsg = '定位未固定';
} else if (robotRealtimePosition?.headingStatus != "1") {
warningMsg = '请先初始化航向角';
}
if (warningMsg) {
utils.message.destroy();
utils.message.warning(warningMsg);
}
}
}, [robotRealtimePosition, execute])
// 获取数据
const fetchAllData = async () => {
if (!stationId) return;
@@ -146,7 +195,10 @@ export default function RobotTaskPage() {
// 获取任务列表数据
const fetchTaskList = async () => {
try {
const params = { siteId: String(stationId) };
const params = {
siteId: String(stationId), pageNum: 1,
pageSize: 99999999
};
// 时间范围
if (filterForm.dateRange && filterForm.dateRange.length === 2) {
@@ -264,6 +316,7 @@ export default function RobotTaskPage() {
message.error('请选择执行设备');
return;
}
try {
const params = {
@@ -276,6 +329,7 @@ export default function RobotTaskPage() {
const res = await excuetRoute(params);
if (res.code === 200) {
setExecute(true);
utils.message.success('任务执行成功');
setExecuteModalVisible(false);
setExecutingRobot(selectedRobotForExecute);
@@ -284,9 +338,13 @@ export default function RobotTaskPage() {
fetchTaskHistoryList();
controllerRef.current?.connectDevice(selectedRobotForExecute);
} else {
setExecute(false);
utils.message.error(res.msg || '任务执行失败');
}
} catch (err) {
setExecute(false);
console.error('执行任务失败:', err);
utils.message.error('任务执行异常');
}
@@ -304,6 +362,8 @@ export default function RobotTaskPage() {
userId: userInfo?.userId,
siteId: stationId,
orgId: userInfo?.orgId,
pageNum: 1,
pageSize: 99999999
};
if (poolFilterForm.taskStatus) {
params.taskStaus = poolFilterForm.taskStatus;
@@ -335,9 +395,10 @@ export default function RobotTaskPage() {
if (!stationId) return;
try {
const params = {
userId: userInfo?.userId,
siteId: stationId,
orgId: userInfo?.orgId,
pageNum: 1,
pageSize: 99999999
};
if (historyFilterForm.taskStatus) {
params.taskStaus = historyFilterForm.taskStatus;
@@ -369,12 +430,19 @@ export default function RobotTaskPage() {
orgId: task.orgId,
};
const res = await cancelRoute(params);
if (res.code === 200) {
if (res.code === 200 && res.data == true) {
utils.message.success('任务已取消');
fetchTaskPoolList();
fetchTaskHistoryList();
setExecute(false);
if (controllerRef.current) {
controllerRef.current.destroy?.();
}
controllerRef.current = null;
setSelectedRobotForExecute(null);
setSelectedRouteForExecute(null);
} else {
utils.message.error(res.msg || '取消失败');
utils.message.error('任务取消失败');
}
} catch (err) {
console.error('取消任务失败:', err);
@@ -608,25 +676,25 @@ export default function RobotTaskPage() {
<Space size="small">
<>
{record.taskStaus === 'NEW' && (
<Popconfirm
title="确定要取消该任务吗?"
onConfirm={() => handleCancelTask(record)}
okText="确定" cancelText="取消"
>
<Button type="text" size="small" danger icon={<CloseOutlined />}>取消</Button>
</Popconfirm>
)}
{/*{record.taskStaus === 'NEW' && (*/}
<Popconfirm
title="确定要取消该任务吗?"
onConfirm={() => handleCancelTask(record)}
okText="确定" cancelText="取消"
>
<Button type="text" size="small" danger icon={<CloseOutlined />}>取消</Button>
</Popconfirm>
{/*//)}*/}
{record.taskStaus === 'EXECUTING' && (
<Popconfirm
title="确定要暂停该任务吗?"
onConfirm={() => handlePauseTask(record)}
okText="确定" cancelText="取消"
>
<Button type="text" size="small">暂停</Button>
</Popconfirm>
)}
{/*{record.taskStaus === 'EXECUTING' && (*/}
<Popconfirm
title="确定要暂停该任务吗?"
onConfirm={() => handlePauseTask(record)}
okText="确定" cancelText="取消"
>
<Button type="text" size="small" style={{ color: '#FF9500' }}>暂停</Button>
</Popconfirm>
{/*)}/*/}
{record.taskStaus === 'PAUSE' && (
<Popconfirm
@@ -634,7 +702,7 @@ export default function RobotTaskPage() {
onConfirm={() => handleRecoverTask(record)}
okText="确定" cancelText="取消"
>
<Button type="text" size="small">恢复</Button>
<Button type="text" size="small" style={{ color: '#00B42A' }}>恢复</Button>
</Popconfirm>
)}
</>
@@ -794,7 +862,61 @@ export default function RobotTaskPage() {
<Row gutter={10} style={{ marginBottom: 10 }}>
<Col xs={24} xl={14} style={{ display: "flex", flexDirection: "column" }}>
<Card
title={<span style={{ fontSize: fontNormal, fontWeight: 700 }}>机器人路径规划与监控</span>}
title={<div style={{ display: 'flex', alignItems: 'center', gap: '12px', flexWrap: 'wrap' }}>
<span style={{ fontSize: fontNormal, fontWeight: 700 }}>
机器人路径规划与监控
</span>
{/* 执行后显示机器信息 + 状态 */}
{execute && executingRobot && (
<div
style={{
display: 'inline-flex',
alignItems: 'center',
gap: '8px',
fontSize: '12px',
color: '#fff',
background: '#165DFF',
padding: '2px 8px',
borderRadius: '4px',
whiteSpace: 'nowrap'
}}
>
{/* 机器名称 */}
<span>{executingRobot.deviceAlias || executingRobot.serialNumber}</span>
{/* 控制模式 */}
<span>
控制模式:{robotRealtimePosition?.controlMode}
{robotRealtimePosition?.controlMode == '3' ? (
<span style={{ color: '#9eff9e' }}>远程</span>
) : (
<span style={{ color: '#ff6f6f' }}>本地</span>
)}
</span>
{/* 航向初始化 */}
<span>
航向:
{robotRealtimePosition?.headingStatus == '1' ? (
<span style={{ color: '#9eff9e' }}>已初始化</span>
) : (
<span style={{ color: '#ff6f6f' }}>未初始化</span>
)}
</span>
{/* 定位质量 */}
<span>
定位:
{(() => {
const qual = robotRealtimePosition?.qual;
const info = getLocationQuality(qual);
return <span style={{ color: info.color }}>{info.text}</span>;
})()}
</span>
</div>
)}
</div>}
size="small"
extra={
<Space size={4}>
@@ -813,9 +935,10 @@ export default function RobotTaskPage() {
devices={devices}
points={points}
focusLocation={focusLocation}
realtimePosition={robotRealtimePosition}
realtimePosition={realtimePosition}
realtimeType="robot"
from="device-control"
drawRealTime={execute}
/>
</div>
</Card>
@@ -826,6 +949,7 @@ export default function RobotTaskPage() {
bordered={false}
bodyStyle={{ padding: 0, display: 'flex', flexDirection: 'column', height: "calc(100%)", overflow: "auto" }}
style={{ ...cardStyle, maxHeight: "300px", flex: 1, marginBottom: 0 }}
>
<Tabs
activeKey={activeTab}
@@ -847,12 +971,20 @@ export default function RobotTaskPage() {
}
]}
tabBarExtraContent={
<Tooltip title="创建任务">
<PlusOutlined
style={{ cursor: 'pointer', color: '#165DFF', fontSize: 14 }}
onClick={() => setIsTaskModalOpen(true)}
/>
</Tooltip>
<Space size={8}>
<Button size="small" icon={<ReloadOutlined />} onClick={() => {
fetchTaskList();
fetchTaskPoolList();
fetchTaskHistoryList();
}} />
<Tooltip title="创建任务">
<PlusOutlined
style={{ cursor: 'pointer', color: '#165DFF', fontSize: 14 }}
onClick={() => setIsTaskModalOpen(true)}
/>
</Tooltip>
</Space>
}
/>