From 3b28bd18d5b23ebe1520fd11eb898823f9bc91da Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 29 Nov 2019 16:09:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Queue.php         |  2 +-
 app/admin/view/queue/index.html        | 10 ++++++++--
 app/admin/view/queue/index_search.html | 10 ++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php
index 0e2d151a3..dec1f1146 100644
--- a/app/admin/controller/Queue.php
+++ b/app/admin/controller/Queue.php
@@ -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();
     }
 
diff --git a/app/admin/view/queue/index.html b/app/admin/view/queue/index.html
index 6f6dd553e..8016d72bd 100644
--- a/app/admin/view/queue/index.html
+++ b/app/admin/view/queue/index.html
@@ -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>
diff --git a/app/admin/view/queue/index_search.html b/app/admin/view/queue/index_search.html
index 25cfa78c7..8e4dcc852 100644
--- a/app/admin/view/queue/index_search.html
+++ b/app/admin/view/queue/index_search.html
@@ -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>