From ece833ee6cb8d371e8bfe8c961e2aa1d290cc0cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BC=9F?= <250213850@qq.com> Date: Tue, 8 Feb 2022 10:49:26 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=88=A0=E9=99=A4=E6=88=90?= =?UTF-8?q?=E5=91=98=E6=97=B6=E6=8A=8A=E9=A1=B9=E7=9B=AE=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=8E=9F=E6=95=B0=E6=8D=AE=E4=B9=9F=E5=88=A0=E9=99=A4=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5=202.=E4=BC=98=E5=8C=96=E7=94=9F=E5=8C=96?= =?UTF-8?q?=E7=BA=AA=E5=85=83=EF=BC=8C=E6=94=BE=E7=BD=AE=E4=BA=89=E9=9C=B8?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E6=8A=A5=E8=A1=A8=E7=99=BE?= =?UTF-8?q?=E5=88=86=E5=8F=B7=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=203.=E4=BC=98=E5=8C=96=E5=9B=A0=E8=AE=A1=E8=B4=B9?= =?UTF-8?q?=E7=82=B9=E5=AF=B9=E5=BA=94=E4=B8=AD=E6=96=87=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=97=B6=E6=8A=A5=E5=BC=82=E5=B8=B8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/api_v1/authz/authz.py | 2 +- api/api_v1/endpoints/project.py | 21 +++++++++++++-------- api/api_v1/endpoints/query.py | 12 +++++++++--- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/api/api_v1/authz/authz.py b/api/api_v1/authz/authz.py index 63e2462..60e8325 100644 --- a/api/api_v1/authz/authz.py +++ b/api/api_v1/authz/authz.py @@ -76,7 +76,7 @@ async def del_role_domain( role=data_in.role_id, domain=data_in.game) - await crud.role.delete_id(db, data_in.role_id) + #await crud.role.delete_id(db, data_in.role_id) return schemas.Msg(code=0, msg='ok', data=res) diff --git a/api/api_v1/endpoints/project.py b/api/api_v1/endpoints/project.py index e34ccc2..7e40058 100644 --- a/api/api_v1/endpoints/project.py +++ b/api/api_v1/endpoints/project.py @@ -199,16 +199,21 @@ async def members(request: Request, for item in data: username = item['username'] role_id = item['role_id'] - res.append({ - **users[username], - 'role': roles[role_id], - 'role_id': role_id, - - }) - + try: + res.append({ + **users[username], + 'role': roles[role_id], + 'role_id': role_id, + }) + except: + pass + # res.append({ + # **users[username], + # 'role': roles[role_id], + # 'role_id': role_id, + # }) return schemas.Msg(code=0, msg='ok', data=res) - # @router.post("/del_member") # async def members(request: Request, # game: str, diff --git a/api/api_v1/endpoints/query.py b/api/api_v1/endpoints/query.py index 0c4be9e..c44769a 100644 --- a/api/api_v1/endpoints/query.py +++ b/api/api_v1/endpoints/query.py @@ -184,9 +184,14 @@ async def event_model( break if list(item.get('event_name'))[-1] == '率': for i in range(len(values)): - values[i]=str(values[i])+'%' + values[i]=str((values[i]))+'%' q['values'].append(values) q['sum'].append(str(sum_)+'%') + elif '比' in item['event_name']: + for i in range(len(values)): + values[i]=str(int(float(values[i])*100))+'%' + q['values'].append(values) + q['sum'].append(str(int(float(sum_)*100))+'%') else: q['values'].append(values) q['sum'].append(sum_) @@ -231,6 +236,7 @@ async def event_model( res_list.append(name) except: pass + q['proid_name'] = res_list # 将proid字段和金额money按对应关系组合成字典并算出对应的总额返回给前端 money_dict = await crud.proid_map.get_all_show_money(db, game) @@ -301,13 +307,13 @@ async def event_model( q['chain_ratio'] = division((df.iloc[-1, 1] - df.iloc[-2, 1]) * 100, df.iloc[-2, 1], 2) if len(df) >= 8: q['wow'] = division((df.iloc[-1, 1] - df.iloc[-8, 1]) * 100, df.iloc[-8, 1], 2) or 0 - q['values'].append(df['values'].to_list()) + q['values'].append(abs(df['values']).to_list()) for last_value in df['values'].values[::-1]: if last_value > 0: q['last_value'] = float(last_value) break #求所有值的和 - q['sum'].append(round(float(df['values'].sum()), 2)) + q['sum'].append(round(abs(float(df['values'].sum())), 2)) #求平均值 q['avg'].append(round(float(df['values'].mean()), 2))