UI:adjust job's exectuting time

pull/45/head
Doflatango 2017-10-24 10:35:22 +08:00
parent 8c2d33af2c
commit 68826f8446
5 changed files with 19 additions and 19 deletions

File diff suppressed because one or more lines are too long

View File

@ -169,7 +169,7 @@ export default {
},
formatLatest: function(latest){
return this.$L('{begin ~ end}, on {node} took {times}', formatTime(latest.beginTime, latest.endTime), latest.node, formatDuration(latest.beginTime, latest.endTime))
return this.$L('on {node} took {times}, {begin ~ end}', latest.node, formatDuration(latest.beginTime, latest.endTime), formatTime(latest.beginTime, latest.endTime));
},
showExecuteJobModal: function(jobName, jobGroup, jobId){
@ -182,4 +182,4 @@ export default {
ExecuteJob
}
}
</script>
</script>

View File

@ -165,7 +165,7 @@ export default {
},
formatTime: function(log){
return this.$L('{begin ~ end}, took {times}', formatTime(log.beginTime, log.endTime), formatDuration(log.beginTime, log.endTime));
return this.$L('took {times}, {begin ~ end}', formatDuration(log.beginTime, log.endTime), formatTime(log.beginTime, log.endTime));
},
showExecuteJobModal: function(jobName, jobGroup, jobId){
@ -177,4 +177,4 @@ export default {
ExecuteJob
}
}
</script>
</script>

View File

@ -49,7 +49,7 @@ var language = {
'successed': 'Successed',
'failed': 'Failed',
'click to select a node and re-execute job': 'Click to select a node and re-execute job',
'{begin ~ end}, took {times}': '{0}, took {1}',
'took {times}, {begin ~ end}': 'Took {0}, {1}',
'executing job: {job}': 'executing job: "{0}"',
'cancel': 'Cancel',
'execute now': 'Execute now!',
@ -73,7 +73,7 @@ var language = {
'delete': 'Delete',
'all groups': 'All groups',
'all nodes': 'All nodes',
'{begin ~ end}, on {node} took {times}': '{0}, on {1} took {2}',
'on {node} took {times}, {begin ~ end}': 'On {0} took {1}, {2}',
'create job': 'Create job',
'update job': 'Update job',
'output': 'Output',

View File

@ -50,7 +50,7 @@ var language = {
'successed': '成功',
'failed': '失败',
'click to select a node and re-execute job': '点此选择节点重新执行任务',
'{begin ~ end}, took {times}': '{0},耗时 {1}',
'took {times}, {begin ~ end}': '耗时 {0}, {1}',
'executing job: {job}': '执行任务:“{0}”',
'cancel': '取消',
'execute now': '立刻执行任务',
@ -75,7 +75,7 @@ var language = {
'delete': '删除',
'all groups': '所有分组',
'all nodes': '所有节点',
'{begin ~ end}, on {node} took {times}': '{0}, 于 {1} 耗时 {2}',
'on {node} took {times}, {begin ~ end}': '于 {0} 耗时 {1}, {2}',
'create job': '新建任务',
'update job': '更新任务',
'output': '输出',