From 59f6b1e7638a8b327d2867f7a398104bb0719563 Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Mon, 25 May 2026 15:26:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=9C=BA=E7=AB=99=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=97=A0=E4=BA=BA=E6=9C=BA=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device.ts | 10 ++++++++++ src/components/devices/DeviceOverviewPage.tsx | 2 +- src/components/devices/DeviceStatusPage.tsx | 2 +- src/pages/Devices.tsx | 9 +++++---- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/api/device.ts b/src/api/device.ts index 28380d5..4fdc48a 100644 --- a/src/api/device.ts +++ b/src/api/device.ts @@ -15,6 +15,14 @@ export function getPlaneDeviceList() { }) } +export function getSiteUAVList(siteId) { + return request({ + url: '/iot/UAV/getSiteUAVList', + method: 'get', + params: { siteId } + }) +} + export function getLiveStream(data) { return request({ url: '/iot/UAV/liveStream', @@ -167,3 +175,5 @@ export function postLiveHeartbeat(data) { } + + diff --git a/src/components/devices/DeviceOverviewPage.tsx b/src/components/devices/DeviceOverviewPage.tsx index b55fee0..123f9b9 100644 --- a/src/components/devices/DeviceOverviewPage.tsx +++ b/src/components/devices/DeviceOverviewPage.tsx @@ -16,7 +16,7 @@ import { } from '@ant-design/icons'; import { useSelector } from 'react-redux'; -import { getDeviceListApi, getPlaneDeviceList } from '../../api/device.ts'; +import { getDeviceListApi } from '../../api/device.ts'; import { RootState } from '@/src/store'; import DroneLivePlayer from '../VolcRtcPlayer.jsx'; import DroneVideoPlayer from './DroneVideoPlayer'; diff --git a/src/components/devices/DeviceStatusPage.tsx b/src/components/devices/DeviceStatusPage.tsx index 7b8c56c..39cbe99 100644 --- a/src/components/devices/DeviceStatusPage.tsx +++ b/src/components/devices/DeviceStatusPage.tsx @@ -247,7 +247,7 @@ export default function DeviceStatusPage({ { label: 无人机, title: 'engineer', - options: devicesAll.filter(item => item.device_sn).map(item => ({ + options: devicesAll.filter(item => item.gateway_sn).map(item => ({ value: item.device_sn, label: item.drone_callsign || item.callsign || '未知设备' })), diff --git a/src/pages/Devices.tsx b/src/pages/Devices.tsx index 324dab5..41759b4 100644 --- a/src/pages/Devices.tsx +++ b/src/pages/Devices.tsx @@ -3,7 +3,7 @@ import { Layout, Typography, Menu, Tabs } from 'antd'; import { AimOutlined, AppstoreOutlined, SettingOutlined } from '@ant-design/icons'; import DeviceOverviewPage from '../components/devices/DeviceOverviewPage'; import DeviceStatusPage from '../components/devices/DeviceStatusPage'; -import { getDeviceListApi, getPlaneDeviceList } from '../api/device'; +import { getDeviceListApi, getSiteUAVList } from '../api/device'; import { useSelector } from 'react-redux'; import { RootState } from '../store'; import WayLinePage from '../components/devices/WayLinePage'; @@ -22,6 +22,7 @@ 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([]); const [devicesAll, setDevicesAll] = useState([]); @@ -34,13 +35,13 @@ export default function DeviceIndexPage() { // 👇 核心:给无人机补全 lastRunningStatus + type: 'plane' const fetchAllData = async () => { - if (!userInfo?.username) return; + if (!userInfo?.username || !stationId) return; try { // 1. 同时发请求 const [deviceRes, planeRes] = await Promise.all([ getDeviceListApi({ tenantName: userInfo.username, deptId: 1 }), - getPlaneDeviceList(), + getSiteUAVList(stationId), ]); // 2. 处理普通设备 @@ -84,7 +85,7 @@ export default function DeviceIndexPage() { useEffect(() => { fetchAllData(); - }, [userInfo]); + }, [userInfo, stationId]); const handleViewStatus = (sn) => { setSelectedSn(sn);