diff --git a/app/cross_compare_common.py b/app/cross_compare_common.py index dde3492..bc835be 100644 --- a/app/cross_compare_common.py +++ b/app/cross_compare_common.py @@ -12,8 +12,7 @@ def gen_compare_overview_res(eva_overview, comp_eva_overview): main_flows_num = len(eva_overview['main_flow_src_desc'].split('、')) comp_main_flows_num = len(comp_eva_overview['main_flow_src_desc'].split('、')) high_stop_turns_num = sum([len(item.split('/')) for item in eva_overview['high_stop_turn_ratio_desc'].split('、')]) - comp_high_stop_turns_num = sum( - [len(item.split('/')) for item in comp_eva_overview['high_stop_turn_ratio_desc'].split('、')]) + comp_high_stop_turns_num = sum([len(item.split('/')) for item in comp_eva_overview['high_stop_turn_ratio_desc'].split('、')]) overview = { 'stop_times': eva_overview['stop_times'], 'comp_stop_times': comp_eva_overview['stop_times'], @@ -21,15 +20,12 @@ def gen_compare_overview_res(eva_overview, comp_eva_overview): 'jam_index': eva_overview['jam_index'], 'comp_jam_index': comp_eva_overview['jam_index'], 'jam_index_color': calc_index_color(eva_overview['jam_index'], comp_eva_overview['jam_index'], 'jam_index'), - 'high_park_percent': eva_overview['high_park_percent'], - 'comp_high_park_percent': comp_eva_overview['high_park_percent'], - 'high_park_percent_color': calc_index_color(float(eva_overview['high_park_percent'].replace('%', '')), - float(comp_eva_overview['high_park_percent'].replace('%', '')), - 'high_park_percent'), + 'high_park_percent': eva_overview['high_park_percent'].replace('%', ''), + 'comp_high_park_percent': comp_eva_overview['high_park_percent'].replace('%', ''), + 'high_park_percent_color': calc_index_color(float(eva_overview['high_park_percent'].replace('%', '')), float(comp_eva_overview['high_park_percent'].replace('%', '')), 'high_park_percent'), 'imbalance_index': eva_overview['imbalance_index'], 'comp_imbalance_index': comp_eva_overview['imbalance_index'], - 'imbalance_index_color': calc_index_color(eva_overview['imbalance_index'], comp_eva_overview['imbalance_index'], - 'imbalance_index'), + 'imbalance_index_color': calc_index_color(eva_overview['imbalance_index'], comp_eva_overview['imbalance_index'], 'imbalance_index'), 'speed': eva_overview['speed'], 'comp_speed': comp_eva_overview['speed'], 'speed_color': calc_index_color(eva_overview['speed'], comp_eva_overview['speed'], 'speed'), @@ -79,7 +75,7 @@ def parse_comp_inroad_delay_infos(inroad_delay_infos, comp_inroad_delay_infos): 'item': '优化前', 'service_level': comp_inroad_delay_infos[key]['service_level'] if key in comp_inroad_data_keys else '-', 'stop_times': comp_inroad_delay_infos[key]['stop_times'] if key in comp_inroad_data_keys else '-', - 'high_park_percent': comp_inroad_delay_infos[key]['high_park_percent'] if key in comp_inroad_data_keys else '-', + 'high_park_percent': str(comp_inroad_delay_infos[key]['high_park_percent']) + '%' if key in comp_inroad_data_keys else '-', 'imbalance_index': comp_inroad_delay_infos[key]['imbalance_index'] if key in comp_inroad_data_keys else '-', 'park_time': comp_inroad_delay_infos[key]['park_time'] if key in comp_inroad_data_keys else '-', 'delay_time': comp_inroad_delay_infos[key]['delay_time'] if key in comp_inroad_data_keys else '-', @@ -90,7 +86,7 @@ def parse_comp_inroad_delay_infos(inroad_delay_infos, comp_inroad_delay_infos): 'item': '优化后', 'service_level': inroad_delay_infos[key]['service_level'] if key in inroad_data_keys else '-', 'stop_times': inroad_delay_infos[key]['stop_times'] if key in inroad_data_keys else '-', - 'high_park_percent': inroad_delay_infos[key]['high_park_percent'] if key in inroad_data_keys else '-', + 'high_park_percent': str(inroad_delay_infos[key]['high_park_percent']) + '%' if key in inroad_data_keys else '-', 'imbalance_index': inroad_delay_infos[key]['imbalance_index'] if key in inroad_data_keys else '-', 'park_time': inroad_delay_infos[key]['park_time'] if key in inroad_data_keys else '-', 'delay_time': inroad_delay_infos[key]['delay_time'] if key in inroad_data_keys else '-', @@ -124,7 +120,7 @@ def parse_comp_inroad_delay_infos(inroad_delay_infos, comp_inroad_delay_infos): 'item': '优化前', 'service_level': comp_inroad_delay_infos[key]['flow_delays'][item_turn]['service_level'] if key in comp_inroad_delay_infos.keys() and item_turn in comp_turn_type else '-', 'stop_times': comp_inroad_delay_infos[key]['flow_delays'][item_turn]['stop_times'] if key in comp_inroad_delay_infos.keys() and item_turn in comp_turn_type else '-', - 'high_park_percent': comp_inroad_delay_infos[key]['flow_delays'][item_turn]['high_park_percent'] if key in comp_inroad_delay_infos.keys() and item_turn in comp_turn_type else '-', + 'high_park_percent': str(comp_inroad_delay_infos[key]['flow_delays'][item_turn]['high_park_percent']) + '%' if key in comp_inroad_delay_infos.keys() and item_turn in comp_turn_type else '-', 'park_time': comp_inroad_delay_infos[key]['flow_delays'][item_turn]['park_time'] if key in comp_inroad_delay_infos.keys() and item_turn in comp_turn_type else '-', 'delay_time': comp_inroad_delay_infos[key]['flow_delays'][item_turn]['delay_time'] if key in comp_inroad_delay_infos.keys() and item_turn in comp_turn_type else '-', 'speed': comp_inroad_delay_infos[key]['flow_delays'][item_turn]['speed'] if key in comp_inroad_delay_infos.keys() and item_turn in comp_turn_type else '-', @@ -134,7 +130,7 @@ def parse_comp_inroad_delay_infos(inroad_delay_infos, comp_inroad_delay_infos): 'item': '优化后', 'service_level': inroad_delay_infos[key]['flow_delays'][item_turn]['service_level'] if key in inroad_delay_infos.keys() and item_turn in turn_type else '-', 'stop_times': inroad_delay_infos[key]['flow_delays'][item_turn]['stop_times'] if key in inroad_delay_infos.keys() and item_turn in turn_type else '-', - 'high_park_percent': inroad_delay_infos[key]['flow_delays'][item_turn]['high_park_percent'] if key in inroad_delay_infos.keys() and item_turn in turn_type else '-', + 'high_park_percent': str(inroad_delay_infos[key]['flow_delays'][item_turn]['high_park_percent']) + '%' if key in inroad_delay_infos.keys() and item_turn in turn_type else '-', 'park_time': inroad_delay_infos[key]['flow_delays'][item_turn]['park_time'] if key in inroad_delay_infos.keys() and item_turn in turn_type else '-', 'delay_time': inroad_delay_infos[key]['flow_delays'][item_turn]['delay_time'] if key in inroad_delay_infos.keys() and item_turn in turn_type else '-', 'speed': inroad_delay_infos[key]['flow_delays'][item_turn]['speed'] if key in inroad_delay_infos.keys() and item_turn in turn_type else '-',