leguadmin/xbackend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1

Browse Source
This commit is contained in:
wuaho 2021-10-13 15:29:51 +08:00
parent 5f38bd20a1
commit 26f63b6f68
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/api_v1/endpoints/query.py
View File

@ -720,6 +720,10 @@ async def scatter_model(
analysis = res['analysis'] analysis = res['analysis']
groupby = res['groupby'] groupby = res['groupby']
quota_interval_arr = res['quota_interval_arr'] quota_interval_arr = res['quota_interval_arr']
# 兼容合计的
if res['time_particle'] == 'total':
df['date'] = '合计'
if analysis != 'number_of_days' and interval_type != 'discrete': if analysis != 'number_of_days' and interval_type != 'discrete':
max_v = int(df['values'].max()) max_v = int(df['values'].max())
min_v = int(df['values'].min()) min_v = int(df['values'].min())
@ -740,9 +744,7 @@ async def scatter_model(
for i, v in enumerate(quota_interval_arr[1:]): for i, v in enumerate(quota_interval_arr[1:]):
resp['label'].append(f'[{quota_interval_arr[i]},{v})') resp['label'].append(f'[{quota_interval_arr[i]},{v})')
bins.append(v) bins.append(v)
# 合计的
if res['time_particle'] == 'total':
df['date'] = '合计'
# 这是整体的 # 这是整体的
for key, tmp_df in df.groupby('date'): for key, tmp_df in df.groupby('date'):
@ -783,12 +785,14 @@ async def scatter_model(
'end_date': res['end_date'], 'end_date': res['end_date'],
'time_particle': res['time_particle'] 'time_particle': res['time_particle']
} }
total_dict = {}
labels = [str(i) for i in sorted(df['values'].unique())] labels = [str(i) for i in sorted(df['values'].unique())]
resp['label'] = labels resp['label'] = labels
for key, tmp_df in df.groupby(['date']): for key, tmp_df in df.groupby(['date']):
total = len(tmp_df) total = len(tmp_df)
dt = key.strftime('%Y-%m-%d') if res['time_particle'] == 'total':
dt='合计'
else:
dt = key.strftime('%Y-%m-%d')
labels_dict = {} labels_dict = {}
for key2, tmp_df2 in tmp_df.groupby('values'): for key2, tmp_df2 in tmp_df.groupby('values'):
label = str(key2) label = str(key2)