获取机器人 逻辑改为单独页面获取 优化无人机视频切换和无人机数据获取逻辑
This commit is contained in:
@@ -38,6 +38,8 @@ import {
|
||||
getsinglePlanTrack,
|
||||
getFlightTaskDetail,
|
||||
getUAVState,
|
||||
getSiteDevice,
|
||||
getSiteUAVList,
|
||||
} from '../../api/device.ts';
|
||||
|
||||
import XboxController from './XboxController';
|
||||
@@ -57,13 +59,61 @@ const { RangePicker } = DatePicker;
|
||||
const { Text } = Typography;
|
||||
|
||||
export default function DeviceStatusPage({
|
||||
devicesAll,
|
||||
serialNumber,
|
||||
onDeviceChange,
|
||||
}) {
|
||||
const { userInfo } = useSelector((state: RootState) => state.user);
|
||||
const { stationId } = useSelector((state: RootState) => state.station);
|
||||
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 device = useMemo(() => {
|
||||
|
||||
Reference in New Issue
Block a user