修正区域删除颜色存在的错误

safesite/daoru.py

@@ -368,7 +368,9 @@ def cal_riskact_level(riskact):
 
 def cal_area_risk_level(area):
     levellist = []
-    for i in RiskAct.objects.filter(area=area,type__dickeyid=396):#区域等级只按设备设施类来划分
+    objs = RiskAct.objects.filter(area=area,type__dickeyid=396)
+    if objs.exists:     
+        for i in objs:#区域等级只按设备设施类来划分
             levellist.append(i.level)
         if '重大风险' in levellist:
             area.risklevel = '重大风险'
@@ -382,6 +384,9 @@ def cal_area_risk_level(area):
         else:
             area.risklevel = '低风险'
             area.save()
+    else:
+        area.risklevel = None
+        area.save()
 
 def is_float(str):
     if str.count('.') == 1: #小数有且仅有一个小数点

safesite/views.py

@@ -3643,6 +3643,10 @@ def apitool(req):
         for i in Risk.objects.all():
             cal_riskact_level(i.riskact)
         return JsonResponse({'code':1})
+    elif a == 'correct_riskarea':
+        for i in RiskAct.objects.all():
+            cal_area_risk_level(i.area)
+        return JsonResponse({'code':1})
     elif a == 'addright':
         menu = req.GET.get('menu')
         objs = Group.objects.all()
@@ -4883,7 +4887,7 @@ def apimapshow(req):
         objs = Miss.objects.filter(usecomp__partid = companyid,deletemark=1,submittime__gte = date1).exclude(missqy=None).values('missqy__id','missqy__name','missqy__polygon').annotate(num=Count('missqy'))
         return HttpResponse(json.dumps(list(objs)),content_type="application/json")
     elif a=='risk':
-        objs = Area.objects.filter(usecomp__partid = companyid).exclude(risklevel=None).values('id','name','polygon','risklevel')
+        objs = Area.objects.filter(usecomp__partid = companyid,deletemark=1).exclude(risklevel=None).values('id','name','polygon','risklevel')#缺少deletemark
         return HttpResponse(json.dumps(list(objs)),content_type="application/json")
     elif a=='operation':
         objs = Operation.objects.filter(usecomp__partid = companyid,deletemark=1).exclude(zyqy=None).exclude(zyzt__zyzt='已关闭')