diff --git a/safesite/datashowview.py b/safesite/datashowview.py index 266abd2b..ad133865 100644 --- a/safesite/datashowview.py +++ b/safesite/datashowview.py @@ -28,7 +28,7 @@ def area(req): first_day,first_day_of_next_month=gettime() #隐患排查列表 - troubles = Trouble.objects.filter(usecomp__partid=companyid).exclude(deletemark=0).order_by('xgsj')[:7] + troubles = Trouble.objects.filter(usecomp__partid=companyid).exclude(deletemark=0).order_by('-xgsj')[:7] #本月线下培训数量 b = Train.objects.filter(usecomp__partid=companyid,deletemark=1) diff --git a/safesite/templates/edulessonaddwj.html b/safesite/templates/edulessonaddwj.html index 99948dcc..2a581e55 100644 --- a/safesite/templates/edulessonaddwj.html +++ b/safesite/templates/edulessonaddwj.html @@ -148,7 +148,7 @@

- 选择文件 + 选择文件 diff --git a/safesite/views.py b/safesite/views.py index 09f9ad50..4e9011fe 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -2204,7 +2204,7 @@ def fxhandle(req): objs = objs.filter(fxsj__gte=req.GET.get('qssj')) if req.GET.get('jssj'): objs = objs.filter(fxsj__lte=req.GET.get('jssj')) - objs = objs.values('zgr__userid','zgr__name','zgbm__partname').annotate(number = Count('zgr')).order_by('-zgsj') + objs = objs.values('zgr__userid','zgr__name','zgbm__partname').annotate(number = Count('zgr')).order_by('-number') total = objs.count() return HttpResponse(transjson(total,objs),content_type="application/json") # elif a == 'exportexcel':