From f2724c780626b564e4ff17d53c42f0a3336fd601 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 18 Sep 2019 15:54:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8C=BA=E5=9F=9F=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=A2=9C=E8=89=B2=E5=AD=98=E5=9C=A8=E7=9A=84=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/daoru.py            |  29 +++++++++++++++++------------
 safesite/exportemp/~$px.docx | Bin 162 -> 0 bytes
 safesite/views.py            |   6 +++++-
 3 files changed, 22 insertions(+), 13 deletions(-)
 delete mode 100644 safesite/exportemp/~$px.docx

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 fcd42e3fa9819ae3c2e99e74ae57ff52b9d59275..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 162
xcmd;eOv%m6%PcM_N-W7QVjvRmGB`4%Fyu01GUNeqF+&MM5kn%7%m>oc1^`8%3f%wz

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='已关闭')