From f0aae2619e0236e3c9cc000cef5fc6af733600cb Mon Sep 17 00:00:00 2001 From: pengtao Date: Tue, 22 Oct 2019 14:55:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0daily=20report=E7=94=9F?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- daily_report/dreport.py | 8 ++-- daily_report/templates/report.html | 70 +++++++++++++++++++----------- 2 files changed, 48 insertions(+), 30 deletions(-) diff --git a/daily_report/dreport.py b/daily_report/dreport.py index cedd403..47f6022 100644 --- a/daily_report/dreport.py +++ b/daily_report/dreport.py @@ -44,7 +44,7 @@ def send_dailyreport(): day = request.args.get('day') rp = Report(gameid, channelid, day) - data = rp.get_data() + data = rp.run() data[gameid] = gameid data[channelid] = channelid data[day] = day @@ -171,7 +171,7 @@ class Report: ad_101 = self.tga.get_data(ad_101_sql)[0][0] ad_1 = self.tga.get_data(ad_1_sql)[0][0] ad_201 = self.tga.get_data(ad_201_sql)[0][0] - return [activa, new, share, timeonlie, ad_101, ad_1, ad_201] + return [activa, new, share, timeonlie, ad_1, ad_101, ad_201] except Exception: log.error(f"get data from tga failed ,{self.gameid}", exc_info=True) return None @@ -273,7 +273,7 @@ class Report: data['input'].append(self.get_input_fromappid(fromappid)) data['output'].append(self.get_output_fromappid(fromappid)) print(data) - + return data @@ -284,7 +284,7 @@ def main(): day = (datetime.date.today() - datetime.timedelta(days=1)).strftime('%Y-%m-%d') for gameid in gameids: cc = Report(gameid, channelid, day) - cc.run() + data = cc.run() if __name__ == "__main__": diff --git a/daily_report/templates/report.html b/daily_report/templates/report.html index c43f006..663383c 100644 --- a/daily_report/templates/report.html +++ b/daily_report/templates/report.html @@ -5,33 +5,42 @@ 金蚕游戏日报，By ops -游戏ID：{{data.get(gameid)}} -渠道ID：{{data.get('channelid')}}='6001' -日期:{{data.get(day)}} +

学生表

-总计数据： -活跃 -新增 -时长 -分享 -K值 -视频/banner - - - -导入数据： +

游戏ID：{{ data.get(gameid) }}

> +

渠道ID：{{ data.get('channelid') }}

> +

日期:{{ data.get(day) }}

+

总表

> + + - 渠道ID - 游戏名称 - 活跃 - 新增 - 分享 - K值 + 活跃 + 新增 + 分享 + 时长 + 视屏显示 + banner显示 + 插屏显示 + + +{ % for item in data.get('all') % } +{{ item }} +{ % endfor % } + +

导入数据：

> + + + 渠道ID + 游戏名称 + 活跃 + 新增 + 分享 + K值 -{% for line in data.get('data') %} +{% for line in data.get('input') %} {%for item in line%} {{ item }} @@ -39,12 +48,21 @@ K值 {% endfor %} -导出数据： -fromappid -中文 -跳转次数 -跳转人数 +

导出数据：

> + + 渠道ID + 跳转目标 + 跳转次数 + 跳转人数 + +{ % for line in data.get('output') % } + + { % for item in line % } + {{ item }} + { % endfor % } + +{ % endfor % } \ No newline at end of file