tt

Controller/EquipmentOTA.py

@@ -190,11 +190,19 @@ class EquipmentVersionView(View):
             cv_qs = Equipment_Version.objects.filter(mci=mci).order_by('code').values_list('code', flat=True).distinct()
             count = cv_qs.count()
             cv_qs = list(cv_qs[(page - 1) * line:page * line])
-        return response.json(0, cv_qs)
+        # return response.json(0, cv_qs)
         ev_qs = Equipment_Version.objects.filter(code__in=list(cv_qs)).values()
-
+        ev_list = CommonService.qs_to_list(ev_qs)
+        datas = {}
+        # 组装数据
+        for ev in ev_list:
+            for code in cv_qs:
+                if code not in datas.keys():
+                    datas[code] = []
+                if code == ev['code']:
+                    datas[code].append(ev)
         res = {
-            'datas': CommonService.qs_to_list(ev_qs[(page - 1) * line:page * line]),
+            'datas': datas,
             'count': ev_qs.count()
         }
         return response.json(0, res)