|
|
@@ -833,11 +833,13 @@ class SmartSceneView(View):
|
|
|
else:
|
|
|
device_qs = Device_Info.objects.filter(id=item['device_id']).values('Type')
|
|
|
item['device_type'] = device_qs[0]['Type'] if device_qs.exists() else ''
|
|
|
- item['tasks'] = eval(item['tasks'])
|
|
|
- return response.json(0, list(scene_log_qs))
|
|
|
+ if item['tasks'] != '':
|
|
|
+ item['tasks'] = eval(item['tasks'])
|
|
|
+ scene_log_list = list(scene_log_qs)
|
|
|
+ return response.json(0, scene_log_list)
|
|
|
except Exception as e:
|
|
|
- print(repr(e))
|
|
|
- return response.json(500, repr(e))
|
|
|
+ print('error_ine:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
+ return response.json(500, 'error_ine:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
|
|
|
@staticmethod
|
|
|
def scene_log_date(request_dict, response):
|
