From 0ad2f6cbb2a94934a290fb62b5ee8e1214852844 Mon Sep 17 00:00:00 2001 From: wangxu <1318272526@qq.com> Date: Tue, 11 Nov 2025 18:02:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AB=98=E9=A2=91=E5=81=9C?= =?UTF-8?q?=E8=BD=A6=E8=BD=AC=E5=90=91=E5=B1=95=E7=A4=BA=E5=BC=82=E5=B8=B8?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/eva_common.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/eva_common.py b/app/eva_common.py index 5fb8c62..d3e9b15 100644 --- a/app/eva_common.py +++ b/app/eva_common.py @@ -281,8 +281,7 @@ def gen_overview_index(avg_cross_delay_info, inroad_static_info_dict, nodeid, da move_speed = avg_cross_delay_info.delay_info.move_speed / 100 if car_num >= 10 else '-' park_time = avg_cross_delay_info.delay_info.park_time if car_num >= 10 else '-' delay_time = avg_cross_delay_info.delay_info.delay_time if car_num >= 10 else '-' - high_stop_turn_ratio_desc, main_flow_src_desc = gen_high_stop_turn_ratio_desc(avg_cross_delay_info.inroad_delay_infos, inroad_static_info_dict, car_num) if car_num >= 10 else '', '' - + high_stop_turn_ratio_desc = gen_high_stop_turn_ratio_desc(avg_cross_delay_info.inroad_delay_infos, inroad_static_info_dict, car_num) if car_num >= 10 else [] tide_index_list = calc_tide_index(crossid, nodeid, date_list, roads_dir_dict) usable_tide_list = [item for item in tide_index_list if item != 0] tide_index = round(sum(usable_tide_list) / len(usable_tide_list), 2) if len(usable_tide_list) > 0 else 0 @@ -297,8 +296,8 @@ def gen_overview_index(avg_cross_delay_info, inroad_static_info_dict, nodeid, da 'park_time': park_time, 'delay_time': delay_time, 'service_level': service_level, - 'high_stop_turn_ratio_desc': high_stop_turn_ratio_desc, - 'main_flow_src_desc': main_flow_src_desc, + 'high_stop_turn_ratio_desc': high_stop_turn_ratio_desc[0] if len(high_stop_turn_ratio_desc) > 0 else '', + 'main_flow_src_desc': high_stop_turn_ratio_desc[1] if len(high_stop_turn_ratio_desc) > 1 else '', 'tide_index': tide_index } return overview_res @@ -326,7 +325,7 @@ def gen_high_stop_turn_ratio_desc(inroad_delay_infos, inroad_static_info_dict, c src_dict[src_dir].append(turn_type) for item in src_dict.keys(): src_desc_list.append(item + '/'.join(src_dict[item])) - return '、'.join(src_desc_list) if src_desc_list else '无', '、'.join(main_flow_src_list) if main_flow_src_list else '无' + return ['、'.join(src_desc_list) if src_desc_list else '无', '、'.join(main_flow_src_list) if main_flow_src_list else '无'] def found_max_car_num_flow(inroad_car_num, inroad_info): @@ -868,7 +867,7 @@ def parse_single_cross_delay_info(crossid, nodeid, data_list, data_type, roads_d turn_type = flow_delay_info.turn_type if turn_type not in (0, 1): continue - if flow_delay_info.delay_info.car_num >= 5: + if flow_delay_info.delay_info.car_num >= 3: flow_data = [ # 停车次数 round(flow_delay_info.delay_info.stop_times, 2),