nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-11-23 11:35:19 +03:00
Code Issues Projects Releases Wiki Activity

Refactor display of +time in WebUI

Browse Source
This commit is contained in:
nicolargo 2024-11-21 19:47:25 +01:00
parent 55d42d358d
commit 2061d1b42c
4 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glances/outputs/static/css/style.scss
View File

@ -287,6 +287,8 @@ body {
text-align: right;
}
* > td:nth-child(6) {
text-overflow: ellipsis;
white-space: nowrap;
width: 7em;
}
* > td:nth-child(7) {
@ -295,6 +297,10 @@ body {
* > td:nth-child(9),td:nth-child(10) {
width: 2em;
}
* > td:nth-child(13),* > td:nth-child(14) {
text-overflow: ellipsis;
white-space: nowrap;
}
.table {
margin-bottom: 1em;
}

38
glances/outputs/static/js/components/plugin-processlist.vue
View File

@ -80,15 +80,8 @@
<td scope="row" v-show="!getDisableStats().includes('username')">
{{ process.username }}
</td>
<td scope="row" class="hidden-xs hidden-sm" v-if="process.timeplus != '?'"
v-show="!getDisableStats().includes('cpu_times')">
<span v-show="process.timeplus.hours > 0" class="highlight">{{ process.timeplus.hours }}h</span>
{{ $filters.leftPad(process.timeplus.minutes, 2, '0') }}:{{
$filters.leftPad(process.timeplus.seconds,
2, '0') }}
<span v-show="process.timeplus.hours <= 0">.{{ $filters.leftPad(process.timeplus.milliseconds,
2, '0')
}}</span>
<td scope="row" class="hidden-xs hidden-sm" v-show="!getDisableStats().includes('cpu_times')">
{{ process.timeforhuman }}
</td>
<td scope="row" class="hidden-xs hidden-sm" v-if="process.timeplus == '?'"
v-show="!getDisableStats().includes('cpu_times')">?</td>
@ -202,18 +195,9 @@
<td scope="row" v-show="!getDisableStats().includes('username')">
{{ process.username }}
</td>
<td scope="row" class="hidden-xs hidden-sm" v-if="process.timeplus != '?'"
v-show="!getDisableStats().includes('cpu_times')">
<span v-show="process.timeplus.hours > 0" class="highlight">{{ process.timeplus.hours }}h</span>
{{ $filters.leftPad(process.timeplus.minutes, 2, '0') }}:{{
$filters.leftPad(process.timeplus.seconds,
2, '0') }}
<span v-show="process.timeplus.hours <= 0">.{{ $filters.leftPad(process.timeplus.milliseconds,
2, '0')
}}</span>
<td scope="row" class="hidden-xs hidden-sm" v-show="!getDisableStats().includes('cpu_times')">
{{ process.timeforhuman }}
</td>
<td scope="row" class="hidden-xs hidden-sm" v-if="process.timeplus == '?'"
v-show="!getDisableStats().includes('cpu_times')">?</td>
<td scope="row" class="hidden-xs hidden-sm" v-show="!getDisableStats().includes('num_threads')">
{{ process.num_threads == -1 ? '?' : process.num_threads }}
</td>
@ -290,11 +274,12 @@ export default {
process.username = last(process.username.split('\\'));
}
process.timeplus = '?';
process.timemillis = '?';
process.timeforhuman = '?';
if (process.cpu_times) {
process.timeplus = timedelta([process.cpu_times['user'], process.cpu_times['system']]);
process.timemillis = timemillis([process.cpu_times['user'], process.cpu_times['system']]);
process.timeforhuman = process.timeplus.hours.toString().padStart(2, '0') + ':' +
process.timeplus.minutes.toString().padStart(2, '0') + ':' +
process.timeplus.seconds.toString().padStart(2, '0')
}
if (process.num_threads === null) {
@ -368,11 +353,12 @@ export default {
process.username = last(process.username.split('\\'));
}
process.timeplus = '?';
process.timemillis = '?';
process.timeforhuman = '?';
if (process.cpu_times) {
process.timeplus = timedelta([process.cpu_times['user'], process.cpu_times['system']]);
process.timemillis = timemillis([process.cpu_times['user'], process.cpu_times['system']]);
process.timeforhuman = process.timeplus.hours.toString().padStart(2, '0') + ':' +
process.timeplus.minutes.toString().padStart(2, '0') + ':' +
process.timeplus.seconds.toString().padStart(2, '0')
}
if (process.num_threads === null) {

2
glances/outputs/static/public/browser.js vendored
View File

File diff suppressed because one or more lines are too long

4
glances/outputs/static/public/glances.js vendored
View File

File diff suppressed because one or more lines are too long