任务监控界面接入任务进度还有workname
This commit is contained in:
@@ -144,6 +144,9 @@ export default class DeviceController {
|
||||
hasAlarm: !!it?.ha || !!it?.hasAlarm,
|
||||
updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
|
||||
controlMode: it?.cm ?? it?.controlMode,
|
||||
progress: it?.p ?? it?.progress,
|
||||
workName: it?.wk ?? null,
|
||||
|
||||
};
|
||||
});
|
||||
console.log('[DeviceController] 收到全量设备状态', next);
|
||||
|
||||
@@ -79,6 +79,8 @@ const TaskMonitorPage: React.FC = () => {
|
||||
const [realtimeMap, setRealtimeMap] = useState<any>({});
|
||||
// 当前选中的车辆:列表高亮与地图信息浮窗共用此状态
|
||||
const [selectedDeviceSerial, setSelectedDeviceSerial] = useState<string | null>(null);
|
||||
// 实时画面视角:与 DeviceStatusPage 保持一致(front/back/left/right)
|
||||
const [videoView, setVideoView] = useState<'front' | 'back' | 'left' | 'right'>('front');
|
||||
const [focusLocation, setFocusLocation] = useState<any>(null);
|
||||
const [messageApi, contextHolder] = message.useMessage();
|
||||
const [taskPoolList, setTaskPoolList] = useState([]);
|
||||
@@ -87,10 +89,40 @@ const TaskMonitorPage: React.FC = () => {
|
||||
const controllerRef = useRef<DeviceController | null>(null);
|
||||
const mapRef = useRef<any>(null);
|
||||
|
||||
// 从全量实时数据(mapPush)里按设备标识匹配记录,realtimeMap 结构为 { [设备ID]: 记录 }
|
||||
const pickRealtimeRecord = (rtMap: any, device: any) => {
|
||||
for (const key of [device?.serialNumber, device?.device_sn, device?.sn, device?.id, device?.deviceId]) {
|
||||
if (key == null || String(key) === '') continue;
|
||||
const hit = rtMap?.[String(key)];
|
||||
if (hit) return hit;
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
// 电量优先取实时数据,实时没有时回退到设备结构里的 lastRunningStatus / locationMessage
|
||||
const getDeviceBattery = (device: any): number | undefined => {
|
||||
const rt = pickRealtimeRecord(realtimeMap, device);
|
||||
const candidates = [rt?.battery, device?.lastRunningStatus?.batteryLevel, device?.lastRunningStatus?.battery, device?.locationMessage?.batteryLevel, device?.locationMessage?.battery];
|
||||
for (const value of candidates) {
|
||||
if (value === undefined || value === null || value === '') continue;
|
||||
const num = Number(value);
|
||||
if (Number.isFinite(num)) return num;
|
||||
}
|
||||
return undefined;
|
||||
};
|
||||
|
||||
// 供 WebSocket 回调始终调用最新的 fetchData
|
||||
const fetchDataRef = useRef<() => any>(() => { });
|
||||
|
||||
// 初始化实时数据控制器
|
||||
useEffect(() => {
|
||||
if (!userInfo || !stationId) return;
|
||||
const controller = new DeviceController(userInfo, messageApi, stationId);
|
||||
// 与 RobotTaskPage 保持一致:任务状态发生变化后重新拉取接口数据
|
||||
const refreshData = () => fetchDataRef.current?.();
|
||||
controller.onIsFinished = refreshData;
|
||||
controller.onIsExecuting = refreshData;
|
||||
controller.deviceStatusChangedMsg = refreshData;
|
||||
controller.initMapPush((rtMap: any) => setRealtimeMap(rtMap || {}));
|
||||
controllerRef.current = controller;
|
||||
return () => {
|
||||
@@ -136,6 +168,8 @@ const TaskMonitorPage: React.FC = () => {
|
||||
}
|
||||
};
|
||||
|
||||
fetchDataRef.current = fetchData;
|
||||
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
@@ -203,13 +237,21 @@ const TaskMonitorPage: React.FC = () => {
|
||||
|
||||
const deviceStats = useMemo(() => {
|
||||
const total = devices.length;
|
||||
const online = devices.filter(d => d.onlineStatus === 1).length;
|
||||
// 在线数以实时数据为准:当前设备列表中存在实时记录的即在线
|
||||
const online = devices.filter(d => !!pickRealtimeRecord(realtimeMap, d)).length;
|
||||
// feStatus: 1=作业中, 2=空闲
|
||||
const working = devices.filter(d => String(d.feStatus) === '1').length;
|
||||
const idle = devices.filter(d => String(d.feStatus) === '2').length;
|
||||
const alarm = alarmList.length;
|
||||
return { total, online, working, idle, alarm };
|
||||
}, [devices, realtimeMap, alarmList]);
|
||||
console.log(realtimeMap, "realtimeMap")
|
||||
// 告警车辆数量以实时数据里的 hasAlarm 为准
|
||||
const alarmDevices = devices.filter(d => !!pickRealtimeRecord(realtimeMap, d)?.hasAlarm);
|
||||
console.log(alarmDevices, "alarmDevices")
|
||||
const alarm = alarmDevices.length;
|
||||
// 与 DeviceStatusPage 一致:有实时数据即在线,兜底接口 onlineStatus
|
||||
const alarmOnline = alarmDevices.filter(d => pickRealtimeRecord(realtimeMap, d) || d?.onlineStatus == 1).length;
|
||||
const alarmOffline = total - online;
|
||||
return { total, online, working, idle, alarm, alarmOnline, alarmOffline };
|
||||
}, [devices, realtimeMap]);
|
||||
|
||||
|
||||
|
||||
@@ -218,6 +260,7 @@ const TaskMonitorPage: React.FC = () => {
|
||||
[devices, selectedDeviceSerial]
|
||||
);
|
||||
const selectedRealtime: any = selectedDevice ? (realtimeMap[selectedDevice.serialNumber] || {}) : {};
|
||||
const selectedBattery = getDeviceBattery(selectedDevice);
|
||||
|
||||
const trendData = useMemo(() => {
|
||||
const countMap: Record<string, number> = {};
|
||||
@@ -388,7 +431,7 @@ const TaskMonitorPage: React.FC = () => {
|
||||
{[
|
||||
{ label: '机器总数', value: deviceStats.total, online: deviceStats.online, offline: deviceStats.total - deviceStats.online, icon: <Box color="#1890ff" />, bg: '#e6f7ff' },
|
||||
{ label: '在线总数', value: deviceStats.online, subLeft: { label: '空闲', value: deviceStats.idle, color: '#1890ff' }, subRight: { label: '工作中', value: deviceStats.working, color: '#52c41a' }, icon: <Activity color="#52c41a" />, bg: '#f6ffed' },
|
||||
{ label: '告警车辆', value: deviceStats.alarm, online: deviceStats.alarm, offline: 0, icon: <AlertCircle color="#ff4d4f" />, bg: '#fff1f0' }
|
||||
{ label: '告警车辆', value: deviceStats.alarm, online: deviceStats.online, offline: deviceStats.alarmOffline, icon: <AlertCircle color="#ff4d4f" />, bg: '#fff1f0' }
|
||||
].map((item, index) => (
|
||||
<div key={index} style={{ display: 'flex', alignItems: 'center', gap: 16 }}>
|
||||
<div style={{ width: 48, height: 48, borderRadius: 12, background: item.bg, display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
|
||||
@@ -442,14 +485,16 @@ const TaskMonitorPage: React.FC = () => {
|
||||
<Button type="text" size="small" aria-label="关闭车辆详情" icon={<X size={18} />} onClick={() => setSelectedDeviceSerial(null)} />
|
||||
</div>
|
||||
<div className="vehicle-map-popup__body">
|
||||
<div className="vehicle-map-popup__row"><span>当前状态</span><strong className={selectedRealtime.status === 'EXECUTING' ? 'is-running' : ''}>{selectedRealtime.status === 'EXECUTING' ? '执行中' : '待命'}</strong></div>
|
||||
<div className="vehicle-map-popup__row"><span>剩余电量</span><strong className={(selectedRealtime.battery ?? 85) < 20 ? 'is-low-battery' : ''}>{selectedRealtime.battery ?? 85}%</strong></div>
|
||||
<div className="vehicle-map-popup__row"><span>当前任务</span><strong>{selectedRealtime.currentTaskName || '常规巡检'}</strong></div>
|
||||
<div className="vehicle-map-popup__row"><span>设备类型</span><strong>{selectedDevice.deviceTypeName || selectedDevice.deviceType || '车辆'}</strong></div>
|
||||
<div className="vehicle-map-popup__row"><span>任务进度</span><strong>{selectedRealtime.taskProgress ?? 0}%</strong></div>
|
||||
<div className="vehicle-map-popup__row"><span>当前状态</span><strong className={selectedRealtime.status === '1' ? 'is-running' : ''}>{selectedRealtime.status === '1' ? '进行中' : selectedRealtime.status === '2' ? '待命' : '离线'}</strong></div>
|
||||
<div className="vehicle-map-popup__row"><span>剩余电量</span><strong className={(selectedBattery ?? 85) < 20 ? 'is-low-battery' : ''}>{selectedBattery ?? 85}%</strong></div>
|
||||
<div className="vehicle-map-popup__row"><span>当前任务</span><strong>{selectedRealtime.workName || "无"}</strong></div>
|
||||
{/*<div className="vehicle-map-popup__row"><span>设备类型</span><strong>{selectedDevice.deviceTypeName || selectedDevice.deviceType || '车辆'}</strong></div>*/}
|
||||
<div className="vehicle-map-popup__row"><span>任务进度</span><strong>{selectedRealtime.progress ?? 0}%</strong></div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
{/*{rt.status == '1' ? '进行中' : rt.status == '2' ? '待命' : '离线'}*/}
|
||||
|
||||
|
||||
{/* 地图上的图例 */}
|
||||
<div style={{ position: 'absolute', bottom: 20, left: 20, display: 'flex', gap: 12, zIndex: 10 }}>
|
||||
@@ -477,6 +522,7 @@ const TaskMonitorPage: React.FC = () => {
|
||||
dataSource={devices.filter(d => d.deviceType !== 'CAMERA')}
|
||||
renderItem={(item: any) => {
|
||||
const rt = realtimeMap[item.serialNumber] || {};
|
||||
const battery = getDeviceBattery(item);
|
||||
|
||||
return (
|
||||
<List.Item
|
||||
@@ -507,9 +553,13 @@ const TaskMonitorPage: React.FC = () => {
|
||||
<div style={{ flex: 1 }}>
|
||||
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 4 }}>
|
||||
<span style={{ fontWeight: 600, fontSize: 14, color: '#262626' }}>{item.deviceAlias || item.deviceName}</span>
|
||||
<Tag color={rt.status === 'EXECUTING' ? 'green' : 'default'} style={{ margin: 0, borderRadius: 4 }}>
|
||||
{rt.status === 'EXECUTING' ? '进行中' : '待命'}
|
||||
<Tag
|
||||
color={rt.status === '1' ? 'blue' : rt.status === '2' ? 'green' : 'default'}
|
||||
style={{ margin: 0, borderRadius: 4 }}
|
||||
>
|
||||
{rt.status == '1' ? '进行中' : rt.status == '2' ? '待命' : '离线'}
|
||||
</Tag>
|
||||
|
||||
</div>
|
||||
<div
|
||||
style={{
|
||||
@@ -521,10 +571,11 @@ const TaskMonitorPage: React.FC = () => {
|
||||
color: '#8c8c8c',
|
||||
minWidth: 0,
|
||||
}}
|
||||
> <span>任务: {rt.currentTaskName || '常规巡检'}</span>
|
||||
>
|
||||
<span>任务: {rt.workName || '无'}</span>
|
||||
<span
|
||||
style={{
|
||||
color: rt.battery < 20 ? '#ff4d4f' : '#faad14',
|
||||
color: (battery ?? 85) < 20 ? '#ff4d4f' : '#faad14',
|
||||
display: 'inline-flex',
|
||||
alignItems: 'center',
|
||||
gap: 2,
|
||||
@@ -534,10 +585,11 @@ const TaskMonitorPage: React.FC = () => {
|
||||
}}
|
||||
>
|
||||
<Zap size={10} style={{ flexShrink: 0 }} />
|
||||
{rt.battery ?? 85}%
|
||||
{battery ?? 85}%
|
||||
</span>
|
||||
</div>
|
||||
<Progress percent={rt.taskProgress || Math.floor(Math.random() * 100)} size="small" showInfo={false} strokeColor="#52c41a" style={{ marginTop: 6 }} />
|
||||
|
||||
<Progress percent={rt.progress || 0} size="small" showInfo={false} strokeColor="#52c41a" style={{ marginTop: 6 }} />
|
||||
</div>
|
||||
</div>
|
||||
</List.Item>
|
||||
@@ -557,14 +609,19 @@ const TaskMonitorPage: React.FC = () => {
|
||||
}}>
|
||||
<VideoPlayer
|
||||
deviceId={devices.find(d => d.deviceType === 'ROBOT' || d.deviceType === 'CLEANING')?.serialNumber}
|
||||
idx={1}
|
||||
idx={videoView === 'back' ? 2 : videoView === 'left' ? 3 : videoView === 'right' ? 4 : 1}
|
||||
className="w-full h-full object-cover"
|
||||
/>
|
||||
|
||||
</div>
|
||||
<div style={{ display: 'grid', gridTemplateColumns: 'repeat(4, 1fr)', gap: 8 }}>
|
||||
{['前视', '后视', '左视', '右视'].map((v, i) => (
|
||||
<Button key={i} size="small" type={i === 0 ? 'primary' : 'default'} style={{ fontSize: 11, height: 28 }}>{v}</Button>
|
||||
{[
|
||||
{ key: 'front', label: '前视' },
|
||||
{ key: 'back', label: '后视' },
|
||||
{ key: 'left', label: '左视' },
|
||||
{ key: 'right', label: '右视' },
|
||||
].map((v) => (
|
||||
<Button key={v.key} size="small" type={videoView === v.key ? 'primary' : 'default'} style={{ fontSize: 11, height: 28 }} onClick={() => setVideoView(v.key as 'front' | 'back' | 'left' | 'right')}>{v.label}</Button>
|
||||
))}
|
||||
</div>
|
||||
</MonitorCard>
|
||||
|
||||
Reference in New Issue
Block a user