From 788e9028ae7dafb0f9fdc51bae97cef35bb939a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Sat, 31 Jul 2021 15:00:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/model/SystemQueue.php |  4 ++--
 app/admin/view/queue/index.html | 13 +++++++++++--
 public/static/admin.js          |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/admin/model/SystemQueue.php b/app/admin/model/SystemQueue.php
index 02c0242d5..3c016da26 100644
--- a/app/admin/model/SystemQueue.php
+++ b/app/admin/model/SystemQueue.php
@@ -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>';
         }
     }
 
diff --git a/app/admin/view/queue/index.html b/app/admin/view/queue/index.html
index 4dac1da44..1f678c9ee 100644
--- a/app/admin/view/queue/index.html
+++ b/app/admin/view/queue/index.html
@@ -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>'
                         }
diff --git a/public/static/admin.js b/public/static/admin.js
index 0655524d0..bbdbcde29 100644
--- a/public/static/admin.js
+++ b/public/static/admin.js
@@ -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);
         });