图表显示bug

test_server/analyse/views.py

@@ -101,9 +101,9 @@ class Companydis(APIView):
     """
     def get(self, request, format=None):
         ret = {'s':[], 't':'单位分布', 'max':300, 'min':0}
-        tmp = Company.objects.exclude(geo__isnull=True).values('pname').annotate(total=Count('pname'))
+        tmp = Company.objects.exclude(geo__isnull=True).values('geo__pname').annotate(total=Count('geo__pname'))
         for i in tmp:
-            ret['s'].append({'name':nameMap[i['pname']], 'value':i['total']})
+            ret['s'].append({'name':nameMap[i['geo__pname']], 'value':i['total']})
         return Response(ret)
 
 class Consumerdis(APIView):
@@ -112,9 +112,9 @@ class Consumerdis(APIView):
     """
     def get(self, request, format=None):
         ret = {'s':[], 't':'学员分布', 'max':600, 'min':0}
-        tmp = Consumer.objects.exclude(company__geo__isnull=True).values('company__pname').annotate(total=Count('company__pname'))
+        tmp = Consumer.objects.exclude(company__geo__isnull=True).values('company__geo__pname').annotate(total=Count('company__geo__pname'))
         for i in tmp:
-            ret['s'].append({'name':nameMap[i['company__pname']], 'value':i['total']})
+            ret['s'].append({'name':nameMap[i['company__geo__pname']], 'value':i['total']})
         return Response(ret)
 class Quota(APIView):
     '''

test_server/crm/views.py

@@ -209,7 +209,7 @@ class CompanyViewSet(ModelViewSet):
         """
         地理位置
         """
-        companys = Company.objects.all().order_by('-create_time')
+        companys = Company.objects.filter(geo__pname__isnull=True).order_by('-create_time')
         for i in companys:
             geo = None
             try: