diff --git a/eladmin-web/src/views/dashboard/PanelGroup.vue b/eladmin-web/src/views/dashboard/PanelGroup.vue index a68670c..8f55484 100644 --- a/eladmin-web/src/views/dashboard/PanelGroup.vue +++ b/eladmin-web/src/views/dashboard/PanelGroup.vue @@ -7,7 +7,7 @@
- 用户统计 + 账号统计
@@ -46,7 +46,7 @@
- 指令数据 + 用户数据
diff --git a/eladmin/eladmin-system/src/main/resources/mapper/system/DashboardMapper.xml b/eladmin/eladmin-system/src/main/resources/mapper/system/DashboardMapper.xml index 7bfb883..8919991 100644 --- a/eladmin/eladmin-system/src/main/resources/mapper/system/DashboardMapper.xml +++ b/eladmin/eladmin-system/src/main/resources/mapper/system/DashboardMapper.xml @@ -47,13 +47,13 @@ select '前七天' text, count(1) value from sys_role where DATE(create_time) = CURDATE() - INTERVAL 7 DAY - select '前一天' text, count(1) value from bus_command_log where DATE(create_time) = CURDATE() - INTERVAL 1 DAY UNION ALL - select '前两天' text, count(1) value from bus_command_log where DATE(create_time) = CURDATE() - INTERVAL 2 DAY UNION ALL - select '前三天' text, count(1) value from bus_command_log where DATE(create_time) = CURDATE() - INTERVAL 3 DAY UNION ALL - select '前四天' text, count(1) value from bus_command_log where DATE(create_time) = CURDATE() - INTERVAL 4 DAY UNION ALL - select '前五天' text, count(1) value from bus_command_log where DATE(create_time) = CURDATE() - INTERVAL 5 DAY UNION ALL - select '前六天' text, count(1) value from bus_command_log where DATE(create_time) = CURDATE() - INTERVAL 6 DAY UNION ALL - select '前七天' text, count(1) value from bus_command_log where DATE(create_time) = CURDATE() - INTERVAL 7 DAY + select '前一天' text, count(1) value from bus_user where DATE(create_time) = CURDATE() - INTERVAL 1 DAY UNION ALL + select '前两天' text, count(1) value from bus_user where DATE(create_time) = CURDATE() - INTERVAL 2 DAY UNION ALL + select '前三天' text, count(1) value from bus_user where DATE(create_time) = CURDATE() - INTERVAL 3 DAY UNION ALL + select '前四天' text, count(1) value from bus_user where DATE(create_time) = CURDATE() - INTERVAL 4 DAY UNION ALL + select '前五天' text, count(1) value from bus_user where DATE(create_time) = CURDATE() - INTERVAL 5 DAY UNION ALL + select '前六天' text, count(1) value from bus_user where DATE(create_time) = CURDATE() - INTERVAL 6 DAY UNION ALL + select '前七天' text, count(1) value from bus_user where DATE(create_time) = CURDATE() - INTERVAL 7 DAY