diff --git a/applications/view/system/log.py b/applications/view/system/log.py index 9f85c02..bad5444 100644 --- a/applications/view/system/log.py +++ b/applications/view/system/log.py @@ -22,9 +22,11 @@ def index(): def login_log(): # orm查询 # 使用分页获取data需要.items - log = AdminLog.query.filter_by(url='/passport/login').order_by(desc(AdminLog.create_time)).layui_paginate() + log = AdminLog.query.filter( + AdminLog.url != '/passport/login' + ).order_by(desc(AdminLog.create_time)).layui_paginate() count = log.total - return table_api(data= model_to_dicts(schema=LogOutSchema, data=log.items), count=count) + return table_api(data=model_to_dicts(schema=LogOutSchema, data=log.items), count=count) # 操作日志 @@ -33,8 +35,9 @@ def login_log(): def operate_log(): # orm查询 # 使用分页获取data需要.items - log = AdminLog.query.filter( - AdminLog.url != '/passport/login').order_by( + log = AdminLog.query.filter_by( + url='/passport/login' + ).order_by( desc(AdminLog.create_time)).layui_paginate() count = log.total return table_api(data=model_to_dicts(schema=LogOutSchema, data=log.items), count=count) diff --git a/static/system/component/pear/module/tabPage.js b/static/system/component/pear/module/tabPage.js index 91c2bc1..9598d53 100644 --- a/static/system/component/pear/module/tabPage.js +++ b/static/system/component/pear/module/tabPage.js @@ -383,7 +383,7 @@ layui.define(['jquery', 'element', 'dropdown'], function (exports) { */ tabPage.prototype.refresh = function (time) { - var $iframe = $(".layui-tab[lay-filter='" + this.option.elem + "'] .layui-tab-content .layui-show > div[data-frameid]"); + var $iframe = $(".layui-tab[lay-filter='" + this.option.elem + "'] .layui-tab-content .layui-show > div[data-frameid], iframe[data-frameid]"); var $iframeLoad; if (time != false && time != 0) { diff --git a/templates/system/admin_log/main.html b/templates/system/admin_log/main.html index 4b56702..7acb5bb 100644 --- a/templates/system/admin_log/main.html +++ b/templates/system/admin_log/main.html @@ -3,7 +3,6 @@ 日志 {% include 'system/common/header.html' %} - @@ -40,74 +39,74 @@ {% include 'system/common/footer.html' %} \ No newline at end of file