diff --git a/back/tgbot/serializers.py b/back/tgbot/serializers.py
index cad4fa9..cb360f8 100644
--- a/back/tgbot/serializers.py
+++ b/back/tgbot/serializers.py
@@ -22,7 +22,7 @@ class TmcElementSerializer(serializers.Serializer):
class TerritorySerializer(serializers.Serializer):
- id = serializers.IntegerField(required=False)
+ id = serializers.IntegerField()
name = serializers.CharField()
count = serializers.IntegerField(required=False)
@@ -44,7 +44,7 @@ class TgStatItemSerializer(serializers.Serializer):
return None
if isinstance(obj.get("location__parent"), list):
location_parent_ids = obj.get("location__parent")
- queryset = Territory.objects.filter(id__in=obj.get("location__parent")).values('name')
+ queryset = Territory.objects.filter(id__in=obj.get("location__parent"))
for q in queryset:
q.count = location_parent_ids.count(q.id)
serializer = TerritorySerializer(queryset, many=True)
diff --git a/back/tgbot/views.py b/back/tgbot/views.py
index d507b34..27f5ab7 100644
--- a/back/tgbot/views.py
+++ b/back/tgbot/views.py
@@ -154,8 +154,7 @@ class TmcStatViewset(viewsets.ViewSet):
tmc=ArrayAgg("tmc"),
)
)
- logger.info(queryset)
+ # logger.info(queryset)
# logger.info(TgItem.objects.all().values())
serializer = TgStatItemSerializer(queryset, many=True)
return Response(serializer.data)
- # return Response()
diff --git a/front/pages/stat/index.vue b/front/pages/stat/index.vue
index 816753c..ce18519 100644
--- a/front/pages/stat/index.vue
+++ b/front/pages/stat/index.vue
@@ -34,20 +34,21 @@ const getData = async () => {
По продуктам
-
+
{{ item.location.name }} {{ item.inv_count }}
-
+
{{ el.tmc__name }}, всего {{ el.count }}
{{ item.inv_count }}
-
+
\ No newline at end of file