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

app/service/portfolio_diagnose.py

@@ -1324,7 +1324,7 @@ class PortfolioDiagnose(object):
             return result
         except Exception as e:
             repr(e)
-            raise e
+            # raise e
             return None
 
     def single_fund_radar(self):

app/utils/jinjia2html_v2.py

@@ -7,6 +7,7 @@ from jinja2 import PackageLoader, Environment
 
 from app.api.engine import work_dir, pdf_folder, template_folder, pdf_save_folder
 from app.config.default_template_params import hold_default_template, diagnose_default_template
+from app.service.fund_service import fund_index_compare
 from app.service.portfolio_diagnose import PortfolioDiagnose
 from app.service.result_service_v2 import UserCustomerResultAdaptor
 import numpy as np
@@ -192,12 +193,12 @@ class DataIntegrate:
         # 优化组合建议1 -- 新增基金
         propose_fund_data_list = []
         propose_fund_evaluation = portfolio_diagnose.propose_fund_evaluation()
-        propose_radar_chart_data = portfolio_diagnose.propose_fund_radar()
+        # propose_radar_chart_data = portfolio_diagnose.propose_fund_radar()
         # with futures.ProcessPoolExecutor(os.cpu_count()) as executor:
         #     res = executor.map(gen_radar_chart, propose_radar_chart_data)
         res = []
-        for chart_data in propose_radar_chart_data:
-            r = draw_index_combination_chart(chart_data)
+        for fund_id in portfolio_diagnose.propose_portfolio.columns:
+            r = fund_index_compare(fund_id)
             res.append(r)
         for i in range(len(propose_fund_evaluation)):
             propose_fund_data_list.append({