From b995497a9711ac35d86a0af3c98fa631e2a1b122 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 6 Jul 2021 22:02:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=94=E6=80=A5?= =?UTF-8?q?=E9=A2=84=E6=A1=88=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/models.py | 13 +++++++++++++ safesite/serializers.py | 7 ++++++- safesite/viewsdrf.py | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/safesite/models.py b/safesite/models.py index e5ca6246..ddc507fb 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -308,6 +308,19 @@ class Drilluser(models.Model): # 演练参加人表 participant = models.ForeignKey(User, on_delete=models.CASCADE) score = models.IntegerField(null=True, blank=True) +class ContingencyPlan(models.Model): + TYPE_CHOICES = ( + ('ZH', '综合应急预案'), + ('ZX', '专项应急预案'), + ('XC', '现场处置方案'), + ) + id = models.AutoField(primary_key=True) + name = models.CharField(verbose_name='名称', max_length=200) + path = models.CharField(verbose_name='地址', max_length=200) + type = models.CharField(verbose_name='预案类型', max_length=200, choices=TYPE_CHOICES) + usecomp = models.ForeignKey(Partment, default=1, on_delete=models.CASCADE) + createtime = models.DateTimeField(default=timezone.now, verbose_name='创建时间') + updatetime = models.DateTimeField(auto_now=True, verbose_name='编辑时间') class Observe(models.Model): # 行为观察 lookid = models.AutoField(primary_key=True) diff --git a/safesite/serializers.py b/safesite/serializers.py index 6812d4dc..9fbfc1de 100644 --- a/safesite/serializers.py +++ b/safesite/serializers.py @@ -56,4 +56,9 @@ class TrainPlanSerializer(serializers.ModelSerializer): class TrainPlanUpdateSerializer(serializers.ModelSerializer): class Meta: model = TrainPlan - fields = ('purpose','year','month', 'manager', 'period', 'group') \ No newline at end of file + fields = ('purpose','year','month', 'manager', 'period', 'group') + +# class CPlanSerializer(serializers.ModelSerializer): +# class Meta: +# model = ContingencyPlan +# fields = '__all__' \ No newline at end of file diff --git a/safesite/viewsdrf.py b/safesite/viewsdrf.py index 6605b860..fc5e2f9a 100644 --- a/safesite/viewsdrf.py +++ b/safesite/viewsdrf.py @@ -67,3 +67,4 @@ class EquipmentCheckFormAPIView(APIView): class EquipmentCheckFormDetailView(generics.RetrieveUpdateDestroyAPIView): queryset = EquipmentCheckForm.objects.all() serializer_class = EquipmentCheckFormSerializers + From 9df11eb16d9451a2fa37bcf8f624fcaf00762232 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 8 Jul 2021 16:10:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?menutree=20=E8=8E=B7=E5=8F=96=E6=9C=89?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/safesite/views.py b/safesite/views.py index 292d6617..393be239 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -934,7 +934,8 @@ def menutree(req): bgroups = user.userg.all() x = [] for i in bgroups: - x.extend(i.menulist) + if i.menulist: + x.extend(i.menulist) menus = Menu.objects.exclude(menuid__in=[11, 9]).filter(menuid__in=list(set(x)), deletemark=1,type=1).order_by( 'sortnum').values('menuid', 'menucode', 'parentid', 'url', 'menuname', 'icon').distinct() return HttpResponse(json.dumps(list(menus)), content_type="application/json")