机器人任务界面加入 websocket连接 卸载页面 的时候断开连接
This commit is contained in:
@@ -376,6 +376,11 @@ export default function DeviceStatusPage({
|
|||||||
if (!device || !controllerRef.current || !device?.serialNumber || isUAV) return;
|
if (!device || !controllerRef.current || !device?.serialNumber || isUAV) return;
|
||||||
|
|
||||||
controllerRef.current.connectDevice(device);
|
controllerRef.current.connectDevice(device);
|
||||||
|
return () => {
|
||||||
|
controllerRef.current.destroy();
|
||||||
|
controllerRef.current = null;
|
||||||
|
|
||||||
|
}
|
||||||
}, [device?.serialNumber]);
|
}, [device?.serialNumber]);
|
||||||
|
|
||||||
// 定时获取无人机状态
|
// 定时获取无人机状态
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { useState, useEffect, useRef } from 'react';
|
import React, { useState, useEffect, useRef, useMemo } from 'react';
|
||||||
import {
|
import {
|
||||||
Row, Col, Card, Button, Space, Table, Tag, Typography, Progress, Badge,
|
Row, Col, Card, Button, Space, Table, Tag, Typography, Progress, Badge,
|
||||||
Tabs, Input, Switch, Divider, Tooltip, Timeline, Select, message, DatePicker,
|
Tabs, Input, Switch, Divider, Tooltip, Timeline, Select, message, DatePicker,
|
||||||
@@ -30,6 +30,8 @@ import CesiumMap from '../Map';
|
|||||||
import { fix2, getVal } from '../../lib/utils';
|
import { fix2, getVal } from '../../lib/utils';
|
||||||
import { useSelector } from 'react-redux';
|
import { useSelector } from 'react-redux';
|
||||||
import { RootState } from '@/src/store';
|
import { RootState } from '@/src/store';
|
||||||
|
import envConfig from '../../../env';
|
||||||
|
import DeviceController from './DeviceController';
|
||||||
|
|
||||||
const { Text, Title } = Typography;
|
const { Text, Title } = Typography;
|
||||||
const { RangePicker } = DatePicker;
|
const { RangePicker } = DatePicker;
|
||||||
@@ -52,21 +54,30 @@ export default function RobotTaskPage() {
|
|||||||
taskStatus: null, // 任务状态
|
taskStatus: null, // 任务状态
|
||||||
robot: null // 机器人设备
|
robot: null // 机器人设备
|
||||||
});
|
});
|
||||||
|
const [messageApi, contextHolder] = message.useMessage();
|
||||||
|
const controllerRef = useRef<DeviceController | null>(null);
|
||||||
|
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const controller = new DeviceController(userInfo, messageApi);
|
||||||
|
controllerRef.current = controller;
|
||||||
|
return () => {
|
||||||
|
controllerRef.current.destroy();
|
||||||
|
controllerRef.current = null;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}, [])
|
||||||
|
|
||||||
const [taskList, setTaskList] = useState([]);
|
const [taskList, setTaskList] = useState([]);
|
||||||
|
|
||||||
// 设备数据
|
// 设备数据
|
||||||
const [devices, setDevices] = useState([]);
|
const [devices, setDevices] = useState([]);
|
||||||
|
|
||||||
// 工作看板 独立筛选状态
|
|
||||||
const [boardRobot, setBoardRobot] = useState(null);
|
|
||||||
const [boardDateRange, setBoardDateRange] = useState(null);
|
|
||||||
const [boardTaskList, setBoardTaskList] = useState([]);
|
|
||||||
|
|
||||||
const [selectedRoute, setSelectedRoute] = useState(null);
|
|
||||||
const [focusLocation, setFocusLocation] = useState(null);
|
const [focusLocation, setFocusLocation] = useState(null);
|
||||||
const [points, setPoints] = useState([]);
|
const [points, setPoints] = useState([]);
|
||||||
const [loading, setLoading] = useState(false);
|
|
||||||
const [createTaskModal, setCreateTaskModal] = useState(false);
|
|
||||||
const [routeSearch, setRouteSearch] = useState('');
|
const [routeSearch, setRouteSearch] = useState('');
|
||||||
const [routeList, setRouteList] = useState([]);
|
const [routeList, setRouteList] = useState([]);
|
||||||
|
|
||||||
@@ -75,6 +86,12 @@ export default function RobotTaskPage() {
|
|||||||
const [selectedRouteForExecute, setSelectedRouteForExecute] = useState(null);
|
const [selectedRouteForExecute, setSelectedRouteForExecute] = useState(null);
|
||||||
const [selectedRobotForExecute, setSelectedRobotForExecute] = useState(null);
|
const [selectedRobotForExecute, setSelectedRobotForExecute] = useState(null);
|
||||||
|
|
||||||
|
// 机器人实时位置
|
||||||
|
const [robotRealtimePosition, setRobotRealtimePosition] = useState(null);
|
||||||
|
// 当前执行任务的机器人
|
||||||
|
const [executingRobot, setExecutingRobot] = useState(null);
|
||||||
|
|
||||||
|
|
||||||
// 获取数据
|
// 获取数据
|
||||||
const fetchAllData = async () => {
|
const fetchAllData = async () => {
|
||||||
if (!stationId) return;
|
if (!stationId) return;
|
||||||
@@ -186,6 +203,24 @@ export default function RobotTaskPage() {
|
|||||||
};
|
};
|
||||||
const handleTaskexcuted = (route) => {
|
const handleTaskexcuted = (route) => {
|
||||||
console.log('执行任务,路线数据:', route);
|
console.log('执行任务,路线数据:', route);
|
||||||
|
|
||||||
|
// 检查路径点
|
||||||
|
let hasPathPoints = false;
|
||||||
|
try {
|
||||||
|
if (route.jsonData) {
|
||||||
|
const data = JSON.parse(route.jsonData);
|
||||||
|
hasPathPoints = data.path && data.path.length > 0;
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error('解析路径数据失败:', err);
|
||||||
|
hasPathPoints = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!hasPathPoints) {
|
||||||
|
utils.message.warning('该路线没有路径点,无法执行');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
setSelectedRouteForExecute(route);
|
setSelectedRouteForExecute(route);
|
||||||
setSelectedRobotForExecute(null);
|
setSelectedRobotForExecute(null);
|
||||||
setExecuteModalVisible(true);
|
setExecuteModalVisible(true);
|
||||||
@@ -210,7 +245,9 @@ export default function RobotTaskPage() {
|
|||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
utils.message.success('任务执行成功');
|
utils.message.success('任务执行成功');
|
||||||
setExecuteModalVisible(false);
|
setExecuteModalVisible(false);
|
||||||
|
setExecutingRobot(selectedRobotForExecute);
|
||||||
fetchTaskList(); // 刷新任务列表
|
fetchTaskList(); // 刷新任务列表
|
||||||
|
controllerRef.current?.connect(selectedRobotForExecute);
|
||||||
} else {
|
} else {
|
||||||
utils.message.error(res.msg || '任务执行失败');
|
utils.message.error(res.msg || '任务执行失败');
|
||||||
}
|
}
|
||||||
@@ -469,7 +506,14 @@ export default function RobotTaskPage() {
|
|||||||
style={{ ...cardStyle, marginBottom: 10 }}
|
style={{ ...cardStyle, marginBottom: 10 }}
|
||||||
>
|
>
|
||||||
<div style={{ width: '100%', height: 420, background: '#e8f3ff center/cover', position: 'relative' }}>
|
<div style={{ width: '100%', height: 420, background: '#e8f3ff center/cover', position: 'relative' }}>
|
||||||
<CesiumMap devices={devices} points={points} focusLocation={focusLocation} from="device-control" />
|
<CesiumMap
|
||||||
|
devices={devices}
|
||||||
|
points={points}
|
||||||
|
focusLocation={focusLocation}
|
||||||
|
realtimePosition={robotRealtimePosition}
|
||||||
|
realtimeType="robot"
|
||||||
|
from="device-control"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user