diff --git a/app/compare_views.py b/app/compare_views.py index 72821cd..917c3af 100644 --- a/app/compare_views.py +++ b/app/compare_views.py @@ -4,7 +4,7 @@ # @Description: 路口对比评测相关接口 from flask import request -from app.cross_compare_report import * +# from app.cross_compare_report import * from app.cross_compare_worker import * from app.cross_eva_views import app diff --git a/app/eva_common.py b/app/eva_common.py index 47358ff..cb3bfe3 100644 --- a/app/eva_common.py +++ b/app/eva_common.py @@ -744,11 +744,11 @@ def gen_flow_turn_rate_index(avg_cross_delay_info, roads_dir_dict): outroad_infos = avg_cross_delay_info.outroad_infos road_delay_dict = {item.inroadid: item for item in road_delay_infos} outroad_info_dict = {item.outroadid: item for item in outroad_infos} - cross_sum_car_num = sum([item.delay_info.car_num for item in road_delay_infos]) - cross_out_sum_car_num = sum([item.turn_info.car_num for item in outroad_infos]) road_flow_turn_rate = {} inroadid_list = [roads_dir_dict[k]['in'] for k in roads_dir_dict.keys()] outroadid_list = [roads_dir_dict[k]['out'] for k in roads_dir_dict.keys()] + cross_sum_car_num = sum([item.delay_info.car_num for item in road_delay_infos if item.inroadid in inroadid_list]) + cross_out_sum_car_num = sum([item.turn_info.car_num for item in outroad_infos if item.outroadid in outroadid_list]) for dir in roads_dir_dict.keys(): roadid = roads_dir_dict[dir]['in'] if 'udr_' in roadid: