From a67da735b33be01b24845ce03ae7551cf55ddbbc Mon Sep 17 00:00:00 2001 From: ningshuxia <ningshuxia0927@outlook.com> Date: 星期三, 16 四月 2025 09:08:16 +0800 Subject: [PATCH] 代码修改i --- 02-desktop/WinFrmUI/IStation.WinFrmUI.Monitor/03-WorkingConditionAnalysis/05-ModelCorrectionCombine/ModelCorrectionCombinePage.cs | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/02-desktop/WinFrmUI/IStation.WinFrmUI.Monitor/03-WorkingConditionAnalysis/05-ModelCorrectionCombine/ModelCorrectionCombinePage.cs b/02-desktop/WinFrmUI/IStation.WinFrmUI.Monitor/03-WorkingConditionAnalysis/05-ModelCorrectionCombine/ModelCorrectionCombinePage.cs index 57fadad..41467d3 100644 --- a/02-desktop/WinFrmUI/IStation.WinFrmUI.Monitor/03-WorkingConditionAnalysis/05-ModelCorrectionCombine/ModelCorrectionCombinePage.cs +++ b/02-desktop/WinFrmUI/IStation.WinFrmUI.Monitor/03-WorkingConditionAnalysis/05-ModelCorrectionCombine/ModelCorrectionCombinePage.cs @@ -235,7 +235,7 @@ private List<PumpViewModel> _pump_vm_list = null; private string _model_file = System.IO.Path.Combine - (Settings.File.RootDirectory, Settings.File.DataFolder, "ch2_v3_20240801(Clear).inp"); + (SettingsD.File.RootDirectory, SettingsD.File.DataFolder, "ch2_v3_20240801(Clear).inp"); /// <summary> /// 娓呯┖鏁版嵁 @@ -377,8 +377,8 @@ var curve_point_count = 100; var flag_qh_curve_dict = GetFlagCurveDict(); - var pipe_flow_id_list = GlobalHelper.GetPipeFlowIdList(station_index); - var pipe_pressure_id_list = GlobalHelper.GetPipePressureIdList(station_index); + var pipe_flow_id_list = GlobalHelperW.GetPipeFlowIdList(station_index); + var pipe_pressure_id_list = GlobalHelperW.GetPipePressureIdList(station_index); var pump_model_mapping_list = AnalysisHelper.GetPumpModelMappingList(); var model_mapping_list = AnalysisHelper.GetStationMappingList(); @@ -449,8 +449,7 @@ continue; pattern_id_dict.Add(id, index); } - - var run_flags = new List<int>() { 22, 23, 25 }; + var vm_list = new List<PumpViewModel>(); var vm_combine_list = new List<ModelCombineViewModel>(); -- Gitblit v1.9.3