获取机器人 逻辑改为单独页面获取 优化无人机视频切换和无人机数据获取逻辑
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import { Layout, Typography, Menu, Tabs } from 'antd';
|
||||
import { Layout, Typography, Menu } from 'antd';
|
||||
import { AimOutlined, AppstoreOutlined, SettingOutlined, BranchesOutlined } from '@ant-design/icons';
|
||||
import DeviceOverviewPage from '../components/devices/DeviceOverviewPage';
|
||||
import DeviceStatusPage from '../components/devices/DeviceStatusPage';
|
||||
@@ -16,7 +16,6 @@ const { Text } = Typography;
|
||||
export default function DeviceIndexPage() {
|
||||
const [activeTab, setActiveTab] = useState('overview');
|
||||
const [selectedSn, setSelectedSn] = useState(null);
|
||||
const { userInfo } = useSelector((state: RootState) => state.user);
|
||||
const { stationId } = useSelector((state: RootState) => state.station);
|
||||
const [devices, setDevices] = useState([]);
|
||||
const [planedevices, setPlaneDevices] = useState([]);
|
||||
@@ -29,25 +28,19 @@ export default function DeviceIndexPage() {
|
||||
{ key: 'robotTask', label: '机器人任务', icon: <BranchesOutlined /> },
|
||||
];
|
||||
|
||||
|
||||
// 👇 核心:给无人机补全 lastRunningStatus + type: 'plane'
|
||||
// 获取设备列表(用于默认选择第一个)
|
||||
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',
|
||||
@@ -55,25 +48,18 @@ export default function DeviceIndexPage() {
|
||||
longitude: item.longitude || 0,
|
||||
latitude: item.latitude || 0,
|
||||
},
|
||||
deviceAlias: item.drone_callsign || item.device_sn
|
||||
|| '无人机',
|
||||
|
||||
deviceAlias: item.drone_callsign || item.device_sn || '无人机',
|
||||
}));
|
||||
|
||||
setDevices(devData);
|
||||
setPlaneDevices(planeData);
|
||||
|
||||
|
||||
|
||||
// 合并所有设备
|
||||
const all = [...devData, ...planeData];
|
||||
setDevicesAll(all);
|
||||
|
||||
// 默认选中第一个
|
||||
// 默认选中第一个设备
|
||||
if (!selectedSn && all.length > 0) {
|
||||
setSelectedSn(all[0].device_sn || all[0].serialNumber);
|
||||
}
|
||||
|
||||
} catch (err) {
|
||||
console.error('数据请求失败', err);
|
||||
}
|
||||
@@ -81,19 +67,26 @@ export default function DeviceIndexPage() {
|
||||
|
||||
useEffect(() => {
|
||||
fetchAllData();
|
||||
}, [userInfo, stationId]);
|
||||
}, [stationId]);
|
||||
|
||||
const handleViewStatus = (sn) => {
|
||||
setSelectedSn(sn);
|
||||
setActiveTab('status');
|
||||
};
|
||||
|
||||
// 切换tab时,如果是overview或status,确保选择的是第一个设备
|
||||
const handleTabChange = (key) => {
|
||||
setActiveTab(key);
|
||||
console.log('切换到tab', key, '当前选中设备SN', selectedSn);
|
||||
// 如果没有选择设备,自动选择第一个
|
||||
if ((key === 'wayLineTask' || key === 'robotTask') && devicesAll.length > 0) {
|
||||
setSelectedSn(devicesAll[0].device_sn || devicesAll[0].serialNumber);
|
||||
}
|
||||
};
|
||||
|
||||
const renderContent = () => {
|
||||
if (activeTab === 'overview') {
|
||||
return <DeviceOverviewPage
|
||||
devices={devices}
|
||||
planedevices={planedevices}
|
||||
devicesAll={devicesAll}
|
||||
onViewStatus={handleViewStatus}
|
||||
selectedSn={selectedSn}
|
||||
onDeviceSelect={(sn) => setSelectedSn(sn)}
|
||||
@@ -101,13 +94,12 @@ export default function DeviceIndexPage() {
|
||||
}
|
||||
if (activeTab === 'status') {
|
||||
return <DeviceStatusPage
|
||||
devicesAll={devicesAll}
|
||||
serialNumber={selectedSn}
|
||||
onDeviceChange={(sn) => setSelectedSn(sn)}
|
||||
/>;
|
||||
}
|
||||
if (activeTab === 'wayLineTask') return <WayLinePage planedevices={planedevices} onRefresh={fetchAllData} />;
|
||||
if (activeTab === 'robotTask') return <RobotTaskPage devices={devices} />;
|
||||
if (activeTab === 'wayLineTask') return <WayLinePage />;
|
||||
if (activeTab === 'robotTask') return <RobotTaskPage />;
|
||||
return null;
|
||||
};
|
||||
|
||||
@@ -126,7 +118,7 @@ export default function DeviceIndexPage() {
|
||||
<Menu
|
||||
mode="horizontal"
|
||||
selectedKeys={[activeTab]}
|
||||
onClick={({ key }) => setActiveTab(key)}
|
||||
onClick={({ key }) => handleTabChange(key)}
|
||||
items={tabs}
|
||||
style={{
|
||||
border: '0',
|
||||
|
||||
Reference in New Issue
Block a user