diff --git a/app/task_worker.py b/app/task_worker.py index 67dbc74..4da888e 100644 --- a/app/task_worker.py +++ b/app/task_worker.py @@ -1563,7 +1563,7 @@ def query_wave_task_params(params): max_phase_position = max(phase_num, max_phase_position) usable_src_dir_list = ['双向', '东向西', '南向北', '西向东', '北向南', '东南向西北', '西南向东北', '西北向东南', '东北向西南'] if srcDir != '': - usable_src_dir_list = [gen_type_str(0, srcDir), gen_type_str(1, srcDir)] + usable_src_dir_list = ['双向', gen_type_str(0, srcDir), gen_type_str(1, srcDir)] task_executor_list = db_task.query_task_executor(nodeid, area_id) if waveid == '' and wave_name == '': wave_tp_info = [{ @@ -1587,7 +1587,7 @@ def query_wave_task_params(params): 'predict_issue_time': predict_issue_time, 'wave_status': 1 if waveid != '' else 0, 'cross_num': len(wave_crosses), - 'slc_company': slc_company_dict[slc_company] if slc_company_res and slc_company in slc_company_dict.keys() else '不统一', + 'slc_company': slc_company_dict[int(slc_company)] if slc_company_res and int(slc_company) in slc_company_dict.keys() else '不统一', 'task_src': task_src, 'max_phase_position': max_phase_position, 'left_coor': left_coor @@ -2179,3 +2179,6 @@ def del_greenwave_task_tiny_adjustment_record(params): if ret == 1: return json.dumps(make_common_res(0, 'ok')) return json.dumps(make_common_res(6, '删除失败')) + + +# 路口巡检任务相关内容:20260407 diff --git a/app/wave_db_func.py b/app/wave_db_func.py index 947675e..3963c03 100644 --- a/app/wave_db_func.py +++ b/app/wave_db_func.py @@ -44,7 +44,7 @@ class WaveDBFunction(TableDbHelperBase): res = self.do_select(sql) wave_tp_infos = [] for row in res: - type_str = gen_type_str(type, srcDir) + type_str = gen_type_str(row['type'], srcDir) weekday_str = gen_weekday_str(row['weekday']) wave_tp_infos.append({ 'wave_tp_id': row['id'],