瀏覽代碼

Merge branch 'dev'

ck 3 年之前
父節點
當前提交
d7a201822e
共有 1 個文件被更改,包括 9 次插入5 次删除
  1. 9 5
      handlers/PitcherPanelHandler.py

+ 9 - 5
handlers/PitcherPanelHandler.py

@@ -66,7 +66,7 @@ class PitcherPanelOverview(BaseHandler):
 
 class ChannelOverview(BaseHandler):
     def post(self):
-        du =DateUtils()
+
         if not self._au:
             self.write_fail(msg='auth error')
         else:
@@ -78,13 +78,17 @@ class ChannelOverview(BaseHandler):
             start=args.get("start",self.thisday)
             end=args.get("end")
             stage=args.get("stage")
-            page = args.get("page", 1)
+            page = args.get("page")
             book = args.get('book')
-            page_size = args.get("page_size", 10)
+            page_size = args.get("page_size")
             order_by = args.get("order_by", 'date')
             order = args.get("order", 'desc')
-            data,total,total_data =get_channel_overview(user_id,channel,pitcher,stage,book,start,end,page,page_size,order_by,order)
-            self.write_json(data=data,total=total,total_data=total_data)
+            data,total,total_data = get_channel_overview(user_id,channel,pitcher,stage,book,start,end,page,page_size,order_by,order)
+            if args.get("download"):
+                self.write_download(str(int(time.time())), data)
+            else:
+                self.write_json(data=data, total=total, total_data=total_data)
+
 
 
 class ChannelAgainOrderTrend(BaseHandler):