新模版10

app/templates/v2/monthReportV2.html

@@ -1008,27 +1008,27 @@
           <table class="tss1_table">
             <tr>
               <td>
-                本月涨幅：<span class="red">3.99%</span>
+                本月涨幅：<span class="red">{{month_rise}}%</span>
               </td>
               <td>
-                本月收益：<span class="green">94,477元</span>
+                本月收益：<span class="green">{{now_month_income}}元</span>
               </td>
               <td>
-                今年累计收益率：<span class="red">19.32%</span>
+                今年累计收益率：<span class="red">{{year_totoal_rate_of_return}}%</span>
               </td>
               <td>
-                今年累计收益：<span class="green">172,623元</span>
+                今年累计收益：<span class="green">{{now_year_income}}元</span>
               </td>
             </tr>
             <tr>
               <td>
-                成立以来累计收益率：<span class="red">19.99%</span>
+                成立以来累计收益率：<span class="red">{{totoal_rate_of_return}}%</span>
               </td>
               <td>
-                年化收益率：<span class="green">56.19%</span>
+                年化收益率：<span class="green">{{annualised_return}}%</span>
               </td>
               <td>
-                最大回撤：<span class="red">19.99%</span>
+                最大回撤：<span class="red">{{max_withdrawal}}%</span>
               </td>
               <td>
               </td>
@@ -1044,13 +1044,13 @@
           <table class="tss1_table">
             <tr>
               <td>
-                投资成本：<span class="red">1,000,000元</span>
+                投资成本：<span class="red">{{cost_of_investment}}元</span>
               </td>
               <td>
-                期末资产：<span class="green">2,000,400元</span>
+                期末资产：<span class="green">{{final_balance}}元</span>
               </td>
               <td>
-                累计盈利：<span class="red">172,623元</span>
+                累计盈利：<span class="red">{{total_profit}}元</span>
               </td>
               <td>
               </td>

app/utils/jinjia2html.py

@@ -137,8 +137,8 @@ class DataIntegrate:
         """目标与业绩"""
         self.now_month_income = int(group_result["cur_month_profit"])   # 本月收益
         self.now_year_income = int(group_result["cur_year_profit"])   # 今年累计收益
-        self.totoal_rate_of_return = round((group_result['cumulative_return']-1)*100, 2)       # 累计收益率
-        self.month_rise = round(group_result["cur_month_profit_ratio"]*100, 2)       # 本月涨幅
+        self.totoal_rate_of_return = round((group_result['cumulative_return']-1)*100, 2)       # 成立以来累计收益率
+        self.month_rise = round(group_result["cur_month_profit_ratio"]*100, 2)       # 本月涨幅s
         self.year_totoal_rate_of_return = round(group_result["cur_year_profit_ratio"]*100, 2)        # 今年累计收益率
         self.annualised_return = round(group_result["return_ratio_year"]*100, 2)     # 年化收益率
         self.volatility = round(group_result["volatility"]*100, 2)