diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml index 0533daf3..74cd5733 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml @@ -36,6 +36,7 @@ WHERE DATE(LOGINTIME) =curdate() GROUP BY REPORTSTRING + ORDER BY REPORTSTRING @@ -55,6 +57,7 @@ WHERE DATE(LOGINTIME) >date_add(curdate(), interval - day(curdate()) -31 day) GROUP BY REPORTSTRING + ORDER BY REPORTCOUNT DESC diff --git a/maxkey-web-manage/src/main/resources/templates/views/main.ftl b/maxkey-web-manage/src/main/resources/templates/views/main.ftl index 939ce082..049059f7 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/main.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/main.ftl @@ -206,7 +206,7 @@ }], yAxes: [{ display: true, - type: 'logarithmic', + stacked: true }] } } @@ -235,7 +235,7 @@ }], yAxes: [{ display: true, - type: 'logarithmic', + stacked: true }] } }