From d61afd5bb3ff1557d2f4e656441e7da76ea2a5f7 Mon Sep 17 00:00:00 2001 From: "Crystal.Sea" Date: Mon, 7 Sep 2020 22:46:50 +0800 Subject: [PATCH] logs query fix logs query fix --- .../views/logs/loginAppsHistoryList.ftl | 24 ++++--------------- .../templates/views/logs/loginHistoryList.ftl | 24 ++++--------------- .../templates/views/logs/logsList.ftl | 18 ++++---------- 3 files changed, 15 insertions(+), 51 deletions(-) diff --git a/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl b/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl index 729edbfdb..685c5ffe3 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/logs/loginAppsHistoryList.ftl @@ -4,17 +4,7 @@ <#include "../layout/header.ftl"/> <#include "../layout/common.cssjs.ftl"/> @@ -91,17 +81,13 @@ - <@locale code="userinfo.department"/> + <@locale code="common.text.startdate"/> - - - " title="department" wurl="/orgs/orgsSelect/deptId/department" wwidth="300" wheight="400" /> + - <@locale code="userinfo.userType"/> + <@locale code="common.text.enddate"/> - - - " title="UserType" wurl="/usertype//selectUserTypeList" wwidth="700" wheight="500" /> + diff --git a/maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList.ftl b/maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList.ftl index cf46c7dbd..5e53807b5 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/logs/loginHistoryList.ftl @@ -4,17 +4,7 @@ <#include "../layout/header.ftl"/> <#include "../layout/common.cssjs.ftl"/> @@ -91,17 +81,13 @@ - <@locale code="userinfo.department"/> + <@locale code="common.text.startdate"/> - - - " title="department" wurl="/orgs/orgsSelect/deptId/department" wwidth="300" wheight="400" /> + - <@locale code="userinfo.userType"/> + <@locale code="common.text.enddate"/> - - - " title="UserType" wurl="/usertype//selectUserTypeList" wwidth="700" wheight="500" /> + diff --git a/maxkey-web-manage/src/main/resources/templates/views/logs/logsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/logs/logsList.ftl index c7be381e8..dc580b3e0 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/logs/logsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/logs/logsList.ftl @@ -4,17 +4,7 @@ <#include "../layout/header.ftl"/> <#include "../layout/common.cssjs.ftl"/> @@ -91,11 +81,13 @@ - <@locale code="userinfo.department"/> + <@locale code="common.text.startdate"/> + - <@locale code="userinfo.userType"/> + <@locale code="common.text.enddate"/> + -- GitLab