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

@@ -698,7 +698,7 @@ const task = {
         let params = ctx.request.body || {};
         let params = ctx.request.body || {};
         let key = params.code || '';
         let key = params.code || '';
         let start = params.start || 0;
         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 => {
         return ctx.redis.lrangeAsync(`global:yoho:task:log:${key}`, start, stop).then(rdata => {
             let data = _.map(rdata, item => {
             let data = _.map(rdata, item => {

@@ -31,11 +31,20 @@
         border-collapse: separate;
         border-collapse: separate;
         border-spacing: 0 4px;
         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;
         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 {
     .task-log tbody tr.empty td {
         border: none !important;
         border: none !important;
@@ -204,9 +213,9 @@
 
 
                 return that.getTaskLog(taskData).then(rdata => {
                 return that.getTaskLog(taskData).then(rdata => {
                     setTimeout(function() {
                     setTimeout(function() {
-                        layer.close(layerIndex);
                         that.rendLog(rdata.data);
                         that.rendLog(rdata.data);
-                    }, 2000);
+                        layer.close(layerIndex);
+                    }, 800);
                 });
                 });
             });
             });