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

app/service/portfolio_diagnose.py

@@ -781,8 +781,8 @@ class PortfolioDiagnose(object):
         return_compare_df.iloc[1:-1, :]["date"] = ""
         old_return_compare_result = {
 
-            "index": {"name": "中证500", "data": return_compare_df["new_index_return"].values},
-            "origin_combination": {"name": "原组合", "data": return_compare_df["cum_return_ratio"].values},
+            "index": {"name": "中证500", "data": return_compare_df["new_index_return"].values*100},
+            "origin_combination": {"name": "原组合", "data": return_compare_df["cum_return_ratio"].values*100},
             "xlabels": return_compare_df["date"].values
         }
 
@@ -905,9 +905,9 @@ class PortfolioDiagnose(object):
             return_compare_df["date"] = return_compare_df["date"].apply(lambda x: x.strftime("%Y-%m-%d"))
             return_compare_df.iloc[1:-1,:]["date"] = ""
             return_compare_result = {
-                "new_combination": {"name": "新组合", "data": return_compare_df["new_return"].values},
-                "index": {"name": "中证500", "data": return_compare_df["new_index_return"].values},
-                "origin_combination": {"name": "原组合", "data": return_compare_df["cum_return_ratio"].values},
+                "new_combination": {"name": "新组合", "data": return_compare_df["new_return"].values*100},
+                "index": {"name": "中证500", "data": return_compare_df["new_index_return"].values*100},
+                "origin_combination": {"name": "原组合", "data": return_compare_df["cum_return_ratio"].values*100},
                 "xlabels": return_compare_df["date"].values
             }