新模版5

app/templates/v2/monthReportV2.html

@@ -1686,7 +1686,7 @@
 
       <div class="box5_content">
         <div class="geji_list_wrap">
-          {% for single_fund in propose_fund_data_list %}
+          {% for single_fund in single_fund_data_list %}
           <div class="self_item">
             <table>
               <tr>
@@ -1696,9 +1696,9 @@
                       <div class="self_title fl">
                          {{single_fund.fund_name}}
                       </div>
-                      <div class="self_type fl">
+<!--                      <div class="self_type fl">-->
                         {{single_fund.status}}
-                      </div>
+<!--                      </div>-->
                     </div>
                     <div class="self_description">
                       {% for one in single_fund.evaluation %}

app/utils/jinjia2html.py

@@ -13,8 +13,9 @@ from app.utils.radar_chart import gen_radar_chart
 
 
 class DataIntegrate:
-    def __init__(self, ifa_id='USER_INFO15914346866762', customer_id='202009281545001'):
+    def __init__(self, ifa_id='USER_INFO15914346866762', customer_id='202009281545001', customer_name='王晶'):
         self.user_customer = UserCustomerResultAdaptor(ifa_id, customer_id)
+        self.customer_name = customer_name
         self.df = self.user_customer.calculate_total_data()
         self.d = self.user_customer.calculate_group_result_data()
         # 组合数据
@@ -72,10 +73,20 @@ class DataIntegrate:
         self.single_fund_data_list = []
         portfolio_evaluation = portfolio_diagnose.old_portfolio_evaluation()
         radar_chart_data = portfolio_diagnose.single_fund_radar()
+        print('***************************')
+        print(portfolio_evaluation)
         for i in range(len(portfolio_evaluation)):
+            if portfolio_evaluation[i]['status'] == '保留':
+                portfolio_evaluation[i]['status'] = '<div class="self_type fl">保留</div>'
+            elif portfolio_evaluation[i]['status'] == '增仓':
+                portfolio_evaluation[i]['status'] = '<div class="self_type fl red">增仓</div>'
+            elif portfolio_evaluation[i]['status'] == '换仓':
+                portfolio_evaluation[i]['status'] = '<div class="self_type fl green">换仓</div>'
+            elif portfolio_evaluation[i]['status'] == '减仓':
+                portfolio_evaluation[i]['status'] = '<div class="self_type fl green">减仓</div>'
             self.single_fund_data_list.append({
                 'fund_name': portfolio_evaluation[i]['name'],
-                'status': '保留',
+                'status': portfolio_evaluation[i]['status'],
                 'evaluation': portfolio_evaluation[i]['data'],
                 'radar_chart_path': gen_radar_chart(radar_chart_data[i])
             })
@@ -149,7 +160,7 @@ class DataIntegrate:
 
     def render_data(self):
         # 全部数据
-        data = {'customer_name': '成龙', 'customer_gender': '女',
+        data = {'customer_name': self.customer_name, 'customer_gender': '女',
                 'year_month': '2020年10月', 'ifa_company': '飞度工作室',
                 'title': '10月综述', 'brand_name': '飞度工作室',
                 'customer_old': 42, 'customer_level': '平衡型',