|
@@ -549,11 +549,11 @@ class LogManagementView(View):
|
|
|
page_no = request_dict.get('pageNo', None)
|
|
|
page_size = request_dict.get('pageSize', None)
|
|
|
|
|
|
- if not all([page_no, page_size]):
|
|
|
- return response.json(444)
|
|
|
-
|
|
|
- page = int(page_no)
|
|
|
- line = int(page_size)
|
|
|
+ is_page = False
|
|
|
+ if all([page_no, page_size]):
|
|
|
+ is_page = True
|
|
|
+ page = int(page_no)
|
|
|
+ line = int(page_size)
|
|
|
|
|
|
try:
|
|
|
query = Q()
|
|
@@ -584,7 +584,10 @@ class LogManagementView(View):
|
|
|
event_list = abnormal_events.order_by('-event_time').values(
|
|
|
'id', 'uid', 'device_type', 'version', 'event_code',
|
|
|
'content', 'report_type', 'event_time', 'created_time'
|
|
|
- )[(page - 1) * line:page * line]
|
|
|
+ )
|
|
|
+ # 分页
|
|
|
+ if is_page:
|
|
|
+ event_list = event_list[(page - 1) * line:page * line]
|
|
|
|
|
|
# 查询device_type对应的name,事件编码对应的事件
|
|
|
for event in event_list:
|