From 090ad5323a613926565e13b7cda11b86dca73fde Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 17 Jun 2021 12:30:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=8E=92=E5=BA=8F=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/core/page/PageDomain.java | 9 +++++++++ .../src/layout/components/Sidebar/Logo.vue | 4 ++-- .../src/views/monitor/logininfor/index.vue | 19 ++++++++++++++----- ruoyi-ui/src/views/monitor/operlog/index.vue | 19 ++++++++++++++----- 4 files changed, 39 insertions(+), 12 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java index 23f1f8bd..119b385f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java @@ -67,6 +67,15 @@ public class PageDomain public void setIsAsc(String isAsc) { + // 兼容前端排序类型 + if ("ascending".equals(isAsc)) + { + isAsc = "asc"; + } + else if ("descending".equals(isAsc)) + { + isAsc = "desc"; + } this.isAsc = isAsc; } } diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue index afe5fcdc..f3bf5d5b 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue +++ b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue @@ -2,11 +2,11 @@