提交修改

duheng

2024-09-20 7d17fabc46e87ea0f0896f760034f4d16a4dfed0

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs

@@ -12,7 +12,6 @@
            InitializeComponent();
            this.PageTitle.Caption = "水力模拟";
            this.PageTitle.HeaderSvgImage = this.svgImg32[0];
            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
        }
@@ -54,6 +53,7 @@
                _hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroRelation.ModelID);
            }
            this.xhsProjectSimulationPropertyCtrl1.SetBindingData(_hydroInfo);
            this.xhsProjectSimulationQ3dCtrl1.SetBindingData(_hydroInfo);
        }

        /// <summary>
@@ -114,6 +114,7 @@
                return;
            }
            this.xhsProjectSimulationHydroCheckFailedCtrl1.SetBindingData(_checkResult.FailedList);
            this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
        }

@@ -132,9 +133,9 @@
                TipFormHelper.ShowSucceed("计算成功！");
                return;
            }
            var dlg = new XhsProjectSimulationHydroCalcuFailedDlg();
            dlg.SetBindingData(_calcuResult.FailedList);
            dlg.ShowDialog();
            this.xhsProjectSimulationHydroCalcuFailedCtrl1.SetBindingData(_calcuResult.FailedList);
            this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
        }

        //水力构件列表
@@ -260,7 +261,49 @@
        //自动匹配
        private void barBtnAllAutoMatching_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var dlg = new AssetsAutoMatchingMainDlg();
            //   _hydroInfo
            var pump = _hydroInfo.Pumps;
            var threelinks = _hydroInfo.Threelinks;
            var aa = new AssetsAutoMatchingInputViewModel();
            foreach (var item in pump)
            {
                aa = new AssetsAutoMatchingInputViewModel
                {
                    PumpMatchingModels = new List<PumpMatchingViewModel>
                    {
             new PumpMatchingViewModel
                {
        RatedH = item.RatedH, // 假设item已经定义并且包含了RatedH等属性
        RatedP = item.RatedP,
        RatedQ = item.RatedQ,
        RatedN = item.RatedN,
        ModelType=item.ModelType,
        DbID=item.DbId,
        DbLocked=item.DbLocked
                }
                     }
                };
            }
            foreach (var item in threelinks)
            {
                aa = new AssetsAutoMatchingInputViewModel
                {
                    ThreeLinkMatchingModels = new List<ThreeLinkMatchingViewModel>
                    {
                        new ThreeLinkMatchingViewModel
                        {
                            Caliber=item.Caliber,
                            Material=item.Material,
                            ModelType=item.ModelType,
                            DbLocked=item.DbLocked,
                            ID=item.ID,
                            Code=item.Code,
                            MinorLoss=item.MinorLoss
                        }
                    }
                };
            }
            var dlg = new AssetsAutoMatchingMainDlg(aa);
            dlg.ShowDialog();
        }

@@ -284,6 +327,5 @@
            _parter = allParterList.Find(x => x.Code == obj);
            ShowProperty();
        }

    }
}