diff options
Diffstat (limited to 'glances/outputs/static/js/components/plugin-processlist.vue')
| -rw-r--r-- | glances/outputs/static/js/components/plugin-processlist.vue | 106 |
1 files changed, 41 insertions, 65 deletions
diff --git a/glances/outputs/static/js/components/plugin-processlist.vue b/glances/outputs/static/js/components/plugin-processlist.vue index 462fce61..ca9951bc 100644 --- a/glances/outputs/static/js/components/plugin-processlist.vue +++ b/glances/outputs/static/js/components/plugin-processlist.vue @@ -3,112 +3,88 @@ <section id="processlist-plugin" class="plugin"> <div class="table"> <div class="table-row"> - <div - class="table-cell" - :class="['sortable', sorter.column === 'cpu_percent' && 'sort']" - @click="$emit('update:sorter', 'cpu_percent')" - > + <div class="table-cell width-50" :class="['sortable', sorter.column === 'cpu_percent' && 'sort']" + @click="$emit('update:sorter', 'cpu_percent')"> CPU% </div> - <div - class="table-cell" - :class="['sortable', sorter.column === 'memory_percent' && 'sort']" - @click="$emit('update:sorter', 'memory_percent')" - > + <div class="table-cell width-50" :class="['sortable', sorter.column === 'memory_percent' && 'sort']" + @click="$emit('update:sorter', 'memory_percent')"> MEM% </div> - <div class="table-cell hidden-xs hidden-sm">VIRT</div> - <div class="table-cell hidden-xs hidden-sm">RES</div> - <div class="table-cell">PID</div> - <div - class="table-cell text-left" - :class="['sortable', sorter.column === 'username' && 'sort']" - @click="$emit('update:sorter', 'username')" - > + <div class="table-cell width-75 hidden-xs hidden-sm">VIRT</div> + <div class="table-cell width-75 hidden-xs hidden-sm">RES</div> + <div class="table-cell width-75">PID</div> + <div class="table-cell width-100 text-left" :class="['sortable', sorter.column === 'username' && 'sort']" + @click="$emit('update:sorter', 'username')"> USER </div> - <div - class="table-cell hidden-xs hidden-sm" + <div class="table-cell width-100 hidden-xs hidden-sm" :class="['sortable', sorter.column === 'timemillis' && 'sort']" - @click="$emit('update:sorter', 'timemillis')" - > + @click="$emit('update:sorter', 'timemillis')"> TIME+ </div> - <div - class="table-cell text-left hidden-xs hidden-sm" + <div class="table-cell width-75 text-left hidden-xs hidden-sm" :class="['sortable', sorter.column === 'num_threads' && 'sort']" - @click="$emit('update:sorter', 'num_threads')" - > + @click="$emit('update:sorter', 'num_threads')"> THR </div> - <div class="table-cell">NI</div> - <div class="table-cell">S</div> - <div - v-show="ioReadWritePresent" - class="table-cell hidden-xs hidden-sm" + <div class="table-cell width-50">NI</div> + <div class="table-cell width-50">S</div> + <div v-show="ioReadWritePresent" class="table-cell width-75 hidden-xs hidden-sm" :class="['sortable', sorter.column === 'io_counters' && 'sort']" - @click="$emit('update:sorter', 'io_counters')" - > + @click="$emit('update:sorter', 'io_counters')"> IOR/s </div> - <div - v-show="ioReadWritePresent" - class="table-cell text-left hidden-xs hidden-sm" + <div v-show="ioReadWritePresent" class="table-cell width-75 text-left hidden-xs hidden-sm" :class="['sortable', sorter.column === 'io_counters' && 'sort']" - @click="$emit('update:sorter', 'io_counters')" - > + @click="$emit('update:sorter', 'io_counters')"> IOW/s </div> - <div - class="table-cell text-left" - :class="['sortable', sorter.column === 'name' && 'sort']" - @click="$emit('update:sorter', 'name')" - > + <div class="table-cell text-left" :class="['sortable', sorter.column === 'name' && 'sort']" + @click="$emit('update:sorter', 'name')"> Command </div> </div> - <div - class="table-row" - v-for="(process, processId) in processes" - :key="processId" - > - <div class="table-cell" :class="getCpuPercentAlert(process)"> + <div class="table-row" v-for="(process, processId) in processes" :key="processId"> + <div class="table-cell width-50" :class="getCpuPercentAlert(process)"> {{ process.cpu_percent == -1 ? '?' : $filters.number(process.cpu_percent, 1) }} </div> - <div class="table-cell" :class="getMemoryPercentAlert(process)"> + <div class="table-cell width-50" :class="getMemoryPercentAlert(process)"> {{ process.memory_percent == -1 ? '?' : $filters.number(process.memory_percent, 1) }} </div> - <div class="table-cell hidden-xs hidden-sm"> + <div class="table-cell width-75"> {{ $filters.bytes(process.memvirt) }} </div> - <div class="table-cell hidden-xs hidden-sm"> + <div class="table-cell width-75"> {{ $filters.bytes(process.memres) }} </div> - <div class="table-cell"> + <div class="table-cell width-75"> {{ process.pid }} </div> - <div class="table-cell text-left"> + <div class="table-cell width-100 text-left"> {{ process.username }} </div> - <div class="table-cell hidden-xs hidden-sm" v-if="process.timeplus != '?'"> + <div class="table-cell width-100 hidden-xs hidden-sm" v-if="process.timeplus != '?'"> <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> + {{ $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> </div> - <div class="table-cell hidden-xs hidden-sm" v-if="process.timeplus == '?'">?</div> - <div class="table-cell text-left hidden-xs hidden-sm"> + <div class="table-cell width-75 hidden-xs hidden-sm" v-if="process.timeplus == '?'">?</div> + <div class="table-cell width-75 text-left hidden-xs hidden-sm"> {{ process.num_threads == -1 ? '?' : process.num_threads }} </div> - <div class="table-cell" :class="{ nice: process.isNice }"> + <div class="table-cell width-50" :class="{ nice: process.isNice }"> {{ $filters.exclamation(process.nice) }} </div> - <div class="table-cell" :class="{ status: process.status == 'R' }"> + <div class="table-cell width-50" :class="{ status: process.status == 'R' }"> {{ process.status }} </div> - <div class="table-cell hidden-xs hidden-sm" v-show="ioReadWritePresent"> + <div class="table-cell width-75 hidden-xs hidden-sm" v-show="ioReadWritePresent"> {{ $filters.bytes(process.io_read) }} </div> - <div class="table-cell text-left hidden-xs hidden-sm" v-show="ioReadWritePresent"> + <div class="table-cell width-75 text-left hidden-xs hidden-sm" v-show="ioReadWritePresent"> {{ $filters.bytes(process.io_write) }} </div> <div class="table-cell text-left" v-show="args.process_short_name"> @@ -159,8 +135,8 @@ export default { process.memvirt = '?'; process.memres = '?'; if (process.memory_info) { - process.memvirt = process.memory_info[1]; - process.memres = process.memory_info[0]; + process.memvirt = process.memory_info.vms; + process.memres = process.memory_info.rss; } process.timeplus = '?'; |