From 0fcd4a65b09acf6e9edf543531be7947b8473f28 Mon Sep 17 00:00:00 2001 From: shilixia <2309368887@qq.com> Date: Tue, 5 Nov 2019 15:06:11 +0800 Subject: [PATCH 1/2] xiugai --- groups/views.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/groups/views.py b/groups/views.py index dbbe2962..e6d0cfd2 100644 --- a/groups/views.py +++ b/groups/views.py @@ -133,11 +133,13 @@ def troubleChart(request):#隐患统计图 end = request.GET.get('end') if code=='tbpic': 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: troublelist = troublelist.filter(fxsj__gte=start) if 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') def observeChart(request):#行为观察 code = request.GET.get('code') @@ -145,11 +147,12 @@ def observeChart(request):#行为观察 end = request.GET.get('end') if code=='obv': 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: observelist = observelist.filter(looktime__gte=start) if 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') def missChart(request):#未遂事件 @@ -159,11 +162,12 @@ def missChart(request):#未遂事件 if code=='miss': 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: misslist = misslist.filter(misstime__gte=start) if 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') def riskChart(request):#风险管控 @@ -194,11 +198,13 @@ def trainChart(request):#教育培训 end = request.GET.get('end') if code=='train': 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: trainlist = trainlist.filter(starttime__gte=start) if 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') def examChart(request):#在线考试 @@ -210,11 +216,11 @@ def examChart(request):#在线考试 companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all() 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: - 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: - examnumber = s_models.ExamTest.objects.filter(usecomps__contains=','+str(i.partid)+',',starttime__lte=end).count() - examjson.append({'companyName':i.partname,'number':examnumber}) + examnumber = examnumber.filter(usecomps__contains=','+str(i.partid)+',',starttime__lte=end) + examjson.append({'companyName':i.partname,'number':examnumber.count()}) return HttpResponse(json.dumps({'code':1,'data':examjson}), content_type='application/json') From b0ce0da639f70e3d1c067e76e33d18460b5fd574 Mon Sep 17 00:00:00 2001 From: shilixia <2309368887@qq.com> Date: Tue, 5 Nov 2019 15:10:00 +0800 Subject: [PATCH 2/2] xiugai2 --- safesite/templates/examfigure.html | 268 ++++++++++++++++++++++++++++ safesite/templates/trainfigure.html | 26 ++- safesite/urls.py | 1 + safesite/views.py | 12 +- 4 files changed, 297 insertions(+), 10 deletions(-) create mode 100644 safesite/templates/examfigure.html diff --git a/safesite/templates/examfigure.html b/safesite/templates/examfigure.html new file mode 100644 index 00000000..ab227e46 --- /dev/null +++ b/safesite/templates/examfigure.html @@ -0,0 +1,268 @@ + + + + +
+ +
+
+ + + + +
+ +
+
+
+ + + + +
+ +
+
+
+
+ + diff --git a/safesite/templates/trainfigure.html b/safesite/templates/trainfigure.html index ab227e46..68ec9739 100644 --- a/safesite/templates/trainfigure.html +++ b/safesite/templates/trainfigure.html @@ -229,19 +229,19 @@
- +
-
+
- +
-
- +
+