diff --git a/app/cross_monitor_worker.py b/app/cross_monitor_worker.py index d90d51d..969ff47 100644 --- a/app/cross_monitor_worker.py +++ b/app/cross_monitor_worker.py @@ -2,3 +2,9 @@ # @Author: Owl # @Date: 2025/11/4 15:13 # @Description: 路口巡检页面相关接口 + +from app.cross_evaluate_worker import * + + +# 查询当前城市巡检任务可用日期列表 + diff --git a/app/eva_common.py b/app/eva_common.py index 1b7531f..e9f4211 100644 --- a/app/eva_common.py +++ b/app/eva_common.py @@ -1121,15 +1121,16 @@ def gen_high_park_problems(road_delay_infos, roads_dir_dict, cross_phase): 'text': '增加' } ) + phase_suggestions = get_flow_phase_detail(src_dir, turn_type_list, cross_phase) src_suggestions.append({ 'src_dir': dir_str_dict[src_dir] + '进口' + turn_type_str, 'text': '所属相位的绿灯时间' }) - phase_suggestions = get_flow_phase_detail(src_dir, turn_type_list, cross_phase) suggestion.append({ - 'child_detail': src_suggestions + 'child_detail': src_suggestions, + 'next_line': phase_suggestions }) - suggestion.extend(phase_suggestions) + # suggestion.extend(phase_suggestions) return detail, suggestion, total_num @@ -1246,6 +1247,10 @@ def gen_cross_imbalance_problems(road_delay_infos, roads_dir_dict, cross_phase): } ] ] + is_tide = False + if max_src == src_reverse[min_src]: + is_tide = True + phase_suggestions = gen_src_dir_phase_detail(max_src, min_src, cross_phase, is_tide=is_tide) suggestion = [ { 'child_detail': [ @@ -1260,14 +1265,11 @@ def gen_cross_imbalance_problems(road_delay_infos, roads_dir_dict, cross_phase): { 'text': '的绿灯时长的分配情况' } - ] + ], + 'next_line': phase_suggestions } ] - is_tide = False - if max_src == src_reverse[min_src]: - is_tide = True - phase_suggestions = gen_src_dir_phase_detail(max_src, min_src, cross_phase, is_tide=is_tide) - suggestion.extend(phase_suggestions) + # suggestion.extend(phase_suggestions) return detail, suggestion, total_num @@ -1317,6 +1319,7 @@ def gen_turn_imbalance_problems(road_delay_infos, roads_dir_dict, inroad_static_ } ] detail.append(item_detail) + phase_suggestion = get_flow_phase_detail(src_dir, [0, 1], cross_phase) item_suggestion = [ { 'child_detail': [ @@ -1324,12 +1327,11 @@ def gen_turn_imbalance_problems(road_delay_infos, roads_dir_dict, inroad_static_ 'src_dir': dir_str_dict[src_dir] + '进口', 'text': '信号灯直左分控,调整直行和左转车辆绿灯时长分配情况' } - ] + ], + 'next_line': phase_suggestion } ] suggestion.extend(item_suggestion) - phase_suggestion = get_flow_phase_detail(src_dir, [0, 1], cross_phase) - suggestion.extend(phase_suggestion) if err_road_dict[src_dir][2]: road_num_suggestion.append( { @@ -1341,7 +1343,6 @@ def gen_turn_imbalance_problems(road_delay_infos, roads_dir_dict, inroad_static_ ] } ) - lane_num_suggestion = [ { 'child_detail': [