Optimize hardware information

This commit is contained in:
2023-12-06 23:19:20 +08:00
parent eb264e2b85
commit 7b3b11413b
2 changed files with 39 additions and 15 deletions

2
src/global.d.ts vendored
View File

@@ -348,4 +348,6 @@ interface HardwareInfoVo {
cpuPhysicalProcessorCount: number cpuPhysicalProcessorCount: number
cpuLogicalProcessorCount: number cpuLogicalProcessorCount: number
microarchitecture: string microarchitecture: string
memories: string
disks: string
} }

View File

@@ -69,13 +69,21 @@ const SoftwareInfo: React.FC = () => {
<div></div> <div></div>
</FlexBox> </FlexBox>
<FlexBox className={'value'}> <FlexBox className={'value'}>
<div>{softwareInfoData?.os}</div> <div title={softwareInfoData?.os}>{softwareInfoData?.os}</div>
<div>{softwareInfoData?.bitness}</div> <div title={softwareInfoData?.bitness.toString()}>
<div>{`${softwareInfoData?.javaVersion} (${softwareInfoData?.javaVersionDate})`}</div> {softwareInfoData?.bitness}
<div>{softwareInfoData?.javaVendor}</div> </div>
<div>{`${softwareInfoData?.javaRuntime} (build ${softwareInfoData?.javaRuntimeVersion})`}</div> <div
<div>{`${softwareInfoData?.jvm} (build ${softwareInfoData?.jvmVersion}, ${softwareInfoData?.jvmInfo})`}</div> title={`${softwareInfoData?.javaVersion} (${softwareInfoData?.javaVersionDate})`}
<div>{softwareInfoData?.jvmVendor}</div> >{`${softwareInfoData?.javaVersion} (${softwareInfoData?.javaVersionDate})`}</div>
<div title={softwareInfoData?.javaVendor}>{softwareInfoData?.javaVendor}</div>
<div
title={`${softwareInfoData?.javaRuntime} (build ${softwareInfoData?.javaRuntimeVersion})`}
>{`${softwareInfoData?.javaRuntime} (build ${softwareInfoData?.javaRuntimeVersion})`}</div>
<div
title={`${softwareInfoData?.jvm} (build ${softwareInfoData?.jvmVersion}, ${softwareInfoData?.jvmInfo})`}
>{`${softwareInfoData?.jvm} (build ${softwareInfoData?.jvmVersion}, ${softwareInfoData?.jvmInfo})`}</div>
<div title={softwareInfoData?.jvmVendor}>{softwareInfoData?.jvmVendor}</div>
<div> <div>
{softwareInfoData?.osBootTime && {softwareInfoData?.osBootTime &&
utcToLocalTime(softwareInfoData?.osBootTime)} utcToLocalTime(softwareInfoData?.osBootTime)}
@@ -113,21 +121,35 @@ const HardwareInfo: React.FC = () => {
<FlexBox className={'card-content'} direction={'horizontal'}> <FlexBox className={'card-content'} direction={'horizontal'}>
<FlexBox className={'key'}> <FlexBox className={'key'}>
<div>CPU</div> <div>CPU</div>
<div></div> <div>CPU </div>
<div></div> <div></div>
<div>64</div> <div>64</div>
<div>CPU </div> <div>CPU </div>
<div>CPU </div> <div>CPU </div>
<div>CPU </div> <div>CPU </div>
<div></div>
<div></div>
</FlexBox> </FlexBox>
<FlexBox className={'value'}> <FlexBox className={'value'}>
<div>{hardwareInfoData?.cpu}</div> <div title={hardwareInfoData?.cpu}>{hardwareInfoData?.cpu}</div>
<div>{hardwareInfoData?.arch}</div> <div title={hardwareInfoData?.arch}>{hardwareInfoData?.arch}</div>
<div>{hardwareInfoData?.microarchitecture}</div> <div title={hardwareInfoData?.microarchitecture}>
<div>{hardwareInfoData?.is64Bit ? '是' : '否'}</div> {hardwareInfoData?.microarchitecture}
<div>{hardwareInfoData?.cpuPhysicalPackageCount}</div> </div>
<div>{hardwareInfoData?.cpuPhysicalProcessorCount}</div> <div title={hardwareInfoData?.is64Bit ? '是' : '否'}>
<div>{hardwareInfoData?.cpuLogicalProcessorCount}</div> {hardwareInfoData?.is64Bit ? '是' : '否'}
</div>
<div title={hardwareInfoData?.cpuPhysicalPackageCount.toString()}>
{hardwareInfoData?.cpuPhysicalPackageCount}
</div>
<div title={hardwareInfoData?.cpuPhysicalProcessorCount.toString()}>
{hardwareInfoData?.cpuPhysicalProcessorCount}
</div>
<div title={hardwareInfoData?.cpuLogicalProcessorCount.toString()}>
{hardwareInfoData?.cpuLogicalProcessorCount}
</div>
<div title={hardwareInfoData?.memories}>{hardwareInfoData?.memories}</div>
<div title={hardwareInfoData?.disks}>{hardwareInfoData?.disks}</div>
</FlexBox> </FlexBox>
</FlexBox> </FlexBox>
</CommonCard> </CommonCard>