This commit is contained in:
shilixia 2019-12-02 10:38:27 +08:00
parent dcff299c75
commit f55f840316
3 changed files with 3 additions and 3 deletions

View File

@ -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)

View File

@ -148,7 +148,7 @@
<p class="_p">
<a class="list" href="javascript:;">
<input id="file" type="file" name="myfile" onchange="UpladFile();" /><span>选择文件</span>
<input id="file" type="file" name="myfile" accept=".xls,.doc,.txt,.pdf" onchange="UpladFile(); " /><span>选择文件</span>
</a>
<!--<button class="btn" type="button" onclick="sub();">上传</button>-->
<a class="el-upload-list__item-name">

View File

@ -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':