From cbc09f1823ef368f8ef388f6bdca81d68aa442b8 Mon Sep 17 00:00:00 2001 From: wangxu <1318272526@qq.com> Date: Fri, 22 May 2026 14:44:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=AF=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=AF=94=E6=8A=A5=E5=91=8Abug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/cross_compare_common.py | 2 +- app/cross_compare_report.py | 4 ++-- app/report_common.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/cross_compare_common.py b/app/cross_compare_common.py index 5839408..d470198 100644 --- a/app/cross_compare_common.py +++ b/app/cross_compare_common.py @@ -97,7 +97,7 @@ def parse_comp_inroad_delay_infos(inroad_delay_infos, comp_inroad_delay_infos): 'item': '变化量', 'service_level': '-' if item_data['service_level'] == '-' or comp_data['service_level'] == '-' else compare_level(comp_data['service_level'], item_data['service_level']), 'stop_times': '-' if item_data['stop_times'] == '-' or comp_data['stop_times'] == '-' else round(comp_data['stop_times'] - item_data['stop_times'], 2), - 'high_park_percent': '-' if '-' in item_data['high_park_percent'] or '-' in comp_data['high_park_percent'] else str(int(float(item_data['high_park_percent'].replace('%', '')) - float(comp_data['high_park_percent'].replace('%', '')))) + '%', + 'high_park_percent': '-' if '-' in item_data['high_park_percent'] or '-' in comp_data['high_park_percent'] else str(int(float(comp_data['high_park_percent'].replace('%', '')) - float(item_data['high_park_percent'].replace('%', '')))) + '%', 'imbalance_index': '-' if item_data['imbalance_index'] == '-' or comp_data['imbalance_index'] == '-' else round(item_data['imbalance_index'] - comp_data['imbalance_index'], 2), 'park_time': '-' if item_data['park_time'] == '-' or comp_data['park_time'] == '-' else item_data['park_time'] - comp_data['park_time'], 'delay_time': '-' if item_data['delay_time'] == '-' or comp_data['delay_time'] == '-' else comp_data['delay_time'] - item_data['delay_time'], diff --git a/app/cross_compare_report.py b/app/cross_compare_report.py index 99d926d..016cf04 100644 --- a/app/cross_compare_report.py +++ b/app/cross_compare_report.py @@ -275,7 +275,7 @@ def gen_compare_report_part1_data(data_range, compare_date_range, time_range, cr compare_key = 'comp_' + key if key == 'service_level': service_level_compare_res = compare_service_level(final_overview[key], final_overview[compare_key]) - if service_level_compare_res and service_level_compare_res > 0: + if service_level_compare_res and service_level_compare_res < 0: service_level_compare_str = f"{index_dict[key]}由{final_overview[compare_key]}提升为{final_overview[key]}， 提升{service_level_compare_res}个等级；" part1_data['data_list'].append(service_level_compare_str) elif key in ('jam_index', 'stop_times', 'high_park_percent', 'delay_time'): @@ -467,7 +467,7 @@ def gen_compare_report_part5_data(part1_data, compared_inroad_delay_infos): for key in ('service_level', 'stop_times', 'high_park_percent', 'speed', 'delay_time'): if key == 'service_level': service_level_compare_res = compare_service_level(item_data[key], compare_data[key]) - if service_level_compare_res and service_level_compare_res > 0: + if service_level_compare_res and service_level_compare_res < 0: service_level_compare_str = f"{index_dict[key]}由{compare_data[key]}提升为{item_data[key]}， 提升{service_level_compare_res}个等级；" src_dir_data.append(service_level_compare_str) elif key in ('stop_times', 'high_park_percent', 'delay_time'): diff --git a/app/report_common.py b/app/report_common.py index 0904992..79c9e82 100644 --- a/app/report_common.py +++ b/app/report_common.py @@ -34,8 +34,8 @@ def compare_service_level(obj1, obj2): priority_map = {'A': 0, 'B': 1, 'C': 2, 'D': 3, 'E': 4, 'F': 5} if obj1 == '-' or obj2 == '-': return None - val1 = priority_map.get(obj1) - val2 = priority_map.get(obj2) + val1 = priority_map.get(obj1) # d 3 + val2 = priority_map.get(obj2) # c 2 if val1 is None or val2 is None: return None