From 755e2eff5aabcf904b35a525aa33cfc40ccadcd9 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 9 Jan 2020 10:29:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Login.php  |  2 +-
 app/admin/view/queue/index.html | 50 ++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/admin/controller/Login.php b/app/admin/controller/Login.php
index 4ce95414a..2ca01d416 100644
--- a/app/admin/controller/Login.php
+++ b/app/admin/controller/Login.php
@@ -78,7 +78,7 @@ class Login extends Controller
                 'login_num' => $this->app->db->raw('login_num+1'),
             ]);
             $this->app->session->set('user', $user);
-            sysoplog('用户登录', "用户登录系统后台成功");
+            sysoplog('用户登录', "登录系统后台成功");
             $this->success('登录成功', url('@admin')->build());
         }
     }
diff --git a/app/admin/view/queue/index.html b/app/admin/view/queue/index.html
index 206f4c943..42a4e300b 100644
--- a/app/admin/view/queue/index.html
+++ b/app/admin/view/queue/index.html
@@ -90,33 +90,33 @@
                 {else} 创建时间：{$vo.create_at|format_datetime} {/if}
             </td>
             <td class='text-left nowrap'>
+                <div>
+                    {eq name='vo.rscript' value='1'}
+                    <span class="layui-badge layui-bg-green margin-right-5">复</span>
+                    {else}
+                    <span class="layui-badge layui-bg-blue margin-right-5">单</span>
+                    {/eq}
 
-                任务状态：{eq name='vo.rscript' value='1'}
-                <span class="layui-badge layui-bg-green margin-right-5">复</span>
-                {else}
-                <span class="layui-badge layui-bg-blue margin-right-5">单</span>
-                {/eq}
+                    {eq name='vo.status' value='1'}
+                    <span class="layui-badge layui-bg-black">待处理</span>
+                    {elseif $vo.status eq 2}
+                    <span class="layui-badge layui-bg-green">处理中</span>
+                    {elseif $vo.status eq 3}
+                    <span class="layui-badge layui-bg-blue">处理完成</span>
+                    {elseif $vo.status eq 4}
+                    <span class="layui-badge layui-bg-red margin-right-5">处理失败</span>
+                    <a class="layui-badge layui-bg-green" data-tips-text="重置该任务" data-action="{:url('redo')}" data-value="id#{$vo.id}">
+                        <i class="layui-icon font-s12">&#xe669;</i>
+                    </a>
+                    {/eq}
 
-                {eq name='vo.status' value='1'}
-                <span class="layui-badge layui-bg-black">待处理</span>
-                {elseif $vo.status eq 2}
-                <span class="layui-badge layui-bg-green">处理中</span>
-                {elseif $vo.status eq 3}
-                <span class="layui-badge layui-bg-blue">处理完成</span>
-                {elseif $vo.status eq 4}
-                <span class="layui-badge layui-bg-red margin-right-5">处理失败</span>
-                <a class="layui-badge layui-bg-green" data-tips-text="重置该任务" data-action="{:url('redo')}" data-value="id#{$vo.id}">
-                    <i class="layui-icon font-s12">&#xe669;</i>
-                </a>
-                {/eq}
-
-                {if auth("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>
-                </a>
-                {/if}
-                <br>
-                状态描述：<span class="color-desc">{$vo.exec_desc|raw|default="没有获取到状态描述"}</span>
+                    {if auth("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>
+                    </a>
+                    {/if}
+                </div>
+                <div class="color-desc">{$vo.exec_desc|raw|default="没有获取到状态描述"}</div>
             </td>
         </tr>
         {/foreach}