From 3886a51f03ec14650e5b7127539104ad40e496da Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 04 十二月 2024 20:36:12 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyViewCtrl.cs | 233 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 195 insertions(+), 38 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyViewCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyViewCtrl.cs
index 5ff655d..2317462 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyViewCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyViewCtrl.cs
@@ -319,48 +319,48 @@
break;
case HydroCurve.PumpQP:
{
- var pumpViewModel = vm as HydroPumpViewModel;
- var curveQp = vm.HydroInfo.Curves?.Find(x => x.Code == pumpViewModel.CurveQP);
- var dlg = new SetHydroCurveDlg();
- dlg.ReloadDataEvent += (curveInfo) =>
- {
- if (vm.HydroInfo.Curves == null)
- {
- vm.HydroInfo.Curves = new List<Model.HydroCurveInfo>();
- }
- if (curveQp != null)
- {
- vm.HydroInfo.Curves.Remove(curveQp);
- }
- vm.HydroInfo.Curves.Add(curveInfo);
- pumpViewModel.CurveQP = curveInfo.Code;
- UpdateRows();
- };
- dlg.SetBindingData(vm.HydroInfo, curveQp, curvePropAttri.CurveType);
- dlg.ShowDialog();
+ //var pumpViewModel = vm as HydroPumpViewModel;
+ //var curveQp = vm.HydroInfo.Curves?.Find(x => x.Code == pumpViewModel.CurveQP);
+ //var dlg = new SetHydroCurveDlg();
+ //dlg.ReloadDataEvent += (curveInfo) =>
+ //{
+ // if (vm.HydroInfo.Curves == null)
+ // {
+ // vm.HydroInfo.Curves = new List<Model.HydroCurveInfo>();
+ // }
+ // if (curveQp != null)
+ // {
+ // vm.HydroInfo.Curves.Remove(curveQp);
+ // }
+ // vm.HydroInfo.Curves.Add(curveInfo);
+ // pumpViewModel.CurveQP = curveInfo.Code;
+ // UpdateRows();
+ //};
+ //dlg.SetBindingData(vm.HydroInfo, curveQp, curvePropAttri.CurveType);
+ //dlg.ShowDialog();
}
break;
case HydroCurve.PumpQE:
{
- var pumpViewModel = vm as HydroPumpViewModel;
- var curveQe = vm.HydroInfo.Curves?.Find(x => x.Code == pumpViewModel.CurveQE);
- var dlg = new SetHydroCurveDlg();
- dlg.ReloadDataEvent += (curveInfo) =>
- {
- if (vm.HydroInfo.Curves == null)
- {
- vm.HydroInfo.Curves = new List<Model.HydroCurveInfo>();
- }
- if (curveQe != null)
- {
- vm.HydroInfo.Curves.Remove(curveQe);
- }
- vm.HydroInfo.Curves.Add(curveInfo);
- pumpViewModel.CurveQE = curveInfo.Code;
- UpdateRows();
- };
- dlg.SetBindingData(vm.HydroInfo, curveQe, curvePropAttri.CurveType);
- dlg.ShowDialog();
+ //var pumpViewModel = vm as HydroPumpViewModel;
+ //var curveQe = vm.HydroInfo.Curves?.Find(x => x.Code == pumpViewModel.CurveQE);
+ //var dlg = new SetHydroCurveDlg();
+ //dlg.ReloadDataEvent += (curveInfo) =>
+ //{
+ // if (vm.HydroInfo.Curves == null)
+ // {
+ // vm.HydroInfo.Curves = new List<Model.HydroCurveInfo>();
+ // }
+ // if (curveQe != null)
+ // {
+ // vm.HydroInfo.Curves.Remove(curveQe);
+ // }
+ // vm.HydroInfo.Curves.Add(curveInfo);
+ // pumpViewModel.CurveQE = curveInfo.Code;
+ // UpdateRows();
+ //};
+ //dlg.SetBindingData(vm.HydroInfo, curveQe, curvePropAttri.CurveType);
+ //dlg.ShowDialog();
}
break;
case HydroCurve.Valve:
@@ -432,6 +432,163 @@
#endregion
+ #region 闃�闂�
+
+ if (vm is HydroValveViewModel valve)
+ {
+ if (fieldName == nameof(HydroValveViewModel.ValveSetting))
+ {
+ e.Row.Visible = false;
+ }
+ switch (valve.Vmo.ValveType)
+ {
+ case Yw.Hydro.ValveType.PSV:
+ {
+ if (fieldName == nameof(HydroValveViewModel.ValvePress))
+ {
+ e.Row.Visible = true;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveFlow))
+ {
+ e.Row.Visible = false;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveOL))
+ {
+ e.Row.Visible = false;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveQL))
+ {
+ e.Row.Visible = false;
+ }
+ }
+ break;
+ case Yw.Hydro.ValveType.PRV:
+ {
+ if (fieldName == nameof(HydroValveViewModel.ValvePress))
+ {
+ e.Row.Visible = true;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveFlow))
+ {
+ e.Row.Visible = false;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveOL))
+ {
+ e.Row.Visible = false;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveQL))
+ {
+ e.Row.Visible = false;
+ }
+ }
+ break;
+ case Yw.Hydro.ValveType.PBV:
+ {
+ if (fieldName == nameof(HydroValveViewModel.ValvePress))
+ {
+ e.Row.Visible = true;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveFlow))
+ {
+ e.Row.Visible = false;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveOL))
+ {
+ e.Row.Visible = false;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveQL))
+ {
+ e.Row.Visible = false;
+ }
+ }
+ break;
+ case Yw.Hydro.ValveType.FCV:
+ {
+ if (fieldName == nameof(HydroValveViewModel.ValvePress))
+ {
+ e.Row.Visible = false;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveFlow))
+ {
+ e.Row.Visible = true;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveOL))
+ {
+ e.Row.Visible = false;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveQL))
+ {
+ e.Row.Visible = false;
+ }
+ }
+ break;
+ case Yw.Hydro.ValveType.TCV:
+ {
+ if (fieldName == nameof(HydroValveViewModel.ValvePress))
+ {
+ e.Row.Visible = false;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveFlow))
+ {
+ e.Row.Visible = false;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveOL))
+ {
+ e.Row.Visible = true;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveQL))
+ {
+ e.Row.Visible = false;
+ }
+ }
+ break;
+ case Yw.Hydro.ValveType.GPV:
+ {
+ if (fieldName == nameof(HydroValveViewModel.ValvePress))
+ {
+ e.Row.Visible = false;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveFlow))
+ {
+ e.Row.Visible = false;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveOL))
+ {
+ e.Row.Visible = false;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveQL))
+ {
+ e.Row.Visible = true;
+ }
+ }
+ break;
+ case Yw.Hydro.ValveType.CV:
+ {
+ if (fieldName == nameof(HydroValveViewModel.ValvePress))
+ {
+ e.Row.Visible = false;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveFlow))
+ {
+ e.Row.Visible = false;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveOL))
+ {
+ e.Row.Visible = false;
+ }
+ if (fieldName == nameof(HydroValveViewModel.ValveQL))
+ {
+ e.Row.Visible = false;
+ }
+ }
+ break;
+ default: break;
+ }
+ }
+
+
+ #endregion
+
}
//灞炴�у�兼敼鍙�
--
Gitblit v1.9.3