diff --git a/app/templates/v2/monthReportV2.1.html b/app/templates/v2/monthReportV2.1.html index 1bebdce8667860f7cf933b64a676387da4bced8d..af43fbacf937e964694d599d6282fd6fb486f558 100644 --- a/app/templates/v2/monthReportV2.1.html +++ b/app/templates/v2/monthReportV2.1.html @@ -221,9 +221,9 @@ text-align: baseline; } - .page .page_head .page_time { - font-size: 28px; - line-height: 48px; + .page .page_title .page_time { + font-size: 16px; + line-height: 20px; color: #333333; font-weight: normal; } @@ -312,8 +312,8 @@ } .tss2 .tss2_title .page_time { - font-size: 20px; - line-height: 33px; + font-size: 16px; + line-height: 20px; color: #333333; font-weight: normal; } @@ -1028,10 +1028,11 @@ <div class="box2" style="page-break-before:always;"> <div class="page dtable"> <div class="page_title dcell"> + <div class="page_time">(最新净值日:{{latest_worth_day}})</div> 投资总览 </div> <div class="page_head dcell"> - <span class="page_time">{{latest_worth_day}}</span> + <!-- <div class="dcell">--> <!-- <img src={{logo}} alt="" class="page_logo">--> <!-- </div>--> @@ -1305,6 +1306,7 @@ <div class="box3"> <div class="page dtable"> <div class="page_title dcell"> + <div class="page_time">(最新净值日:{{latest_worth_day}})</div> {%if folio == "default"%} ç›®æ ‡ä¸Žä¸šç»© {%else%} @@ -1312,7 +1314,6 @@ {%endif%} </div> <div class="page_head dcell"> - <span class="page_time">{{latest_worth_day}}</span> <!-- <div class="dcell">--> <!-- <img src={{logo}} alt="" class="page_logo">--> <!-- </div>--> @@ -1689,9 +1690,8 @@ </div> <div class="tss2"> <div class="tss2_title clearfix"> + <div class="page_time">(最新净值日:{{latest_worth_day}})</div> 贡献分解 - - <span class="fr page_time">{{latest_worth_day}}</span> </div> <div class="tss2_content"> <img src={{group_result["contribution_decomposition"]}} alt="" class="tss2_img"> diff --git a/app/utils/jinjia2html_v2.py b/app/utils/jinjia2html_v2.py index 1b55ee972c673e3202c5213a73b42d65691b5b9e..0894bbd8b6c81c502668e1d27429dd8d79b8c139 100644 --- a/app/utils/jinjia2html_v2.py +++ b/app/utils/jinjia2html_v2.py @@ -251,7 +251,7 @@ class DataIntegrate: 'sh': template_folder + '/v2/img/sh.png', # å…¨å±€æ•°æ® 'customer_name': self.customer_name, - 'year_month': self.user_customer.month_start_date.strftime("%Y-%m-%d"), + 'year_month': self.user_customer.end_date.strftime("%Y-%m-%d"), 'month': self.user_customer.month_start_date.strftime("%m"), 'start_date': self.user_customer.start_date.strftime("%Y-%m-%d"), 'latest_worth_day': self.user_customer.last_nav_date,