根据不同账号 显示的首页优化 规划界面 悬浮显示 状态信息 全局急停状态统一 割刀 根据新方案对接 两个状态 任务路线 显示为 抽拉式一行一个 xbox组件优化数据发送,重构数据
This commit is contained in:
@@ -40,7 +40,7 @@ import envConfig from '../../../env';
|
||||
import utils from '@/lib/utils.ts';
|
||||
import { useUnitFormatter } from '@/lib/units';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { sendEmergencyStop } from './emergencyStopControl';
|
||||
import { sendEmergencyStop, subscribeEmergencyStop, syncEmergencyStop } from './emergencyStopControl';
|
||||
import AlarmLevelTag from '../AlarmLevelTag.tsx';
|
||||
import { getDeviceTastPool } from '@/api/device.ts';
|
||||
import { backToRestPointCommand } from '@/api/mapEdit';
|
||||
@@ -69,6 +69,10 @@ export default function DeviceOverviewPage() {
|
||||
const [deviceStatistics, setDeviceStatistics] = useState(null);
|
||||
const [currentSelectedRobot, setCurrentSelectedRobot] = useState(null);
|
||||
const [realtimeMap, setRealtimeMap] = useState<any>({});
|
||||
// 急停锁存状态:与 DPadControl / XboxController 共享同一份状态
|
||||
const [eStopActive, setEStopActive] = useState(false);
|
||||
|
||||
useEffect(() => subscribeEmergencyStop(setEStopActive), []);
|
||||
const controllerRef = useRef<DeviceController | null>(null);
|
||||
const [messageApi, contextHolder] = message.useMessage();
|
||||
const [taskList, setTaskList] = useState<any[]>([]);
|
||||
@@ -429,11 +433,16 @@ export default function DeviceOverviewPage() {
|
||||
...persistentDroneData,
|
||||
...wsData,
|
||||
// 统一字段名
|
||||
capacity_percent: wsData.battery_level || persistentDroneData?.capacity_percent || selectedDevice.capacity_percent || 100
|
||||
capacity_percent: wsData.battery_level ?? wsData.battery ?? wsData.capacity_percent ?? persistentDroneData?.capacity_percent ?? selectedDevice.capacity_percent ?? 100
|
||||
};
|
||||
|
||||
}, [selectedDevice, uavState, persistentHostData, persistentDroneData, realtimeMap]);
|
||||
|
||||
// 实时数据里的急停状态同步到共享锁存状态:true=已急停,false=未急停
|
||||
useEffect(() => {
|
||||
syncEmergencyStop(realtimeDevice?.emergency_stop);
|
||||
}, [realtimeDevice?.emergency_stop]);
|
||||
|
||||
// MQTT消息处理
|
||||
const handleMqttMessage = useCallback((topic, message) => {
|
||||
|
||||
@@ -701,6 +710,9 @@ export default function DeviceOverviewPage() {
|
||||
const sn = d.serialNumber || d.device_sn;
|
||||
const rt = realtimeMap[sn] || {};
|
||||
const online = rt.status !== undefined ? (rt.status !== 'OFFLINE' ? 1 : 0) : d.onlineStatus;
|
||||
// 状态 / 电量优先取实时消息
|
||||
const rtFeStatus = rt?.status;
|
||||
const rtBattery = rt.battery ?? rt.battery_level ?? rt.capacity_percent ?? undefined;
|
||||
|
||||
return {
|
||||
...d,
|
||||
@@ -710,7 +722,12 @@ export default function DeviceOverviewPage() {
|
||||
status: online === 1 ? t('devices.online') : t('devices.offline'),
|
||||
onlineStatus: online,
|
||||
mode: rt.status === 'EXECUTING' ? '作业中' : rt.status === 'IDLE' ? t('devices.idle') : (d.feStatus == 1 ? '作业中' : d.feStatus == 2 ? t('devices.idle') : '离线'),
|
||||
capacity_percent: rt.battery || d.capacity_percent || 100,
|
||||
feStatus: rtFeStatus,
|
||||
capacity_percent: rtBattery ?? d.capacity_percent ?? 100,
|
||||
lastRunningStatus: {
|
||||
...(d.lastRunningStatus || {}),
|
||||
battery: rtBattery ?? d.lastRunningStatus?.battery ?? d?.vehicleMessage?.battery
|
||||
},
|
||||
position: rt.position || d.position || '站内',
|
||||
task: rt.currentTaskName || d.task || (d.status === 4 ? '待命' : '作业中'),
|
||||
comm: rt.rssi ? `${rt.rssi}dBm` : (d.rssi ? `${d.rssi}dBm` : '良好'),
|
||||
@@ -724,9 +741,10 @@ export default function DeviceOverviewPage() {
|
||||
const handleReturn = () => message.info(t('devices.fixed2ReturnHomeFixed2CommandIssuedFixed2'));
|
||||
const handleRecharge = () => message.info(t('devices.commandIssuedFixed2'));
|
||||
// 急停:点击时直接下发 button7(绕过控制权限校验),并提示已触发
|
||||
const handleEmergencyStop = () => {
|
||||
sendEmergencyStop(selectedDevice?.serialNumber || "");
|
||||
message.error(t('devices.s73'));
|
||||
const handleEmergencyStop = async () => {
|
||||
const next = await sendEmergencyStop(selectedDevice?.serialNumber || "");
|
||||
if (next) message.error(t('devices.estopTriggered'));
|
||||
else message.success(t('devices.estopNormal'));
|
||||
};
|
||||
|
||||
const fix2 = (val) => {
|
||||
@@ -871,17 +889,18 @@ export default function DeviceOverviewPage() {
|
||||
dataIndex: 'lastRunningStatus',
|
||||
width: 70,
|
||||
render: (lastRunningStatus) => {
|
||||
const v = lastRunningStatus?.battery || 100;
|
||||
const v = lastRunningStatus?.battery ?? "--";
|
||||
return <Progress
|
||||
percent={v}
|
||||
size="small"
|
||||
status={v < 40 ? 'exception' : 'active'}
|
||||
/>;
|
||||
}
|
||||
}, { title: t('aiAnalysis.location'), dataIndex: 'position', width: 90 },
|
||||
},
|
||||
// { title: t('aiAnalysis.location'), dataIndex: 'position', width: 90 },
|
||||
//{ title: '累计作业面积', dataIndex: 'work_area', width: 110, render: v => `${Number(v || 0).toFixed(2)} ㎡` },
|
||||
//{ title: t('devices.fixed2CurrentFixed2TaskSuspended2Fixed2'), dataIndex: 'task', width: 100 },
|
||||
{ title: t('devices.statusFixed2'), dataIndex: 'comm', width: 100, render: v => <Badge status={v && v.includes('-') ? 'warning' : 'success'} text={v} /> },
|
||||
//{ title: t('devices.statusFixed2'), dataIndex: 'comm', width: 100, render: v => <Badge status={v && v.includes('-') ? 'warning' : 'success'} text={v} /> },
|
||||
{
|
||||
title: t('roles.actions'),
|
||||
key: 'action',
|
||||
@@ -967,6 +986,13 @@ export default function DeviceOverviewPage() {
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
title: t('devices.executionCycle'),
|
||||
width: 320,
|
||||
render: (_, record) => {
|
||||
return `${record.startTime || ''} - ${record.finishTime || ''}`;
|
||||
}
|
||||
},
|
||||
{
|
||||
title: t('roles.status'),
|
||||
dataIndex: 'taskStaus',
|
||||
@@ -1018,7 +1044,7 @@ export default function DeviceOverviewPage() {
|
||||
dataSource={alarmList}
|
||||
scroll={{ x: 'max-content' }}
|
||||
columns={[
|
||||
{ title: t('common.time'), dataIndex: 'alertTime', width: 90, render: (v) => <span style={{ fontSize: 13 }}>{v}</span> },
|
||||
{ title: t('common.time'), dataIndex: 'alarmTime', width: 90, render: (v) => <span style={{ fontSize: 13 }}>{v}</span> },
|
||||
{ title: t('devices.device'), dataIndex: 'deviceName', width: 100, render: (v) => <span style={{ fontSize: 13 }}>{v}</span> },
|
||||
{
|
||||
title: t('alerts.alarmTitle'),
|
||||
@@ -1076,8 +1102,8 @@ export default function DeviceOverviewPage() {
|
||||
<span style={{ fontSize: 20, color: '#1890ff' }}><CarOutlined /></span>
|
||||
)}
|
||||
<span style={{ fontSize: 14, fontWeight: 600 }}>{selectedDevice.deviceAlias || selectedDevice.drone_callsign || selectedDevice.callsign || selectedDevice.deviceName}</span>
|
||||
<Tag color={selectedDevice.onlineStatus === 1 ? "success" : "default"} size="small" style={{ margin: 0 }}>
|
||||
{selectedDevice.onlineStatus == 1 ? t('devices.online') : t('devices.offline')}
|
||||
<Tag color={realtimeDevice.status == 1 || realtimeDevice.status == 2 ? "success" : "default"} size="small" style={{ margin: 0 }}>
|
||||
{realtimeDevice.status == 1 || realtimeDevice.status == 2 ? t('devices.online') : t('devices.offline')}
|
||||
</Tag>
|
||||
<Button
|
||||
type="primary" size="small" ghost icon={<InfoCircleOutlined />}
|
||||
@@ -1089,7 +1115,7 @@ export default function DeviceOverviewPage() {
|
||||
<div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 4 }}>
|
||||
<div style={{ display: 'flex', alignItems: 'center', gap: 4 }}>
|
||||
<span style={{ color: '#52c41a' }}><ThunderboltOutlined /></span>
|
||||
<span style={{ fontSize: 12 }}>{t('devices.batteryLevel')}: {fix2(realtimeDevice?.capacity_percent || realtimeDevice?.lastRunningStatus?.battery || 100)}%</span>
|
||||
<span style={{ fontSize: 12 }}>{t('devices.batteryLevel')}: {fix2(realtimeDevice?.battery)}%</span>
|
||||
</div>
|
||||
{realtimeDevice?.environment_temperature && (
|
||||
<div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
|
||||
@@ -1159,7 +1185,7 @@ export default function DeviceOverviewPage() {
|
||||
{/*<Button style={{ borderRadius: 8, flex: 1 }} onClick={handlePause}>{t('video.pause')}</Button>*/}
|
||||
<Button type="primary" style={{ borderRadius: 8, flex: 1 }} onClick={handleAutoBack}>{t('devices.returnHome')}</Button>
|
||||
{/*<Button style={{ flex: 1, background: '#52c41a', borderColor: '#52c41a', color: "#fff", borderRadius: 8, }} onClick={handleRecharge}>{t('devices.s24')}</Button>*/}
|
||||
<Button danger style={{ flex: 1, borderRadius: 8 }} onClick={handleEmergencyStop}>{t('devices.s29')}</Button>
|
||||
<Button danger={!eStopActive} type={eStopActive ? 'primary' : 'default'} style={{ flex: 1, borderRadius: 8, background: eStopActive ? '#cf1322' : undefined, borderColor: eStopActive ? '#cf1322' : undefined, color: eStopActive ? '#fff' : undefined }} onClick={handleEmergencyStop}>{eStopActive ? t('devices.estopTriggered') : t('devices.s29')}</Button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user