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

app/service/portfolio_diagnose.py

@@ -562,9 +562,18 @@ class PortfolioDiagnose(object):
         num_fund = len(self.portfolio)
         evaluate_enum = [["优秀", "良好", "一般"],
          ["优秀", "良好", "合格", "较差"]]
+
         z_score_evaluate = evaluate_enum[0][z_score_level]
         drawdown_evaluate = evaluate_enum[1][drawdown_level]
-        # return_evaluate = evaluate_enum[1][return_level]
+        if z_score_evaluate in ["优秀", "良好"]:
+            z_score_evaluate = """<span class="self_description_red">{}</span>""".format(z_score_evaluate)
+        else:
+            z_score_evaluate = """<span class="self_description_green">{}</span>""".format(z_score_evaluate)
+
+        if drawdown_evaluate in ["优秀", "良好"]:
+            drawdown_evaluate = """<span class="self_description_red">{}</span>""".format(drawdown_evaluate)
+        else:
+            drawdown_evaluate = """<span class="self_description_green">{}</span>""".format(drawdown_evaluate)
 
         sentence = {
             1: "1、组合构建于{}年{}月，至今已运行{}个月。投入成本为{}万元，截止{}年{}月{}日，整体盈利{}万元，整体表现{}，回撤控制能力{}；\n",
@@ -577,11 +586,9 @@ class PortfolioDiagnose(object):
                 2: [num_fund, return_rank_evaluate, profit_positive_evaluate, abandon_evaluate, no_data_fund_evaluate],
                 3: [strategy_name_evaluate, strategy_distribution_evaluate, fund_corr_evaluate]
                 }
-        ret = ""
+        ret = []
         for k, v in data.items():
-            # print(translate_single(content[k], v))
-            ret = ret + sentence[k].format(*data[k])
-        ret.replace("，；", "；")
+            ret.append(sentence[k].format(*data[k]).replace("，；", "；"))
         return ret
 
     def new_evaluation(self):