Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
@@ -808,7 +808,7 @@ // } //} //this.docPnlFuncList.Text = modular.ToString(); //this.funcTreeListCtrl1.SetBindingData(modular, surfaceGuid); //this.funcTreeListCtrl1.SetMatching(modular, surfaceGuid); //if (surfaceGuid == null) //{ // var func = this.funcTreeListCtrl1.SetDefault(); WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.cs
@@ -145,7 +145,7 @@ if (!IsExistPage(guid, true)) { // var page = new XhsSchemeMultiMgrPage(); // await page.SetBindingData(obj.ID); // await page.SetMatching(obj.ID); var page = new XhsProjectSimulationMgrPage(); await page.SetBindingData(PrjID); WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/XhsSchemeAssetMgrPage.cs
@@ -81,7 +81,7 @@ private void barButtonItem1_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) { // var dlg = new AssetsAutoMatchingMainDlg(); // dlg.SetBindingData(); // dlg.SetMatching(); // dlg.ShowDialog(); } @@ -116,7 +116,7 @@ private void barBtnAutoMatch_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) { /* var dlg = new AssetsAutoMatchingMainDlg(); dlg.SetBindingData(); dlg.SetMatching(); dlg.ShowDialog(); */ } WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/PumpMatchingViewModel.cs
@@ -1,4 +1,6 @@ namespace HStation.WinFrmUI using HStation.WinFrmUI.Xhs; namespace HStation.WinFrmUI { public class PumpMatchingViewModel { @@ -105,5 +107,12 @@ [DisplayName("修改后额定转速")] [Browsable(true)] public double? AlterRatedN { get; set; } /// <summary> /// 是否匹配成功 /// </summary> [DisplayName("是否匹配成功")] [Browsable(true)] public eMatchingType MatchingType { get; set; } } } WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ElbowsMatchingCtrl.Designer.cs
@@ -32,12 +32,17 @@ gridControl1 = new DevExpress.XtraGrid.GridControl(); elbowsMatchingViewModelBindingSource = new BindingSource(components); gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); colName = new DevExpress.XtraGrid.Columns.GridColumn(); colCode = new DevExpress.XtraGrid.Columns.GridColumn(); colModelType = new DevExpress.XtraGrid.Columns.GridColumn(); colMaterial = new DevExpress.XtraGrid.Columns.GridColumn(); colAlterCaliber = new DevExpress.XtraGrid.Columns.GridColumn(); colAlterMaterial = new DevExpress.XtraGrid.Columns.GridColumn(); colAlterMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn(); colCaliber = new DevExpress.XtraGrid.Columns.GridColumn(); colCode = new DevExpress.XtraGrid.Columns.GridColumn(); colDbLocked = new DevExpress.XtraGrid.Columns.GridColumn(); colMatchingType = new DevExpress.XtraGrid.Columns.GridColumn(); colMaterial = new DevExpress.XtraGrid.Columns.GridColumn(); colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn(); colName = new DevExpress.XtraGrid.Columns.GridColumn(); colModelType = new DevExpress.XtraGrid.Columns.GridColumn(); ((ISupportInitialize)gridControl1).BeginInit(); ((ISupportInitialize)elbowsMatchingViewModelBindingSource).BeginInit(); ((ISupportInitialize)gridView1).BeginInit(); @@ -60,17 +65,42 @@ // // gridView1 // gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colMaterial, colCaliber, colDbLocked }); gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colAlterCaliber, colAlterMaterial, colAlterMinorLoss, colCaliber, colCode, colDbLocked, colMatchingType, colMaterial, colName, colMinorLoss, colModelType }); gridView1.GridControl = gridControl1; gridView1.Name = "gridView1"; gridView1.OptionsView.ShowGroupPanel = false; // // colName // colAlterCaliber // colName.FieldName = "Name"; colName.Name = "colName"; colName.Visible = true; colName.VisibleIndex = 0; colAlterCaliber.FieldName = "AlterCaliber"; colAlterCaliber.Name = "colAlterCaliber"; colAlterCaliber.Visible = true; colAlterCaliber.VisibleIndex = 6; colAlterCaliber.Width = 78; // // colAlterMaterial // colAlterMaterial.FieldName = "AlterMaterial"; colAlterMaterial.Name = "colAlterMaterial"; colAlterMaterial.Visible = true; colAlterMaterial.VisibleIndex = 4; colAlterMaterial.Width = 59; // // colAlterMinorLoss // colAlterMinorLoss.FieldName = "AlterMinorLoss"; colAlterMinorLoss.Name = "colAlterMinorLoss"; colAlterMinorLoss.Visible = true; colAlterMinorLoss.VisibleIndex = 8; colAlterMinorLoss.Width = 78; // // colCaliber // colCaliber.FieldName = "Caliber"; colCaliber.Name = "colCaliber"; colCaliber.Visible = true; colCaliber.VisibleIndex = 5; colCaliber.Width = 78; // // colCode // @@ -78,13 +108,23 @@ colCode.Name = "colCode"; colCode.Visible = true; colCode.VisibleIndex = 1; colCode.Width = 76; // // colModelType // colDbLocked // colModelType.FieldName = "ModelType"; colModelType.Name = "colModelType"; colModelType.Visible = true; colModelType.VisibleIndex = 2; colDbLocked.FieldName = "DbLocked"; colDbLocked.Name = "colDbLocked"; colDbLocked.Visible = true; colDbLocked.VisibleIndex = 9; colDbLocked.Width = 85; // // colMatchingType // colMatchingType.FieldName = "MatchingType"; colMatchingType.Name = "colMatchingType"; colMatchingType.Visible = true; colMatchingType.VisibleIndex = 10; colMatchingType.Width = 78; // // colMaterial // @@ -92,20 +132,31 @@ colMaterial.Name = "colMaterial"; colMaterial.Visible = true; colMaterial.VisibleIndex = 3; colMaterial.Width = 76; // // colCaliber // colMinorLoss // colCaliber.FieldName = "Caliber"; colCaliber.Name = "colCaliber"; colCaliber.Visible = true; colCaliber.VisibleIndex = 4; colMinorLoss.FieldName = "MinorLoss"; colMinorLoss.Name = "colMinorLoss"; colMinorLoss.Visible = true; colMinorLoss.VisibleIndex = 7; colMinorLoss.Width = 78; // // colDbLocked // colName // colDbLocked.FieldName = "DbLocked"; colDbLocked.Name = "colDbLocked"; colDbLocked.Visible = true; colDbLocked.VisibleIndex = 5; colName.FieldName = "Name"; colName.Name = "colName"; colName.Visible = true; colName.VisibleIndex = 0; colName.Width = 76; // // colModelType // colModelType.FieldName = "ModelType"; colModelType.Name = "colModelType"; colModelType.Visible = true; colModelType.VisibleIndex = 2; colModelType.Width = 76; // // ElbowsMatchingCtrl // @@ -125,11 +176,16 @@ private DevExpress.XtraGrid.GridControl gridControl1; private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private BindingSource elbowsMatchingViewModelBindingSource; private DevExpress.XtraGrid.Columns.GridColumn colName; private DevExpress.XtraGrid.Columns.GridColumn colCode; private DevExpress.XtraGrid.Columns.GridColumn colModelType; private DevExpress.XtraGrid.Columns.GridColumn colMaterial; private DevExpress.XtraGrid.Columns.GridColumn colAlterCaliber; private DevExpress.XtraGrid.Columns.GridColumn colAlterMaterial; private DevExpress.XtraGrid.Columns.GridColumn colAlterMinorLoss; private DevExpress.XtraGrid.Columns.GridColumn colCaliber; private DevExpress.XtraGrid.Columns.GridColumn colCode; private DevExpress.XtraGrid.Columns.GridColumn colDbLocked; private DevExpress.XtraGrid.Columns.GridColumn colMatchingType; private DevExpress.XtraGrid.Columns.GridColumn colMaterial; private DevExpress.XtraGrid.Columns.GridColumn colName; private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss; private DevExpress.XtraGrid.Columns.GridColumn colModelType; } } WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ElbowsMatchingCtrl.cs
@@ -12,6 +12,15 @@ private List<ElbowsMatchingViewModel> _allBindingList = null; public void SetBindingData(List<ElbowsMatchingViewModel> elbowsMatchingViewModels) { if (_allBindingList != null) { _allBindingList = elbowsMatchingViewModels; this.elbowsMatchingViewModelBindingSource.DataSource = _allBindingList; } } public List<ElbowsMatchingViewModel> SetBindingData(List<ElbowsMatchingViewModel> inputs, List<AdaptingManageVmo> alllist) { if (inputs == null || inputs.Count == 0) @@ -31,7 +40,6 @@ } } _allBindingList = resultList; this.elbowsMatchingViewModelBindingSource.DataSource = _allBindingList; this.elbowsMatchingViewModelBindingSource.ResetBindings(false); return resultList; } WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/FourLinkMatchingCtrl.Designer.cs
@@ -32,11 +32,18 @@ gridControl1 = new DevExpress.XtraGrid.GridControl(); fourLinkMatchingViewModelBindingSource = new BindingSource(components); gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); colName = new DevExpress.XtraGrid.Columns.GridColumn(); colCode = new DevExpress.XtraGrid.Columns.GridColumn(); colMaterial = new DevExpress.XtraGrid.Columns.GridColumn(); colAlterCaliber = new DevExpress.XtraGrid.Columns.GridColumn(); colAlterMaterial = new DevExpress.XtraGrid.Columns.GridColumn(); colAlterMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn(); colCaliber = new DevExpress.XtraGrid.Columns.GridColumn(); colCode = new DevExpress.XtraGrid.Columns.GridColumn(); colMatchingType = new DevExpress.XtraGrid.Columns.GridColumn(); colMatchingType1 = new DevExpress.XtraGrid.Columns.GridColumn(); colDbLocked = new DevExpress.XtraGrid.Columns.GridColumn(); colMaterial = new DevExpress.XtraGrid.Columns.GridColumn(); colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn(); colModelType = new DevExpress.XtraGrid.Columns.GridColumn(); colName = new DevExpress.XtraGrid.Columns.GridColumn(); ((ISupportInitialize)gridControl1).BeginInit(); ((ISupportInitialize)fourLinkMatchingViewModelBindingSource).BeginInit(); ((ISupportInitialize)gridView1).BeginInit(); @@ -59,31 +66,31 @@ // // gridView1 // gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colMaterial, colCaliber, colDbLocked }); gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colAlterCaliber, colAlterMaterial, colAlterMinorLoss, colCaliber, colCode, colMatchingType, colMatchingType1, colDbLocked, colMaterial, colMinorLoss, colModelType, colName }); gridView1.GridControl = gridControl1; gridView1.Name = "gridView1"; gridView1.OptionsView.ShowGroupPanel = false; // // colName // colAlterCaliber // colName.FieldName = "Name"; colName.Name = "colName"; colName.Visible = true; colName.VisibleIndex = 0; colAlterCaliber.FieldName = "AlterCaliber"; colAlterCaliber.Name = "colAlterCaliber"; colAlterCaliber.Visible = true; colAlterCaliber.VisibleIndex = 4; // // colCode // colAlterMaterial // colCode.FieldName = "Code"; colCode.Name = "colCode"; colCode.Visible = true; colCode.VisibleIndex = 1; colAlterMaterial.FieldName = "AlterMaterial"; colAlterMaterial.Name = "colAlterMaterial"; colAlterMaterial.Visible = true; colAlterMaterial.VisibleIndex = 6; // // colMaterial // colAlterMinorLoss // colMaterial.FieldName = "Material"; colMaterial.Name = "colMaterial"; colMaterial.Visible = true; colMaterial.VisibleIndex = 2; colAlterMinorLoss.FieldName = "AlterMinorLoss"; colAlterMinorLoss.Name = "colAlterMinorLoss"; colAlterMinorLoss.Visible = true; colAlterMinorLoss.VisibleIndex = 8; // // colCaliber // @@ -92,12 +99,61 @@ colCaliber.Visible = true; colCaliber.VisibleIndex = 3; // // colCode // colCode.FieldName = "Code"; colCode.Name = "colCode"; colCode.Visible = true; colCode.VisibleIndex = 1; // // colMatchingType // colMatchingType.FieldName = "MatchingType"; colMatchingType.Name = "colMatchingType"; colMatchingType.Visible = true; colMatchingType.VisibleIndex = 9; // // colMatchingType1 // colMatchingType1.FieldName = "MatchingType"; colMatchingType1.Name = "colMatchingType1"; colMatchingType1.Visible = true; colMatchingType1.VisibleIndex = 11; // // colDbLocked // colDbLocked.FieldName = "DbLocked"; colDbLocked.Name = "colDbLocked"; colDbLocked.Visible = true; colDbLocked.VisibleIndex = 4; colDbLocked.VisibleIndex = 10; // // colMaterial // colMaterial.FieldName = "Material"; colMaterial.Name = "colMaterial"; colMaterial.Visible = true; colMaterial.VisibleIndex = 5; // // colMinorLoss // colMinorLoss.FieldName = "MinorLoss"; colMinorLoss.Name = "colMinorLoss"; colMinorLoss.Visible = true; colMinorLoss.VisibleIndex = 7; // // colModelType // colModelType.FieldName = "ModelType"; colModelType.Name = "colModelType"; colModelType.Visible = true; colModelType.VisibleIndex = 2; // // colName // colName.FieldName = "Name"; colName.Name = "colName"; colName.Visible = true; colName.VisibleIndex = 0; // // FourLinkMatchingCtrl // @@ -116,11 +172,18 @@ private DevExpress.XtraGrid.GridControl gridControl1; private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private DevExpress.XtraGrid.Columns.GridColumn colName; private DevExpress.XtraGrid.Columns.GridColumn colCode; private DevExpress.XtraGrid.Columns.GridColumn colMaterial; private DevExpress.XtraGrid.Columns.GridColumn colCaliber; private DevExpress.XtraGrid.Columns.GridColumn colDbLocked; private BindingSource fourLinkMatchingViewModelBindingSource; private DevExpress.XtraGrid.Columns.GridColumn colAlterCaliber; private DevExpress.XtraGrid.Columns.GridColumn colAlterMaterial; private DevExpress.XtraGrid.Columns.GridColumn colAlterMinorLoss; private DevExpress.XtraGrid.Columns.GridColumn colCaliber; private DevExpress.XtraGrid.Columns.GridColumn colCode; private DevExpress.XtraGrid.Columns.GridColumn colMatchingType; private DevExpress.XtraGrid.Columns.GridColumn colMatchingType1; private DevExpress.XtraGrid.Columns.GridColumn colDbLocked; private DevExpress.XtraGrid.Columns.GridColumn colMaterial; private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss; private DevExpress.XtraGrid.Columns.GridColumn colModelType; private DevExpress.XtraGrid.Columns.GridColumn colName; } } WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/FourLinkMatchingCtrl.cs
@@ -12,7 +12,16 @@ private List<FourLinkMatchingViewModel> _allBindingList = null; public List<FourLinkMatchingViewModel> SetBindingData(List<FourLinkMatchingViewModel> inputs, List<AdaptingManageVmo> alllist) public void SetBindingData(List<FourLinkMatchingViewModel> fourLinkMatchingViewModels) { if (_allBindingList != null) { _allBindingList = fourLinkMatchingViewModels; this.fourLinkMatchingViewModelBindingSource.ResetBindings(false); } } public List<FourLinkMatchingViewModel> SetMatching(List<FourLinkMatchingViewModel> inputs, List<AdaptingManageVmo> alllist) { if (inputs == null || inputs.Count == 0) return null; @@ -31,7 +40,6 @@ } } _allBindingList = resultList; this.fourLinkMatchingViewModelBindingSource.DataSource = _allBindingList; this.fourLinkMatchingViewModelBindingSource.ResetBindings(false); return resultList; } WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/PipeLineMatchingCtrl.Designer.cs
@@ -32,12 +32,17 @@ gridControl1 = new DevExpress.XtraGrid.GridControl(); pipeLineMatchingViewModelBindingSource = new BindingSource(components); gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); colName = new DevExpress.XtraGrid.Columns.GridColumn(); colAlterCaliber = new DevExpress.XtraGrid.Columns.GridColumn(); colAlterMaterial = new DevExpress.XtraGrid.Columns.GridColumn(); colAlterMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn(); colCode = new DevExpress.XtraGrid.Columns.GridColumn(); colMaterial = new DevExpress.XtraGrid.Columns.GridColumn(); colCaliber = new DevExpress.XtraGrid.Columns.GridColumn(); colDbLocked = new DevExpress.XtraGrid.Columns.GridColumn(); colMaterial = new DevExpress.XtraGrid.Columns.GridColumn(); colMatchingType = new DevExpress.XtraGrid.Columns.GridColumn(); colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn(); colModelType = new DevExpress.XtraGrid.Columns.GridColumn(); colName = new DevExpress.XtraGrid.Columns.GridColumn(); ((ISupportInitialize)gridControl1).BeginInit(); ((ISupportInitialize)pipeLineMatchingViewModelBindingSource).BeginInit(); ((ISupportInitialize)gridView1).BeginInit(); @@ -60,17 +65,31 @@ // // gridView1 // gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colMaterial, colCaliber, colDbLocked, colMatchingType }); gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colAlterCaliber, colAlterMaterial, colAlterMinorLoss, colCode, colCaliber, colDbLocked, colMaterial, colMatchingType, colMinorLoss, colModelType, colName }); gridView1.GridControl = gridControl1; gridView1.Name = "gridView1"; gridView1.OptionsView.ShowGroupPanel = false; // // colName // colAlterCaliber // colName.FieldName = "Name"; colName.Name = "colName"; colName.Visible = true; colName.VisibleIndex = 0; colAlterCaliber.FieldName = "AlterCaliber"; colAlterCaliber.Name = "colAlterCaliber"; colAlterCaliber.Visible = true; colAlterCaliber.VisibleIndex = 4; // // colAlterMaterial // colAlterMaterial.FieldName = "AlterMaterial"; colAlterMaterial.Name = "colAlterMaterial"; colAlterMaterial.Visible = true; colAlterMaterial.VisibleIndex = 6; // // colAlterMinorLoss // colAlterMinorLoss.FieldName = "AlterMinorLoss"; colAlterMinorLoss.Name = "colAlterMinorLoss"; colAlterMinorLoss.Visible = true; colAlterMinorLoss.VisibleIndex = 8; // // colCode // @@ -78,13 +97,6 @@ colCode.Name = "colCode"; colCode.Visible = true; colCode.VisibleIndex = 1; // // colMaterial // colMaterial.FieldName = "Material"; colMaterial.Name = "colMaterial"; colMaterial.Visible = true; colMaterial.VisibleIndex = 2; // // colCaliber // @@ -98,14 +110,42 @@ colDbLocked.FieldName = "DbLocked"; colDbLocked.Name = "colDbLocked"; colDbLocked.Visible = true; colDbLocked.VisibleIndex = 4; colDbLocked.VisibleIndex = 9; // // colMaterial // colMaterial.FieldName = "Material"; colMaterial.Name = "colMaterial"; colMaterial.Visible = true; colMaterial.VisibleIndex = 5; // // colMatchingType // colMatchingType.FieldName = "MatchingType"; colMatchingType.Name = "colMatchingType"; colMatchingType.Visible = true; colMatchingType.VisibleIndex = 5; colMatchingType.VisibleIndex = 10; // // colMinorLoss // colMinorLoss.FieldName = "MinorLoss"; colMinorLoss.Name = "colMinorLoss"; colMinorLoss.Visible = true; colMinorLoss.VisibleIndex = 7; // // colModelType // colModelType.FieldName = "ModelType"; colModelType.Name = "colModelType"; colModelType.Visible = true; colModelType.VisibleIndex = 2; // // colName // colName.FieldName = "Name"; colName.Name = "colName"; colName.Visible = true; colName.VisibleIndex = 0; // // PipeLineMatchingCtrl // @@ -124,12 +164,17 @@ private DevExpress.XtraGrid.GridControl gridControl1; private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private DevExpress.XtraGrid.Columns.GridColumn colName; private BindingSource pipeLineMatchingViewModelBindingSource; private DevExpress.XtraGrid.Columns.GridColumn colAlterCaliber; private DevExpress.XtraGrid.Columns.GridColumn colAlterMaterial; private DevExpress.XtraGrid.Columns.GridColumn colAlterMinorLoss; private DevExpress.XtraGrid.Columns.GridColumn colCode; private DevExpress.XtraGrid.Columns.GridColumn colMaterial; private DevExpress.XtraGrid.Columns.GridColumn colCaliber; private DevExpress.XtraGrid.Columns.GridColumn colDbLocked; private BindingSource pipeLineMatchingViewModelBindingSource; private DevExpress.XtraGrid.Columns.GridColumn colMaterial; private DevExpress.XtraGrid.Columns.GridColumn colMatchingType; private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss; private DevExpress.XtraGrid.Columns.GridColumn colModelType; private DevExpress.XtraGrid.Columns.GridColumn colName; } } WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/PipeLineMatchingCtrl.cs
@@ -12,7 +12,16 @@ private List<PipeLineMatchingViewModel> _allBindingList = null; public List<PipeLineMatchingViewModel> SetBindingData(List<PipeLineMatchingViewModel> inputs, List<PipeLineManageVmo> alllist) public void SetBindingData(List<PipeLineMatchingViewModel> pipeLineMatchingViewModels) { if (_allBindingList != null) { _allBindingList = pipeLineMatchingViewModels; this.pipeLineMatchingViewModelBindingSource.DataSource = _allBindingList; } } public List<PipeLineMatchingViewModel> SetMatching(List<PipeLineMatchingViewModel> inputs, List<PipeLineManageVmo> alllist) { if (inputs == null) { @@ -31,7 +40,6 @@ } } _allBindingList = finishList; this.pipeLineMatchingViewModelBindingSource.DataSource = _allBindingList; this.pipeLineMatchingViewModelBindingSource.ResetBindings(false); return finishList; } WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/PumpMatchingCtrl.Designer.cs
@@ -30,17 +30,24 @@ { components = new Container(); gridControl1 = new DevExpress.XtraGrid.GridControl(); pumpMatchingViewModelBindingSource = new BindingSource(components); gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); pumpMatchingViewModelBindingSource = new BindingSource(components); colName = new DevExpress.XtraGrid.Columns.GridColumn(); colCode = new DevExpress.XtraGrid.Columns.GridColumn(); colModelType = new DevExpress.XtraGrid.Columns.GridColumn(); colRatedP = new DevExpress.XtraGrid.Columns.GridColumn(); colRatedQ = new DevExpress.XtraGrid.Columns.GridColumn(); colRatedH = new DevExpress.XtraGrid.Columns.GridColumn(); colRatedN = new DevExpress.XtraGrid.Columns.GridColumn(); colRatedQ = new DevExpress.XtraGrid.Columns.GridColumn(); colRatedQ1 = new DevExpress.XtraGrid.Columns.GridColumn(); colDbLocked = new DevExpress.XtraGrid.Columns.GridColumn(); colAlterRatedP = new DevExpress.XtraGrid.Columns.GridColumn(); colAlterRatedQ = new DevExpress.XtraGrid.Columns.GridColumn(); colAlterRatedH = new DevExpress.XtraGrid.Columns.GridColumn(); colAlterRatedN = new DevExpress.XtraGrid.Columns.GridColumn(); colMatchingType = new DevExpress.XtraGrid.Columns.GridColumn(); ((ISupportInitialize)gridControl1).BeginInit(); ((ISupportInitialize)pumpMatchingViewModelBindingSource).BeginInit(); ((ISupportInitialize)gridView1).BeginInit(); ((ISupportInitialize)pumpMatchingViewModelBindingSource).BeginInit(); SuspendLayout(); // // gridControl1 @@ -54,16 +61,16 @@ gridControl1.TabIndex = 0; gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 }); // // pumpMatchingViewModelBindingSource // pumpMatchingViewModelBindingSource.DataSource = typeof(PumpMatchingViewModel); // // gridView1 // gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colRatedH, colRatedN, colRatedQ, colRatedQ1, colDbLocked }); gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colRatedP, colRatedQ, colRatedH, colRatedN, colDbLocked, colAlterRatedP, colAlterRatedQ, colAlterRatedH, colAlterRatedN, colMatchingType }); gridView1.GridControl = gridControl1; gridView1.Name = "gridView1"; gridView1.OptionsView.ShowGroupPanel = false; // // pumpMatchingViewModelBindingSource // pumpMatchingViewModelBindingSource.DataSource = typeof(PumpMatchingViewModel); // // colName // @@ -72,40 +79,89 @@ colName.Visible = true; colName.VisibleIndex = 0; // // colRatedH // colCode // colRatedH.FieldName = "RatedH"; colRatedH.Name = "colRatedH"; colRatedH.Visible = true; colRatedH.VisibleIndex = 1; colCode.FieldName = "Code"; colCode.Name = "colCode"; colCode.Visible = true; colCode.VisibleIndex = 1; // // colRatedN // colModelType // colRatedN.FieldName = "RatedN"; colRatedN.Name = "colRatedN"; colRatedN.Visible = true; colRatedN.VisibleIndex = 2; colModelType.FieldName = "ModelType"; colModelType.Name = "colModelType"; colModelType.Visible = true; colModelType.VisibleIndex = 2; // // colRatedP // colRatedP.FieldName = "RatedP"; colRatedP.Name = "colRatedP"; colRatedP.Visible = true; colRatedP.VisibleIndex = 3; // // colRatedQ // colRatedQ.FieldName = "RatedQ"; colRatedQ.Name = "colRatedQ"; colRatedQ.Visible = true; colRatedQ.VisibleIndex = 3; colRatedQ.VisibleIndex = 4; // // colRatedQ1 // colRatedH // colRatedQ1.FieldName = "RatedQ"; colRatedQ1.Name = "colRatedQ1"; colRatedQ1.Visible = true; colRatedQ1.VisibleIndex = 4; colRatedH.FieldName = "RatedH"; colRatedH.Name = "colRatedH"; colRatedH.Visible = true; colRatedH.VisibleIndex = 5; // // colRatedN // colRatedN.FieldName = "RatedN"; colRatedN.Name = "colRatedN"; colRatedN.Visible = true; colRatedN.VisibleIndex = 6; // // colDbLocked // colDbLocked.FieldName = "DbLocked"; colDbLocked.Name = "colDbLocked"; colDbLocked.Visible = true; colDbLocked.VisibleIndex = 5; colDbLocked.VisibleIndex = 7; // // colAlterRatedP // colAlterRatedP.FieldName = "AlterRatedP"; colAlterRatedP.Name = "colAlterRatedP"; colAlterRatedP.Visible = true; colAlterRatedP.VisibleIndex = 8; // // colAlterRatedQ // colAlterRatedQ.FieldName = "AlterRatedQ"; colAlterRatedQ.Name = "colAlterRatedQ"; colAlterRatedQ.Visible = true; colAlterRatedQ.VisibleIndex = 9; // // colAlterRatedH // colAlterRatedH.FieldName = "AlterRatedH"; colAlterRatedH.Name = "colAlterRatedH"; colAlterRatedH.Visible = true; colAlterRatedH.VisibleIndex = 10; // // colAlterRatedN // colAlterRatedN.FieldName = "AlterRatedN"; colAlterRatedN.Name = "colAlterRatedN"; colAlterRatedN.Visible = true; colAlterRatedN.VisibleIndex = 11; // // colMatchingType // colMatchingType.FieldName = "MatchingType"; colMatchingType.Name = "colMatchingType"; colMatchingType.Visible = true; colMatchingType.VisibleIndex = 12; // // PumpMatchingCtrl // @@ -115,8 +171,8 @@ Name = "PumpMatchingCtrl"; Size = new Size(1035, 503); ((ISupportInitialize)gridControl1).EndInit(); ((ISupportInitialize)pumpMatchingViewModelBindingSource).EndInit(); ((ISupportInitialize)gridView1).EndInit(); ((ISupportInitialize)pumpMatchingViewModelBindingSource).EndInit(); ResumeLayout(false); } @@ -126,10 +182,17 @@ private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private BindingSource pumpMatchingViewModelBindingSource; private DevExpress.XtraGrid.Columns.GridColumn colName; private DevExpress.XtraGrid.Columns.GridColumn colCode; private DevExpress.XtraGrid.Columns.GridColumn colModelType; private DevExpress.XtraGrid.Columns.GridColumn colRatedP; private DevExpress.XtraGrid.Columns.GridColumn colRatedQ; private DevExpress.XtraGrid.Columns.GridColumn colRatedH; private DevExpress.XtraGrid.Columns.GridColumn colRatedN; private DevExpress.XtraGrid.Columns.GridColumn colRatedQ; private DevExpress.XtraGrid.Columns.GridColumn colRatedQ1; private DevExpress.XtraGrid.Columns.GridColumn colDbLocked; private DevExpress.XtraGrid.Columns.GridColumn colAlterRatedP; private DevExpress.XtraGrid.Columns.GridColumn colAlterRatedQ; private DevExpress.XtraGrid.Columns.GridColumn colAlterRatedH; private DevExpress.XtraGrid.Columns.GridColumn colAlterRatedN; private DevExpress.XtraGrid.Columns.GridColumn colMatchingType; } } WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/PumpMatchingCtrl.cs
@@ -12,7 +12,13 @@ private List<PumpMatchingViewModel> _allBindingList = null; public async Task<List<PumpMatchingViewModel>> SetBindingData(List<PumpMatchingViewModel> pumpMatchingViewModel, List<PumpMainVmo> pumpMainVmos) public void SetBindingData(List<PumpMatchingViewModel> pumpMatchingViewModel) { _allBindingList = pumpMatchingViewModel; this.pumpMatchingViewModelBindingSource.DataSource = _allBindingList; } public async Task<List<PumpMatchingViewModel>> SetMatching(List<PumpMatchingViewModel> pumpMatchingViewModel, List<PumpMainVmo> pumpMainVmos) { List<PumpMatchingViewModel> _allBindingList = new List<PumpMatchingViewModel>(); if (pumpMatchingViewModel == null) @@ -21,7 +27,7 @@ { var result = await AsstesAutoMatchingHelper.PumpMatching(item, pumpMainVmos); } this.pumpMatchingViewModelBindingSource.DataSource = _allBindingList; this.pumpMatchingViewModelBindingSource.ResetBindings(false); return _allBindingList; } } WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ThreeLinkMatchingCtrl.cs
@@ -14,7 +14,16 @@ private List<ThreeLinkMatchingViewModel> _allBindingList = null; public List<ThreeLinkMatchingViewModel> SetBindingData(List<ThreeLinkMatchingViewModel> inputs, List<AdaptingManageVmo> alllist) public void SetBindingData(List<ThreeLinkMatchingViewModel> threeLinkMatchingViewModels) { if (threeLinkMatchingViewModels != null) { _allBindingList = threeLinkMatchingViewModels; this.threeLinkMatchingViewModelBindingSource.DataSource = _allBindingList; } } public List<ThreeLinkMatchingViewModel> SetMatching(List<ThreeLinkMatchingViewModel> inputs, List<AdaptingManageVmo> alllist) { if (inputs == null || inputs.Count == 0) return null; @@ -33,7 +42,6 @@ } } _allBindingList = resultList; this.threeLinkMatchingViewModelBindingSource.DataSource = _allBindingList; this.threeLinkMatchingViewModelBindingSource.ResetBindings(false); return resultList; } WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ValveMatchingCtrl.Designer.cs
@@ -32,13 +32,17 @@ gridControl1 = new DevExpress.XtraGrid.GridControl(); valveMatchingViewModelBindingSource = new BindingSource(components); gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); colName = new DevExpress.XtraGrid.Columns.GridColumn(); colCode = new DevExpress.XtraGrid.Columns.GridColumn(); colMaterial = new DevExpress.XtraGrid.Columns.GridColumn(); colAlterCaliber = new DevExpress.XtraGrid.Columns.GridColumn(); colAlterMaterial = new DevExpress.XtraGrid.Columns.GridColumn(); colAlterMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn(); colCaliber = new DevExpress.XtraGrid.Columns.GridColumn(); colCode = new DevExpress.XtraGrid.Columns.GridColumn(); colDbLocked = new DevExpress.XtraGrid.Columns.GridColumn(); colMatchingType = new DevExpress.XtraGrid.Columns.GridColumn(); colLossCoefficient = new DevExpress.XtraGrid.Columns.GridColumn(); colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn(); colModelType = new DevExpress.XtraGrid.Columns.GridColumn(); colName = new DevExpress.XtraGrid.Columns.GridColumn(); colMaterial = new DevExpress.XtraGrid.Columns.GridColumn(); ((ISupportInitialize)gridControl1).BeginInit(); ((ISupportInitialize)valveMatchingViewModelBindingSource).BeginInit(); ((ISupportInitialize)gridView1).BeginInit(); @@ -61,17 +65,38 @@ // // gridView1 // gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colMaterial, colCaliber, colLossCoefficient, colDbLocked, colMatchingType }); gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colAlterCaliber, colAlterMaterial, colAlterMinorLoss, colCaliber, colCode, colDbLocked, colMatchingType, colMinorLoss, colModelType, colName, colMaterial }); gridView1.GridControl = gridControl1; gridView1.Name = "gridView1"; gridView1.OptionsView.ShowGroupPanel = false; // // colName // colAlterCaliber // colName.FieldName = "Name"; colName.Name = "colName"; colName.Visible = true; colName.VisibleIndex = 0; colAlterCaliber.FieldName = "AlterCaliber"; colAlterCaliber.Name = "colAlterCaliber"; colAlterCaliber.Visible = true; colAlterCaliber.VisibleIndex = 6; // // colAlterMaterial // colAlterMaterial.FieldName = "AlterMaterial"; colAlterMaterial.Name = "colAlterMaterial"; colAlterMaterial.Visible = true; colAlterMaterial.VisibleIndex = 4; // // colAlterMinorLoss // colAlterMinorLoss.FieldName = "AlterMinorLoss"; colAlterMinorLoss.Name = "colAlterMinorLoss"; colAlterMinorLoss.Visible = true; colAlterMinorLoss.VisibleIndex = 8; // // colCaliber // colCaliber.FieldName = "Caliber"; colCaliber.Name = "colCaliber"; colCaliber.Visible = true; colCaliber.VisibleIndex = 5; // // colCode // @@ -80,40 +105,47 @@ colCode.Visible = true; colCode.VisibleIndex = 1; // // colMaterial // colMaterial.FieldName = "Material"; colMaterial.Name = "colMaterial"; colMaterial.Visible = true; colMaterial.VisibleIndex = 2; // // colCaliber // colCaliber.FieldName = "Caliber"; colCaliber.Name = "colCaliber"; colCaliber.Visible = true; colCaliber.VisibleIndex = 3; // // colDbLocked // colDbLocked.FieldName = "DbLocked"; colDbLocked.Name = "colDbLocked"; colDbLocked.Visible = true; colDbLocked.VisibleIndex = 4; colDbLocked.VisibleIndex = 9; // // colMatchingType // colMatchingType.FieldName = "MatchingType"; colMatchingType.Name = "colMatchingType"; colMatchingType.Visible = true; colMatchingType.VisibleIndex = 5; colMatchingType.VisibleIndex = 10; // // colLossCoefficient // colMinorLoss // colLossCoefficient.FieldName = "LossCoefficient"; colLossCoefficient.Name = "colLossCoefficient"; colLossCoefficient.Visible = true; colLossCoefficient.VisibleIndex = 6; colMinorLoss.FieldName = "MinorLoss"; colMinorLoss.Name = "colMinorLoss"; colMinorLoss.Visible = true; colMinorLoss.VisibleIndex = 7; // // colModelType // colModelType.FieldName = "ModelType"; colModelType.Name = "colModelType"; colModelType.Visible = true; colModelType.VisibleIndex = 2; // // colName // colName.FieldName = "Name"; colName.Name = "colName"; colName.Visible = true; colName.VisibleIndex = 0; // // colMaterial // colMaterial.FieldName = "Material"; colMaterial.Name = "colMaterial"; colMaterial.Visible = true; colMaterial.VisibleIndex = 3; // // ValveMatchingCtrl // @@ -133,12 +165,16 @@ private DevExpress.XtraGrid.GridControl gridControl1; private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private BindingSource valveMatchingViewModelBindingSource; private DevExpress.XtraGrid.Columns.GridColumn colName; private DevExpress.XtraGrid.Columns.GridColumn colCode; private DevExpress.XtraGrid.Columns.GridColumn colMaterial; private DevExpress.XtraGrid.Columns.GridColumn colAlterCaliber; private DevExpress.XtraGrid.Columns.GridColumn colAlterMaterial; private DevExpress.XtraGrid.Columns.GridColumn colAlterMinorLoss; private DevExpress.XtraGrid.Columns.GridColumn colCaliber; private DevExpress.XtraGrid.Columns.GridColumn colCode; private DevExpress.XtraGrid.Columns.GridColumn colDbLocked; private DevExpress.XtraGrid.Columns.GridColumn colLossCoefficient; private DevExpress.XtraGrid.Columns.GridColumn colMatchingType; private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss; private DevExpress.XtraGrid.Columns.GridColumn colModelType; private DevExpress.XtraGrid.Columns.GridColumn colName; private DevExpress.XtraGrid.Columns.GridColumn colMaterial; } } WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ValveMatchingCtrl.cs
@@ -12,8 +12,19 @@ private List<ValveMatchingViewModel> _allBindingList = null; public List<ValveMatchingViewModel> SetBindingData(List<ValveMatchingViewModel> inputs, List<ValveMainVmo> alllist) public void SetBindingData(List<ValveMatchingViewModel> valveMatchingViewModels) { if (_allBindingList != null) { _allBindingList = valveMatchingViewModels; this.valveMatchingViewModelBindingSource.DataSource = _allBindingList; } } public List<ValveMatchingViewModel> SetMatching(List<ValveMatchingViewModel> inputs, List<ValveMainVmo> alllist) { if (inputs == null) return null; var finishList = new List<ValveMatchingViewModel>(); foreach (var item in inputs) { @@ -27,7 +38,6 @@ } } _allBindingList = finishList; this.valveMatchingViewModelBindingSource.DataSource = _allBindingList; this.valveMatchingViewModelBindingSource.ResetBindings(false); return finishList; } WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsAutoMatchingMainDlg.Designer.cs
@@ -203,7 +203,7 @@ Controls.Add(layoutControl1); Name = "AssetsAutoMatchingMainDlg"; StartPosition = FormStartPosition.CenterScreen; Text = "泵型号选择"; Text = "自动匹配"; ((ISupportInitialize)layoutControl1).EndInit(); layoutControl1.ResumeLayout(false); ((ISupportInitialize)navigationFrame1).EndInit(); WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsAutoMatchingMainDlg.cs
@@ -2,9 +2,8 @@ { public partial class AssetsAutoMatchingMainDlg : DevExpress.XtraEditors.XtraForm { public AssetsAutoMatchingMainDlg(AssetsAutoMatchingInputViewModel assetsAutoMatchingInputViewModel) public AssetsAutoMatchingMainDlg() { _assetsAutoMatching = assetsAutoMatchingInputViewModel; InitializeComponent(); } @@ -12,6 +11,12 @@ private AssetsAutoMatchingInputViewModel _assetsAutoMatching = null; public void SetBindingData(AssetsAutoMatchingInputViewModel assetsAutoMatchingInputViewModel) { _assetsAutoMatching = assetsAutoMatchingInputViewModel; this.AssetsMainChoicePage.SetBindingData(_assetsAutoMatching); } //完成 private void btnComplete_Click(object sender, EventArgs e) { WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsMainChoicePage.Designer.cs
@@ -80,6 +80,7 @@ tabNavigationPage1.ImageOptions.SvgImageSize = new Size(20, 20); tabNavigationPage1.ItemShowMode = DevExpress.XtraBars.Navigation.ItemShowMode.ImageAndText; tabNavigationPage1.Name = "tabNavigationPage1"; tabNavigationPage1.PageVisible = false; tabNavigationPage1.Properties.ShowMode = DevExpress.XtraBars.Navigation.ItemShowMode.ImageAndText; tabNavigationPage1.Size = new Size(960, 502); // WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsMainChoicePage.cs
@@ -15,6 +15,16 @@ private BLL.ValveMain _valveMain = null; public void SetBindingData(AssetsAutoMatchingInputViewModel inputViewModel) { this.elbowsMatchingCtrl1.SetBindingData(inputViewModel.ElbowsMatchingModels); this.pipeLineMatchingCtrl1.SetBindingData(inputViewModel.PipeLineMatchingModels); this.pumpMatchingCtrl1.SetBindingData(inputViewModel.PumpMatchingModels); this.threeLinkMatchingCtrl1.SetBindingData(inputViewModel.ThreeLinkMatchingModels); this.fourLinkMatchingCtrl1.SetBindingData(inputViewModel.FourLinkMatchingModels); this.valveMatchingCtrl1.SetBindingData(inputViewModel.ValveMatchingModels); } /// <summary> /// 初始化 /// </summary> @@ -30,15 +40,15 @@ var allValve = await _valveMain.GetAll(); var assetsAutoMatching = new AssetsAutoMatchingInputViewModel(); //泵匹配 var pumpMatching = await this.pumpMatchingCtrl1.SetBindingData(input.PumpMatchingModels, allPump); var pumpMatching = await this.pumpMatchingCtrl1.SetMatching(input.PumpMatchingModels, allPump); //三通匹配 var threeLinkMatching = this.threeLinkMatchingCtrl1.SetBindingData(input.ThreeLinkMatchingModels, allAdapting); var threeLinkMatching = this.threeLinkMatchingCtrl1.SetMatching(input.ThreeLinkMatchingModels, allAdapting); //四通匹配 var fourLinkMatching = this.fourLinkMatchingCtrl1.SetBindingData(input.FourLinkMatchingModels, allAdapting); var fourLinkMatching = this.fourLinkMatchingCtrl1.SetMatching(input.FourLinkMatchingModels, allAdapting); //管道匹配 var PipeLineMatching = this.pipeLineMatchingCtrl1.SetBindingData(input.PipeLineMatchingModels, allPipeLine); var PipeLineMatching = this.pipeLineMatchingCtrl1.SetMatching(input.PipeLineMatchingModels, allPipeLine); //阀门匹配 var ValveMatching = this.valveMatchingCtrl1.SetBindingData(input.ValveMatchingModels, allValve); var ValveMatching = this.valveMatchingCtrl1.SetMatching(input.ValveMatchingModels, allValve); assetsAutoMatching.PumpMatchingModels = pumpMatching; assetsAutoMatching.ThreeLinkMatchingModels = threeLinkMatching; return assetsAutoMatching; WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
@@ -97,7 +97,7 @@ ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False; ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False; ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages; ribbonControl1.Size = new Size(1161, 128); ribbonControl1.Size = new Size(1161, 101); ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden; // // barBtnHydroCheck @@ -240,12 +240,12 @@ tabPane1.Controls.Add(pageBimface); tabPane1.Controls.Add(pageQ3d); tabPane1.Dock = DockStyle.Fill; tabPane1.Location = new Point(0, 128); tabPane1.Location = new Point(0, 101); tabPane1.Name = "tabPane1"; tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { pageBimface, pageQ3d }); tabPane1.RegularSize = new Size(886, 208); tabPane1.RegularSize = new Size(886, 235); tabPane1.SelectedPage = pageBimface; tabPane1.Size = new Size(886, 208); tabPane1.Size = new Size(886, 235); tabPane1.TabIndex = 1; tabPane1.Text = "tabPane1"; // @@ -254,14 +254,14 @@ pageBimface.Caption = "三维模型"; pageBimface.Controls.Add(xhsProjectSimulationBimfaceCtrl1); pageBimface.Name = "pageBimface"; pageBimface.Size = new Size(886, 175); pageBimface.Size = new Size(886, 202); // // xhsProjectSimulationBimfaceCtrl1 // xhsProjectSimulationBimfaceCtrl1.Dock = DockStyle.Fill; xhsProjectSimulationBimfaceCtrl1.Location = new Point(0, 0); xhsProjectSimulationBimfaceCtrl1.Name = "xhsProjectSimulationBimfaceCtrl1"; xhsProjectSimulationBimfaceCtrl1.Size = new Size(886, 175); xhsProjectSimulationBimfaceCtrl1.Size = new Size(886, 202); xhsProjectSimulationBimfaceCtrl1.TabIndex = 0; xhsProjectSimulationBimfaceCtrl1.ClickParterEvent += xhsProjectSimulationBimfaceCtrl1_ClickParterEvent; // @@ -291,10 +291,10 @@ docPnlProperty.Controls.Add(dockPanel1_Container); docPnlProperty.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right; docPnlProperty.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18"); docPnlProperty.Location = new Point(886, 128); docPnlProperty.Location = new Point(886, 101); docPnlProperty.Name = "docPnlProperty"; docPnlProperty.OriginalSize = new Size(275, 200); docPnlProperty.Size = new Size(275, 960); docPnlProperty.Size = new Size(275, 987); docPnlProperty.Text = "属性"; // // dockPanel1_Container @@ -302,7 +302,7 @@ dockPanel1_Container.Controls.Add(xhsProjectSimulationPropertyCtrl1); dockPanel1_Container.Location = new Point(4, 26); dockPanel1_Container.Name = "dockPanel1_Container"; dockPanel1_Container.Size = new Size(268, 931); dockPanel1_Container.Size = new Size(268, 958); dockPanel1_Container.TabIndex = 0; // // xhsProjectSimulationPropertyCtrl1 @@ -310,7 +310,7 @@ xhsProjectSimulationPropertyCtrl1.Dock = DockStyle.Fill; xhsProjectSimulationPropertyCtrl1.Location = new Point(0, 0); xhsProjectSimulationPropertyCtrl1.Name = "xhsProjectSimulationPropertyCtrl1"; xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 931); xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 958); xhsProjectSimulationPropertyCtrl1.TabIndex = 0; xhsProjectSimulationPropertyCtrl1.GetHydroInfoEvent += xhsProjectSimulationPropertyCtrl1_GetHydroInfoEvent; // @@ -320,7 +320,7 @@ docPnlHydroParterList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom; docPnlHydroParterList.FloatVertical = true; docPnlHydroParterList.ID = new Guid("facc1bde-3cf7-455c-b59c-8377daa6b90e"); docPnlHydroParterList.Location = new Point(0, 797); docPnlHydroParterList.Location = new Point(0, 572); docPnlHydroParterList.Name = "docPnlHydroParterList"; docPnlHydroParterList.OriginalSize = new Size(200, 291); docPnlHydroParterList.Size = new Size(886, 291); @@ -350,7 +350,7 @@ docPnlHydroCalcu.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom; docPnlHydroCalcu.FloatVertical = true; docPnlHydroCalcu.ID = new Guid("ac7055c0-e9fe-40c2-bf51-83dde5710cd4"); docPnlHydroCalcu.Location = new Point(0, 561); docPnlHydroCalcu.Location = new Point(0, 336); docPnlHydroCalcu.Name = "docPnlHydroCalcu"; docPnlHydroCalcu.OriginalSize = new Size(200, 236); docPnlHydroCalcu.Size = new Size(886, 236); @@ -414,10 +414,10 @@ AutoScaleDimensions = new SizeF(7F, 14F); AutoScaleMode = AutoScaleMode.Font; Controls.Add(tabPane1); Controls.Add(docPnlHydroCheck); Controls.Add(docPnlHydroCalcu); Controls.Add(docPnlHydroParterList); Controls.Add(docPnlProperty); Controls.Add(docPnlHydroCheck); Controls.Add(ribbonControl1); Margin = new Padding(2); Name = "XhsProjectSimulationCorePage"; WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -254,14 +254,19 @@ return; } _hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(id); //this.xhsProjectSimulationPropertyCtrl1.SetBindingData(_hydroInfo); //this.xhsProjectSimulationPropertyCtrl1.SetMatching(_hydroInfo); TipFormHelper.ShowSucceed("保存成功！"); } //自动匹配 private void barBtnAllAutoMatching_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) { var dlg = new AssetsAutoMatchingMainDlg(new AssetsAutoMatchingInputViewModel()); var dlg = new AssetsAutoMatchingMainDlg(); // dlg.SetBindingData(); dlg.RelaodEvent += (rhs) => { return false; }; dlg.ShowDialog(); } @@ -291,7 +296,5 @@ await this.xhsProjectSimulationBimfaceCtrl1.SetSelectedComponents(new List<string>() { parter.Code }); ShowProperty(); } } } WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/XhsProjectSimulationMgrPage.cs
@@ -48,7 +48,7 @@ { _project = await BLLFactory<HStation.BLL.XhsProject>.Instance.GetByID(projectId); await SetBindingData(_project); //this.xhsSchemeMgrListCtrl1.SetBindingData(projectId); //this.xhsSchemeMgrListCtrl1.SetMatching(projectId); //_project = await new BLL.XhsProjectStd().GetByID(projectId); //this.PageTitle.Caption = //var projectSite = await new BLL.XhsProjectSiteStd().GetDefaultByProjectID(_project.ID);
