+
-
-
-
-
- | 用户ID |
- 姓名 |
- 所属部门 |
- 填报隐患数 |
-
-
-
-
-
-
-
-
- | 用户ID |
- 姓名 |
- 所属部门 |
- 整改隐患数 |
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/safesite/urls.py b/safesite/urls.py
index 6f605cb5..354a213b 100644
--- a/safesite/urls.py
+++ b/safesite/urls.py
@@ -87,6 +87,7 @@ urlpatterns = [
path('html/report/edit',views.reportedit),
path('html/bhr',views.bhrhtml),
path('riskas',views.riskas),
+ path('html/examhistory/
/',views.examhistory),
#html页面
@@ -150,8 +151,9 @@ urlpatterns = [
#path('api/riskactcheck',views.apiriskactcheck),
path('api/riskcheck2',views.apiriskcheck2),
path('api/report',views.apireport),
- path('html/examhistory//',views.examhistory),
path('api/obscount',views.observepic),
+ path('api/riskas',views.apiriskas),
+
#path('api/rights/group/',views.rightsgroup),
path('api/main',views.mainapi),
diff --git a/safesite/views.py b/safesite/views.py
index f7aaeeef..d0d11533 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -1647,7 +1647,7 @@ def charthandle(req):
nowyjz = a.yjz
nowycz = a.ycz
return JsonResponse({'code':1,'yjz':nowyjz,'ycz':nowycz})
- elif req.GET.get('a')=='yhlbt':#隐患列表图
+ elif req.GET.get('a')=='yhlbt':#隐患类别图
if req.GET.get('year'):
year = int(req.GET.get('year'))
month = int(req.GET.get('month'))
@@ -1953,6 +1953,79 @@ def charthandle(req):
value.append({'value':y,'name':x})
return JsonResponse({'code':1,'key':key,'value':value})
+def apiriskas(req):
+ userid = req.session['userid']
+ companyid = getcompany(userid)
+ if req.GET.get('a') == 'fxdlxt':#风险点类型图
+ objs = RiskAct.objects.filter(usecomp__partid=companyid)
+ if req.GET.get('zrbm',None):
+ partid = req.GET.get('zrbm')
+ objs = objs.filter(zrbm__partid=partid)
+ legendData = []
+ seriesData = []
+ for i in Dickey.objects.filter(dicparent__dicid=53):
+ legendData.append(i.dickeyname)
+ seriesData.append({'value':objs.filter(type=i).count(),'name':i.dickeyname})
+ return JsonResponse({'code':1,'legendData':legendData,'seriesData':seriesData})
+ elif req.GET.get('a') == 'fxdjbt':#风险点级别图
+ objs = RiskAct.objects.filter(usecomp__partid=companyid)
+ if req.GET.get('zrbm',None):
+ partid = req.GET.get('zrbm')
+ objs = objs.filter(zrbm__partid=partid)
+ legendData = ['低风险','一般风险','较大风险','重大风险']
+ seriesData = []
+ for i in legendData:
+ seriesData.append({'value':objs.filter(level=i).count(),'name':i})
+ return JsonResponse({'code':1,'legendData':legendData,'seriesData':seriesData})
+ elif req.GET.get('a') == 'fxjbt':#风险级别图
+ objs = Risk.objects.filter(usecomp__partid=companyid)
+ if req.GET.get('zrbm',None):
+ partid = req.GET.get('zrbm')
+ objs = objs.filter(riskact__zrbm__partid=partid)
+ legendData = ['低风险','一般风险','较大风险','重大风险']
+ seriesData = []
+ for i in legendData:
+ seriesData.append({'value':objs.filter(level=i).count(),'name':i})
+ return JsonResponse({'code':1,'legendData':legendData,'seriesData':seriesData})
+ elif req.GET.get('a') == 'fxdqyt':#风险点区域图
+ objs = RiskAct.objects.filter(usecomp__partid=companyid)
+ objs2 = Risk.objects.filter(usecomp__partid=companyid)
+ if req.GET.get('zrbm',None):
+ partid = req.GET.get('zrbm')
+ objs = objs.filter(zrbm__partid=partid)
+ objs2 = objs2.filter(riskact__zrbm__partid=partid)
+ xAxisData = []
+ series = []
+ #areas = Area.objects.filter(usecomp__partid=companyid,deletemark=1)
+ #riskactareas = Area.objects.filter(usecomp__partid=companyid,deletemark=1).annotate(num=Count('riskactarea')).filter(num__gt=0).order_by('-num')
+ riskactareas = objs.values('area').annotate(num=Count('area')).order_by('-num')
+ for i in riskactareas:
+ xAxisData.append(Area.objects.get(id=i['area']).name)
+ data = {}
+ data['datariskact']=[] # 风险点总数
+ data['datariskact1']=[] # 低风险点数
+ data['datariskact2']=[] # 一般风险点数
+ data['datariskact3']=[] # 较大风险点数
+ data['datariskact4']=[] # 重大风险点数
+ data['datarisk']=[] # 风险总数
+ data['datarisk1']=[] # 低风险数
+ data['datarisk2']=[] # 一般风险数
+ data['datarisk3']=[] # 较大风险数
+ data['datarisk4']=[] # 重大风险数
+ for i in riskactareas:
+ objsxx = objs.filter(area__id=i['area'])
+ data['datariskact'].append(objsxx.count())
+ data['datariskact1'].append(objsxx.filter(level="低风险").count())
+ data['datariskact2'].append(objsxx.filter(level="一般风险").count())
+ data['datariskact3'].append(objsxx.filter(level="较大风险").count())
+ data['datariskact4'].append(objsxx.filter(level="重大风险").count())
+ objsxx2 = objs2.filter(riskact__area__id=i['area'])
+ data['datarisk'].append(objsxx2.count())
+ data['datarisk1'].append(objsxx2.filter(level="低风险").count())
+ data['datarisk2'].append(objsxx2.filter(level="一般风险").count())
+ data['datarisk3'].append(objsxx2.filter(level="较大风险").count())
+ data['datarisk4'].append(objsxx2.filter(level="重大风险").count())
+ return JsonResponse({'code':1,'xAxisData':xAxisData,'seriesData':data})
def fxhandle(req):
a = req.GET.get('a')
if a == 'exportyjdoc':