|
@@ -440,7 +440,7 @@ class DeviceDataView(View):
|
|
|
count_remain = count_part - count
|
|
count_remain = count_part - count
|
|
|
rate = round(count_remain / count_part * 100, 2)
|
|
rate = round(count_remain / count_part * 100, 2)
|
|
|
type_list.append({
|
|
type_list.append({
|
|
|
- 'name': name,
|
|
|
|
|
|
|
+ 'type': name,
|
|
|
'count': count_remain,
|
|
'count': count_remain,
|
|
|
'rate': rate
|
|
'rate': rate
|
|
|
})
|
|
})
|
|
@@ -453,7 +453,7 @@ class DeviceDataView(View):
|
|
|
type_count = test_list.count(Type)
|
|
type_count = test_list.count(Type)
|
|
|
rate = round(type_count / count_part * 100, 2)
|
|
rate = round(type_count / count_part * 100, 2)
|
|
|
type_list.append({
|
|
type_list.append({
|
|
|
- 'name': name,
|
|
|
|
|
|
|
+ 'type': name,
|
|
|
'count': type_count,
|
|
'count': type_count,
|
|
|
'rate': rate
|
|
'rate': rate
|
|
|
})
|
|
})
|
|
@@ -555,8 +555,8 @@ class DeviceDataView(View):
|
|
|
name = '未知类型'
|
|
name = '未知类型'
|
|
|
rate = round(count / count_all * 100, 2)
|
|
rate = round(count / count_all * 100, 2)
|
|
|
device_info_list.append({
|
|
device_info_list.append({
|
|
|
|
|
+ 'type': name,
|
|
|
'count': count,
|
|
'count': count,
|
|
|
- 'name': name,
|
|
|
|
|
'rate': rate
|
|
'rate': rate
|
|
|
})
|
|
})
|
|
|
for device_info in device_type_qs:
|
|
for device_info in device_type_qs:
|
