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

修改系统任务

Browse Source
This commit is contained in:
Anyon 2019-11-29 16:09:46 +08:00
parent 5a4aa12554
commit 3b28bd18d5
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/controller/Queue.php
View File

@ -55,7 +55,7 @@ class Queue extends Controller
$this->title = '系统任务管理';
$this->iswin = ProcessService::instance()->iswin();
// 任务列表查询分页处理
$query = $this->_query($this->table)->dateBetween('create_at')->timeBetween('enter_time,outer_time');
$query = $this->_query($this->table)->dateBetween('create_at')->timeBetween('enter_time,exec_time');
$query->like('title,command')->equal('status')->order('id desc')->page();
}

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

@ -44,10 +44,15 @@
<span class="color-desc">任务指令：{$vo.command|default=''}</span>
</td>
<td class='text-left nowrap'>
创建时间：{$vo.create_at|format_datetime} / {$vo.exec_time|format_datetime}<br>
执行时间：{$vo.enter_time|format_datetime} / {$vo.outer_time|format_datetime}
计划执行：{$vo.exec_time|format_datetime}<br>
{if !empty($vo.enter_time) && !empty($vo.outer_time)}
开始时间：{$vo.enter_time|format_datetime}（ 耗时 <b class="color-blue">{$vo.outer_time-$vo.enter_time}</b> 秒 ）
{else}
创建时间：{$vo.create_at|format_datetime}
{/if}
</td>
<td class='text-left nowrap'>
任务状态：{eq name='vo.rscript' value='1'}
<span class="layui-badge layui-bg-green margin-right-5">复</span>
{else}
@ -66,6 +71,7 @@
<i class="layui-icon font-s12">&#xe669;</i>
</a>
{/eq}
{if auth("admin/queue/remove") and in_array($vo.status,[1,3,4])}
<a data-action='{:url("remove")}' data-confirm="确定要删除该任务吗？" data-value="id#{$vo.id}" data-tips-text="删除该任务" class='layui-badge layui-bg-red margin-left-5'>
<i class="layui-icon">&#xe640;</i>

10
app/admin/view/queue/index_search.html
View File

@ -44,9 +44,9 @@
</div>
</div>
<div class="layui-form-item layui-inline">
<label class="layui-form-label">创建时间</label>
<label class="layui-form-label">计划时间</label>
<div class="layui-input-inline">
<input data-date-range name="create_at" value="{:input('get.create_at')}" placeholder="请选择创建时间" class="layui-input">
<input data-date-range name="exec_time" value="{:input('get.exec_time')}" placeholder="请选择计划时间" class="layui-input">
</div>
</div>
<div class="layui-form-item layui-inline">
@ -55,12 +55,6 @@
<input data-date-range name="enter_time" value="{:input('get.enter_time')}" placeholder="请选择开始时间" class="layui-input">
</div>
</div>
<div class="layui-form-item layui-inline">
<label class="layui-form-label">结束时间</label>
<div class="layui-input-inline">
<input data-date-range name="outer_time" value="{:input('get.outer_time')}" placeholder="请选择结束时间" class="layui-input">
</div>
</div>
<div class="layui-form-item layui-inline">
<button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
</div>