} label={t('devices.steer.chassisUp')} color="#3b82f6" active={steerState.chassis === 'up'} onToggle={() => toggleSteerGroup('chassis', 'up')} />
} label={t('devices.steer.chassisDown')} color="#3b82f6" active={steerState.chassis === 'down'} onToggle={() => toggleSteerGroup('chassis', 'down')} />
diff --git a/src/components/devices/RobotFeatureButtons.tsx b/src/components/devices/RobotFeatureButtons.tsx
index b088d44..ce6d494 100644
--- a/src/components/devices/RobotFeatureButtons.tsx
+++ b/src/components/devices/RobotFeatureButtons.tsx
@@ -38,7 +38,7 @@ const FEATURES: FeatureConfig[] = [
//{ key: 'tiltProtection', icon:
, activeColor: '#10b981', inactiveColor: '#94a3b8' },
{ key: 'autoback', icon:
, activeColor: '#22c55e', inactiveColor: '#94a3b8' },
{ key: 'findCar', icon:
, activeColor: '#ef4444', inactiveColor: '#94a3b8' },
- { key: 'personFollow', icon:
, activeColor: '#10b981', inactiveColor: '#94a3b8' },
+ //{ key: 'personFollow', icon:
, activeColor: '#10b981', inactiveColor: '#94a3b8' },
];
// 急停方块
diff --git a/src/components/devices/RobotTaskPage.tsx b/src/components/devices/RobotTaskPage.tsx
index 44eb31a..356c889 100644
--- a/src/components/devices/RobotTaskPage.tsx
+++ b/src/components/devices/RobotTaskPage.tsx
@@ -192,14 +192,31 @@ export default function RobotTaskPage() {
const working = (robotStats.working || 0) + (droneStats.working || 0);
- const finishCount = (robotStats.finishCount || 0) + (droneStats.finishCount || 0);
+ const finishCount = (robotStats.todayFinishCount || 0) + (droneStats.finishCount || 0);
- const totalCount = (robotStats.totalCount || 0) + (droneStats.totalCount || 0);
+ const totalCount = (robotStats.todayTotalCount || 0) + (droneStats.totalCount || 0);
const completionRate = totalCount ? Math.round((finishCount / totalCount) * 100) : 0;
+ const yesterdayFinishCount = (robotStats.yesterdayFinishCount || 0);
+ const yesterdayTotalCount = (robotStats.yesterdayTotalCount || 0);
+ const yesterdayCompletionRate = yesterdayTotalCount ? Math.round((yesterdayFinishCount / yesterdayTotalCount) * 100) : 0;
+ const completionRateDiff = completionRate - yesterdayCompletionRate;
+ const completionRateTrendText = `${completionRateDiff > 0 ? '+' : ''}${completionRateDiff}%`;
+ const completionRateTrendColor = completionRateDiff >= 0 ? '#00B42A' : '#F53F3F';
const onlineRate = robotOnline.total ? Math.round((robotOnline.online / robotOnline.total) * 100) : 0;
- const totalWorkArea = robotStats?.workArea ?? "0";
+ const todayAlarmCount = robotStats.todayAlarmCount || 0;
+ const yesterdayAlarmCount = robotStats.yesterdayAlarmCount || 0;
+
+ const alarmDiff = todayAlarmCount - yesterdayAlarmCount;
+
+ const alarmTrendColor = alarmDiff > 0
+ ? '#F53F3F'
+ : alarmDiff < 0
+ ? '#00B42A'
+ : '#86909C';
+
+ const alarmTrendText = `${alarmDiff > 0 ? '+' : ''}${alarmDiff}`; const totalWorkArea = robotStats?.workArea ?? "0";
return [
@@ -209,10 +226,17 @@ export default function RobotTaskPage() {
//{ title: t('devices.totalWorkArea'), value: totalWorkArea, unit: '㎡', trend: "", trendColor: '#00B42A', icon:
, color: '#722ED1' },
- { title: t('devices.statCompletionRate'), value: completionRate, unit: '%', trend: t('devices.vsYesterday', { value: '+5%' }), trendColor: '#00B42A', icon:
, color: '#00B42A' },
-
- { title: t('devices.statAlerts'), value: '0', unit: t('devices.unitTimes'), trend: t('devices.vsYesterday', { value: '-1' }), trendColor: '#00B42A', icon:
, color: '#F53F3F' },
+ { title: t('devices.statCompletionRate'), value: completionRate, unit: '%', trend: t('devices.vsYesterday', { value: completionRateTrendText }), trendColor: completionRateTrendColor, icon:
, color: '#00B42A' },
+ {
+ title: t('devices.statAlerts'),
+ value: todayAlarmCount,
+ unit: t('devices.unitTimes'),
+ trend: t('devices.vsYesterday', { value: alarmTrendText }),
+ trendColor: alarmTrendColor,
+ icon:
,
+ color: '#F53F3F'
+ },
{ title: t('devices.statOnlineRate'), value: `${onlineRate}`, unit: '%', desc: t('devices.good'), icon:
, color: '#165DFF' },
] as { title: string; value: any; unit: string; desc?: string; trend?: string; trendColor?: string; icon: React.ReactElement; color: string }[];
diff --git a/src/components/devices/TaskPlanningView.tsx b/src/components/devices/TaskPlanningView.tsx
index 87c39bd..5485db2 100644
--- a/src/components/devices/TaskPlanningView.tsx
+++ b/src/components/devices/TaskPlanningView.tsx
@@ -21,6 +21,7 @@ import { backToRestPointCommand } from '@/api/mapEdit';
import { sendEmergencyStop, subscribeEmergencyStop, syncEmergencyStop } from './emergencyStopControl';
import AgrtcRoomRobot from '../AgrtcRoomRobot.js';
import { deviceRunParamSelectByDeviceId } from '@/api/stationManage/index.js';
+import { getAlarmList } from '@/api/alarmApi.js';
const { Text, Title } = Typography;
@@ -95,6 +96,7 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
const [executeModalVisible, setExecuteModalVisible] = useState(false);
const [selectedRouteForExecute, setSelectedRouteForExecute] = useState(null);
const [selectedRobotForExecute, setSelectedRobotForExecute] = useState(null);
+ const [alarmList, setAlarmList] = useState([])
const [runningPoolTask, setRunningPoolTask] = useState(null);//正在执行的任务
@@ -108,6 +110,8 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
// 任务池和历史任务数据
const [taskPoolList, setTaskPoolList] = useState([]);
const [taskHistoryList, setTaskHistoryList] = useState([]);
+ // 顶部今日/昨日统计专用数据:不受历史任务列表筛选条件影响
+ const [statsTaskHistoryList, setStatsTaskHistoryList] = useState([]);
// 当前激活的Tab
const [activeTab, setActiveTab] = useState('pool'); // 'task' for 任务列表, 'pool' for 任务池, 'history' for 历史任务
@@ -234,6 +238,7 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
setSelectedRouteForExecute(null);
fetchTaskList();
fetchTaskHistoryList();
+ fetchStatsTaskHistoryList();
fetchTaskPoolList();
setNum((prev) => prev + 1); // 触发重新渲染 传递给 组件 获取返航列表或者障碍物
@@ -329,6 +334,18 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
controller.deviceStatusChangedMsg = () => {
fetchAllData();
}
+
+ controller.onDeviceErrorPush = (payload: any) => {
+ const incoming: any[] = Array.isArray(payload?.alarms) ? payload.alarms : [];
+ setAlarmList((prev) => {
+ if (!incoming?.length) return prev;
+ const ids = new Set(incoming.map((a) => a?.id ?? a?.alarmNo));
+ // 新告警补 createTime(WS 推送可能没有该字段)
+ const now = new Date().toISOString();
+ const merged = incoming.map((a) => (a?.createTime ? a : { ...a, createTime: a?.alarmTime || now }));
+ return [...merged, ...prev.filter((a) => !ids.has(a?.id ?? a?.alarmNo))];
+ });
+ };
controller.onDetectionReport = handleDetectionReport;
@@ -434,7 +451,6 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
if (isSameDevice) return;
// 切换设备
- console.log('🔄 检测到正在执行任务的新设备,开始连接', targetDevice);
//if (isFirstConnect.current) { isFirstConnect.current = false; controllerRef.current?.connectDevice(targetDevice); } else { controllerRef.current?.switchDevice(targetDevice); }
//setShowVideo(true);
@@ -474,7 +490,7 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
fix_status: rt?.fixStatus,
controlMode: rt?.controlMode ?? rt?.control_mode ?? targetRobot?.lastRunningStatus?.controlMode,
sm: rt?.sm,
- e: rt?.emergencyStop,
+ progress: rt?.progress,
};
}, [realtimeMap, targetRobot]);
@@ -755,6 +771,7 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
fetchTaskList();
fetchTaskPoolList();
fetchTaskHistoryList();
+ fetchStatsTaskHistoryList();
});
}
@@ -776,11 +793,15 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
const handleRreshTask = (data) => {
- fetchTaskList();
- fetchTaskPoolList();
- fetchTaskHistoryList();
- fetchConsecutiveTaskList();
- setNum((prev) => prev + 1); // 触发重新渲染 传递给 组件 获取返航列表或者障碍物
+ setTimeout(() => {
+ fetchTaskList();
+ fetchTaskPoolList();
+ fetchTaskHistoryList();
+ fetchStatsTaskHistoryList();
+ fetchConsecutiveTaskList();
+ setNum((prev) => prev + 1); // 触发重新渲染 传递给 组件 获取返航列表或者障碍物
+ }, 800)
+
}
@@ -823,6 +844,19 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
}
};
+ // 获取顶部统计专用历史数据(不应用历史列表筛选条件)
+ const fetchStatsTaskHistoryList = async () => {
+ console.log('fetchStatsTaskHistoryList')
+ if (!stationId) return;
+ try {
+ const params = { siteId: stationId, orgId: currentStation?.orgId, pageNum: 1, pageSize: 99999999 };
+ const res = await getSiteDeviceTaskHistory(params);
+ if (res.code == 200) setStatsTaskHistoryList(res.rows || []);
+ } catch (err) {
+ console.error('获取统计任务数据失败:', err);
+ }
+ };
+
// 获取历史任务数据
const fetchTaskHistoryList = async () => {
if (!stationId) return;
@@ -868,6 +902,7 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
utils.message.success(t('devices.fixed2TaskSuspended2Fixed2CancelledFixed2'));
fetchTaskPoolList();
fetchTaskHistoryList();
+ fetchStatsTaskHistoryList();
fetchConsecutiveTaskList();
setExecute(false);
//if (controllerRef.current) {
@@ -901,6 +936,7 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
utils.message.success(t('devices.taskPaused'));
fetchTaskPoolList();
fetchTaskHistoryList();
+ fetchStatsTaskHistoryList();
} else {
utils.message.error(res.msg || t('devices.pauseFailed'));
}
@@ -923,6 +959,7 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
utils.message.success(t('devices.taskResumed'));
fetchTaskPoolList();
fetchTaskHistoryList();
+ fetchStatsTaskHistoryList();
} else {
utils.message.error(res.msg || t('devices.resumeFailed'));
}
@@ -961,13 +998,16 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
}
}, [poolFilterForm, stationId]);
- // 监听历史任务筛选条件变化
+ // 监听历史任务筛选条件变化(仅刷新列表,不刷新顶部统计)
useEffect(() => {
- if (stationId) {
- fetchTaskHistoryList();
- }
+ if (stationId) fetchTaskHistoryList();
}, [historyFilterForm, stationId]);
+ // 顶部统计始终取未筛选的历史任务数据
+ useEffect(() => {
+ if (stationId) fetchStatsTaskHistoryList();
+ }, [stationId, currentStation?.orgId]);
+
const taskColumns = [
{
title: t('devices.taskName'),
@@ -1357,13 +1397,112 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
const { waitList, runList, finishList } = groupBoardData;
const { successfulTaskList } = historyData;
+ // 今日 / 昨日 任务完成统计(按 startTime 分总任务、endTime 分完成任务)
+ const { todayFinishCount, yesterdayFinishCount, todayTotalCount, yesterdayTotalCount } = useMemo(() => {
+ const todayKey = dayjs().format('YYYY-MM-DD');
+ const yesterdayKey = dayjs().subtract(1, 'day').format('YYYY-MM-DD');
+
+ // 时间可能是 ISO 字符串,也可能是 Java LocalDateTime 数组 [y,mo,d,h,mi,s]
+ const toDayKey = (v: any) => {
+ if (!v) return '';
+ if (Array.isArray(v)) {
+ const [y, mo, d] = v;
+ return y ? dayjs(new Date(y, mo - 1, d)).format('YYYY-MM-DD') : '';
+ }
+ const dt = dayjs(v);
+ return dt.isValid() ? dt.format('YYYY-MM-DD') : '';
+ };
+
+ let tf = 0, yf = 0, tt = 0, yt = 0;
+
+ for (const item of statsTaskHistoryList || []) {
+ const startTime = item?.startTime;
+ const status = item?.taskStaus;
+
+ if (!startTime) continue;
+
+ const startKey = toDayKey(startTime);
+
+ // 统计今日/昨日任务总数(按开始时间)
+ if (startKey === todayKey) tt++;
+ else if (startKey === yesterdayKey) yt++;
+
+ // 统计今日/昨日完成数(完成状态,按开始时间)
+ if (status === 'FINISH') {
+ if (startKey === todayKey) tf++;
+ else if (startKey === yesterdayKey) yf++;
+ }
+ }
+
+ return {
+ todayFinishCount: tf,
+ yesterdayFinishCount: yf,
+ todayTotalCount: tt,
+ yesterdayTotalCount: yt
+ };
+ }, [statsTaskHistoryList]);
+
+
+ const {
+ todayCompletionRate,
+ yesterdayCompletionRate,
+ completionRateDiff,
+ completionRateTrendText,
+ completionRateTrendColor
+ } = useMemo(() => {
+ const todayRate = todayTotalCount
+ ? Math.round((todayFinishCount / todayTotalCount) * 100)
+ : 0;
+
+ const yesterdayRate = yesterdayTotalCount
+ ? Math.round((yesterdayFinishCount / yesterdayTotalCount) * 100)
+ : 0;
+
+ const diff = todayRate - yesterdayRate;
+
+ return {
+ todayCompletionRate: todayRate,
+ yesterdayCompletionRate: yesterdayRate,
+ completionRateDiff: diff,
+ completionRateTrendText: `${diff > 0 ? '+' : ''}${diff}%`,
+ completionRateTrendColor:
+ diff > 0 ? '#00B42A' : diff < 0 ? '#F53F3F' : '#86909C'
+ };
+ }, [todayFinishCount, todayTotalCount, yesterdayFinishCount, yesterdayTotalCount]);
+
+ // 告警时间解析:兼容 ISO 字符串 与 Java LocalDateTime 数组 [y,mo,d,h,mi,s]
+ const parseAlarmDay = (v: any) => {
+ if (!v) return null;
+ if (Array.isArray(v)) {
+ const [y, mo, d] = v;
+ if (!y) return null;
+ return dayjs(new Date(y, mo - 1, d));
+ }
+ const dt = dayjs(v);
+ return dt.isValid() ? dt : null;
+ };
+ // 今日 / 昨日 告警数
+ const { todayAlarmCount, yesterdayAlarmCount } = useMemo(() => {
+ const today = dayjs().startOf('day');
+ const yesterday = dayjs().subtract(1, 'day').startOf('day');
+ let t = 0, y = 0;
+ for (const a of alarmList || []) {
+ const dt = parseAlarmDay(a?.createTime ?? a?.alarmTime);
+ if (!dt) continue;
+ if (dt.isSame(today, 'day')) t++;
+ else if (dt.isSame(yesterday, 'day')) y++;
+ }
+ return { todayAlarmCount: t, yesterdayAlarmCount: y };
+ }, [alarmList]);
+
+
const topCards = [
{ title: t('devices.statTodayPlan'), value: taskList.length, unit: t('devices.unitPlan'), desc: t('devices.statInProgress'), icon:
, color: '#165DFF' },
{ title: t('devices.statWorkingRobots'), value: taskPoolList?.filter(item => ['EXECUTING', 'PAUSE'].includes(item.taskStaus))?.length, unit: t('devices.unitRobot'), desc: t('devices.statWorking'), icon:
, color: '#165DFF' },
{ title: t('devices.statTotalDistance'), value: '12.5', unit: 'km', trend: t('devices.vsYesterday', { value: '+1.2' }), trendColor: '#00B42A', icon:
, color: '#722ED1' },
- { title: t('devices.statCompletionRate'), value: successfulTaskList.length ? Math.round((successfulTaskList.length / taskHistoryList.length) * 100) : 0, unit: '%', trend: t('devices.vsYesterday', { value: '+5%' }), trendColor: '#00B42A', icon:
, color: '#00B42A' },
- { title: t('devices.statAlerts'), value: '0', unit: t('devices.unitTimes'), trend: t('devices.vsYesterday', { value: '-1' }), trendColor: '#00B42A', icon:
, color: '#F53F3F' },
+ { title: t('devices.statCompletionRate'), value: todayCompletionRate, unit: '%', trend: t('devices.vsYesterday', { value: completionRateTrendText }), trendColor: completionRateTrendColor, icon:
, color: '#00B42A' },
+ { title: t('devices.statAlerts'), value: todayAlarmCount, unit: t('devices.unitTimes'), trend: t('devices.vsYesterday', { value: (todayAlarmCount - yesterdayAlarmCount >= 0 ? '+' : '') + (todayAlarmCount - yesterdayAlarmCount) }), trendColor: todayAlarmCount - yesterdayAlarmCount > 0 ? '#F53F3F' : '#00B42A', icon:
, color: '#F53F3F' },
{
title: t('devices.statOnlineRate'),
value: `${devices?.length ? Math.round((devices.filter(d => d.onlineStatus == 1).length / devices.length) * 100) : 0}`,
@@ -1399,7 +1538,6 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
if (res?.code === 200) {
const n = Number(res.data?.cameraNum);
setCameraNum(Number.isFinite(n) && n >= 1 && n <= 4 ? n : 1);
- console.log('[DSP] deviceRunParam res.data=', res.data);
} else {
setCameraNum(1);
}
@@ -1408,6 +1546,18 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
});
return () => { cancelled = true; };
}, [selectedMachineSn]);
+ const fetchAlarmList = async () => {
+ try {
+ const res = await getAlarmList({ pageNum: 1, pageSize: 9999, siteId: stationId });
+ if (res.code === 200) {
+ setAlarmList(res.rows ?? []);
+ }
+
+ } catch (err) {
+ messageApi.error(t('common.loadFailed'));
+ } finally {
+ }
+ };
useEffect(() => {
const workingCount = taskPoolList?.filter(item =>
@@ -1419,15 +1569,16 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
working: workingCount,
finishCount: successfulTaskList.length,
totalCount: taskHistoryList.length,
- ...deviceStatistics,
+ todayAlarmCount,
+ yesterdayAlarmCount, todayFinishCount, yesterdayFinishCount, todayTotalCount, yesterdayTotalCount, ...deviceStatistics,
});
}, [
taskList.length,
taskPoolList,
successfulTaskList.length,
taskHistoryList.length,
- deviceStatistics,
- ]);
+ deviceStatistics, yesterdayAlarmCount,
+ todayAlarmCount, todayFinishCount, yesterdayFinishCount, todayTotalCount, yesterdayTotalCount]);;
// ===== 分区列表 =====
useEffect(() => {
@@ -1436,6 +1587,7 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
const list = Array.isArray(res?.data) ? res.data : (Array.isArray(res?.rows) ? res.rows : []);
setRegionList(list);
}).catch(() => setRegionList([]));
+ fetchAlarmList();
}, [stationId]);
// 按区域下发时,选中区域的可用路径(bindRoutes + defaultRoute)
@@ -1628,6 +1780,7 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
fetchTaskList();
fetchTaskPoolList();
fetchTaskHistoryList();
+ fetchStatsTaskHistoryList();
}
} else if (dispatchMode === 'immediate' && dispatchSource == "region") {
try {
@@ -1644,6 +1797,7 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
fetchTaskList();
fetchTaskPoolList();
fetchTaskHistoryList();
+ fetchStatsTaskHistoryList();
fetchConsecutiveTaskList();
} else {
utils.message.error(res.msg || t("devices.createFailed"));
@@ -1694,6 +1848,7 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
fetchTaskList();
fetchTaskPoolList();
fetchTaskHistoryList();
+ fetchStatsTaskHistoryList();
}
}
} catch (err) {
@@ -2059,10 +2214,10 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
key: 'history',
label: t('devices.taskHistory'),
},
- {
- key: 'consecutive',
- label: t('devices.taskConsecutive'),
- }
+ //{
+ // key: 'consecutive',
+ // label: t('devices.taskConsecutive'),
+ //}
]}
tabBarExtraContent={
@@ -2070,6 +2225,7 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
fetchTaskList();
fetchTaskPoolList();
fetchTaskHistoryList();
+ fetchStatsTaskHistoryList();
fetchConsecutiveTaskList();
}} />
@@ -2194,7 +2350,7 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
rowKey="id"
columns={taskPoolColumns}
dataSource={taskPoolList}
- pagination={false}
+ //pagination={false}
scroll={{ x: 800, y: 150 }}
onRow={(record) => ({
onClick: () => handlePoolTaskClick(record),
@@ -2203,6 +2359,7 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
backgroundColor: record.id === runningPoolTask?.id ? '#e6f4ff' : 'transparent'
}
})}
+ pagination={{ pageSize: 10, showSizeChanger: false, showQuickJumper: true, showTotal: (total) => t('devices.mapEditor.totalCountWithUnit', { count: total }) }}
/>
>
)}
@@ -2350,8 +2507,8 @@ export function TaskPlanningView({ selectedMachineSn, embedded = false, onStatsC
{([
{ type: 'returnPoint' as const, label: t('devices.mapEditor.returnPoint'), desc: t('devices.mapEditor.returnPointDesc'), icon:
},
- { type: 'restArea' as const, label: t('devices.mapEditor.restArea'), desc: t('devices.mapEditor.restAreaDesc'), icon:
},
- { type: 'obstaclePoint' as const, label: t('devices.mapEditor.obstaclePointLabel'), desc: t('devices.mapEditor.obstaclePointDesc'), icon:
},
+ //{ type: 'restArea' as const, label: t('devices.mapEditor.restArea'), desc: t('devices.mapEditor.restAreaDesc'), icon:
},
+ //{ type: 'obstaclePoint' as const, label: t('devices.mapEditor.obstaclePointLabel'), desc: t('devices.mapEditor.obstaclePointDesc'), icon:
},
{ type: 'routeGen' as const, label: t('devices.mapEditor.routeGen'), desc: t('devices.mapEditor.routeGenDesc'), icon:
},
]).map((item) => {
const selected = editorType === item.type;
diff --git a/src/components/devices/deviceController.js b/src/components/devices/deviceController.js
index 6fd9d1b..8048825 100644
--- a/src/components/devices/deviceController.js
+++ b/src/components/devices/deviceController.js
@@ -149,7 +149,7 @@ 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,
+ progress: Number(Number(it?.p ?? it?.progress ?? 0).toFixed(2)),
workName: it?.wk ?? null,
sm: it?.sm ?? null,
emergencyStop: it?.e
diff --git a/src/components/devices/emergencyStopControl.ts b/src/components/devices/emergencyStopControl.ts
index a30e9cc..43b9c9d 100644
--- a/src/components/devices/emergencyStopControl.ts
+++ b/src/components/devices/emergencyStopControl.ts
@@ -41,7 +41,7 @@ export const sendEmergencyStop = async (deviceId: string) => {
deviceId,
eStop: newActive ? 1 : 0
});
- if (res?.code == 200) {
+ if (res?.code == 200 && res?.data) {
active = newActive;
emit();
utils.message.success('急停状态切换成功');
diff --git a/src/components/recharts.jsx b/src/components/recharts.jsx
index a2d309e..1c5920d 100644
--- a/src/components/recharts.jsx
+++ b/src/components/recharts.jsx
@@ -357,6 +357,7 @@ export const UniversalPieChart = ({
outerRadius={outerRadius}
paddingAngle={paddingAngle}
label={showLabel}
+ isAnimationActive={false}
>
{data.map((entry, index) => (
= ({
description: t('devices.taskTypeRadio.immediateDescription'),
icon: ,
},
- {
- value: 'scheduled',
- title: t('devices.taskTypeRadio.scheduled'),
- description: t('devices.taskTypeRadio.scheduledDescription'),
- icon: ,
- },
+ //{
+ // value: 'scheduled',
+ // title: t('devices.taskTypeRadio.scheduled'),
+ // description: t('devices.taskTypeRadio.scheduledDescription'),
+ // icon: ,
+ //},
];
diff --git a/src/locales/en/index.ts b/src/locales/en/index.ts
index 8500e59..1bec274 100644
--- a/src/locales/en/index.ts
+++ b/src/locales/en/index.ts
@@ -1560,6 +1560,8 @@
autoControl: 'autoControl',
manual: 'manual',
auto: 'auto',
+ taskProgress: 'taskProgress',
+
diff --git a/src/locales/zh/index.ts b/src/locales/zh/index.ts
index 37e7328..debd973 100644
--- a/src/locales/zh/index.ts
+++ b/src/locales/zh/index.ts
@@ -274,6 +274,8 @@ const zh = {
deviceStatus: '设备状态',
waylineTask: '航线任务',
robotTask: '机器人任务',
+ taskProgress: '任务进度',
+
deviceName: '设备名称',
deviceType: '设备类型',
deviceModel: '设备型号',
diff --git a/src/pages/TaskMonitorPage.tsx b/src/pages/TaskMonitorPage.tsx
index 91eacba..5cc2927 100644
--- a/src/pages/TaskMonitorPage.tsx
+++ b/src/pages/TaskMonitorPage.tsx
@@ -772,7 +772,7 @@ const TaskMonitorPage: React.FC = () => {
)}
当前任务{selectedRealtime.workName || "无"}
{/*设备类型{selectedDevice.deviceTypeName || selectedDevice.deviceType || '车辆'} */}
- 任务进度{selectedRealtime.progress ?? 0}%
+ 任务进度{selectedRealtime.progress}%
|
)}
@@ -914,7 +914,7 @@ const TaskMonitorPage: React.FC = () => {
{/* Progress 关键:minWidth:0,禁止撑出去 */}