Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite
This commit is contained in:
commit
55e2aeedf7
|
@ -6233,7 +6233,6 @@ def trainfg(req):
|
||||||
dickeyname=i.dickeyname
|
dickeyname=i.dickeyname
|
||||||
traintypelist.append({'value':count,'name':dickeyname})
|
traintypelist.append({'value':count,'name':dickeyname})
|
||||||
return HttpResponse(json.dumps({'code':1,'data':{'traintypelist':list(traintypelist)}}), content_type='application/json')
|
return HttpResponse(json.dumps({'code':1,'data':{'traintypelist':list(traintypelist)}}), content_type='application/json')
|
||||||
|
|
||||||
#设备统计图
|
#设备统计图
|
||||||
|
|
||||||
def equipmentfig(req):
|
def equipmentfig(req):
|
||||||
|
@ -6251,5 +6250,5 @@ def equipmentfig(req):
|
||||||
return JsonResponse({"code":1,"normal":normal,"abnormal":abnormal})
|
return JsonResponse({"code":1,"normal":normal,"abnormal":abnormal})
|
||||||
elif a=='eqmcount':
|
elif a=='eqmcount':
|
||||||
eqmlist=Equipment.objects.filter(usecomp__partid=companyid,deletemark=1).values('area__name').annotate(num = Count('area'))
|
eqmlist=Equipment.objects.filter(usecomp__partid=companyid,deletemark=1).values('area__name').annotate(num = Count('area'))
|
||||||
|
|
||||||
return HttpResponse(json.dumps({'code':1,'data':{'eqmlist':list(eqmlist)}}), content_type='application/json')
|
return HttpResponse(json.dumps({'code':1,'data':{'eqmlist':list(eqmlist)}}), content_type='application/json')
|
||||||
|
|
Loading…
Reference in New Issue