连续任务下发列表 取消连续任务 增加模式切换 方向盘手柄 加一个提示 切换模式控件 加一个高亮效果 任务监控界面 数据完善
This commit is contained in:
@@ -1482,6 +1482,7 @@ const RealTimeMonitorPage = () => {
|
||||
onToggle={(feature, enabled) => {
|
||||
console.log('[RTMonitor Feature]', feature, enabled);
|
||||
}}
|
||||
controlMode={pickRealtimeRecord(realtimeMap, selectedDevice)?.controlMode}
|
||||
/>
|
||||
</Card>
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ import { useSelector } from 'react-redux';
|
||||
import { RootState } from '../store';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import dayjs from 'dayjs';
|
||||
import { getRobotTaskList, getSiteDevice, getDeviceTastPool, getSiteDeviceTaskHistory } from '../api/device';
|
||||
import { getRobotTaskList, getSiteDevice, getDeviceTastPool, getSiteDeviceTaskHistory, } from '../api/device';
|
||||
import { getAlarmList, getAlarmStatistics } from '../api/alarmApi';
|
||||
import { alarmTypeMap } from '@/constants.js';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
@@ -81,6 +81,8 @@ const TaskMonitorPage: React.FC = () => {
|
||||
const [selectedDeviceSerial, setSelectedDeviceSerial] = useState<string | null>(null);
|
||||
const [focusLocation, setFocusLocation] = useState<any>(null);
|
||||
const [messageApi, contextHolder] = message.useMessage();
|
||||
const [taskPoolList, setTaskPoolList] = useState([]);
|
||||
|
||||
|
||||
const controllerRef = useRef<DeviceController | null>(null);
|
||||
const mapRef = useRef<any>(null);
|
||||
@@ -101,7 +103,7 @@ const TaskMonitorPage: React.FC = () => {
|
||||
if (!stationId) return;
|
||||
setLoading(true);
|
||||
try {
|
||||
const [taskRes, alarmRes, alarmStatRes, deviceRes, taskHistoreList] = await Promise.all([
|
||||
const [taskRes, alarmRes, alarmStatRes, deviceRes, taskHistoreList, taskpoollist] = await Promise.all([
|
||||
getRobotTaskList({ siteId: String(stationId), pageNum: 1, pageSize: 999 }),
|
||||
getAlarmList({ siteId: stationId, pageNum: 1, pageSize: 9999 }),
|
||||
getAlarmStatistics({ siteId: stationId }),
|
||||
@@ -111,6 +113,13 @@ const TaskMonitorPage: React.FC = () => {
|
||||
orgId: currentStation?.orgId,
|
||||
pageNum: 1,
|
||||
pageSize: 99999999
|
||||
}),
|
||||
getDeviceTastPool({
|
||||
userId: userInfo?.userId,
|
||||
siteId: stationId,
|
||||
orgId: currentStation?.orgId,
|
||||
pageNum: 1,
|
||||
pageSize: 99999999
|
||||
})
|
||||
]);
|
||||
|
||||
@@ -119,6 +128,7 @@ const TaskMonitorPage: React.FC = () => {
|
||||
if (alarmStatRes.code === 200) setAlarmStats(alarmStatRes.data || null);
|
||||
if (deviceRes.code === 200) setDevices(deviceRes.rows || []);
|
||||
if (taskHistoreList.code == 200) setTaskHistoryLisy(taskHistoreList.rows || []);
|
||||
if (taskpoollist.code == 200) setTaskPoolList(taskpoollist.rows || []);
|
||||
} catch (err) {
|
||||
console.error('Fetch monitoring data failed', err);
|
||||
} finally {
|
||||
@@ -126,6 +136,8 @@ const TaskMonitorPage: React.FC = () => {
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
fetchData();
|
||||
//const timer = setInterval(fetchData, 60000); // 每分钟刷新一次
|
||||
@@ -181,11 +193,11 @@ const TaskMonitorPage: React.FC = () => {
|
||||
const taskSummary = useMemo(() => {
|
||||
const todayTasks = taskList.filter(t => dayjs(t.createTime).isSame(dayjs(), 'day'));
|
||||
return {
|
||||
pending: todayTasks.filter(t => t.taskStaus === 'NEW').length,
|
||||
running: todayTasks.filter(t => t.taskStaus === 'EXECUTING').length,
|
||||
completed: todayTasks.filter(t => ['FINISH', 'FINISHED'].includes(t.taskStaus)).length,
|
||||
failed: todayTasks.filter(t => t.taskStaus === 'FAILED').length,
|
||||
total: todayTasks.length
|
||||
pending: taskPoolList.filter(t => t.taskStaus === 'NEW').length,
|
||||
running: taskPoolList.filter(t => t.taskStaus === 'EXECUTING').length,
|
||||
completed: taskListHis.filter(t => ['FINISH', 'FINISHED'].includes(t.taskStaus)).length,
|
||||
failed: taskListHis.filter(t => t.taskStaus === 'FAILED').length,
|
||||
total: taskListHis.length
|
||||
};
|
||||
}, [taskList]);
|
||||
|
||||
@@ -253,16 +265,16 @@ const TaskMonitorPage: React.FC = () => {
|
||||
{contextHolder}
|
||||
|
||||
<div style={{ padding: '0 0 16px' }}>
|
||||
<Title level={4} style={{ margin: 0, color: '#17456d', letterSpacing: 1 }}>任务监控指挥中心</Title>
|
||||
<Title level={4} style={{ margin: 0, color: '#17456d', letterSpacing: 1 }}>任务监控中心</Title>
|
||||
</div>
|
||||
|
||||
<Row gutter={12} style={{ height: columnHeight }}>
|
||||
{/* 左侧面板 */}
|
||||
<Col span={5} style={{ height: '100%', display: 'flex', flexDirection: 'column', minWidth: 0 }}>
|
||||
<MonitorCard title="任务总览" icon={<LayoutGrid size={18} color="#1890ff" />} height="30%">
|
||||
<MonitorCard title="任务总览" icon={<LayoutGrid size={18} color="#1890ff" />} height="30%" extra={<Button type="link" size="small" onClick={() => navigate('/devices/robotTask')}>查看更多</Button>}>
|
||||
<Row gutter={8}>
|
||||
{[
|
||||
{ label: '待部署', value: taskSummary.pending, color: '#faad14', bg: '#fff7e6' },
|
||||
{ label: '待进行', value: taskSummary.pending, color: '#faad14', bg: '#fff7e6' },
|
||||
{ label: '进行中', value: taskSummary.running, color: '#1890ff', bg: '#e6f7ff' },
|
||||
{ label: '已完成', value: taskSummary.completed, color: '#52c41a', bg: '#f6ffed' },
|
||||
{ label: '故障', value: taskSummary.failed, color: '#ff4d4f', bg: '#fff1f0' }
|
||||
@@ -282,7 +294,7 @@ const TaskMonitorPage: React.FC = () => {
|
||||
))}
|
||||
</Row>
|
||||
<div style={{ marginTop: 16 }}>
|
||||
{taskList.slice(0, 2).map((task, idx) => (
|
||||
{taskPoolList.slice(0, 2).map((task, idx) => (
|
||||
<div key={idx} style={{ background: '#f8faff', padding: '10px 12px', borderRadius: 8, marginBottom: 8, border: '1px solid #e6f7ff' }}>
|
||||
<div style={{ display: 'flex', justifyContent: 'space-between', fontSize: 13, marginBottom: 4 }}>
|
||||
<span style={{ fontWeight: 500, color: '#262626' }}>{task.planName}</span>
|
||||
@@ -291,7 +303,7 @@ const TaskMonitorPage: React.FC = () => {
|
||||
<Progress percent={Math.floor(Math.random() * 40 + 60)} size="small" showInfo={false} strokeColor="#1890ff" />
|
||||
<div style={{ fontSize: 11, color: '#8c8c8c', marginTop: 4 }}>
|
||||
<Clock size={10} style={{ marginRight: 4 }} />
|
||||
{dayjs(task.createTime).format('HH:mm:ss')} 下发
|
||||
{dayjs(task.createTime).format('YY-MM-DD HH:mm:ss')} 下发
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
|
||||
Reference in New Issue
Block a user