System page: various minor UI tweaks (#4985)

* System page: various minor UI tweaks

* Be consistent with capitalisation

* Change detection start epoch to running/idle

* Remove detection start column entirely
This commit is contained in:
James L 2023-01-11 12:11:57 +00:00 committed by GitHub
parent ddde477770
commit acd1fb9e3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -142,15 +142,15 @@ export default function System() {
<Thead> <Thead>
<Tr> <Tr>
<Th>P-ID</Th> <Th>P-ID</Th>
<Th>Detection Start</Th>
<Th>Inference Speed</Th> <Th>Inference Speed</Th>
<Th>CPU %</Th>
</Tr> </Tr>
</Thead> </Thead>
<Tbody> <Tbody>
<Tr> <Tr>
<Td>{detectors[detector]['pid']}</Td> <Td>{detectors[detector]['pid']}</Td>
<Td>{detectors[detector]['detection_start']}</Td> <Td>{detectors[detector]['inference_speed']} ms</Td>
<Td>{detectors[detector]['inference_speed']}</Td> <Td>{cpu_usages[detectors[detector]['pid']]?.['cpu'] || '- '}%</Td>
</Tr> </Tr>
</Tbody> </Tbody>
</Table> </Table>
@ -185,7 +185,7 @@ export default function System() {
<Table className="w-full"> <Table className="w-full">
<Thead> <Thead>
<Tr> <Tr>
<Th>Gpu %</Th> <Th>GPU %</Th>
<Th>Memory %</Th> <Th>Memory %</Th>
</Tr> </Tr>
</Thead> </Thead>
@ -220,20 +220,27 @@ export default function System() {
<Tr> <Tr>
<Th>Process</Th> <Th>Process</Th>
<Th>P-ID</Th> <Th>P-ID</Th>
<Th>fps</Th> <Th>FPS</Th>
<Th>Cpu %</Th> <Th>CPU %</Th>
<Th>Memory %</Th> <Th>Memory %</Th>
</Tr> </Tr>
</Thead> </Thead>
<Tbody> <Tbody>
<Tr key="capture" index="0"> <Tr key="ffmpeg" index="0">
<Td>ffmpeg</Td>
<Td>{cameras[camera]['ffmpeg_pid'] || '- '}</Td>
<Td>{cameras[camera]['camera_fps'] || '- '}</Td>
<Td>{cpu_usages[cameras[camera]['ffmpeg_pid']]?.['cpu'] || '- '}%</Td>
<Td>{cpu_usages[cameras[camera]['ffmpeg_pid']]?.['mem'] || '- '}%</Td>
</Tr>
<Tr key="capture" index="1">
<Td>Capture</Td> <Td>Capture</Td>
<Td>{cameras[camera]['capture_pid'] || '- '}</Td> <Td>{cameras[camera]['capture_pid'] || '- '}</Td>
<Td>{cameras[camera]['process_fps'] || '- '}</Td> <Td>{cameras[camera]['process_fps'] || '- '}</Td>
<Td>{cpu_usages[cameras[camera]['capture_pid']]?.['cpu'] || '- '}%</Td> <Td>{cpu_usages[cameras[camera]['capture_pid']]?.['cpu'] || '- '}%</Td>
<Td>{cpu_usages[cameras[camera]['capture_pid']]?.['mem'] || '- '}%</Td> <Td>{cpu_usages[cameras[camera]['capture_pid']]?.['mem'] || '- '}%</Td>
</Tr> </Tr>
<Tr key="detect" index="1"> <Tr key="detect" index="2">
<Td>Detect</Td> <Td>Detect</Td>
<Td>{cameras[camera]['pid'] || '- '}</Td> <Td>{cameras[camera]['pid'] || '- '}</Td>
<Td> <Td>
@ -242,13 +249,6 @@ export default function System() {
<Td>{cpu_usages[cameras[camera]['pid']]?.['cpu'] || '- '}%</Td> <Td>{cpu_usages[cameras[camera]['pid']]?.['cpu'] || '- '}%</Td>
<Td>{cpu_usages[cameras[camera]['pid']]?.['mem'] || '- '}%</Td> <Td>{cpu_usages[cameras[camera]['pid']]?.['mem'] || '- '}%</Td>
</Tr> </Tr>
<Tr key="ffmpeg" index="2">
<Td>ffmpeg</Td>
<Td>{cameras[camera]['ffmpeg_pid'] || '- '}</Td>
<Td>{cameras[camera]['camera_fps'] || '- '}</Td>
<Td>{cpu_usages[cameras[camera]['ffmpeg_pid']]?.['cpu'] || '- '}%</Td>
<Td>{cpu_usages[cameras[camera]['ffmpeg_pid']]?.['mem'] || '- '}%</Td>
</Tr>
</Tbody> </Tbody>
</Table> </Table>
</div> </div>