From afbd40a78779260c3543fda782d679e26e9822cb Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Mon, 3 Aug 2026 16:40:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BA=8C=E7=BA=A7=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=20=20=E4=BC=98=E5=8C=96=E6=8E=A7=E5=88=B6=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/devices/DeviceOverviewPage.tsx | 19 +-- src/components/devices/DeviceStatusPage.tsx | 80 ++++++++---- src/pages/Devices.tsx | 120 ++++++++++-------- src/router/index.tsx | 5 +- 4 files changed, 130 insertions(+), 94 deletions(-) diff --git a/src/components/devices/DeviceOverviewPage.tsx b/src/components/devices/DeviceOverviewPage.tsx index 249c336..cbd41e7 100644 --- a/src/components/devices/DeviceOverviewPage.tsx +++ b/src/components/devices/DeviceOverviewPage.tsx @@ -53,7 +53,7 @@ const logs = [ { time: '10:05:22', device: 'RBT-01', type: '事件', desc: '电量较低,建议回充', level: '低电量' }, ]; -export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceSelect }) { +export default function DeviceOverviewPage() { const { userInfo } = useSelector((state: RootState) => state.user); const { stationId } = useSelector((state: RootState) => state.station); @@ -68,6 +68,7 @@ export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceS const [devicesAll, setDevicesAll] = useState([]); const [taskStats, setTaskStats] = useState({ completed: 12, total: 15 }); const [deviceStatistics, setDeviceStatistics] = useState(null); + const [currentSelectedRobot, setCurrentSelectedRobot] = useState(null); // 编辑机器人弹窗相关 const [editRobotModalOpen, setEditRobotModalOpen] = useState(false); @@ -115,6 +116,7 @@ export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceS console.error('数据请求失败', err); } }; + const onViewStatus = (sn) => { } // 打开编辑弹窗 @@ -233,9 +235,9 @@ export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceS // 当前选中设备(切换时才变) const selectedDevice = useMemo(() => { - const sn = selectedSn || (devicesAll?.[0]?.device_sn || devicesAll?.[0]?.serialNumber); + const sn = currentSelectedRobot || (devicesAll?.[0]?.device_sn || devicesAll?.[0]?.serialNumber); return devicesAll?.find(item => (item.device_sn || item.serialNumber) === sn) || null; - }, [devicesAll, selectedSn]); + }, [devicesAll, currentSelectedRobot]); const isUAV = !!selectedDevice?.gateway_sn; useEffect(() => { @@ -510,7 +512,7 @@ export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceS const getVal = (val) => val == "no_rain" ? "无" : (val || '-'); const handleDeviceChange = (id) => { - if (onDeviceSelect) onDeviceSelect(id); + setCurrentSelectedRobot(id); }; // 获取无人机状态 @@ -646,18 +648,19 @@ export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceS { title: '操作', key: 'action', - width: 80, + width: 120, //fixed: 'right', render: (_, record) => ( - {/* 编辑按钮绑定弹窗 */} + diff --git a/src/components/devices/DeviceStatusPage.tsx b/src/components/devices/DeviceStatusPage.tsx index c66f4f6..5c78c72 100644 --- a/src/components/devices/DeviceStatusPage.tsx +++ b/src/components/devices/DeviceStatusPage.tsx @@ -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', }} > 选择设备: