根据二级路由 优化控制状态界面

This commit is contained in:
mmc
2026-08-03 16:40:27 +08:00
parent f8b7be2c63
commit afbd40a787
4 changed files with 130 additions and 94 deletions

View File

@@ -63,10 +63,7 @@ const { RangePicker } = DatePicker;
const { Text } = Typography;
export default function DeviceStatusPage({
serialNumber,
onDeviceChange,
}) {
export default function DeviceStatusPage() {
const { userInfo } = useSelector((state: RootState) => state.user);
const { stationId } = useSelector((state: RootState) => state.station);
const [persistentDroneData, setPersistentDroneData] = useState(null); // 持久化无人机数据
@@ -175,24 +172,44 @@ export default function DeviceStatusPage({
fetchAllData();
}, [userInfo, stationId]);
// 当前选中的设备SN
const [selectedSn, setSelectedSn] = useState('');
// 当设备列表加载后,如果没有选中的设备,默认选中第一个
useEffect(() => {
if (devicesAll?.length > 0) {
const firstDevice = devicesAll[0];
setSelectedSn(firstDevice.device_sn || firstDevice.serialNumber);
}
}, [devicesAll]);
// 获取当前选中的无人机设备
const device = useMemo(() => {
const sn =
serialNumber ||
devicesAll?.[0]?.device_sn ||
devicesAll?.[0]?.serialNumber;
const sn = selectedSn;
if (!sn) return null;
return devicesAll?.find(
(d) => (d.device_sn || d.serialNumber) === sn,
(d) => (d.device_sn || d.serialNumber) == sn,
);
}, [devicesAll, serialNumber]);
}, [devicesAll, selectedSn]);
const isUAV = useMemo(() => {
return !!device?.device_sn;
// 设备有 drone_callsign 或 gateway_sn 则是无人机
return !!(device?.drone_callsign || device?.gateway_sn);
}, [device]);
// 设备选择变化时,调用回调并更新内部状态
const handleDeviceSelectChange = (val) => {
setSelectedSn(val);
// 切换设备时清空之前的标记点等
setMarkedPoints([]);
setCompleteFlag(false);
setSavePath(null);
};
// 当MQTT数据更新时,更新持久化数据(只在有新数据时更新)
const handleMqttMessage = (topic, message) => {
@@ -357,8 +374,8 @@ export default function DeviceStatusPage({
}, [device, wsDeviceInfo, isUAV]);
const { video: robotVideo, error, ready } = useWebRTCPlayer(
!isUAV ? serialNumber : '',
`webrtc://1.95.137.212/live/livestream/${serialNumber}`,
!isUAV ? device?.serialNumber : '',
`webrtc://1.95.137.212/live/livestream/${device?.serialNumber}`,
);
const getVal = (val) => val === "no_rain" ? "无" : (val || '-');
@@ -850,40 +867,47 @@ export default function DeviceStatusPage({
display: 'flex',
alignItems: 'center',
gap: 12,
flexWrap: 'wrap',
}}
>
<Text strong>选择设备:</Text>
<Select
style={{ width: 380 }}
value={device?.device_sn || device?.serialNumber}
onChange={(val) => onDeviceChange?.(val)}
style={{ width: 380, minWidth: 280 }}
value={selectedSn}
onChange={handleDeviceSelectChange}
showSearch
optionFilterProp="label"
placeholder="请选择设备"
allowClear={false}
loading={devicesAll.length === 0}
options={[
{
label: <span>机器人</span>,
title: 'manager',
options: devicesAll.filter(item => item.serialNumber).map(item => ({
label: '机器人',
title: 'robot',
options: devicesAll.filter(item => !item.gateway_sn && !item.drone_callsign && item.serialNumber).map(item => ({
value: item.device_sn || item.serialNumber,
label: item.deviceAlias || item.deviceName || '未知设备'
label: `${item.deviceAlias || item.deviceName || '未知设备'} `,
})),
},
{
label: <span>无人机</span>,
title: 'engineer',
options: devicesAll.filter(item => item.gateway_sn).map(item => ({
label: '无人机',
title: 'uav',
options: devicesAll.filter(item => item.gateway_sn || item.drone_callsign).map(item => ({
value: item.device_sn,
label: item.drone_callsign || item.callsign || '未知设备'
label: `${item.drone_callsign || item.callsign || '未知无人机'}`,
})),
},
]}
].filter(group => group.options.length > 0)}
/>
<Tag color="blue">
<Tag color={isUAV ? 'cyan' : 'blue'}>
{isUAV ? '无人机' : '机器人'}
</Tag>
<Tag color={device?.onlineStatus == 1 ? 'green' : 'default'}>
{device?.onlineStatus === 1 ? '在线' : '离线'}
</Tag>
</div>
@@ -1085,7 +1109,7 @@ export default function DeviceStatusPage({
{robotVideo ? (
mowerView === 'all' ? (
<MowerAllView
serialNumber={serialNumber}
serialNumber={device?.serialNumber}
robotVideo={robotVideo}
error={error}
ready={ready}
@@ -1093,7 +1117,7 @@ export default function DeviceStatusPage({
) : (
<div style={{ position: 'relative', width: '100%', height: '100%' }}>
<VideoPlayer
deviceId={serialNumber}
deviceId={device?.serialNumber}
idx={
mowerView === 'front' ? 1
: mowerView === 'back' ? 2