|
@@ -581,7 +581,7 @@ class AdminManage(TemplateView):
|
|
return response.json(444, 'page, line')
|
|
return response.json(444, 'page, line')
|
|
|
|
|
|
eq_qs = Equipment_Info.objects.filter(addTime__gte=start_time, addTime__lte=end_time)\
|
|
eq_qs = Equipment_Info.objects.filter(addTime__gte=start_time, addTime__lte=end_time)\
|
|
- .filter(~Q(push_server_status=200)).values('id', 'devUid', 'devNickName', 'Channel', 'alarm', 'eventType', 'eventTime', 'receiveTime', 'userID__username')
|
|
|
|
|
|
+ .filter(~Q(push_server_status=200)).values('id', 'devUid', 'devNickName', 'Channel', 'alarm', 'eventType', 'eventTime', 'receiveTime', 'push_server_status', 'userID__username')
|
|
if eq_qs.exists():
|
|
if eq_qs.exists():
|
|
count = eq_qs.count()
|
|
count = eq_qs.count()
|
|
eq_qs = eq_qs[(page-1)*line: page * line]
|
|
eq_qs = eq_qs[(page-1)*line: page * line]
|