|
@@ -99,21 +99,22 @@ def getSource():
|
|
|
if not result:
|
|
if not result:
|
|
|
return jsonify({'code': '200', 'result': [], 'message': '没有更多数据'})
|
|
return jsonify({'code': '200', 'result': [], 'message': '没有更多数据'})
|
|
|
source_list = list()
|
|
source_list = list()
|
|
|
- for source, task_type, spider_name, machine, source_desc, task_type_desc, spider_name_desc in result:
|
|
|
|
|
|
|
+ for source_info in result:
|
|
|
|
|
+
|
|
|
source_dict = {
|
|
source_dict = {
|
|
|
'task_type': [
|
|
'task_type': [
|
|
|
{
|
|
{
|
|
|
- 'type': task_type,
|
|
|
|
|
- 'description': task_type_desc,
|
|
|
|
|
|
|
+ 'type': source_info['task_type'],
|
|
|
|
|
+ 'description': source_info['task_type_desc'],
|
|
|
'spider': {
|
|
'spider': {
|
|
|
- 'spider_name': spider_name,
|
|
|
|
|
- 'description': spider_name_desc
|
|
|
|
|
|
|
+ 'spider_name': source_info['spider_name'],
|
|
|
|
|
+ 'description': source_info['spider_name_desc']
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
],
|
|
],
|
|
|
- 'description': source_desc,
|
|
|
|
|
- 'source': source,
|
|
|
|
|
- 'machine': machine
|
|
|
|
|
|
|
+ 'description': source_info['source_desc'],
|
|
|
|
|
+ 'source': source_info['source'],
|
|
|
|
|
+ 'machine': source_info['machine']
|
|
|
}
|
|
}
|
|
|
source_list.append(source_dict)
|
|
source_list.append(source_dict)
|
|
|
except Exception as e:
|
|
except Exception as e:
|
