blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-05 19:41:44 +08:00
Code Issues Projects Releases Wiki Activity

优化系统任务展示

Browse Source
This commit is contained in:
邹景立 2021-07-31 15:00:56 +08:00
parent 1258d781d6
commit 788e9028ae
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/model/SystemQueue.php
View File

@ -41,9 +41,9 @@ class SystemQueue extends Model
public function getOuterTimeAttr($value, array $data): string
{
if ($value > 0 && $value > $data['enter_time']) {
return sprintf("%.4f", $data['outer_time'] - $data['enter_time']) . ' 秒';
return '<b class="color-blue">' . sprintf("%.4f", $data['outer_time'] - $data['enter_time']) . '</b> 秒';
} else {
return '<span class="color-desc">-</span>';
return '<b class="color-desc">-</b>';
}
}

13
app/admin/view/queue/index.html
View File

@ -71,12 +71,21 @@
{field: 'code', title: '任务编号', width: 140, sort: true},
{field: 'title', title: '任务名称', minWidth: 160},
{field: 'command', title: '任务指令', minWidth: 160},
{field: 'exec_time', title: '计划时间', minWidth: 170},
{
field: 'exec_time', title: '计划时间', minWidth: 250, templet: function (d) {
d.exec_time = d.exec_time || 0, d.loops_time = d.loops_time || 0;
if (d.loops_time > 0) {
return d.exec_time + ' ( 每 <b class="color-blue">' + d.loops_time + '</b> 秒 ) ';
} else {
return d.exec_time + ' <span class="color-desc">( 单次任务 )</span> ';
}
}
},
{
field: 'enter_time', title: '开始时间', minWidth: 180, templet: function (d) {
d.enter_time = d.enter_time || '', d.outer_time = d.outer_time || '0.0000';
if (d.enter_time.length > 12) {
return d.enter_time.substr(12) + ('<span class="color-desc">（ 耗时 ' + d.outer_time + ' )</span>');
return d.enter_time.substr(12) + '<span class="color-desc"> ( 耗时 ' + d.outer_time + ' )</span>';
} else {
return '<span class="color-desc">未执行</span>'
}

2
public/static/admin.js
View File

@ -560,7 +560,7 @@ $(function () {
/*! 全局文件上传入口 */
$.fn.uploadFile = function (callable) {
if (this.data('inited')) return false;
var that = this, mult = 'one|btn'.indexOf(this.data('file') || 'one') > -1 ? 0 : 1;
var that = this, mult = '|one|btn|'.indexOf(this.data('file') || 'one') ? 0 : 1;
this.data('inited', true).data('multiple', mult), require(['upload'], function (apply) {
apply.call(this, that, callable);
});