zcdsj
/
safesite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
caoqianming 2019-09-18 15:54:06 +08:00
parent f8bb4c1ace
commit f2724c7806
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
safesite/daoru.py
View File

@ -368,19 +368,24 @@ def cal_riskact_level(riskact):
def cal_area_risk_level(area): def cal_area_risk_level(area):
levellist = [] levellist = []
for i in RiskAct.objects.filter(area=area,type__dickeyid=396):#区域等级只按设备设施类来划分 objs = RiskAct.objects.filter(area=area,type__dickeyid=396)
levellist.append(i.level) if objs.exists:
if '重大风险' in levellist: for i in objs:#区域等级只按设备设施类来划分
area.risklevel = '重大风险' levellist.append(i.level)
area.save() if '重大风险' in levellist:
elif '较大风险' in levellist: area.risklevel = '重大风险'
area.risklevel = '较大风险' area.save()
area.save() elif '较大风险' in levellist:
elif '一般风险' in levellist: area.risklevel = '较大风险'
area.risklevel = '一般风险' area.save()
area.save() elif '一般风险' in levellist:
area.risklevel = '一般风险'
area.save()
else:
area.risklevel = '低风险'
area.save()
else: else:
area.risklevel = '低风险' area.risklevel = None
area.save() area.save()
def is_float(str): def is_float(str):

BIN
safesite/exportemp/~$px.docx
View File

Binary file not shown.

6
safesite/views.py
View File

@ -3643,6 +3643,10 @@ def apitool(req):
for i in Risk.objects.all(): for i in Risk.objects.all():
cal_riskact_level(i.riskact) cal_riskact_level(i.riskact)
return JsonResponse({'code':1}) 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': elif a == 'addright':
menu = req.GET.get('menu') menu = req.GET.get('menu')
objs = Group.objects.all() 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')) 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") return HttpResponse(json.dumps(list(objs)),content_type="application/json")
elif a=='risk': 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") return HttpResponse(json.dumps(list(objs)),content_type="application/json")
elif a=='operation': elif a=='operation':
objs = Operation.objects.filter(usecomp__partid = companyid,deletemark=1).exclude(zyqy=None).exclude(zyzt__zyzt='已关闭') objs = Operation.objects.filter(usecomp__partid = companyid,deletemark=1).exclude(zyqy=None).exclude(zyzt__zyzt='已关闭')