获取机器人 逻辑改为单独页面获取 优化无人机视频切换和无人机数据获取逻辑
This commit is contained in:
@@ -22,9 +22,11 @@ import AgoraTextTest from '../AgoraRtc.tsx';
|
|||||||
import { useWebRTCPlayer } from '../useWebRTCStream.tsx';
|
import { useWebRTCPlayer } from '../useWebRTCStream.tsx';
|
||||||
import VideoPlayer from '../VideoPlayer.tsx.tsx';
|
import VideoPlayer from '../VideoPlayer.tsx.tsx';
|
||||||
import CesiumMap from '../Map.jsx';
|
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 { useMqtt } from '@/hooks/useMqtt';
|
||||||
import envConfig from '../../../env';
|
import envConfig from '../../../env';
|
||||||
|
import { useSelector } from 'react-redux';
|
||||||
|
import { RootState } from '@/store';
|
||||||
|
|
||||||
const { Content } = Layout;
|
const { Content } = Layout;
|
||||||
const { Text, Title } = Typography;
|
const { Text, Title } = Typography;
|
||||||
@@ -47,13 +49,64 @@ const logs = [
|
|||||||
{ time: '10:05:22', device: 'RBT-01', type: '事件', desc: '电量较低,建议回充', level: '低电量' },
|
{ 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 [zoomedVideo, setZoomedVideo] = useState(null);
|
||||||
const [mowerView, setMowerView] = useState('front');
|
const [mowerView, setMowerView] = useState('front');
|
||||||
const [videoSource, setVideoSource] = useState('drone');
|
const [videoSource, setVideoSource] = useState('drone');
|
||||||
const [uavState, setUavState] = useState(null);
|
const [uavState, setUavState] = useState(null);
|
||||||
const [persistentDroneData, setPersistentDroneData] = useState(null);
|
const [persistentDroneData, setPersistentDroneData] = useState(null);
|
||||||
const [persistentHostData, setPersistentHostData] = 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(() => {
|
const selectedDevice = useMemo(() => {
|
||||||
|
|||||||
@@ -38,6 +38,8 @@ import {
|
|||||||
getsinglePlanTrack,
|
getsinglePlanTrack,
|
||||||
getFlightTaskDetail,
|
getFlightTaskDetail,
|
||||||
getUAVState,
|
getUAVState,
|
||||||
|
getSiteDevice,
|
||||||
|
getSiteUAVList,
|
||||||
} from '../../api/device.ts';
|
} from '../../api/device.ts';
|
||||||
|
|
||||||
import XboxController from './XboxController';
|
import XboxController from './XboxController';
|
||||||
@@ -57,13 +59,61 @@ const { RangePicker } = DatePicker;
|
|||||||
const { Text } = Typography;
|
const { Text } = Typography;
|
||||||
|
|
||||||
export default function DeviceStatusPage({
|
export default function DeviceStatusPage({
|
||||||
devicesAll,
|
|
||||||
serialNumber,
|
serialNumber,
|
||||||
onDeviceChange,
|
onDeviceChange,
|
||||||
}) {
|
}) {
|
||||||
const { userInfo } = useSelector((state: RootState) => state.user);
|
const { userInfo } = useSelector((state: RootState) => state.user);
|
||||||
|
const { stationId } = useSelector((state: RootState) => state.station);
|
||||||
const [persistentDroneData, setPersistentDroneData] = useState(null); // 持久化无人机数据
|
const [persistentDroneData, setPersistentDroneData] = useState(null); // 持久化无人机数据
|
||||||
const [persistentHostData, setPersistentHostData] = 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(() => {
|
const device = useMemo(() => {
|
||||||
|
|||||||
@@ -34,8 +34,8 @@ const DroneVideoPlayer: React.FC<DroneVideoPlayerProps> = ({
|
|||||||
else setInternalVideoSource(source);
|
else setInternalVideoSource(source);
|
||||||
};
|
};
|
||||||
|
|
||||||
const [selectedCamera, setSelectedCamera] = useState<'indoor' | 'outdoor'>('');
|
const [selectedCamera, setSelectedCamera] = useState<'indoor' | 'outdoor'>('indoor'); // 默认选择室内
|
||||||
const [selectedLens, setSelectedLens] = useState<'wide' | 'zoom' | 'ir'>('');
|
const [selectedLens, setSelectedLens] = useState<'wide' | 'zoom' | 'ir'>(''); // 默认选择广角
|
||||||
// 当前选中的摄像头 index
|
// 当前选中的摄像头 index
|
||||||
const [selectedDroneCameraIdx, setSelectedDroneCameraIdx] = useState<number>(0);
|
const [selectedDroneCameraIdx, setSelectedDroneCameraIdx] = useState<number>(0);
|
||||||
const [droneStreamData, setDroneStreamData] = useState<any>(null);
|
const [droneStreamData, setDroneStreamData] = useState<any>(null);
|
||||||
@@ -113,8 +113,12 @@ const DroneVideoPlayer: React.FC<DroneVideoPlayerProps> = ({
|
|||||||
};
|
};
|
||||||
|
|
||||||
// 切换无人机摄像头
|
// 切换无人机摄像头
|
||||||
const switchDroneCamera = (idx: number) => {
|
const switchDroneCamera = async (idx: number) => {
|
||||||
setSelectedDroneCameraIdx(idx);
|
setSelectedDroneCameraIdx(idx);
|
||||||
|
// 切换摄像头后也需要调用接口加载当前选择的镜头
|
||||||
|
if (selectedLens) {
|
||||||
|
await loadDroneLens(selectedLens);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
// 用来记住上一次的值,判断哪一路发生了变化
|
// 用来记住上一次的值,判断哪一路发生了变化
|
||||||
const prevRef = useRef({
|
const prevRef = useRef({
|
||||||
|
|||||||
@@ -20,7 +20,8 @@ import {
|
|||||||
import {
|
import {
|
||||||
getRobotRouteList,
|
getRobotRouteList,
|
||||||
getPlaneDeviceListAll, saveDeviceTask, getRobotTaskList,
|
getPlaneDeviceListAll, saveDeviceTask, getRobotTaskList,
|
||||||
deleteDeviceTask
|
deleteDeviceTask,
|
||||||
|
getSiteDevice
|
||||||
} from '../../api/device';
|
} from '../../api/device';
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
import utils from '../../lib/utils';
|
import utils from '../../lib/utils';
|
||||||
@@ -32,7 +33,10 @@ import { RootState } from '@/src/store';
|
|||||||
const { Text, Title } = Typography;
|
const { Text, Title } = Typography;
|
||||||
const { RangePicker } = DatePicker;
|
const { RangePicker } = DatePicker;
|
||||||
|
|
||||||
export default function RobotTaskPage({ devices }) {
|
export default function RobotTaskPage() {
|
||||||
|
const { userInfo } = useSelector((state: RootState) => state.user);
|
||||||
|
const { stationId } = useSelector((state: RootState) => state.station);
|
||||||
|
|
||||||
const fontSmall = 'clamp(10px, 0.7vw, 11px)';
|
const fontSmall = 'clamp(10px, 0.7vw, 11px)';
|
||||||
const fontNormal = 'clamp(12px, 0.75vw, 13px)';
|
const fontNormal = 'clamp(12px, 0.75vw, 13px)';
|
||||||
const fontTitle = 'clamp(14px, 0.85vw, 16px)';
|
const fontTitle = 'clamp(14px, 0.85vw, 16px)';
|
||||||
@@ -49,6 +53,9 @@ export default function RobotTaskPage({ devices }) {
|
|||||||
});
|
});
|
||||||
const [taskList, setTaskList] = useState([]);
|
const [taskList, setTaskList] = useState([]);
|
||||||
|
|
||||||
|
// 设备数据
|
||||||
|
const [devices, setDevices] = useState([]);
|
||||||
|
|
||||||
// 工作看板 独立筛选状态
|
// 工作看板 独立筛选状态
|
||||||
const [boardRobot, setBoardRobot] = useState(null);
|
const [boardRobot, setBoardRobot] = useState(null);
|
||||||
const [boardDateRange, setBoardDateRange] = useState(null);
|
const [boardDateRange, setBoardDateRange] = useState(null);
|
||||||
@@ -61,7 +68,23 @@ export default function RobotTaskPage({ devices }) {
|
|||||||
const [createTaskModal, setCreateTaskModal] = useState(false);
|
const [createTaskModal, setCreateTaskModal] = useState(false);
|
||||||
const [routeSearch, setRouteSearch] = useState('');
|
const [routeSearch, setRouteSearch] = useState('');
|
||||||
const [routeList, setRouteList] = useState([]);
|
const [routeList, setRouteList] = useState([]);
|
||||||
const { stationId } = useSelector((state: RootState) => state.station);
|
|
||||||
|
// 获取数据
|
||||||
|
const fetchAllData = async () => {
|
||||||
|
if (!stationId) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const deviceRes = await getSiteDevice({ siteId: stationId, pageSize: 9999, pageNum: 1 });
|
||||||
|
const devData = deviceRes?.code === 200 ? (deviceRes.rows || []) : [];
|
||||||
|
setDevices(devData);
|
||||||
|
} catch (err) {
|
||||||
|
console.error('数据请求失败', err);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
fetchAllData();
|
||||||
|
}, [userInfo, stationId]);
|
||||||
|
|
||||||
// 新建任务弹窗状态
|
// 新建任务弹窗状态
|
||||||
const [isTaskModalOpen, setIsTaskModalOpen] = useState(false);
|
const [isTaskModalOpen, setIsTaskModalOpen] = useState(false);
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ import {
|
|||||||
Calendar, User, TrendingUp, Maximize2, Play, Square, X, MapPin, RotateCw
|
Calendar, User, TrendingUp, Maximize2, Play, Square, X, MapPin, RotateCw
|
||||||
} from 'lucide-react';
|
} from 'lucide-react';
|
||||||
import {
|
import {
|
||||||
getsinglePlan, getsinglePlanTrack, updateFlightTaskStatus, postFlightCommmand, getWayLine, createWaylineTask, getFlightTaskDetail
|
getsinglePlan, getsinglePlanTrack, updateFlightTaskStatus, postFlightCommmand, getWayLine, createWaylineTask, getFlightTaskDetail, getSiteUAVList
|
||||||
} from '@/api/device';
|
} from '@/api/device';
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
import utils from '@/lib/utils';
|
import utils from '@/lib/utils';
|
||||||
@@ -27,11 +27,16 @@ import { getUAVState } from '@/api/device';
|
|||||||
import { fix2, getVal } from '@/lib/utils';
|
import { fix2, getVal } from '@/lib/utils';
|
||||||
import { useMqtt } from '@/hooks/useMqtt';
|
import { useMqtt } from '@/hooks/useMqtt';
|
||||||
import envConfig from '../../../env';
|
import envConfig from '../../../env';
|
||||||
|
import { useSelector } from 'react-redux';
|
||||||
|
import { RootState } from '@/store';
|
||||||
|
|
||||||
const { Text, Title } = Typography;
|
const { Text, Title } = Typography;
|
||||||
const { RangePicker } = DatePicker;
|
const { RangePicker } = DatePicker;
|
||||||
|
|
||||||
export default function WayLinePage({ planedevices, onRefresh }) {
|
export default function WayLinePage({ onRefresh }) {
|
||||||
|
const { userInfo } = useSelector((state: RootState) => state.user);
|
||||||
|
const { stationId } = useSelector((state: RootState) => state.station);
|
||||||
|
|
||||||
const fontSmall = 'clamp(10px, 0.7vw, 11px)';
|
const fontSmall = 'clamp(10px, 0.7vw, 11px)';
|
||||||
const fontNormal = 'clamp(12px, 0.75vw, 13px)';
|
const fontNormal = 'clamp(12px, 0.75vw, 13px)';
|
||||||
const fontTitle = 'clamp(14px, 0.85vw, 16px)';
|
const fontTitle = 'clamp(14px, 0.85vw, 16px)';
|
||||||
@@ -40,6 +45,7 @@ export default function WayLinePage({ planedevices, onRefresh }) {
|
|||||||
const cardStyle = { borderRadius: 12, border: 'none', boxShadow: '0 2px 12px rgba(0,0,0,0.04)' };
|
const cardStyle = { borderRadius: 12, border: 'none', boxShadow: '0 2px 12px rgba(0,0,0,0.04)' };
|
||||||
|
|
||||||
// 任务列表 独立筛选状态
|
// 任务列表 独立筛选状态
|
||||||
|
const [planedevices, setPlaneDevices] = useState([]);
|
||||||
const [listDrone, setListDrone] = useState(null);
|
const [listDrone, setListDrone] = useState(null);
|
||||||
const [listDroneRealtime, setListDroneRealtime] = useState(null);
|
const [listDroneRealtime, setListDroneRealtime] = useState(null);
|
||||||
const [listDateRange, setListDateRange] = useState(null);
|
const [listDateRange, setListDateRange] = useState(null);
|
||||||
@@ -47,6 +53,39 @@ export default function WayLinePage({ planedevices, onRefresh }) {
|
|||||||
const [persistentDroneData, setPersistentDroneData] = useState(null); // 持久化无人机数据
|
const [persistentDroneData, setPersistentDroneData] = useState(null); // 持久化无人机数据
|
||||||
const [persistentHostData, setPersistentHostData] = useState(null); // 持久化机场数据
|
const [persistentHostData, setPersistentHostData] = useState(null); // 持久化机场数据
|
||||||
|
|
||||||
|
// 获取数据
|
||||||
|
const fetchAllData = async () => {
|
||||||
|
if (!stationId) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const planeRes = await getSiteUAVList(stationId);
|
||||||
|
|
||||||
|
// 处理无人机 + 自动补全地图需要的字段
|
||||||
|
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
|
||||||
|
|| '无人机',
|
||||||
|
|
||||||
|
}));
|
||||||
|
|
||||||
|
setPlaneDevices(planeData);
|
||||||
|
|
||||||
|
} catch (err) {
|
||||||
|
console.error('数据请求失败', err);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
fetchAllData();
|
||||||
|
}, [userInfo, stationId]);
|
||||||
|
|
||||||
const listDroneTimerRef = useRef<any>(null);
|
const listDroneTimerRef = useRef<any>(null);
|
||||||
|
|
||||||
// 当MQTT数据更新时,更新持久化数据(只在有新数据时更新)
|
// 当MQTT数据更新时,更新持久化数据(只在有新数据时更新)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import React, { useState, useEffect } from 'react';
|
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 { AimOutlined, AppstoreOutlined, SettingOutlined, BranchesOutlined } from '@ant-design/icons';
|
||||||
import DeviceOverviewPage from '../components/devices/DeviceOverviewPage';
|
import DeviceOverviewPage from '../components/devices/DeviceOverviewPage';
|
||||||
import DeviceStatusPage from '../components/devices/DeviceStatusPage';
|
import DeviceStatusPage from '../components/devices/DeviceStatusPage';
|
||||||
@@ -16,7 +16,6 @@ const { Text } = Typography;
|
|||||||
export default function DeviceIndexPage() {
|
export default function DeviceIndexPage() {
|
||||||
const [activeTab, setActiveTab] = useState('overview');
|
const [activeTab, setActiveTab] = useState('overview');
|
||||||
const [selectedSn, setSelectedSn] = useState(null);
|
const [selectedSn, setSelectedSn] = useState(null);
|
||||||
const { userInfo } = useSelector((state: RootState) => state.user);
|
|
||||||
const { stationId } = useSelector((state: RootState) => state.station);
|
const { stationId } = useSelector((state: RootState) => state.station);
|
||||||
const [devices, setDevices] = useState([]);
|
const [devices, setDevices] = useState([]);
|
||||||
const [planedevices, setPlaneDevices] = useState([]);
|
const [planedevices, setPlaneDevices] = useState([]);
|
||||||
@@ -29,25 +28,19 @@ export default function DeviceIndexPage() {
|
|||||||
{ key: 'robotTask', label: '机器人任务', icon: <BranchesOutlined /> },
|
{ key: 'robotTask', label: '机器人任务', icon: <BranchesOutlined /> },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// 获取设备列表(用于默认选择第一个)
|
||||||
// 👇 核心:给无人机补全 lastRunningStatus + type: 'plane'
|
|
||||||
const fetchAllData = async () => {
|
const fetchAllData = async () => {
|
||||||
if (!stationId) return;
|
if (!stationId) return;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// 1. 同时发请求
|
|
||||||
const [deviceRes, planeRes] = await Promise.all([
|
const [deviceRes, planeRes] = await Promise.all([
|
||||||
getSiteDevice({ siteId: stationId, pageSize: 9999, pageNum: 1 }),
|
getSiteDevice({ siteId: stationId, pageSize: 9999, pageNum: 1 }),
|
||||||
getSiteUAVList(stationId),
|
getSiteUAVList(stationId),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// 2. 处理普通设备
|
|
||||||
const devData = deviceRes?.code === 200 ? (deviceRes.rows || []) : [];
|
const devData = deviceRes?.code === 200 ? (deviceRes.rows || []) : [];
|
||||||
|
|
||||||
// 3. 处理无人机 + 自动补全地图需要的字段(关键改动)
|
|
||||||
let planeData = planeRes?.code === 200 ? (planeRes?.rows || []) : [];
|
let planeData = planeRes?.code === 200 ? (planeRes?.rows || []) : [];
|
||||||
|
|
||||||
// ====================== ✅ 核心改造 ======================
|
|
||||||
planeData = planeData.map(item => ({
|
planeData = planeData.map(item => ({
|
||||||
...item,
|
...item,
|
||||||
type: 'plane',
|
type: 'plane',
|
||||||
@@ -55,25 +48,18 @@ export default function DeviceIndexPage() {
|
|||||||
longitude: item.longitude || 0,
|
longitude: item.longitude || 0,
|
||||||
latitude: item.latitude || 0,
|
latitude: item.latitude || 0,
|
||||||
},
|
},
|
||||||
deviceAlias: item.drone_callsign || item.device_sn
|
deviceAlias: item.drone_callsign || item.device_sn || '无人机',
|
||||||
|| '无人机',
|
|
||||||
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
setDevices(devData);
|
setDevices(devData);
|
||||||
setPlaneDevices(planeData);
|
setPlaneDevices(planeData);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// 合并所有设备
|
|
||||||
const all = [...devData, ...planeData];
|
const all = [...devData, ...planeData];
|
||||||
setDevicesAll(all);
|
setDevicesAll(all);
|
||||||
|
|
||||||
// 默认选中第一个
|
// 默认选中第一个设备
|
||||||
if (!selectedSn && all.length > 0) {
|
if (!selectedSn && all.length > 0) {
|
||||||
setSelectedSn(all[0].device_sn || all[0].serialNumber);
|
setSelectedSn(all[0].device_sn || all[0].serialNumber);
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('数据请求失败', err);
|
console.error('数据请求失败', err);
|
||||||
}
|
}
|
||||||
@@ -81,19 +67,26 @@ export default function DeviceIndexPage() {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetchAllData();
|
fetchAllData();
|
||||||
}, [userInfo, stationId]);
|
}, [stationId]);
|
||||||
|
|
||||||
const handleViewStatus = (sn) => {
|
const handleViewStatus = (sn) => {
|
||||||
setSelectedSn(sn);
|
setSelectedSn(sn);
|
||||||
setActiveTab('status');
|
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 = () => {
|
const renderContent = () => {
|
||||||
if (activeTab === 'overview') {
|
if (activeTab === 'overview') {
|
||||||
return <DeviceOverviewPage
|
return <DeviceOverviewPage
|
||||||
devices={devices}
|
|
||||||
planedevices={planedevices}
|
|
||||||
devicesAll={devicesAll}
|
|
||||||
onViewStatus={handleViewStatus}
|
onViewStatus={handleViewStatus}
|
||||||
selectedSn={selectedSn}
|
selectedSn={selectedSn}
|
||||||
onDeviceSelect={(sn) => setSelectedSn(sn)}
|
onDeviceSelect={(sn) => setSelectedSn(sn)}
|
||||||
@@ -101,13 +94,12 @@ export default function DeviceIndexPage() {
|
|||||||
}
|
}
|
||||||
if (activeTab === 'status') {
|
if (activeTab === 'status') {
|
||||||
return <DeviceStatusPage
|
return <DeviceStatusPage
|
||||||
devicesAll={devicesAll}
|
|
||||||
serialNumber={selectedSn}
|
serialNumber={selectedSn}
|
||||||
onDeviceChange={(sn) => setSelectedSn(sn)}
|
onDeviceChange={(sn) => setSelectedSn(sn)}
|
||||||
/>;
|
/>;
|
||||||
}
|
}
|
||||||
if (activeTab === 'wayLineTask') return <WayLinePage planedevices={planedevices} onRefresh={fetchAllData} />;
|
if (activeTab === 'wayLineTask') return <WayLinePage />;
|
||||||
if (activeTab === 'robotTask') return <RobotTaskPage devices={devices} />;
|
if (activeTab === 'robotTask') return <RobotTaskPage />;
|
||||||
return null;
|
return null;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -126,7 +118,7 @@ export default function DeviceIndexPage() {
|
|||||||
<Menu
|
<Menu
|
||||||
mode="horizontal"
|
mode="horizontal"
|
||||||
selectedKeys={[activeTab]}
|
selectedKeys={[activeTab]}
|
||||||
onClick={({ key }) => setActiveTab(key)}
|
onClick={({ key }) => handleTabChange(key)}
|
||||||
items={tabs}
|
items={tabs}
|
||||||
style={{
|
style={{
|
||||||
border: '0',
|
border: '0',
|
||||||
|
|||||||
Reference in New Issue
Block a user