Merge pull request #47 from imlonghao/no-ghz

yabs: change Ghz to Mhz
This commit is contained in:
corbpie 2022-06-24 11:29:56 +10:00 committed by GitHub
commit 6e1f4bb4ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions

View File

@ -55,9 +55,9 @@
</tr> </tr>
<tr> <tr>
<td class="td-nowrap">CPU freq</td> <td class="td-nowrap">CPU freq</td>
<td class="td-nowrap">{{$server1_data[0]->cpu_freq}}<span class="data-type">Ghz</span></td> <td class="td-nowrap">{{$server1_data[0]->cpu_freq}}<span class="data-type">Mhz</span></td>
{!! \App\Models\Server::tableRowCompare($server1_data[0]->cpu_freq, $server2_data[0]->cpu_freq, 'Ghz') !!} {!! \App\Models\Server::tableRowCompare($server1_data[0]->cpu_freq, $server2_data[0]->cpu_freq, 'Mhz') !!}
<td class="td-nowrap">{{$server2_data[0]->cpu_freq}}<span class="data-type">Ghz</span></td> <td class="td-nowrap">{{$server2_data[0]->cpu_freq}}<span class="data-type">Mhz</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-nowrap">Ram</td> <td class="td-nowrap">Ram</td>

View File

@ -15,7 +15,7 @@
<th class="text-center"><i class="fas fa-box" title="Virt"></i></th> <th class="text-center"><i class="fas fa-box" title="Virt"></i></th>
<th class="text-center">OS</th> <th class="text-center">OS</th>
<th class="text-center"><i class="fas fa-microchip" title="CPU"></i></th> <th class="text-center"><i class="fas fa-microchip" title="CPU"></i></th>
<th class="text-center">Ghz</th> <th class="text-center">Mhz</th>
<th class="text-center"><i class="fas fa-memory" title="ram"></i></th> <th class="text-center"><i class="fas fa-memory" title="ram"></i></th>
<th class="text-center"><i class="fas fa-compact-disc" title="disk"></i></th> <th class="text-center"><i class="fas fa-compact-disc" title="disk"></i></th>
<th class="text-nowrap">Location</th> <th class="text-nowrap">Location</th>

View File

@ -62,7 +62,7 @@
<td class="px-2 py-2 font-bold text-muted">CPU</td> <td class="px-2 py-2 font-bold text-muted">CPU</td>
<td> <td>
{{ $server_extras[0]->cpu }} @if($server_extras[0]->has_yabs) {{ $server_extras[0]->cpu }} @if($server_extras[0]->has_yabs)
<small>@</small> {{ $server_extras[0]->cpu_freq }} Ghz <small>@</small> {{ $server_extras[0]->cpu_freq }} Mhz
@endif</td> @endif</td>
</tr> </tr>
<tr> <tr>

View File

@ -42,7 +42,7 @@
<tr> <tr>
<td><a href="servers/{{$yab->server_id}}" class="text-decoration-none">{{ $yab->hostname }}</a></td> <td><a href="servers/{{$yab->server_id}}" class="text-decoration-none">{{ $yab->hostname }}</a></td>
<td><span title="{{$yab->cpu_model}}">{{ $yab->cpu_cores }}</span></td> <td><span title="{{$yab->cpu_model}}">{{ $yab->cpu_cores }}</span></td>
<td><span title="{{$yab->cpu_model}}">{{ $yab->cpu_freq }}<small>Ghz</small></span></td> <td><span title="{{$yab->cpu_model}}">{{ $yab->cpu_freq }}<small>Mhz</small></span></td>
<td>{{ $yab->ram }}<small>{{ $yab->ram_type }}</small></td> <td>{{ $yab->ram }}<small>{{ $yab->ram_type }}</small></td>
<td>{{ $yab->disk }}<small>{{ $yab->disk_type }}</small></td> <td>{{ $yab->disk }}<small>{{ $yab->disk_type }}</small></td>
<td><a href="https://browser.geekbench.com/v5/cpu/{{$yab->gb5_id}}" class="text-decoration-none">{{ $yab->gb5_single }}</a></td> <td><a href="https://browser.geekbench.com/v5/cpu/{{$yab->gb5_id}}" class="text-decoration-none">{{ $yab->gb5_single }}</a></td>

View File

@ -20,7 +20,7 @@
</tr> </tr>
<tr> <tr>
<td class="px-4 py-2 font-bold">CPU</td> <td class="px-4 py-2 font-bold">CPU</td>
<td>{{ $yab[0]->cpu_cores }} @ {{$yab[0]->cpu_freq}} Ghz</td> <td>{{ $yab[0]->cpu_cores }} @ {{$yab[0]->cpu_freq}} Mhz</td>
</tr> </tr>
<tr> <tr>
<td class="px-4 py-2 font-bold">CPU type</td> <td class="px-4 py-2 font-bold">CPU type</td>