获取机器人 逻辑改为单独页面获取 优化无人机视频切换和无人机数据获取逻辑

This commit is contained in:
mmc
2026-06-02 09:03:04 +08:00
parent 2a73e346f9
commit 3fdd4ab11a
6 changed files with 198 additions and 37 deletions

View File

@@ -22,9 +22,11 @@ import AgoraTextTest from '../AgoraRtc.tsx';
import { useWebRTCPlayer } from '../useWebRTCStream.tsx';
import VideoPlayer from '../VideoPlayer.tsx.tsx';
import CesiumMap from '../Map.jsx';
import { getUAVState } from '@/api/device.ts';
import { getUAVState, getSiteDevice, getSiteUAVList } from '@/api/device.ts';
import { useMqtt } from '@/hooks/useMqtt';
import envConfig from '../../../env';
import { useSelector } from 'react-redux';
import { RootState } from '@/store';
const { Content } = Layout;
const { Text, Title } = Typography;
@@ -47,13 +49,64 @@ const logs = [
{ time: '10:05:22', device: 'RBT-01', type: '事件', desc: '电量较低,建议回充', level: '低电量' },
];
export default function DeviceOverviewPage({ devices, planedevices, devicesAll, onViewStatus, selectedSn, onDeviceSelect }) {
export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceSelect }) {
const { userInfo } = useSelector((state: RootState) => state.user);
const { stationId } = useSelector((state: RootState) => state.station);
const [zoomedVideo, setZoomedVideo] = useState(null);
const [mowerView, setMowerView] = useState('front');
const [videoSource, setVideoSource] = useState('drone');
const [uavState, setUavState] = useState(null);
const [persistentDroneData, setPersistentDroneData] = useState(null);
const [persistentHostData, setPersistentHostData] = useState(null);
const [devices, setDevices] = useState([]);
const [planedevices, setPlaneDevices] = useState([]);
const [devicesAll, setDevicesAll] = useState([]);
// 获取数据
const fetchAllData = async () => {
if (!stationId) return;
try {
// 1. 同时发请求
const [deviceRes, planeRes] = await Promise.all([
getSiteDevice({ siteId: stationId, pageSize: 9999, pageNum: 1 }),
getSiteUAVList(stationId),
]);
// 2. 处理普通设备
const devData = deviceRes?.code === 200 ? (deviceRes.rows || []) : [];
// 3. 处理无人机 + 自动补全地图需要的字段(关键改动)
let planeData = planeRes?.code === 200 ? (planeRes?.rows || []) : [];
planeData = planeData.map(item => ({
...item,
type: 'plane',
lastRunningStatus: {
longitude: item.longitude || 0,
latitude: item.latitude || 0,
},
deviceAlias: item.drone_callsign || item.device_sn
|| '无人机',
}));
setDevices(devData);
setPlaneDevices(planeData);
// 合并所有设备
const all = [...devData, ...planeData];
setDevicesAll(all);
} catch (err) {
console.error('数据请求失败', err);
}
};
useEffect(() => {
fetchAllData();
}, [userInfo, stationId]);
// 当前选中设备(切换时才变)
const selectedDevice = useMemo(() => {