Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
3dc71a06
G
glances
项目概览
蜕变的菜鸟
/
glances
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
glances
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3dc71a06
编写于
5月 09, 2015
作者:
A
Alessio Sergi
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #590 from notFloran/web-ui-fix-time+
[Web UI] Fix format of time+ in the process list
上级
c0f473df
a5e88503
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
23 addition
and
14 deletion
+23
-14
glances/outputs/static/css/style.css
glances/outputs/static/css/style.css
+4
-0
glances/outputs/static/html/plugins/processlist.html
glances/outputs/static/html/plugins/processlist.html
+3
-1
glances/outputs/static/js/filters.js
glances/outputs/static/js/filters.js
+8
-0
glances/outputs/static/js/stats_controller.js
glances/outputs/static/js/stats_controller.js
+8
-13
未找到文件。
glances/outputs/static/css/style.css
浏览文件 @
3dc71a06
...
...
@@ -49,6 +49,10 @@ body {
font-weight
:
bold
;
color
:
white
;
}
.highlight
{
font-weight
:
bold
;
color
:
magenta
;
}
.ok
{
color
:
green
;
}
...
...
glances/outputs/static/html/plugins/processlist.html
浏览文件 @
3dc71a06
...
...
@@ -22,7 +22,9 @@
<div
class=
"table-cell text-left"
>
{{process.username}}
</div>
<div
class=
"table-cell"
ng-class=
"{nice: isNice(process.nice)}"
>
{{process.nice | exclamation}}
</div>
<div
class=
"table-cell"
ng-class=
"{status: process.status == 'R'}"
>
{{process.status}}
</div>
<div
class=
"table-cell hidden-xs hidden-sm"
>
{{process.timeformatted}}
</div>
<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.io_read}}
</div>
<div
class=
"table-cell hidden-xs hidden-sm"
>
{{process.io_write}}
</div>
<div
class=
"table-cell text-left"
ng-if=
"show.short_process_name"
>
{{process.name}}
</div>
...
...
glances/outputs/static/js/filters.js
浏览文件 @
3dc71a06
...
...
@@ -76,3 +76,11 @@ glancesApp.filter('bits', function($filter) {
return
$filter
(
'
bytes
'
)(
bits
,
low_precision
)
+
'
b
'
;
}
});
glancesApp
.
filter
(
'
leftPad
'
,
function
(
$filter
)
{
return
function
(
value
,
length
,
chars
)
{
length
=
length
||
0
;
chars
=
chars
||
'
'
;
return
_
.
padLeft
(
value
,
length
,
chars
);
}
});
glances/outputs/static/js/stats_controller.js
浏览文件 @
3dc71a06
...
...
@@ -85,21 +85,16 @@ glancesApp.controller('statsController', function($scope, $http, $interval, $q,
}
return
sum
;
}
function
leftpad
(
input
)
{
if
(
input
<
10
)
{
return
"
0
"
+
input
}
return
input
}
function
timedelta
(
input
)
{
var
sum
=
timemillis
(
input
);
var
d
=
new
Date
(
sum
);
var
hour
=
leftpad
(
d
.
getUTCHours
())
// TODO : multiple days ( * (d.getDay() * 24)))
var
minutes
=
leftpad
(
d
.
getUTCMinutes
())
var
seconds
=
leftpad
(
d
.
getUTCSeconds
())
var
milliseconds
=
parseInt
(
""
+
d
.
getUTCMilliseconds
()
/
10
)
var
millisecondsStr
=
leftpad
(
milliseconds
)
return
hour
+
"
:
"
+
minutes
+
"
:
"
+
seconds
+
"
.
"
+
millisecondsStr
return
{
hours
:
d
.
getUTCHours
(),
// TODO : multiple days ( * (d.getDay() * 24)))
minutes
:
d
.
getUTCMinutes
(),
seconds
:
d
.
getUTCSeconds
(),
milliseconds
:
parseInt
(
""
+
d
.
getUTCMilliseconds
()
/
10
)
};
};
function
durationBetweenTwoDates
(
startDate
,
endDate
)
{
...
...
@@ -115,7 +110,7 @@ glancesApp.controller('statsController', function($scope, $http, $interval, $q,
var
process
=
response
[
'
processlist
'
][
i
]
process
.
memvirt
=
process
.
memory_info
[
1
]
process
.
memres
=
process
.
memory_info
[
0
]
process
.
time
formatted
=
timedelta
(
process
.
cpu_times
)
process
.
time
plus
=
timedelta
(
process
.
cpu_times
)
process
.
timemillis
=
timemillis
(
process
.
cpu_times
)
process
.
io_read
=
'
?
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录