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

xiugai

This commit is contained in:
shilixia 2019-11-05 15:06:11 +08:00
parent 3bc9705961
commit 0fcd4a65b0
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
groups/views.py
View File

@ -133,11 +133,13 @@ def troubleChart(request):#隐患统计图
end = request.GET.get('end') end = request.GET.get('end')
if code=='tbpic': if code=='tbpic':
companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all() companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all()
troublelist = s_models.Trouble.objects.filter(deletemark=1,usecomp__in=companys).values('usecomp__partid','usecomp__partname').annotate(number = Count('troubleid')) troublelist = s_models.Trouble.objects.filter(deletemark=1,usecomp__in=companys).values('usecomp__partid','usecomp__partname')
if start: if start:
troublelist = troublelist.filter(fxsj__gte=start) troublelist = troublelist.filter(fxsj__gte=start)
if end: if end:
troublelist = troublelist.filter(fxsj__lte=end) troublelist = troublelist.filter(fxsj__lte=end)
troublelist=troublelist.annotate(number = Count('usecomp')).order_by('-number')
return HttpResponse(json.dumps({'code':1,'data':{'troublelist':list(troublelist)}}), content_type='application/json') return HttpResponse(json.dumps({'code':1,'data':{'troublelist':list(troublelist)}}), content_type='application/json')
def observeChart(request):#行为观察 def observeChart(request):#行为观察
code = request.GET.get('code') code = request.GET.get('code')
@ -145,11 +147,12 @@ def observeChart(request):#行为观察
end = request.GET.get('end') end = request.GET.get('end')
if code=='obv': if code=='obv':
companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all() companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all()
observelist = s_models.Observe.objects.filter(deletemark=1,usecomp__in=companys).values('usecomp__partid','usecomp__partname').annotate(number = Count('lookid')) observelist = s_models.Observe.objects.filter(deletemark=1,usecomp__in=companys).values('usecomp__partid','usecomp__partname')
if start: if start:
observelist = observelist.filter(looktime__gte=start) observelist = observelist.filter(looktime__gte=start)
if end: if end:
observelist = observelist.filter(looktime__lte=end) observelist = observelist.filter(looktime__lte=end)
observelist=observelist.annotate(number = Count('usecomp')).order_by('-number')
return HttpResponse(json.dumps({'code':1,'data':{'observelist':list(observelist)}}), content_type='application/json') return HttpResponse(json.dumps({'code':1,'data':{'observelist':list(observelist)}}), content_type='application/json')
def missChart(request):#未遂事件 def missChart(request):#未遂事件
@ -159,11 +162,12 @@ def missChart(request):#未遂事件
if code=='miss': if code=='miss':
companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all() companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all()
misslist = s_models.Miss.objects.filter(deletemark=1,usecomp__in=companys).values('usecomp__partid','usecomp__partname').annotate(number = Count('missid')) misslist = s_models.Miss.objects.filter(deletemark=1,usecomp__in=companys).values('usecomp__partid','usecomp__partname')
if start: if start:
misslist = misslist.filter(misstime__gte=start) misslist = misslist.filter(misstime__gte=start)
if end: if end:
misslist = misslist.filter(misstime__lte=end) misslist = misslist.filter(misstime__lte=end)
misslist=misslist.annotate(number = Count('usecomp')).order_by('-number')
return HttpResponse(json.dumps({'code':1,'data':{'misslist':list(misslist)}}), content_type='application/json') return HttpResponse(json.dumps({'code':1,'data':{'misslist':list(misslist)}}), content_type='application/json')
def riskChart(request):#风险管控 def riskChart(request):#风险管控
@ -194,11 +198,13 @@ def trainChart(request):#教育培训
end = request.GET.get('end') end = request.GET.get('end')
if code=='train': if code=='train':
companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all() companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all()
trainlist = s_models.Train.objects.filter(usecomp__in=companys).values('usecomp__partid','usecomp__partname').annotate(number = Count('trainid')) trainlist = s_models.Train.objects.filter(usecomp__in=companys,deletemark=1).values('usecomp__partid','usecomp__partname')
if start: if start:
trainlist = trainlist.filter(starttime__gte=start) trainlist = trainlist.filter(starttime__gte=start)
if end: if end:
trainlist = trainlist.filter(starttime__lte=end) trainlist = trainlist.filter(starttime__lte=end)
trainlist=trainlist.annotate(number = Count('usecomp')).order_by('-number')
return HttpResponse(json.dumps({'code':1,'data':{'trainlist':list(trainlist)}}), content_type='application/json') return HttpResponse(json.dumps({'code':1,'data':{'trainlist':list(trainlist)}}), content_type='application/json')
def examChart(request):#在线考试 def examChart(request):#在线考试
@ -210,11 +216,11 @@ def examChart(request):#在线考试
companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all() companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all()
for i in companys: for i in companys:
examnumber = s_models.ExamTest.objects.filter(usecomps__contains=','+str(i.partid)+',').count() examnumber = s_models.ExamTest.objects.filter(usecomps__contains=','+str(i.partid)+',')
if start: if start:
examnumber = s_models.ExamTest.objects.filter(usecomps__contains=','+str(i.partid)+',',starttime__gte=start).count() examnumber = examnumber.filter(usecomps__contains=','+str(i.partid)+',',starttime__gte=start)
if end: if end:
examnumber = s_models.ExamTest.objects.filter(usecomps__contains=','+str(i.partid)+',',starttime__lte=end).count() examnumber = examnumber.filter(usecomps__contains=','+str(i.partid)+',',starttime__lte=end)
examjson.append({'companyName':i.partname,'number':examnumber}) examjson.append({'companyName':i.partname,'number':examnumber.count()})
return HttpResponse(json.dumps({'code':1,'data':examjson}), content_type='application/json') return HttpResponse(json.dumps({'code':1,'data':examjson}), content_type='application/json')