OPENTECH / yoho-node-ci · Commits

Go to a project

Authored by htoooth
Commit eee2af81d57ef1e81f09525f7ed1f2cf080ed870 2 parents 722c7257 c2514655

Merge branch 'master' of http://git.yoho.cn/OPENTECH/yoho-node-ci

Inline Side-by-side
Showing 2 changed files with 15 additions and 6 deletions
... ... @@ -698,7 +698,7 @@ const task = {
let params = ctx.request.body || {};
let key = params.code || '';
let start = params.start || 0;
let stop = params.stop || 100;
let stop = params.stop || 1000;
return ctx.redis.lrangeAsync(`global:yoho:task:log:${key}`, start, stop).then(rdata => {
let data = _.map(rdata, item => {
... ...
... ... @@ -31,11 +31,20 @@
border-collapse: separate;
border-spacing: 0 4px;
}
.task-log tbody tr:nth-child(odd) td:first-child {
.task-log tbody tr:nth-child(5n + 1) td:first-child {
border-left: 2px solid #00C656;
}
.task-log tbody tr:nth-child(even) td:first-child {
border-left: 2px solid #4F95E8;
.task-log tbody tr:nth-child(5n + 2) td:first-child {
border-left: 2px solid #1e90ff;
}
.task-log tbody tr:nth-child(5n + 3) td:first-child {
border-left: 2px solid #00faff;
}
.task-log tbody tr:nth-child(5n + 4) td:first-child {
border-left: 2px solid #ee82ee;
}
.task-log tbody tr:nth-child(5n + 5) td:first-child {
border-left: 2px solid #FFFF00;
}
.task-log tbody tr.empty td {
border: none !important;
... ... @@ -204,9 +213,9 @@
return that.getTaskLog(taskData).then(rdata => {
setTimeout(function() {
layer.close(layerIndex);
that.rendLog(rdata.data);
}, 2000);
layer.close(layerIndex);
}, 800);
});
});
... ...