|
@@ -317,7 +317,7 @@ class PcTest(View):
|
|
function_qs = PctestModel.objects.filter(device__in=device_qs)
|
|
function_qs = PctestModel.objects.filter(device__in=device_qs)
|
|
|
|
|
|
data = user_qs[0]
|
|
data = user_qs[0]
|
|
- data['jobs'] = CommonService.qs_to_list(job_qs.values('id', 'jobname'))
|
|
|
|
|
|
+ data['jobs'] = CommonService.qs_to_list(job_qs.values('id', 'jobname', 'jobcode'))
|
|
|
|
|
|
i = 0
|
|
i = 0
|
|
for jobs in data['jobs']:
|
|
for jobs in data['jobs']:
|
|
@@ -326,7 +326,7 @@ class PcTest(View):
|
|
|
|
|
|
j = 0
|
|
j = 0
|
|
for devices in jobs['devices']:
|
|
for devices in jobs['devices']:
|
|
- data['jobs'][i]['devices'][j]['functions'] = CommonService.qs_to_list(function_qs.filter(device__id=devices['device__id']).values('function__id','function__functionname'))
|
|
|
|
|
|
+ data['jobs'][i]['devices'][j]['functions'] = CommonService.qs_to_list(function_qs.filter(device__id=devices['device__id']).values('function__id','function__functionname','function__functioncode'))
|
|
j = j+1
|
|
j = j+1
|
|
|
|
|
|
i = i+1
|
|
i = i+1
|