diff --git a/dist/index.html b/dist/index.html index 9e8888eeb971909f745ebb2ee6545f6412e2280f..0553e18cd30df119778aab877ee29905b7397602 100644 --- a/dist/index.html +++ b/dist/index.html @@ -8,10 +8,10 @@ - +
- + \ No newline at end of file diff --git a/services/case_service.py b/services/case_service.py index 8a310f0c95df5e6f4d017f6af01622ba546536bb..84f5505fa0d99e3382439b162e01530502df55eb 100644 --- a/services/case_service.py +++ b/services/case_service.py @@ -507,12 +507,12 @@ async def export_excel(case_ids): content['执行模式'].append(case.run_model.value) content['是否可用'].append(case.is_available) content['关联的tone用例'].append(case.tone_case) - content['设备类型'].append(case.device_type.value) - content['设备架构'].append(case.device_arch.value) + content['设备类型'].append(case.device_type) + content['设备架构'].append(case.device_arch) content['所属模块'].append(case_nodes_dict[case.parent]) content['创建时间'].append(case.gmt_created) content['改动时间'].append(case.gmt_modified) - content['用例描述'].append(case.base_fields) + content['用例描述'].append(case.desc) content['扩展'].append(case.custom_fields) return await write_excel(content) @@ -531,17 +531,19 @@ async def search_case(data): node_list = await __search_child_nodes_by_path(node.path) conditions.append(Case.parent.in_(node_list)) if 'labels' in data: - case_ids = await get_cases_by_label_names(data['labels'].split(',')) + case_ids = await get_cases_by_label_names(data.get('labels').split(',')) conditions.append(Case.id.in_(case_ids)) if 'is_available' in data: result = True if data.get('is_available') == 'true' else False conditions.append(Case.is_available == result) if 'priority' in data: pr_list = list() - for pr in data['priority'].split(','): + for pr in data.get('priority').split(','): if __get_priority(pr): pr_list.append(__get_priority(pr)) conditions.append(Case.priority.in_(pr_list)) + if 'type' in data: + conditions.append(Case.type == data.get('type')) if 'test_type' in data: conditions.append(Case.type == data.get('test_type')) if 'run_method' in data: @@ -560,16 +562,16 @@ async def search_case(data): if end_time: end_time = string_toShortDatetime(end_time) conditions.append(Case.gmt_modified <= end_time) - if 'device_type' in data and Device_Type_EN.UNLIMIT.value not in data['device_type']: + if 'device_type' in data and Device_Type_EN.UNLIMIT.value not in data.get('device_type').split(','): device_type_list = list() device_type_list.append(Case.device_type == Device_Type_EN.UNLIMIT.value) - for item in data['device_type']: + for item in data.get('device_type').split(','): device_type_list.append(Case.device_type.contains(item)) multi_condition.append(or_(*device_type_list)) - if 'device_arch' in data and Device_Arch.NOARCH.value not in data['device_arch']: + if 'device_arch' in data and Device_Arch.NOARCH.value not in data.get('device_arch').split(','): device_type_list = list() device_type_list.append(Case.device_type == Device_Type_EN.UNLIMIT.value) - for item in data['device_type']: + for item in data.get('device_arch').split(','): device_type_list.append(Case.device_type.contains(item)) multi_condition.append(or_(*device_type_list)) if 'key' in data: @@ -595,7 +597,7 @@ def __get_priority(pr): async def excel_template(): - filepath = 'common/dist/temp.xlsx' + filepath = 'common/static/temp.xlsx' with open(filepath, "rb") as f: content = f.read() return content diff --git a/services/task_service.py b/services/task_service.py index 700750b39a777b14d0bde1df39e29a12c60ec147..931da56a069adc69d8bcaf01c49cbdf8f168d783 100644 --- a/services/task_service.py +++ b/services/task_service.py @@ -141,7 +141,7 @@ async def modify_task(data, task_id, user): task.config = data['config'] if 'cases' in data: if data['cases']: - case_infos = await __gen_run_result_case_infos(data['cases'].split(',')) + case_infos = await __gen_run_result_case_infos(data['cases']) task.run_result['case_infos'] = case_infos else: task.run_result['case_infos'] = []