From 1dd158434a41627a6684cd630b2696fb83b1e3d6 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期四, 19 十二月 2024 13:23:04 +0800 Subject: [PATCH] 流量计整改 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs index 15ebb19..e1fa571 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs @@ -231,26 +231,26 @@ break; case Yw.Hydro.ParterCatalog.Meter: { - //var meterViewModel = vm as HydroMeterViewModel; - //var input = HydroMatchingHelper.Create(meterViewModel); - //var dlg = new SimulationMeterSingleMatchingDlg(); - //dlg.ReloadDataEvent += (output) => - //{ - // HydroMatchingHelper.Apply(meterViewModel, output); - // this.hydroVisualPropertyCtrl1.UpdateRows(); - // this.PropertyValueChangedEvent?.Invoke(vm.Vmo); - // this.MarkPropertyValueChangedEvent?.Invoke(vm.Vmo); - // this.GradingPropertyValueChangedEvent?.Invoke(vm.Vmo); - //}; - //dlg.SetBindingData(input); - //dlg.ShowDialog(); + var meterViewModel = vm as HydroMeterViewModel; + var input = HydroMatchingHelper.Create(meterViewModel); + var dlg = new AssetsMeterSingleMatchingDlg(); + dlg.ReloadDataEvent += (output) => + { + HydroMatchingHelper.Apply(meterViewModel, output); + this.hydroVisualPropertyCtrl1.UpdateRows(); + this.PropertyValueChangedEvent?.Invoke(vm.Vmo); + this.MarkPropertyValueChangedEvent?.Invoke(vm.Vmo); + this.GradingPropertyValueChangedEvent?.Invoke(vm.Vmo); + }; + dlg.SetBindingData(input); + dlg.ShowDialog(); } break; case Yw.Hydro.ParterCatalog.Flowmeter: { var flowmeterViewModel = vm as HydroFlowmeterViewModel; var input = HydroMatchingHelper.Create(flowmeterViewModel); - var dlg = new SimulationFlowmeterSingleMatchingDlg(); + var dlg = new AssetsFlowmeterSingleMatchingDlg(); dlg.ReloadDataEvent += (output) => { HydroMatchingHelper.Apply(flowmeterViewModel, output); -- Gitblit v1.9.3