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

app/service/portfolio_diagnose.py

@@ -1093,7 +1093,7 @@ class PortfolioDiagnose(object):
         ret = []
         fund_name = get_fund_name(fund_id).values[0][0]
         try:
-            default_evaluation = pd.read_csv("evaluation.csv", encoding='utf-8', names=['fund_id', 'eval'])
+            default_evaluation = pd.read_csv("./app/service/evaluation.csv", encoding='utf-8', names=['fund_id', 'eval'])
             if default_evaluation[default_evaluation['fund_id'] == fund_id]['eval'].values[0]:
                 ret.append('1、' + default_evaluation[default_evaluation['fund_id'] == fund_id]['eval'].values[0])
 
@@ -1107,8 +1107,8 @@ class PortfolioDiagnose(object):
                 else:
                     evaluation_dict['status'] = ""
                 return evaluation_dict
-        except Exception:
-            pass
+        except Exception as e:
+            raise e
 
         i = 1
         for k, v in evaluation.items():

app/templates/v2/monthReportV2.1.html

@@ -944,8 +944,7 @@
         </div>
         <div class="dcell">
           <div class="cover_text">
-            小飞象<br>
-            工作室
+            {{brand_name}}
           </div>
         </div>
       </div>
@@ -1143,7 +1142,7 @@
         <div class="tss3">
           <div class="tss3_head dtable">
             <div class="tss3_title dcell">
-              组合月度及累计回报率曲线
+              月度收益
             </div>
           </div>
           <table border="1">