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

app/templates/v2/monthReportV2.html

@@ -1028,7 +1028,7 @@
                 年化收益率：<span class="green">{{annualised_return}}%</span>
               </td>
               <td>
-                最大回撤：<span class="red">{{max_withdrawal}}%</span>
+                最大回撤：<span class="red">{{now_withdrawal}}%</span>
               </td>
               <td>
               </td>

app/utils/jinjia2html.py

@@ -171,6 +171,7 @@ class DataIntegrate:
                 'year_month': '2020年10月', 'ifa_company': '飞度工作室',
                 'title': '10月综述', 'brand_name': '飞度工作室',
                 'customer_old': 42, 'customer_level': '平衡型',
+                'new_evaluation': self.new_evaluation,
                 'position_years': '5年', 'planned_allocation_amount': 2000.00,
                 'now_allocation_amount': self.total_cost, 'now_yield': self.now_yield, 'index_yield': self.index_yield,
                 'expected_yield': 20,
@@ -218,10 +219,10 @@ class DataIntegrate:
         # with open(save_file, 'w', encoding="utf-8") as f:
         #     f.write(monthReport_html)
 
-        # save_file = "app/html/v2/monthReportV2.html"
-        # with open(save_file, 'w', encoding="utf-8") as f:
-        #     f.write(monthReport_html)
-        html_to_pdf(monthReport_html, '/Users/pengxiong/Desktop/fund_report/app/pdf/%s.pdf' % str(uuid.uuid4()))
+        save_file = "app/html/v2/monthReportV2.html"
+        with open(save_file, 'w', encoding="utf-8") as f:
+            f.write(monthReport_html)
+        # html_to_pdf(monthReport_html, '/Users/pengxiong/Desktop/fund_report/app/pdf/%s.pdf' % str(uuid.uuid4()))