优化任务完成之后 的显示 优化实时监控界面的显示逻辑
This commit is contained in:
@@ -6,7 +6,8 @@ import {
|
||||
TimePicker,
|
||||
Popconfirm,
|
||||
App,
|
||||
Radio
|
||||
Radio,
|
||||
Empty
|
||||
} from 'antd';
|
||||
import {
|
||||
PlusOutlined, ImportOutlined, NodeIndexOutlined,
|
||||
@@ -93,6 +94,7 @@ export default function RobotTaskPage() {
|
||||
|
||||
|
||||
const [runningPoolTask, setRunningPoolTask] = useState(null);//正在执行的任务
|
||||
const [proPoints, setProPoints] = useState({});//规划点
|
||||
|
||||
|
||||
// 当前执行任务的机器人
|
||||
@@ -160,6 +162,7 @@ export default function RobotTaskPage() {
|
||||
|
||||
|
||||
const handleFinish = (data) => {
|
||||
console.log('任务完成回调', data);
|
||||
setExecute(false);
|
||||
setShowVideo(false); // 任务完成关闭视频
|
||||
utils.message.success(t('devices.fixed2TaskSuspended2Fixed2CompletedFixed2'));
|
||||
@@ -274,42 +277,7 @@ export default function RobotTaskPage() {
|
||||
// 处理路线点回调:taskId必须和当前选中任务一致
|
||||
controller.onRoutePost = (msg) => {
|
||||
console.log('收到 route_post 消息:', msg);
|
||||
const { taskId, data } = msg;
|
||||
|
||||
// 1. 先在任务池中查找该taskId对应的任务
|
||||
const matchedTask = taskPoolList.find(task => String(task.id) === String(taskId));
|
||||
|
||||
// 2. 两种情况处理:
|
||||
// a) 当前没有选中任务,且匹配到了任务池中的任务 → 自动选中该任务
|
||||
// b) 当前已选中任务,且选中任务的id === 传来的taskId → 更新数据
|
||||
const isSameAsSelected = runningPoolTask && String(runningPoolTask.id) === String(taskId);
|
||||
const shouldSelectNewTask = !runningPoolTask && matchedTask;
|
||||
|
||||
if (isSameAsSelected || shouldSelectNewTask) {
|
||||
console.log('taskId匹配成功,处理路线数据', {
|
||||
taskId,
|
||||
runningPoolTaskId: runningPoolTask?.id,
|
||||
matchedTask
|
||||
});
|
||||
|
||||
// 如果是匹配到新任务就设置选中状态
|
||||
if (shouldSelectNewTask) {
|
||||
setRunningPoolTask(matchedTask);
|
||||
}
|
||||
|
||||
// 先直接用推送的data设置点(实时性)
|
||||
if (data) {
|
||||
setPoints(data);
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
console.log('taskId不匹配,忽略本次推送', {
|
||||
receivedTaskId: taskId,
|
||||
currentSelectedTaskId: runningPoolTask?.id,
|
||||
matchedTaskFound: !!matchedTask
|
||||
});
|
||||
}
|
||||
setProPoints(msg);
|
||||
};
|
||||
|
||||
|
||||
@@ -322,6 +290,8 @@ export default function RobotTaskPage() {
|
||||
if (controllerRef.current) {
|
||||
controllerRef.current.destroy?.();
|
||||
}
|
||||
setExecute(false);
|
||||
|
||||
controllerRef.current = null;
|
||||
};
|
||||
|
||||
@@ -349,6 +319,10 @@ export default function RobotTaskPage() {
|
||||
|
||||
// 找到对应的设备
|
||||
const targetDevice = devices.find(d => d.serialNumber === runningTask.deviceId);
|
||||
setRunningPoolTask(runningTask); // 设置当前任务
|
||||
setExecute(true);
|
||||
setExecutingRobot(targetDevice);
|
||||
setClearNavLine(v => v + 1); // 清空地图轨迹
|
||||
|
||||
if (!targetDevice) return;
|
||||
|
||||
@@ -359,14 +333,20 @@ export default function RobotTaskPage() {
|
||||
|
||||
// 切换设备
|
||||
console.log('🔄 检测到正在执行任务的新设备,开始连接', targetDevice);
|
||||
setRunningPoolTask(runningTask); // 设置当前任务
|
||||
setExecute(true);
|
||||
setExecutingRobot(targetDevice);
|
||||
setClearNavLine(v => v + 1); // 清空地图轨迹
|
||||
|
||||
if (isFirstConnect.current) { isFirstConnect.current = false; controllerRef.current?.connectDevice(targetDevice); } else { controllerRef.current?.switchDevice(targetDevice); }
|
||||
setShowVideo(true);
|
||||
|
||||
}, [devices, taskPoolList, executingRobot, runningPoolTask]);
|
||||
useEffect(() => {
|
||||
console.log('runningPoolTask, proPoints', runningPoolTask, proPoints);
|
||||
if (!runningPoolTask?.id || !proPoints?.taskId) return;
|
||||
if (runningPoolTask?.id == proPoints?.taskId) {
|
||||
setPoints(proPoints?.data || []);
|
||||
}
|
||||
|
||||
|
||||
}, [runningPoolTask, proPoints]);
|
||||
|
||||
|
||||
const realtimePosition = useMemo(() => {
|
||||
@@ -471,6 +451,7 @@ export default function RobotTaskPage() {
|
||||
}, [taskPoolList]);
|
||||
const getRouteOut = async () => {
|
||||
try {
|
||||
if (!selectedPathWork?.id) return;
|
||||
|
||||
const res = await getSingleRouteList({ id: selectedPathWork?.id });
|
||||
// coverage(区域覆盖)绘制为多边形,其余为折线/单点
|
||||
@@ -508,7 +489,6 @@ export default function RobotTaskPage() {
|
||||
}, [selectedPathWork?.id])
|
||||
// 调用接口获取路线详情
|
||||
const fetchRouteDetail = async (id) => {
|
||||
console.log(id, "获取正在执行任务的id")
|
||||
try {
|
||||
const params = {
|
||||
taskId: id,
|
||||
@@ -1578,128 +1558,127 @@ export default function RobotTaskPage() {
|
||||
style={cardStyle}
|
||||
>
|
||||
<div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
|
||||
{routeList
|
||||
//.filter(item => {
|
||||
// if (!routeSearch) return true;
|
||||
// const name = (item.workName || item.name || '').toLowerCase();
|
||||
// const id = String(item.id || '').toLowerCase();
|
||||
// const key = routeSearch.toLowerCase();
|
||||
// return name.includes(key) || id.includes(key);
|
||||
//})
|
||||
.map(route => (
|
||||
<div
|
||||
key={route.id}
|
||||
style={{
|
||||
padding: 12,
|
||||
borderRadius: 8,
|
||||
background: '#F7F8FA',
|
||||
cursor: 'pointer',
|
||||
// 核心:判断当前项是否被选中,动态设置边框
|
||||
border: selectedPathWork?.id === route.id ? '1px solid #165DFF' : '1px solid transparent',
|
||||
display: 'flex',
|
||||
gap: 12,
|
||||
alignItems: 'center'
|
||||
}}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
// 先清空再设置,确保每次点击都能触发 useEffect 的重绘
|
||||
setSelectedPathWork(null);
|
||||
// 在下一个 tick 中设置,确保 state 重置生效
|
||||
setTimeout(() => {
|
||||
setSelectedPathWork(route);
|
||||
}, 0);
|
||||
}}
|
||||
onMouseEnter={e => {
|
||||
// 只有未选中的项,悬浮才变色
|
||||
if (selectedPathWork?.id !== route.id) {
|
||||
e.currentTarget.style.borderColor = '#165DFF';
|
||||
}
|
||||
}}
|
||||
onMouseLeave={e => {
|
||||
// 只有未选中的项,离开才恢复透明
|
||||
if (selectedPathWork?.id !== route.id) {
|
||||
e.currentTarget.style.borderColor = 'transparent';
|
||||
}
|
||||
}}
|
||||
>
|
||||
<div style={{
|
||||
width: 40,
|
||||
height: 40,
|
||||
borderRadius: 6,
|
||||
background: '#e8f3ff',
|
||||
overflow: 'hidden',
|
||||
flexShrink: 0
|
||||
}}>
|
||||
{route.imgUrl ? (
|
||||
<img
|
||||
src={route.imgUrl}
|
||||
alt={route.workName || route.name}
|
||||
style={{ width: '100%', height: '100%', objectFit: 'cover' }}
|
||||
/>
|
||||
) : (
|
||||
<div style={{
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
color: '#165DFF'
|
||||
}}>
|
||||
<EyeOutlined />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* 路线信息 */}
|
||||
<div style={{ flex: 1, minWidth: 0 }}>
|
||||
<div style={{ fontWeight: 600, fontSize: 14, whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
|
||||
{route.workName || route.name || t('devices.unnamedRoute')}
|
||||
</div>
|
||||
<div style={{ fontSize: 12, color: '#86909C', marginTop: 4 }}>
|
||||
ID: {route.id}
|
||||
</div>
|
||||
</div>
|
||||
{/* 删除按钮 */}
|
||||
<Tooltip title={t('devices.deleteRoute')}>
|
||||
<Button
|
||||
type="text"
|
||||
icon={<DeleteOutlined style={{ color: '#F53F3F', fontSize: 20 }} />}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
setSelectedPathWork(route);
|
||||
// 替换为你的删除处理函数
|
||||
handleDeleteRoute(route);
|
||||
}}
|
||||
/>
|
||||
</Tooltip>
|
||||
<Tooltip title={t('devices.createTask')}>
|
||||
<Button
|
||||
type="text"
|
||||
icon={<PlusOutlined style={{ color: '#165DFF', fontSize: 20 }} />}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
setSelectedPathWork(route);
|
||||
setIsTaskModalOpen(true);
|
||||
}}
|
||||
/>
|
||||
</Tooltip>
|
||||
|
||||
{/* 执行按钮 */}
|
||||
<Tooltip title={t('devices.executeRoute')}>
|
||||
<Button
|
||||
type="text"
|
||||
icon={<PlayCircleOutlined style={{ color: '#165DFF', fontSize: 28 }} />}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
setSelectedPathWork(route);
|
||||
handleTaskexcuted(route);
|
||||
}}
|
||||
/>
|
||||
</Tooltip>
|
||||
|
||||
{
|
||||
// 判断有无数据
|
||||
(!routeList || routeList.length === 0) ? (
|
||||
<div style={{ padding: '40px 0', textAlign: 'center', color: '#86909C' }}>
|
||||
<Empty></Empty>
|
||||
</div>
|
||||
))}
|
||||
) : (
|
||||
routeList.map(route => (
|
||||
<div
|
||||
key={route.id}
|
||||
style={{
|
||||
padding: 12,
|
||||
borderRadius: 8,
|
||||
background: '#F7F8FA',
|
||||
cursor: 'pointer',
|
||||
// 核心:判断当前项是否被选中,动态设置边框
|
||||
border: selectedPathWork?.id === route.id ? '1px solid #165DFF' : '1px solid transparent',
|
||||
display: 'flex',
|
||||
gap: 12,
|
||||
alignItems: 'center'
|
||||
}}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
// 先清空再设置,确保每次点击都能触发 useEffect 的重绘
|
||||
setSelectedPathWork(null);
|
||||
// 在下一个 tick 中设置,确保 state 重置生效
|
||||
setTimeout(() => {
|
||||
setSelectedPathWork(route);
|
||||
}, 0);
|
||||
}}
|
||||
onMouseEnter={e => {
|
||||
// 只有未选中的项,悬浮才变色
|
||||
if (selectedPathWork?.id !== route.id) {
|
||||
e.currentTarget.style.borderColor = '#165DFF';
|
||||
}
|
||||
}}
|
||||
onMouseLeave={e => {
|
||||
// 只有未选中的项,离开才恢复透明
|
||||
if (selectedPathWork?.id !== route.id) {
|
||||
e.currentTarget.style.borderColor = 'transparent';
|
||||
}
|
||||
}}
|
||||
>
|
||||
<div style={{
|
||||
width: 40,
|
||||
height: 40,
|
||||
borderRadius: 6,
|
||||
background: '#e8f3ff',
|
||||
overflow: 'hidden',
|
||||
flexShrink: 0
|
||||
}}>
|
||||
{route.imgUrl ? (
|
||||
<img
|
||||
src={route.imgUrl}
|
||||
alt={route.workName || route.name}
|
||||
style={{ width: '100%', height: '100%', objectFit: 'cover' }}
|
||||
/>
|
||||
) : (
|
||||
<div style={{
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
color: '#165DFF'
|
||||
}}>
|
||||
<EyeOutlined />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
{/* 路线信息 */}
|
||||
<div style={{ flex: 1, minWidth: 0 }}>
|
||||
<div style={{ fontWeight: 600, fontSize: 14, whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
|
||||
{route.workName || route.name || t('devices.unnamedRoute')}
|
||||
</div>
|
||||
<div style={{ fontSize: 12, color: '#86909C', marginTop: 4 }}>
|
||||
ID: {route.id}
|
||||
</div>
|
||||
</div>
|
||||
{/* 删除按钮 */}
|
||||
<Tooltip title={t('devices.deleteRoute')}>
|
||||
<Button
|
||||
type="text"
|
||||
icon={<DeleteOutlined style={{ color: '#F53F3F', fontSize: 20 }} />}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
setSelectedPathWork(route);
|
||||
// 替换为你的删除处理函数
|
||||
handleDeleteRoute(route);
|
||||
}}
|
||||
/>
|
||||
</Tooltip>
|
||||
<Tooltip title={t('devices.createTask')}>
|
||||
<Button
|
||||
type="text"
|
||||
icon={<PlusOutlined style={{ color: '#165DFF', fontSize: 20 }} />}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
setSelectedPathWork(route);
|
||||
setIsTaskModalOpen(true);
|
||||
}}
|
||||
/>
|
||||
</Tooltip>
|
||||
{/* 执行按钮 */}
|
||||
<Tooltip title={t('devices.executeRoute')}>
|
||||
<Button
|
||||
type="text"
|
||||
icon={<PlayCircleOutlined style={{ color: '#165DFF', fontSize: 28 }} />}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
setSelectedPathWork(route);
|
||||
handleTaskexcuted(route);
|
||||
}}
|
||||
/>
|
||||
</Tooltip>
|
||||
</div>
|
||||
))
|
||||
)
|
||||
}
|
||||
</div>
|
||||
|
||||
</Card>
|
||||
</Col>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user