Commit 483ca1f1 authored by pengxiong's avatar pengxiong

Merge remote-tracking branch 'origin/manage' into manage

parents 0bd88713 511e30e4
...@@ -176,9 +176,10 @@ def fund_index_compare(fund_id, invest_type=2, index_id='000905.SH'): ...@@ -176,9 +176,10 @@ def fund_index_compare(fund_id, invest_type=2, index_id='000905.SH'):
xlabels = ["" for i in range(len(compare))] xlabels = ["" for i in range(len(compare))]
index_name = get_index_name(index_id).values[0][0]
chart_data = { chart_data = {
"xlabels": xlabels, "xlabels": xlabels,
"index": {'name': '中证500', 'data': compare["index_return_ratio"].values}, "index": {'name': index_name, 'data': compare["index_return_ratio"].values},
"fund": {'name': fund_id, 'data': compare[fund_id + "_return_ratio"].values}, "fund": {'name': fund_id, 'data': compare[fund_id + "_return_ratio"].values},
} }
r = draw_index_combination_chart(chart_data) r = draw_index_combination_chart(chart_data)
......
...@@ -344,6 +344,16 @@ def get_fund_name(fund): ...@@ -344,6 +344,16 @@ def get_fund_name(fund):
return df return df
def get_index_name(index_id):
with TAMP_SQL(tamp_fund_engine) as tamp_fund:
tamp_fund_session = tamp_fund.session
sql = "SELECT `name` FROM index_basic WHERE `ts_code`='{}'".format(index_id)
# df = pd.read_sql(sql, con)
cur = tamp_fund_session.execute(sql)
data = cur.fetchall()
df = pd.DataFrame(list(data), columns=['index_name'])
return df
# 获取排名信息 # 获取排名信息
fund_rank = get_fund_rank() fund_rank = get_fund_rank()
# 获取探普产品池 # 获取探普产品池
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment