Commit a5b53456 authored by pengxiong's avatar pengxiong

Merge branch 'dev' of http://47.100.44.39:10001/pengxiong/fund_report into dev

parents 40a4da53 ecafdf4b
...@@ -125,13 +125,15 @@ class DataIntegrate: ...@@ -125,13 +125,15 @@ class DataIntegrate:
"""个基点评.""" """个基点评."""
single_fund_data_list = [] single_fund_data_list = []
portfolio_evaluation = portfolio_diagnose.old_portfolio_evaluation() portfolio_evaluation = portfolio_diagnose.old_portfolio_evaluation()
# radar_chart_data = portfolio_diagnose.single_fund_radar()
# with futures.ProcessPoolExecutor(os.cpu_count()) as executor:
# res = executor.map(gen_radar_chart, radar_chart_data)
index_compare_chart_data = portfolio_diagnose.original_fund_index_compare(self.user_customer.fund_cnav_total) index_compare_chart_data = portfolio_diagnose.original_fund_index_compare(self.user_customer.fund_cnav_total)
with futures.ProcessPoolExecutor(os.cpu_count()) as executor: # with futures.ProcessPoolExecutor(os.cpu_count()) as executor:
res = executor.map(draw_index_combination_chart, index_compare_chart_data) # res = executor.map(draw_index_combination_chart, index_compare_chart_data)
res = list(res) # res = list(res)
res = []
for chart_data in index_compare_chart_data:
r = draw_index_combination_chart(chart_data)
res.append(r)
for i in range(len(portfolio_evaluation)): for i in range(len(portfolio_evaluation)):
if portfolio_evaluation[i]['status'] == '保留': if portfolio_evaluation[i]['status'] == '保留':
portfolio_evaluation[i]['status'] = '<div class="self_type fl">保留</div>' portfolio_evaluation[i]['status'] = '<div class="self_type fl">保留</div>'
...@@ -250,7 +252,7 @@ class DataIntegrate: ...@@ -250,7 +252,7 @@ class DataIntegrate:
'month': self.user_customer.month_start_date.strftime("%m"), 'month': self.user_customer.month_start_date.strftime("%m"),
'start_date': self.user_customer.start_date.strftime("%Y-%m-%d"), 'start_date': self.user_customer.start_date.strftime("%Y-%m-%d"),
'latest_worth_day': self.user_customer.last_nav_date, 'latest_worth_day': self.user_customer.last_nav_date,
'brand_name': '小飞象<br>工作室', 'brand_name': '资产管<br>理中心',
'customer_old': 42, 'customer_old': 42,
'customer_level': '平衡型', 'customer_level': '平衡型',
# 综述数据 # 综述数据
......
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