From 4b12b1c5c6b58668227cf3b693a5df6442955b03 Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Sat, 17 Oct 2026 15:55:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA=20=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/devices/DeviceStatusPage.tsx | 216 ++++++++++++++++---- src/components/devices/deviceController.js | 1 + 2 files changed, 180 insertions(+), 37 deletions(-) diff --git a/src/components/devices/DeviceStatusPage.tsx b/src/components/devices/DeviceStatusPage.tsx index d5e641a..0364cee 100644 --- a/src/components/devices/DeviceStatusPage.tsx +++ b/src/components/devices/DeviceStatusPage.tsx @@ -1253,47 +1253,117 @@ export default function DeviceStatusPage() {
{t('devices.robotStatus')}
{t('devices.rtBattery')} - - {runningStatus?.battery !== undefined ? `${runningStatus?.battery}%` : '-'} + + {(runningStatus?.battery_percentage ?? runningStatus?.battery) !== undefined + ? `${runningStatus?.battery_percentage ?? runningStatus?.battery}%` + : '-'} + {t('devices.rtVoltage')} - {runningStatus?.voltage !== undefined ? `${Number(runningStatus?.voltage).toFixed(2)}V` : '-'} + + {(runningStatus?.battery_voltage ?? runningStatus?.voltage) !== undefined + ? `${Number(runningStatus?.battery_voltage ?? runningStatus?.voltage).toFixed(2)}V` + : '-'} + + {t('devices.rtLeftMotor')} - {runningStatus?.leftCurrent !== undefined ? `${Number(runningStatus?.leftCurrent).toFixed(2)}A` : '-'} + + {(runningStatus?.left_motor_current ?? runningStatus?.leftCurrent) !== undefined + ? `${Number(runningStatus?.left_motor_current ?? runningStatus?.leftCurrent).toFixed(2)}A` + : '-'} + + {t('devices.rtRightMotor')} - {runningStatus?.rightCurrent !== undefined ? `${Number(runningStatus?.rightCurrent).toFixed(2)}A` : '-'} + + {(runningStatus?.right_motor_current ?? runningStatus?.rightCurrent) !== undefined + ? `${Number(runningStatus?.right_motor_current ?? runningStatus?.rightCurrent).toFixed(2)}A` + : '-'} + + {t('devices.rtLeftSpeed')} - {runningStatus?.leftMeasureSpeed !== undefined ? `${Number(runningStatus?.leftMeasureSpeed).toFixed(1)}rpm` : '-'} + + {(runningStatus?.left_measured_rpm ?? runningStatus?.leftMeasureSpeed) !== undefined + ? `${Number(runningStatus?.left_measured_rpm ?? runningStatus?.leftMeasureSpeed).toFixed(1)}rpm` + : '-'} + + {t('devices.rtRightSpeed')} - {runningStatus?.rightMeasureSpeed !== undefined ? `${Number(runningStatus?.rightMeasureSpeed).toFixed(1)}rpm` : '-'} + + {(runningStatus?.right_measured_rpm ?? runningStatus?.rightMeasureSpeed) !== undefined + ? `${Number(runningStatus?.right_measured_rpm ?? runningStatus?.rightMeasureSpeed).toFixed(1)}rpm` + : '-'} + + {t('devices.rtLeftTemp')} - {runningStatus?.leftMotorTemp !== undefined ? formatTemperature(Number(runningStatus?.leftMotorTemp), 1).label : '-'} + + {(runningStatus?.left_motor_temperature ?? runningStatus?.leftMotorTemp) !== undefined + ? formatTemperature(Number(runningStatus?.left_motor_temperature ?? runningStatus?.leftMotorTemp), 1).label + : '-'} + + {t('devices.rtRightTemp')} - {runningStatus?.rightMotorTemp !== undefined ? formatTemperature(Number(runningStatus?.rightMotorTemp), 1).label : '-'} + + {(runningStatus?.right_motor_temperature ?? runningStatus?.rightMotorTemp) !== undefined + ? formatTemperature(Number(runningStatus?.right_motor_temperature ?? runningStatus?.rightMotorTemp), 1).label + : '-'} + + {t('devices.rtMainTemp')} - {runningStatus?.chipTemp !== undefined ? formatTemperature(Number(runningStatus?.chipTemp), 1).label : '-'} + + {(runningStatus?.main_temperature ?? runningStatus?.chipTemp) !== undefined + ? formatTemperature(Number(runningStatus?.main_temperature ?? runningStatus?.chipTemp), 1).label + : '-'} + + {t('devices.rtHeadingAngle')} - {runningStatus?.yaw !== undefined ? `${Number(runningStatus?.yaw).toFixed(1)}°` : '-'} + + {runningStatus?.yaw !== undefined ? `${Number(runningStatus?.yaw).toFixed(1)}°` : '-'} + + {t('devices.rtPitchAngle')} - {runningStatus?.pitch !== undefined ? `${Number(runningStatus?.pitch).toFixed(1)}°` : '-'} + + {runningStatus?.pitch !== undefined ? `${Number(runningStatus?.pitch).toFixed(1)}°` : '-'} + + {t('devices.rtHeadingStatus')} - {runningStatus?.headingStatus !== undefined ? `${runningStatus?.headingStatus == 1 ? t('devices.rtInitialized') : t('devices.uninitialized')}` : '-'} + + {(runningStatus?.heading_status ?? runningStatus?.headingStatus) !== undefined + ? (runningStatus?.heading_status ?? runningStatus?.headingStatus) === '1' + ? t('devices.rtInitialized') + : t('devices.uninitialized') + : '-'} + + {t('devices.rtPositioning')} - {runningStatus?.qual == 0 ? t('constants.locationInvalid') : - runningStatus?.qual == 1 ? t('devices.gpsSingle') : - runningStatus?.qual == 2 ? t('devices.dgpsDiff') : - runningStatus?.qual == 4 ? t('devices.rtkFixed2') : - runningStatus?.qual == 5 ? t('devices.rtkFloat') : t('constants.locationUnknown')} + {runningStatus?.qual == 0 + ? t('constants.locationInvalid') + : runningStatus?.qual == 1 + ? t('devices.gpsSingle') + : runningStatus?.qual == 2 + ? t('devices.dgpsDiff') + : runningStatus?.qual == 4 + ? t('devices.rtkFixed2') + : runningStatus?.qual == 5 + ? t('devices.rtkFloat') + : t('constants.locationUnknown')} + {t('devices.rtSatellites')} {t('devices.satelliteCount', { count: runningStatus?.satelliteCnt || 0 })} + {t('devices.rtMode')} - {runningStatus?.controlMode == 1 ? t('devices.localMode') : - runningStatus?.controlMode == 3 ? t('devices.remoteMode') : t('constants.locationUnknown')} + {(runningStatus?.control_mode ?? runningStatus?.controlMode) !== undefined + ? (runningStatus?.control_mode ?? runningStatus?.controlMode) === '1' + ? t('devices.localMode') + : (runningStatus?.control_mode ?? runningStatus?.controlMode) === '3' + ? t('devices.remoteMode') + : t('constants.locationUnknown') + : '-'}
+ : null} @@ -1383,42 +1453,114 @@ export default function DeviceStatusPage() {
{t('devices.robotStatus')}
{t('devices.rtBattery')} - - {runningStatus?.battery !== undefined ? `${runningStatus?.battery}%` : '-'} + + {(runningStatus?.battery_percentage ?? runningStatus?.battery) !== undefined + ? `${runningStatus?.battery_percentage ?? runningStatus?.battery}%` + : '-'} + {t('devices.rtVoltage')} - {runningStatus?.voltage !== undefined ? `${Number(runningStatus?.voltage).toFixed(2)}V` : '-'} + + {(runningStatus?.battery_voltage ?? runningStatus?.voltage) !== undefined + ? `${Number(runningStatus?.battery_voltage ?? runningStatus?.voltage).toFixed(2)}V` + : '-'} + + {t('devices.rtLeftMotor')} - {runningStatus?.leftCurrent !== undefined ? `${Number(runningStatus?.leftCurrent).toFixed(2)}A` : '-'} + + {(runningStatus?.left_motor_current ?? runningStatus?.leftCurrent) !== undefined + ? `${Number(runningStatus?.left_motor_current ?? runningStatus?.leftCurrent).toFixed(2)}A` + : '-'} + + {t('devices.rtRightMotor')} - {runningStatus?.rightCurrent !== undefined ? `${Number(runningStatus?.rightCurrent).toFixed(2)}A` : '-'} + + {(runningStatus?.right_motor_current ?? runningStatus?.rightCurrent) !== undefined + ? `${Number(runningStatus?.right_motor_current ?? runningStatus?.rightCurrent).toFixed(2)}A` + : '-'} + + {t('devices.rtLeftSpeed')} - {runningStatus?.leftMeasureSpeed !== undefined ? `${Number(runningStatus?.leftMeasureSpeed).toFixed(1)}rpm` : '-'} + + {(runningStatus?.left_measured_rpm ?? runningStatus?.leftMeasureSpeed) !== undefined + ? `${Number(runningStatus?.left_measured_rpm ?? runningStatus?.leftMeasureSpeed).toFixed(1)}rpm` + : '-'} + + {t('devices.rtRightSpeed')} - {runningStatus?.rightMeasureSpeed !== undefined ? `${Number(runningStatus?.rightMeasureSpeed).toFixed(1)}rpm` : '-'} + + {(runningStatus?.right_measured_rpm ?? runningStatus?.rightMeasureSpeed) !== undefined + ? `${Number(runningStatus?.right_measured_rpm ?? runningStatus?.rightMeasureSpeed).toFixed(1)}rpm` + : '-'} + + {t('devices.rtLeftTemp')} - {runningStatus?.leftMotorTemp !== undefined ? formatTemperature(Number(runningStatus?.leftMotorTemp), 1).label : '-'} + + {(runningStatus?.left_motor_temperature ?? runningStatus?.leftMotorTemp) !== undefined + ? formatTemperature(Number(runningStatus?.left_motor_temperature ?? runningStatus?.leftMotorTemp), 1).label + : '-'} + + {t('devices.rtRightTemp')} - {runningStatus?.rightMotorTemp !== undefined ? formatTemperature(Number(runningStatus?.rightMotorTemp), 1).label : '-'} + + {(runningStatus?.right_motor_temperature ?? runningStatus?.rightMotorTemp) !== undefined + ? formatTemperature(Number(runningStatus?.right_motor_temperature ?? runningStatus?.rightMotorTemp), 1).label + : '-'} + + {t('devices.rtMainTemp')} - {runningStatus?.chipTemp !== undefined ? formatTemperature(Number(runningStatus?.chipTemp), 1).label : '-'} + + {(runningStatus?.main_temperature ?? runningStatus?.chipTemp) !== undefined + ? formatTemperature(Number(runningStatus?.main_temperature ?? runningStatus?.chipTemp), 1).label + : '-'} + + {t('devices.rtHeadingAngle')} - {runningStatus?.yaw !== undefined ? `${Number(runningStatus?.yaw).toFixed(1)}°` : '-'} + + {runningStatus?.yaw !== undefined ? `${Number(runningStatus?.yaw).toFixed(1)}°` : '-'} + + {t('devices.rtPitchAngle')} - {runningStatus?.pitch !== undefined ? `${Number(runningStatus?.pitch).toFixed(1)}°` : '-'} + + {runningStatus?.pitch !== undefined ? `${Number(runningStatus?.pitch).toFixed(1)}°` : '-'} + + {t('devices.rtHeadingStatus')} - {runningStatus?.headingStatus !== undefined ? `${runningStatus?.headingStatus == 1 ? t('devices.rtInitialized') : t('devices.uninitialized')}` : '-'} + + {(runningStatus?.heading_status ?? runningStatus?.headingStatus) !== undefined + ? (runningStatus?.heading_status ?? runningStatus?.headingStatus) === '1' + ? t('devices.rtInitialized') + : t('devices.uninitialized') + : '-'} + + {t('devices.rtPositioning')} - {runningStatus?.fix_status ? fixStatusMap[runningStatus?.fix_status] : t('constants.locationUnknown')} - + {runningStatus?.qual == 0 + ? t('constants.locationInvalid') + : runningStatus?.qual == 1 + ? t('devices.gpsSingle') + : runningStatus?.qual == 2 + ? t('devices.dgpsDiff') + : runningStatus?.qual == 4 + ? t('devices.rtkFixed2') + : runningStatus?.qual == 5 + ? t('devices.rtkFloat') + : t('constants.locationUnknown')} + {t('devices.rtSatellites')} {t('devices.satelliteCount', { count: runningStatus?.satelliteCnt || 0 })} + {t('devices.rtMode')} - {runningStatus?.controlMode == 1 ? t('devices.localMode') : - runningStatus?.controlMode == 3 ? t('devices.remoteMode') : t('constants.locationUnknown')} + {(runningStatus?.control_mode ?? runningStatus?.controlMode) !== undefined + ? (runningStatus?.control_mode ?? runningStatus?.controlMode) === '1' + ? t('devices.localMode') + : (runningStatus?.control_mode ?? runningStatus?.controlMode) === '3' + ? t('devices.remoteMode') + : t('constants.locationUnknown') + : '-'}
diff --git a/src/components/devices/deviceController.js b/src/components/devices/deviceController.js index 50a3dd6..822d3fc 100644 --- a/src/components/devices/deviceController.js +++ b/src/components/devices/deviceController.js @@ -141,6 +141,7 @@ export default class DeviceController { battery: it?.b !== undefined ? Number(it.b) : (it?.batteryLevel !== undefined ? Number(it.batteryLevel) : undefined), hasAlarm: !!it?.ha || !!it?.hasAlarm, updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'), + controlMode: it?.cm ?? it?.controlMode, }; }); console.log('[DeviceController] 收到全量设备状态', next);