diff --git a/src/components/devices/DeviceOverviewPage.tsx b/src/components/devices/DeviceOverviewPage.tsx index 688eb10..344e39a 100644 --- a/src/components/devices/DeviceOverviewPage.tsx +++ b/src/components/devices/DeviceOverviewPage.tsx @@ -22,11 +22,12 @@ import AgoraTextTest from '../AgoraRtc.tsx'; import { useWebRTCPlayer } from '../useWebRTCStream.tsx'; import VideoPlayer from '../VideoPlayer.tsx.tsx'; import CesiumMap from '../Map.jsx'; -import { getUAVState, getSiteDevice, getSiteUAVList } from '@/api/device.ts'; +import { getUAVState, getSiteDevice, getSiteUAVList, getsinglePlan, getRobotTaskList } from '@/api/device.ts'; +import dayjs from 'dayjs'; import { useMqtt } from '@/hooks/useMqtt'; -import envConfig from '../../../env'; import { useSelector } from 'react-redux'; import { RootState } from '@/store'; +import envConfig from '../../../env'; const { Content } = Layout; const { Text, Title } = Typography; @@ -62,6 +63,7 @@ export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceS const [devices, setDevices] = useState([]); const [planedevices, setPlaneDevices] = useState([]); const [devicesAll, setDevicesAll] = useState([]); + const [taskStats, setTaskStats] = useState({ completed: 12, total: 15 }); // 获取数据 const fetchAllData = async () => { @@ -107,6 +109,72 @@ export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceS useEffect(() => { fetchAllData(); }, [userInfo, stationId]); + useEffect(() => { + fetchTaskStats(); + }, [devicesAll.length]); + + // 获取今日任务统计 + const fetchTaskStats = async () => { + if (!stationId) return; + + try { + const todayStart = dayjs().startOf('day').unix(); + const todayEnd = dayjs().endOf('day').unix(); + + let completedCount = 0; + let totalCount = 0; + + // 1. 获取无人机今日任务 + if (planedevices?.length > 0) { + try { + const sns = planedevices.map(item => item.gateway_sn); + const droneRes = await getsinglePlan({ sns, beginAt: todayStart, endAt: todayEnd }); + if (droneRes?.code === 200 && droneRes.data) { + let droneTasks = []; + Object.values(droneRes.data).forEach((item: any) => { + if (item.list) droneTasks = droneTasks.concat(item.list); + }); + totalCount += droneTasks.length; + // 计算无人机完成的任务 + completedCount += droneTasks.filter(t => + ['success', 'completed', 'executed', 'FINISH', 'COMPLETED'].includes(t.status) + ).length; + } + } catch (err) { + console.error('获取无人机任务统计失败', err); + } + } + + // 2. 获取机器人今日任务 + try { + const robotRes = await getRobotTaskList({ siteId: String(stationId) }); + if (robotRes?.code == 200 && robotRes.data) { + const todayRobotTasks = robotRes.data.filter((t: any) => { + // 简单判断是今日的任务 + if (t.createTime) { + const taskTime = dayjs(t.createTime); + return taskTime.isAfter(dayjs().startOf('day')) && taskTime.isBefore(dayjs().endOf('day')); + } + return true; // 默认都算 + }); + totalCount += todayRobotTasks.length; + // 计算机器人完成的任务 + completedCount += todayRobotTasks.filter((t: any) => + ['FINISH', 'FINISHED', 'COMPLETED', 'completed'].includes(t.taskStaus) + ).length; + } + } catch (err) { + console.error('获取机器人任务统计失败', err); + } + + + setTaskStats({ completed: completedCount, total: totalCount }); + + } catch (err) { + console.error('获取任务统计失败', err); + setTaskStats({ completed: 12, total: 15 }); + } + }; // 当前选中设备(切换时才变) const selectedDevice = useMemo(() => { @@ -278,14 +346,21 @@ export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceS const totalMowers = devicesAll?.filter(d => d.productName?.includes('割草机')).length || 0; const activeMowers = devicesAll?.filter(d => d.productName?.includes('割草机') && d.onlineStatus === 1).length || 0; const washDroneStandby = planedevices?.filter(d => d.productName?.includes('清洗') && d.onlineStatus === 1).length || 0; + + + + // 今日任务执行统计 + const completedTasks = taskStats.completed; + const totalTasks = taskStats.total; + const completionRate = totalTasks > 0 ? Math.round((completedTasks / totalTasks) * 100) : 0; + return [ { title: '无人机机场状态', icon: , value: `${onlineDrones} / ${totalDrones}`, sub: `可调度 ${onlineDrones} 架`, color: '#1890ff' }, { title: '机器人', icon: , value: `${totalMowers} 台`, sub: `作业中 ${activeMowers}`, color: '#13c2c2' }, { title: '无人机', icon: , value: `${totalDrones} 架`, sub: `待命 ${washDroneStandby}`, color: '#eb2f96' }, - { title: '设备平均电量', icon: , value: '86%', sub: '', color: '#52c41a' }, - { title: '今日任务执行', icon: , value: '12 / 15', sub: '完成率 80%', color: '#2f54eb' }, + { title: '今日任务执行', icon: , value: `${completedTasks} / ${totalTasks}`, sub: `完成率 ${completionRate}%`, color: '#2f54eb' }, ]; - }, [devicesAll, planedevices]); + }, [devicesAll, planedevices, persistentDroneData, uavState, taskStats]); // 设备调度列表 const dynamicScheduleList = useMemo(() => { @@ -343,7 +418,7 @@ export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceS {dynamicTopCards.map((card, idx) => ( - +
diff --git a/src/components/devices/WayLinePage.tsx b/src/components/devices/WayLinePage.tsx index fc647a0..1ebc317 100644 --- a/src/components/devices/WayLinePage.tsx +++ b/src/components/devices/WayLinePage.tsx @@ -532,7 +532,6 @@ export default function WayLinePage({ onRefresh }) { if (item.list) combinedList = combinedList.concat(item.list); }); } - console.log('看板任务列表:', combinedList); setBoardTaskList(combinedList); } } catch (err) { diff --git a/src/pages/ReportCenter.tsx b/src/pages/ReportCenter.tsx index a6f8ef3..a2b7bed 100644 --- a/src/pages/ReportCenter.tsx +++ b/src/pages/ReportCenter.tsx @@ -27,12 +27,60 @@ const { Text, Title } = Typography; // 模拟数据(完全匹配参考图) const overviewCards = [ - { title: '本月发电量', value: '138.6', unit: 'MWh', trend: '环比 ↑ +6.2%', color: '#00B42A', bg: '#E8FFEA', icon: }, - { title: 'PR均值', value: '82.8', unit: '%', trend: '环比 ↑ +1.1%', color: '#165DFF', bg: '#E8F3FF', icon: }, - { title: '运维工单完成率', value: '93.4', unit: '%', trend: '本月累计 126 单', color: '#165DFF', bg: '#E8F3FF', icon: }, - { title: '告警闭环率', value: '94.2', unit: '%', trend: '严重告警 8 条', color: '#F53F3F', bg: '#FFF1F0', icon: }, - { title: '清洗收益提升', value: '+7.6', unit: '%', trend: '预估增发 12,850 kWh', color: '#00B42A', bg: '#E8FFEA', icon: }, - { title: '自动生成报告', value: '24', unit: '份', trend: '本月累计', color: '#722ED1', bg: '#F9F0FF', icon: }, + { + title: '本月发电量', + value: '138.6', + unit: 'MWh', + trend: '环比 ↑ +6.2%', + color: '#00B42A', + iconBg: '#E8FFEA', + icon: + }, + { + title: 'PR均值', + value: '82.8', + unit: '%', + trend: '环比 ↑ +1.1%', + color: '#165DFF', + iconBg: '#E8F3FF', + icon: + }, + { + title: '运维工单完成率', + value: '93.4', + unit: '%', + trend: '本月累计 126 单', + color: '#165DFF', + iconBg: '#E8F3FF', + icon: + }, + { + title: '告警闭环率', + value: '94.2', + unit: '%', + trend: '严重告警 8 条', + color: '#F53F3F', + iconBg: '#FFF1F0', + icon: + }, + { + title: '清洗收益提升', + value: '+7.6', + unit: '%', + trend: '预估增发 12,850 kWh', + color: '#00B42A', + iconBg: '#E8FFEA', + icon: + }, + { + title: '自动生成报告', + value: '24', + unit: '份', + trend: '本月累计', + color: '#722ED1', + iconBg: '#F9F0FF', + icon: + }, ]; const monthlyPowerData = [ @@ -132,11 +180,7 @@ export default function ReportCenterPage() { .report-tabs .ant-tabs-nav { margin-bottom: 8px !important; } - .report-tabs .ant-tabs-tab { - padding: 2px 4px !important; - font-size: 14px; - font-weight: 500; - } + .filter-label { font-size: 12px; color: #86909C; @@ -153,7 +197,7 @@ export default function ReportCenterPage() { } `} -
+
报表中心 {/* 页面头部标签 */} @@ -169,66 +213,52 @@ export default function ReportCenterPage() { {overviewCards.map((card, idx) => ( - + - - {card.title} - - } - value={card.value} - precision={card.title === 'PR均值' ? 1 : 1} - suffix={ - card.unit && ( - {card.unit} - ) - } - valueStyle={{ - color: card.color, - fontSize: 28, - fontWeight: 700, - marginBottom: 4 + {/* 左侧文字区域 */} +
+
+ {card.title} +
+
+ {card.value} + {card.unit} +
+ {/* 底部环比/备注 */} +
+ {card.trend} +
+
+ + {/* 右侧圆形图标区域 */} + +
+ > + {card.icon} +
- {card.rate && ( -
- 环比 - - {card.rate} - -
- )} - - {card.desc && ( -
- {card.desc} -
- )}
))} diff --git a/src/pages/WorkOrder.tsx b/src/pages/WorkOrder.tsx index 4166822..a77e7b1 100644 --- a/src/pages/WorkOrder.tsx +++ b/src/pages/WorkOrder.tsx @@ -450,8 +450,8 @@ const WorkOrderPage = () => {
-
{item.title}
-
+
{item.title}
+
{item.value}
{item.unit && {item.unit}}