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

1.优化删除成员时把项目角色原数据也删除的情况

Browse Source 
2.优化生化纪元，放置争霸基础数据报表百分号显示异常问题
3.优化因计费点对应中文数据没有时报异常的问题
This commit is contained in:
李伟 2022-02-08 10:49:26 +08:00
parent 9d253cc68c
commit ece833ee6c
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/api_v1/authz/authz.py
View File

@ -76,7 +76,7 @@ async def del_role_domain(
role=data_in.role_id, role=data_in.role_id,
domain=data_in.game) 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) return schemas.Msg(code=0, msg='ok', data=res)

21
api/api_v1/endpoints/project.py
View File

@ -199,16 +199,21 @@ async def members(request: Request,
for item in data: for item in data:
username = item['username'] username = item['username']
role_id = item['role_id'] role_id = item['role_id']
res.append({ try:
**users[username], res.append({
'role': roles[role_id], **users[username],
'role_id': role_id, '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) return schemas.Msg(code=0, msg='ok', data=res)
# @router.post("/del_member") # @router.post("/del_member")
# async def members(request: Request, # async def members(request: Request,
# game: str, # game: str,

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

@ -184,9 +184,14 @@ async def event_model(
break break
if list(item.get('event_name'))[-1] == '率': if list(item.get('event_name'))[-1] == '率':
for i in range(len(values)): for i in range(len(values)):
values[i]=str(values[i])+'%' values[i]=str((values[i]))+'%'
q['values'].append(values) q['values'].append(values)
q['sum'].append(str(sum_)+'%') 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: else:
q['values'].append(values) q['values'].append(values)
q['sum'].append(sum_) q['sum'].append(sum_)
@ -231,6 +236,7 @@ async def event_model(
res_list.append(name) res_list.append(name)
except: except:
pass pass
q['proid_name'] = res_list q['proid_name'] = res_list
# 将proid字段和金额money按对应关系组合成字典并算出对应的总额返回给前端 # 将proid字段和金额money按对应关系组合成字典并算出对应的总额返回给前端
money_dict = await crud.proid_map.get_all_show_money(db, game) 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) q['chain_ratio'] = division((df.iloc[-1, 1] - df.iloc[-2, 1]) * 100, df.iloc[-2, 1], 2)
if len(df) >= 8: if len(df) >= 8:
q['wow'] = division((df.iloc[-1, 1] - df.iloc[-8, 1]) * 100, df.iloc[-8, 1], 2) or 0 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]: for last_value in df['values'].values[::-1]:
if last_value > 0: if last_value > 0:
q['last_value'] = float(last_value) q['last_value'] = float(last_value)
break 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)) q['avg'].append(round(float(df['values'].mean()), 2))