diff --git a/safesite/daoru.py b/safesite/daoru.py index a6242370..a6f9cb2b 100644 --- a/safesite/daoru.py +++ b/safesite/daoru.py @@ -368,19 +368,24 @@ def cal_riskact_level(riskact): def cal_area_risk_level(area): levellist = [] - for i in RiskAct.objects.filter(area=area,type__dickeyid=396):#区域等级只按设备设施类来划分 - levellist.append(i.level) - if '重大风险' in levellist: - area.risklevel = '重大风险' - area.save() - elif '较大风险' in levellist: - area.risklevel = '较大风险' - area.save() - elif '一般风险' in levellist: - area.risklevel = '一般风险' - area.save() + 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 = '重大风险' + area.save() + elif '较大风险' in levellist: + area.risklevel = '较大风险' + area.save() + elif '一般风险' in levellist: + area.risklevel = '一般风险' + area.save() + else: + area.risklevel = '低风险' + area.save() else: - area.risklevel = '低风险' + area.risklevel = None area.save() def is_float(str): diff --git a/safesite/exportemp/~$px.docx b/safesite/exportemp/~$px.docx deleted file mode 100644 index fcd42e3f..00000000 Binary files a/safesite/exportemp/~$px.docx and /dev/null differ diff --git a/safesite/views.py b/safesite/views.py index 04c5d74b..8ea66603 100644 --- a/safesite/views.py +++ b/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='已关闭')