diff --git a/apps/em/filters.py b/apps/em/filters.py index 57920f30..5241ea18 100644 --- a/apps/em/filters.py +++ b/apps/em/filters.py @@ -23,7 +23,8 @@ class EquipFilterSet(filters.FilterSet): "cate__code": ['exact', 'in', 'contains'], "cate__is_for_safe": ['exact'], "cate__is_for_enp": ['exact'], - "cate__is_car": ['exact'] + "cate__is_car": ['exact'], + "is_deleted": ['exact'] } def filter_tag(self, queryset, name, value): diff --git a/apps/third/views_d.py b/apps/third/views_d.py index c740efc4..8f881807 100644 --- a/apps/third/views_d.py +++ b/apps/third/views_d.py @@ -252,6 +252,8 @@ class TDeviceViewSet(ListModelMixin, UpdateModelMixin, DestroyModelMixin, Custom rows = res['rows'] t_l = [] for i in rows: + if i['name'] == '采集器': + continue t_l.append(i['sn']) td = TDevice.objects.filter(code=i['sn']).first() if td: @@ -425,6 +427,8 @@ class TDeviceViewSet(ListModelMixin, UpdateModelMixin, DestroyModelMixin, Custom _, res = spClient.request(**spapis['device_list'], params=request.data) codes = [] for i in res['rows']: + if i['name'] == '采集器': + continue codes.append(i['sn']) tds_info = TDeviceSerializer( instance=TDevice.objects.filter(code__in=codes), many=True).data