Sfoglia il codice sorgente

完善报表逻辑

Signed-off-by: binren <zhangbr@elab-plus.com>
binren 4 anni fa
parent
commit
2faa5713e7
3 ha cambiato i file con 17 aggiunte e 23 eliminazioni
  1. 1 1
      jianye_report.py
  2. 9 12
      mail_content_text.py
  3. 7 10
      text.html

+ 1 - 1
jianye_report.py

@@ -42,7 +42,7 @@ class JianYeReport(object):
         if customer_type == 2:
             return MailContentText.text_1
         else:
-            return '{},您的{}数据报表已出,请查看。'
+            return '本期的数据报告已经准备完成,请点击附件查阅.'
 
     def table_one_data(self):
         """

+ 9 - 12
mail_content_text.py

@@ -9,33 +9,30 @@ class MailContentText(object):
         <title>elab数据报表推送服务</title>
         </head>
         <body>
-            <h4 style="font-family: 'Microsoft YaHei UI'; font-size: 20px; padding-bottom: 1px"><b>集团{}月{}日数据概览</b></h4>
-            <ol style="font-family: 'Microsoft YaHei UI'; font-size: 15px; line-height: 20px; padding-bottom: 5px">
+            <h4 style="font-family: 'Microsoft YaHei UI'; font-size: 20px"><b>集团{}月{}日数据概览</b></h4>
+            <ul style="font-family: 'Microsoft YaHei UI'; font-size: 20px">
                  <li>总浏览量:{},总浏览人数: {}</li>
                  <li>新增获客: {}, 新增获电: {}</li>
                  <li> 推荐用户数: {},分享获电: {},裂变获电: {}</li>
                  <li>全民经纪人注册数:{}</li>
                  <li>报备成功数: {}, 报备到访数: {}</li>
-            </ol>
-            <hr />
+            </ul>
             <h4 style="font-family: 'Microsoft YaHei UI'; font-size: 20px"><b>集团{}月累计数据概览</b></h4>
-                <ol  style="font-family: 'Microsoft YaHei UI'; font-size: 15px; line-height: 20px">
-                    <li>总浏览量:{} ,总浏览人数:xx</li>
-                    <li>新增获客: {}, 新增获电:xx</li>
+                <ul  style="font-family: 'Microsoft YaHei UI'; font-size: 20px">
+                    <li>总浏览量:{} ,总浏览人数:{}</li>
+                    <li>新增获客: {}, 新增获电:{}</li>
                     <li>推荐用户数: {},分享获电: {},裂变获电: {}</li>
                     <li>全民经纪人注册数:{}</li>
                     <li>报备成功数: {}, 报备到访数: {}</li>
-                </ol>
-                <hr />
+                </ul>
             <h4 style="font-family: 'Microsoft YaHei UI'; font-size: 20px;"><b>集团上线以来累计数据概览</b></h4>
-                <ol  style="font-family: 'Microsoft YaHei UI'; font-size: 15px; line-height: 20px">
+                <ul  style="font-family: 'Microsoft YaHei UI'; font-size: 20px">
                     <li>总浏览量:{} ,总浏览人数: {}</li>
                     <li>新增获客: {}, 新增获电: {}</li>
                     <li>推荐用户数: {},分享获电: {},裂变获电: {}</li>
                     <li>全民经纪人注册数:{}</li>
                     <li>报备成功数: {},报备到访数: {}</li>
-                </ol>
-            <hr />
+                </ul>
         </body>
         </html>
     """

+ 7 - 10
text.html

@@ -5,32 +5,29 @@
 <title>elab数据报表推送服务</title>
 </head>
 <body>
-    <h4 style="font-family: 'Microsoft YaHei UI'; font-size: 20px; padding-bottom: 1px"><b>集团{}月{}日数据概览</b></h4>
-    <ol style="font-family: 'Microsoft YaHei UI'; font-size: 15px; line-height: 20px; padding-bottom: 5px">
+    <h4 style="font-family: 'Microsoft YaHei UI'; font-size: 20px"><b>集团{}月{}日数据概览</b></h4>
+    <ul style="font-family: 'Microsoft YaHei UI'; font-size: 20px">
          <li>总浏览量:{},总浏览人数: {}</li>
          <li>新增获客: {}, 新增获电: {}</li>
          <li> 推荐用户数: {},分享获电: {},裂变获电: {}</li>
          <li>全民经纪人注册数:{}</li>
          <li>报备成功数: {}, 报备到访数: {}</li>
-    </ol>
-    <hr />
+    </ul>
     <h4 style="font-family: 'Microsoft YaHei UI'; font-size: 20px"><b>集团{}月累计数据概览</b></h4>
-        <ol  style="font-family: 'Microsoft YaHei UI'; font-size: 15px; line-height: 20px">
+        <ul  style="font-family: 'Microsoft YaHei UI'; font-size: 20px">
             <li>总浏览量:{} ,总浏览人数:xx</li>
             <li>新增获客: {}, 新增获电:xx</li>
             <li>推荐用户数: {},分享获电: {},裂变获电: {}</li>
             <li>全民经纪人注册数:{}</li>
             <li>报备成功数: {}, 报备到访数: {}</li>
-        </ol>
-        <hr />
+        </ul>
     <h4 style="font-family: 'Microsoft YaHei UI'; font-size: 20px;"><b>集团上线以来累计数据概览</b></h4>
-        <ol  style="font-family: 'Microsoft YaHei UI'; font-size: 15px; line-height: 20px">
+        <ul  style="font-family: 'Microsoft YaHei UI'; font-size: 20px">
             <li>总浏览量:{} ,总浏览人数: {}</li>
             <li>新增获客: {}, 新增获电: {}</li>
             <li>推荐用户数: {},分享获电: {},裂变获电: {}</li>
             <li>全民经纪人注册数:{}</li>
             <li>报备成功数: {},报备到访数: {}</li>
-        </ol>
-    <hr />
+        </ul>
 </body>
 </html>