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

1

Browse Source
This commit is contained in:
wuaho 2021-07-29 22:31:45 +08:00
parent 311d30269e
commit 172856ede3
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/api_v1/endpoints/dashboard.py
View File

@ -153,4 +153,5 @@ async def dashboards(request: Request,
"""获取一个看板"""
res = await crud.dashboard.get(db, id=data_in.id)
# res['reports'] = await crud.report.find_many(db, **{'_id': {'$in': [item['report_id'] for item in res.get('reports')]}})
return schemas.Msg(code=0, msg='ok', data=res['reports'])
data = {item['report_id']: item for item in res['reports']}
return schemas.Msg(code=0, msg='ok', data=data)

13
models/behavior_analysis.py
View File

@ -221,10 +221,15 @@ class BehaviorAnalysis:
opt = ({'+', '-', '*', '/'} & set(s)).pop()
a, b = s.split(opt)
r1 = a.split('.')
r2 = b.split('.')
return {'event_name': [r1[0], r2[0]],
'select': func.round(settings.ARITHMETIC[opt](f(r1), f(r2)), 2).label('values')
}
if '.' in b:
r2 = b.split('.')
return {'event_name': [r1[0], r2[0]],
'select': func.round(settings.ARITHMETIC[opt](f(r1), f(r2)), 2).label('values')
}
elif b.isdigit():
return {'event_name': [r1[0]],
'select': func.round(settings.ARITHMETIC[opt](f(r1), int(b)), 2).label('values')
}
def event_model_sql(self):
sqls = []