From 370fb0bc717a5e17721ae018412e31b1b85120c3 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@163.com>
Date: Fri, 14 Aug 2020 00:20:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml  | 3 +++
 maxkey-web-manage/src/main/resources/templates/views/main.ftl | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

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 0533daf35..74cd5733b 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
     </select>
     <!-- 30 DAY COUNT 最近30天每天访问量-->   
     <select id="analysisMonth" parameterType="String" resultType="Map">
@@ -45,6 +46,7 @@
     	WHERE 
     		DATE(LOGINTIME) >date_add(curdate(), interval - day(curdate()) -31 day)
     	GROUP BY REPORTSTRING
+    	ORDER BY REPORTSTRING
     </select>
     
     <!-- 30天浏览器的访问统计 -->
@@ -55,6 +57,7 @@
     	WHERE 
     		DATE(LOGINTIME) >date_add(curdate(), interval - day(curdate()) -31 day)
     	GROUP BY REPORTSTRING
+    	ORDER BY REPORTCOUNT DESC
     </select>
     
     <!-- 30天应用单点登录的访问统计 -->
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 939ce082a..049059f72 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
 					}]
 				}
 			}