|
@@ -76,7 +76,10 @@ class HomeDataView(View):
|
|
|
else:
|
|
|
user_increase_region_dict[k] = v
|
|
|
for k, v in user_increase_region_dict.items():
|
|
|
- user_increase_region_list.append({k: v})
|
|
|
+ user_increase_region_list.append({
|
|
|
+ 'countryName': k,
|
|
|
+ 'count': v
|
|
|
+ })
|
|
|
|
|
|
# 所有用户数据
|
|
|
user_all_qs = DeviceUserSummary.objects.filter(time__lte=start_time_stamp, query_type=0).values('count',
|
|
@@ -91,7 +94,10 @@ class HomeDataView(View):
|
|
|
else:
|
|
|
user_all_region_dict[k] = v
|
|
|
for k, v in user_all_region_dict.items():
|
|
|
- user_all_region_list.append({k: v})
|
|
|
+ user_all_region_list.append({
|
|
|
+ 'countryName': k,
|
|
|
+ 'count': v
|
|
|
+ })
|
|
|
user_all_count = user_all_qs.aggregate(count=Sum('count'))['count']
|
|
|
user_all_count = user_all_count if user_all_count else 0
|
|
|
# 活跃用户数据
|