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

Controller/AdminManage.py

@@ -461,7 +461,7 @@ class AdminManage(TemplateView):
         current_day = localtime.tm_mday
 
         time_struct = [localtime.tm_year, localtime.tm_mon, current_day, 0, 0, 0, 0, 0, 0]
-        current_time = time.mktime(tuple(time_struct))
+        current_time = int(time.mktime(tuple(time_struct)))
         current_time = current_time - time.timezone - 8 * 60 * 60
         count = 0
         if level == 0: # 七天
@@ -481,7 +481,7 @@ class AdminManage(TemplateView):
 
         for i in range(count + 1):
             data.append({
-                'date_time': time.strftime('%m-%d', time.localtime(start_time)),
+                'date_time': int(start_time),
                 'data': None
             })
             start_time += (24 * 60 * 60)
@@ -490,10 +490,9 @@ class AdminManage(TemplateView):
         successes = 0
         failures = 0
         for eqx in eqx_qs:
-            statistics_date = time.strftime('%m-%d', time.localtime(eqx['statistics_date']))
             successes += eqx['number_of_successes']
             failures += eqx['number_of_failures']
-            tmp_dict[statistics_date] = {
+            tmp_dict[eqx['statistics_date']] = {
                 'number_of_successes': eqx['number_of_successes'],
                 'number_of_failures': eqx['number_of_failures'],
                 'total': (eqx['number_of_successes'] + eqx['number_of_failures'])
@@ -518,9 +517,8 @@ class AdminManage(TemplateView):
                 tmp['number_of_failures'] += 1
                 failures += 1
             tmp['total'] += 1
-        statistics_date = time.strftime('%m-%d', time.localtime(start_time))
-        print(statistics_date)
-        tmp_dict[statistics_date] = tmp
+
+        tmp_dict[start_time] = tmp
 
         for item in data:
             if tmp_dict.__contains__(item['date_time']):