提交 3daa17bb 编写于 作者: N Nicolas Hennion

Merge pull request #701 from notFloran/web-ui-hide-io-read-write

[WebUI] hide io read/write if value is not present
......@@ -9,8 +9,8 @@
<div class="table-cell">NI</div>
<div class="table-cell">S</div>
<div sortable-th sorter="sorter" column="timemillis" class="table-cell hidden-xs hidden-sm">TIME+</div>
<div sortable-th sorter="sorter" column="io_read" class="table-cell hidden-xs hidden-sm">IOR/s</div>
<div sortable-th sorter="sorter" column="io_write" class="table-cell hidden-xs hidden-sm">IOW/s</div>
<div sortable-th sorter="sorter" column="io_read" class="table-cell hidden-xs hidden-sm" ng-show="statsProcessList.ioReadWritePresent">IOR/s</div>
<div sortable-th sorter="sorter" column="io_write" class="table-cell hidden-xs hidden-sm" ng-show="statsProcessList.ioReadWritePresent">IOW/s</div>
<div sortable-th sorter="sorter" column="name" class="table-cell text-left">Command</div>
</div>
<div class="table-row" ng-repeat="process in statsProcessList.processes | orderBy:sorter.column:sorter.isReverseColumn(sorter.column)">
......@@ -25,8 +25,8 @@
<div class="table-cell hidden-xs hidden-sm">
<span ng-show="process.timeplus.hours > 0" class="highlight">{{ process.timeplus.hours }}h</span>{{ process.timeplus.minutes | leftPad:2:'0' }}:{{ process.timeplus.seconds | leftPad:2:'0' }}<span ng-show="process.timeplus.hours <= 0">.{{ process.timeplus.milliseconds | leftPad:2:'0' }}</span>
</div>
<div class="table-cell hidden-xs hidden-sm">{{process.ioRead}}</div>
<div class="table-cell hidden-xs hidden-sm">{{process.ioWrite}}</div>
<div class="table-cell hidden-xs hidden-sm" ng-show="process.ioRead">{{process.ioRead}}</div>
<div class="table-cell hidden-xs hidden-sm" ng-show="process.ioWrite">{{process.ioWrite}}</div>
<div class="table-cell text-left" ng-show="show.short_process_name">{{process.name}}</div>
<div class="table-cell text-left" ng-show="!show.short_process_name">{{process.cmdline}}</div>
</div>
......
glancesApp.service('GlancesPluginProcessList', function($filter, GlancesPlugin) {
var _pluginName = "processlist";
var _ioReadWritePresent = false;
this.processes = [];
this.setData = function(data, views) {
this.processes = [];
this.ioReadWritePresent = false;
for (var i = 0; i < data[_pluginName].length; i++) {
var process = data[_pluginName][i];
......@@ -13,10 +15,12 @@ glancesApp.service('GlancesPluginProcessList', function($filter, GlancesPlugin)
process.timeplus = $filter('timedelta')(process.cpu_times);
process.timemillis = $filter('timemillis')(process.cpu_times);
process.ioRead = '?';
process.ioWrite = '?';
process.ioRead = null;
process.ioWrite = null;
if (process.io_counters) {
this.ioReadWritePresent = true;
process.ioRead = (process.io_counters[0] - process.io_counters[2]) / process.time_since_update;
if (process.ioRead != 0) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册