yf_ymm 5 лет назад
Родитель
Сommit
3118c872e4
1 измененных файлов с 15 добавлено и 0 удалено
  1. 15 0
      apps/Equipment/views.py

+ 15 - 0
apps/Equipment/views.py

@@ -716,12 +716,27 @@ class QXZ_Report_Detail2(ListView):
         pass
     def post(self,request):
         e_id = request.POST.get("e_id")
+        page = int(request.POST.get("page"))
         qxz_list = QXZdata_New.objects.filter(equip_id=e_id)
+        f_tbegin = request.POST.get('begin')
+        f_tend = request.POST.get('end')
+        if f_tbegin:
+            print("f_tbegin:", f_tbegin)
+            print("f_tend:", f_tend)
+            begindate = re.findall(r"\d+\.?\d*", f_tbegin)
+            enddate = re.findall(r"\d+\.?\d*", f_tend)
+            start_date = datetime.date(int(begindate[0]), int(begindate[1]), int(begindate[2]))
+            end_date = datetime.date(int(enddate[0]), int(enddate[1]), int(enddate[2]))
+            print("start_date:", start_date)
+            print("end_date:", end_date)
+            qxz_list = QXZdata_New.objects.filter(equip_id=e_id, upl_time__range=(start_date, end_date))
+            
         data = []
         for i in qxz_list:
             dat = {"e1":i.e1,"e2":i.e2,"e3":i.e3,"e4":i.e4,"e5":i.e5,"e6":i.e6,"e7":i.e7,"e8":i.e8,"e9":i.e9,"e10":i.e10,"e11":i.e11,"e12":i.e12,"e13":i.e13,"e14":i.e14}
             data.append({"upl_time":i.upl_time.strftime('%Y-%m-%d %H:%M:%S'),"dat":dat})
         nums = len(data)
+        data = data[(10*(page-1)):(page*10)]
         datas = {"data":data,"nums":nums}
         datas = json.dumps(datas)
         return HttpResponse(datas)