diff --git a/src/components/devices/DeviceOverviewPage.tsx b/src/components/devices/DeviceOverviewPage.tsx index 60c6485..16b2fa2 100644 --- a/src/components/devices/DeviceOverviewPage.tsx +++ b/src/components/devices/DeviceOverviewPage.tsx @@ -11,7 +11,8 @@ import { CloudOutlined, ClockCircleOutlined, ReloadOutlined, AimOutlined, ApiOutlined, SettingOutlined, PlusOutlined, ArrowRightOutlined, - EditOutlined, FullscreenOutlined, InfoCircleOutlined + EditOutlined, FullscreenOutlined, InfoCircleOutlined, + CarOutlined } from '@ant-design/icons'; import { useSelector } from 'react-redux'; @@ -275,8 +276,9 @@ export default function DeviceOverviewPage({ devices, planedevices, devicesAll, bordered={false} style={{ borderRadius: 8, marginBottom: 8 }} bodyStyle={{ padding: 12, paddingBottom: 0 }} - > option.label.toLowerCase().includes(input.toLowerCase()) } - options={devicesAll.map(item => ({ - value: item.device_sn || item.serialNumber, - label: item.deviceAlias || item.drone_callsign || item.callsign || item.deviceName || '未知设备' - }))} + options={[ + { + label: 机器人, + title: 'manager', + options: devices.map(item => ({ + value: item.device_sn || item.serialNumber, + label: item.deviceAlias || item.deviceName || '未知设备' + })), + }, + { + label: 无人机, + title: 'engineer', + options: planedevices.map(item => ({ + value: item.device_sn, + label: item.drone_callsign || item.callsign || '未知设备' + })), + }, + ]} + //options={devicesAll.map(item => ({ + // value: item.device_sn || item.serialNumber, + // label: item.deviceAlias || item.drone_callsign || item.callsign || item.deviceName || '未知设备' + //}))} /> {selectedDevice && ( @@ -298,15 +318,23 @@ export default function DeviceOverviewPage({ devices, planedevices, devicesAll,
- + {selectedDevice.deviceType === 'drone' || + selectedDevice.deviceName?.includes('无人机') || + selectedDevice.drone_callsign ? ( + + ) : ( + + )} + {selectedDevice.deviceAlias || selectedDevice.drone_callsign || selectedDevice.callsign || selectedDevice.deviceName} {selectedDevice.onlineStatus == 1 ? "在线" : "离线"}
- - - - + + + +
-
+
实时画面 实时监控
- - {selectedDevice.device_sn && ( + {/* 无人机视频 + 时间:有数据才显示,否则空 div */} + {planeVideo?.[0] ? ( + <> + + + + ) : ( +
+ )} {selectedDevice.device_sn && (
高度 {fix2(selectedDevice.height)}m 风速 {fix2(selectedDevice.wind_speed)}m/s @@ -424,7 +460,7 @@ export default function DeviceOverviewPage({ devices, planedevices, devicesAll,
建议操作
-
+
⦿优先执行巡检航线 P-03
⦿先行安排除草任务 G-02
⦿建议生成清洗工单
@@ -453,9 +489,15 @@ export default function DeviceOverviewPage({ devices, planedevices, devicesAll,
降雨
{getVal(selectedDevice?.rainfall)}
RTK
{selectedDevice?.position_state?.is_fixed === 'fixing_successful' ? '固定' : '未固定'}
-
-
适宜执行
-
+
+
+
适宜执行
+
+ +
+ + +
可正常作业