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} +
+ {eq name='vo.rscript' value='1'} + + {else} + + {/eq} - 任务状态:{eq name='vo.rscript' value='1'} - - {else} - - {/eq} + {eq name='vo.status' value='1'} + 待处理 + {elseif $vo.status eq 2} + 处理中 + {elseif $vo.status eq 3} + 处理完成 + {elseif $vo.status eq 4} + 处理失败 + + + + {/eq} - {eq name='vo.status' value='1'} - 待处理 - {elseif $vo.status eq 2} - 处理中 - {elseif $vo.status eq 3} - 处理完成 - {elseif $vo.status eq 4} - 处理失败 - - - - {/eq} - - {if auth("remove") and in_array($vo.status,[1,3,4])} - - - - {/if} -
- 状态描述:{$vo.exec_desc|raw|default="没有获取到状态描述"} + {if auth("remove") and in_array($vo.status,[1,3,4])} + + + + {/if} +
+
{$vo.exec_desc|raw|default="没有获取到状态描述"}
{/foreach}