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

app/service/fund_service.py

@@ -7,6 +7,7 @@
 # @Software   : PyCharm
 # -----------------------------------------------------------------------------
 from app.service.portfolio_diagnose import *
+from app.utils.draw import draw_index_combination_chart
 
 
 def get_tamp_nav(fund, start_date, rollback=False, invest_type=2):
@@ -172,7 +173,16 @@ def fund_index_compare(fund_id, invest_type=2, index_id='000905.SH'):
     compare = pd.merge(index_daily, fund_nav, how='inner', left_index=True, right_index=True)
     compare[index_id + '_return_ratio'] = (compare[index_id] / compare[index_id].iloc[0] - 1) * 100
     compare[fund_id + '_return_ratio'] = (compare[fund_id] / compare[fund_id].iloc[0] - 1) * 100
-    return compare
+
+    xlabels = ["" for i in range(len(compare))]
+
+    chart_data = {
+        "xlabels": xlabels,
+        "index": {'name': '中证500', 'data': compare["index_return_ratio"].values},
+        "fund": {'name': fund_id, 'data': compare[fund_id + "_return_ratio"].values},
+    }
+    r = draw_index_combination_chart(chart_data)
+    return r
 
 
 def get_fund_evaluation(args):