Merge branch 'master' of http://39.104.94.153:3000/yf_zd/second

apps/Equipment/views.py

@@ -3622,7 +3622,9 @@ class Alarm_Record(ListView):
         page = int(request.POST.get("page"))
         dat = []
         for i in alarm_list:
-            data.append({"equip_id":i.equip_id,"logs":i.logs,"ekey":i.ekey,"upl_time":i.upl_time})
+            dat.append({"equip_id":i.equip_id,"logs":i.logs,"ekey":i.ekey,"upl_time":i.upl_time.strftime('%Y-%m-%d %H:%M:%S')})
         nums = len(dat)
-        dat = dat[(10*(page-1)):(page*10)]
-        data = {"dat":dat,"nums":nums}
+        data = dat[(10*(page-1)):(page*10)]
+        data = {"dat":dat,"nums":nums}
+        data = json.dumps(data)
+        return HttpResponse(data)