Merge https://e.coding.net/ctcdevteam/safesite

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)

safesite/serializers.py

@@ -57,3 +57,8 @@ class TrainPlanUpdateSerializer(serializers.ModelSerializer):
     class Meta:
         model = TrainPlan
         fields = ('purpose','year','month', 'manager', 'period', 'group')
+
+# class CPlanSerializer(serializers.ModelSerializer):
+#     class Meta:
+#         model = ContingencyPlan
+#         fields = '__all__'

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")

safesite/viewsdrf.py

@@ -67,3 +67,4 @@ class EquipmentCheckFormAPIView(APIView):
 class EquipmentCheckFormDetailView(generics.RetrieveUpdateDestroyAPIView):
     queryset = EquipmentCheckForm.objects.all()
     serializer_class = EquipmentCheckFormSerializers
+