Merge remote-tracking branch 'origin/dev' into dev

src/main/webapp/resources/js/index/app.js

@@ -5239,9 +5239,11 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 condition.dateFrom = null;
                 condition.dateTo = null;
             } else if (zone == 7) { // 一星期内
+                date.setHours(0, 0, 0 ,0);
                 date.setDate(date.getDate() - 7);
                 condition.dateFrom = date;
                 var ndate = new Date();
+                ndate.setHours(23, 59, 59 ,999);
                 ndate.setDate(ndate.getDate() - 1);
                 condition.dateTo = ndate;
             } else if (zone == 1) { // 一个月内