From e1abcb36d2ec9cd32915bd53ed8171ce234eb837 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 7 Jan 2022 21:43:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A3=80=E6=9F=A5=E8=A1=A8?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/views.py | 7 ++++++- safesite/viewsdrf.py | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/safesite/views.py b/safesite/views.py index a3c14f1a..db91b268 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -5808,7 +5808,12 @@ def apioperation(req): x['zyimg2'] = x['zyimg2'].split('?') else: x['zyimg2'] = [] - x['fxcs'] = [int(i) for i in x['fxcs'].split('?')] + + x['fxcs'] = [] + for i in x['fxcs'].split('?'): + if i: + x['fxcs'].append(int(i)) + x['fxcs_'] = list(Fxcs.objects.filter( id__in=x['fxcs']).values('id', 'fxfx', 'aqcs', 'cslx')) # 确认详情 diff --git a/safesite/viewsdrf.py b/safesite/viewsdrf.py index fc5e2f9a..74d50631 100644 --- a/safesite/viewsdrf.py +++ b/safesite/viewsdrf.py @@ -5,6 +5,7 @@ from rest_framework.generics import ListAPIView from rest_framework.viewsets import ModelViewSet from rest_framework.response import Response from rest_framework import generics +from rest_framework import status class EquipmentCheckFormAPIView(APIView): @@ -68,3 +69,9 @@ class EquipmentCheckFormDetailView(generics.RetrieveUpdateDestroyAPIView): queryset = EquipmentCheckForm.objects.all() serializer_class = EquipmentCheckFormSerializers + def destroy(self, request, *args, **kwargs): + obj = EquipmentCheckForm.objects.get(id=kwargs['pk']) + obj.deletemark=0 + obj.save() + return Response(status=status.HTTP_204_NO_CONTENT) +