diff --git a/app/cross_compare_worker.py b/app/cross_compare_worker.py index 0468c5c..294119e 100644 --- a/app/cross_compare_worker.py +++ b/app/cross_compare_worker.py @@ -437,6 +437,7 @@ def query_cross_survey_result(params): 'image_location': image_location, 'dist': dist }) + image_list = sorted(image_list, key=lambda x: x['image_time']) src_images[src_dir] = image_list dir_info = {} for item in done_inroads_list: diff --git a/app/eva_common.py b/app/eva_common.py index 380e3c3..bc5b66d 100644 --- a/app/eva_common.py +++ b/app/eva_common.py @@ -839,24 +839,24 @@ def calc_service_level(delay_time, stop_times): service_level = 'A' elif 10 < delay_time <= 20: service_level = 'B' - if stop_times < 0.25: - service_level = 'A' + # if stop_times < 0.25: + # service_level = 'A' elif 20 < delay_time <= 35: service_level = 'C' - if stop_times < 0.4: - service_level = 'B' + # if stop_times < 0.4: + # service_level = 'B' elif 35 < delay_time <= 55: service_level = 'D' - if stop_times < 0.5: - service_level = 'C' + # if stop_times < 0.5: + # service_level = 'C' elif 55 < delay_time <= 80: service_level = 'E' - if stop_times < 0.65: - service_level = 'D' + # if stop_times < 0.65: + # service_level = 'D' else: service_level = 'F' - if stop_times < 8: - service_level = 'E' + # if stop_times < 0.8: + # service_level = 'E' return service_level