Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj.user
@@ -20,4 +20,9 @@ <SubType>Form</SubType> </Compile> </ItemGroup> <ItemGroup> <EmbeddedResource Update="Login\LoginFrm.resx"> <SubType>Designer</SubType> </EmbeddedResource> </ItemGroup> </Project> Desktop/HStation.Desktop.Xhs.Core/Login/LoginFrm.resx
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.cs
@@ -48,11 +48,14 @@ { var alllist = await _bll.GetByPumpSeriesID(obj); _allBindingList.Clear(); if (alllist != null) { foreach (var item in alllist) { _allBindingList.Add(new AssetsPumpMainViewModel(item)); } } } else { var idlist = await new BLL.AssetsPumpGroupAndMainMapping().GetByGroupID(obj); WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddAssetsValveMainDlg.Designer.cs
@@ -159,7 +159,7 @@ txtCaliber.TabIndex = 4; txtCaliber.EditValueChanged += txtCaliber_EditValueChanged; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditAssetsValveMainDlg.Designer.cs
@@ -158,7 +158,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/ViewAssetsValveMainDlg.Designer.cs
@@ -151,7 +151,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(76, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/AddAssetsValveFactorDlg.Designer.cs
@@ -120,7 +120,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/EditAssetsValveFactorDlg.Designer.cs
@@ -120,7 +120,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/ViewAssetsValveFactorDlg.Designer.cs
@@ -108,7 +108,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(76, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddAssetsPipeMainDlg.Designer.cs
@@ -113,7 +113,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(107, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditAssetsPipeMainDlg.Designer.cs
@@ -121,7 +121,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(107, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/ViewAssetsPipeMainDlg.Designer.cs
@@ -116,7 +116,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(100, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/AddAssetsElbowMainDlg.Designer.cs
@@ -189,7 +189,7 @@ txtCaliber.TabIndex = 4; txtCaliber.EditValueChanged += txtCaliber_EditValueChanged; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditAssetsElbowMainDlg.Designer.cs
@@ -188,7 +188,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ViewAssetsElbowMainDlg.Designer.cs
@@ -161,7 +161,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(76, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ViewAssetsElbowMainDlg.cs
@@ -1,4 +1,6 @@ namespace HStation.WinFrmUI using HStation.Assets; namespace HStation.WinFrmUI { public partial class ViewAssetsElbowMainDlg : DevExpress.XtraEditors.XtraForm { @@ -29,6 +31,7 @@ this.txtFlags.EditValue = Yw.Untity.FlagsHelper.ToString(vmo.Flags); this.txtTagName.EditValue = vmo.TagName; this.txtDescription.EditValue = vmo.Description; this.imageComboBoxEditConnectlenght.Properties.AddEnum(typeof(eElbowType)); this.imageComboBoxEditConnectlenght.EditValue = vmo.ElbowType; this.txtAngle.EditValue = vmo.Angle; } WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/AddAssetsElbowFactorDlg.Designer.cs
@@ -125,7 +125,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 2; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/EditAssetsElbowFactorDlg.Designer.cs
@@ -125,7 +125,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/ViewAssetsElbowFactorDlg.Designer.cs
@@ -113,7 +113,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(76, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddAssetsThreelinkMainDlg.Designer.cs
@@ -126,7 +126,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(131, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/EditAssetsThreelinkMainDlg.Designer.cs
@@ -126,7 +126,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(131, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ViewAssetsThreelinkMainDlg.Designer.cs
@@ -45,9 +45,9 @@ layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); ((ISupportInitialize)layoutControl1).BeginInit(); layoutControl1.SuspendLayout(); ((ISupportInitialize)textEditBranchThroughCoefficient.Properties).BeginInit(); @@ -66,9 +66,9 @@ ((ISupportInitialize)layoutControlItem9).BeginInit(); ((ISupportInitialize)layoutControlItem4).BeginInit(); ((ISupportInitialize)layoutControlItem13).BeginInit(); ((ISupportInitialize)layoutControlItem8).BeginInit(); ((ISupportInitialize)layoutControlItem3).BeginInit(); ((ISupportInitialize)layoutControlItem2).BeginInit(); ((ISupportInitialize)layoutControlItem8).BeginInit(); SuspendLayout(); // // layoutControl1 @@ -251,15 +251,6 @@ layoutControlItem13.Text = "口径:"; layoutControlItem13.TextSize = new Size(100, 14); // // layoutControlItem8 // layoutControlItem8.Control = txtFlags; layoutControlItem8.Location = new Point(322, 72); layoutControlItem8.Name = "layoutControlItem8"; layoutControlItem8.Size = new Size(323, 24); layoutControlItem8.Text = "标签:"; layoutControlItem8.TextSize = new Size(100, 14); // // layoutControlItem3 // layoutControlItem3.Control = textEditBranchThroughCoefficient; @@ -277,6 +268,15 @@ layoutControlItem2.Size = new Size(322, 24); layoutControlItem2.Text = "主管通过损失系数:"; layoutControlItem2.TextSize = new Size(100, 14); // // layoutControlItem8 // layoutControlItem8.Control = txtFlags; layoutControlItem8.Location = new Point(322, 72); layoutControlItem8.Name = "layoutControlItem8"; layoutControlItem8.Size = new Size(323, 24); layoutControlItem8.Text = "标签:"; layoutControlItem8.TextSize = new Size(100, 14); // // ViewAssetsThreelinkMainDlg // @@ -305,9 +305,9 @@ ((ISupportInitialize)layoutControlItem9).EndInit(); ((ISupportInitialize)layoutControlItem4).EndInit(); ((ISupportInitialize)layoutControlItem13).EndInit(); ((ISupportInitialize)layoutControlItem8).EndInit(); ((ISupportInitialize)layoutControlItem3).EndInit(); ((ISupportInitialize)layoutControlItem2).EndInit(); ((ISupportInitialize)layoutControlItem8).EndInit(); ResumeLayout(false); }
@@ -28,6 +28,8 @@ this.txtDescription.EditValue = vmo.Description; this.txtCaliber.EditValue = vmo.Caliber; this.txtMaterial.EditValue = vmo.Material; this.textEditRunThroughCoefficient.EditValue = vmo.RunThroughMinorLoss; this.textEditBranchThroughCoefficient.EditValue = vmo.BranchThroughMinorLoss; } } } WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/AddAssetsThreelinkFactorDlg.Designer.cs
@@ -203,7 +203,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 2; // // txtMaterial // txtDN // txtMaterial.Location = new Point(131, 60); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/EditAssetsThreelinkFactorDlg.Designer.cs
@@ -289,7 +289,7 @@ txtCaliber.StyleController = layoutControl2; txtCaliber.TabIndex = 2; // // txtMaterial // txtDN // txtMaterial.Location = new Point(131, 60); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/ViewAssetsThreelinkFactorDlg.Designer.cs
@@ -216,7 +216,7 @@ layoutControlItem4.Text = "口径:"; layoutControlItem4.TextSize = new Size(100, 14); // // txtMaterial // txtDN // txtMaterial.Location = new Point(124, 60); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddAssetsFourlinkMainDlg.Designer.cs
@@ -159,7 +159,7 @@ txtCaliber.TabIndex = 4; txtCaliber.EditValueChanged += txtCaliber_EditValueChanged; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/EditAssetsFourlinkMainDlg.Designer.cs
@@ -158,7 +158,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/ViewAssetsFourlinkMainDlg.Designer.cs
@@ -151,7 +151,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(76, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/AddAssetsFourlinkFactorDlg.Designer.cs
@@ -120,7 +120,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 2; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/EditAssetsFourlinkFactorDlg.Designer.cs
@@ -120,7 +120,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 2; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/ViewAssetsFourlinkFactorDlg.Designer.cs
@@ -108,7 +108,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 2; // // txtMaterial // txtDN // txtMaterial.Location = new Point(76, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/AddAssetsSprinklerMainDlg.Designer.cs
@@ -121,7 +121,7 @@ TextEditAngle.StyleController = layoutControl1; TextEditAngle.TabIndex = 9; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/EditAssetsSprinklerMainDlg.Designer.cs
@@ -121,7 +121,7 @@ TextEditAngle.StyleController = layoutControl1; TextEditAngle.TabIndex = 14; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/ViewAssetsSprinklerMainDlg.Designer.cs
@@ -116,7 +116,7 @@ TextEditAngle.StyleController = layoutControl1; TextEditAngle.TabIndex = 7; // // txtMaterial // txtDN // txtMaterial.Location = new Point(76, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/AddAssetsSprinklerFactorDlg.Designer.cs
@@ -107,7 +107,7 @@ TextEditAngle.StyleController = layoutControl1; TextEditAngle.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 60); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/EditAssetsSprinklerFactorDlg.Designer.cs
@@ -122,7 +122,7 @@ TextEditAngle.StyleController = layoutControl1; TextEditAngle.TabIndex = 3; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 60); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/ViewAssetsSprinklerFactorDlg.Designer.cs
@@ -175,7 +175,7 @@ TextEditAngle.StyleController = layoutControl1; TextEditAngle.TabIndex = 3; // // txtMaterial // txtDN // txtMaterial.Location = new Point(76, 60); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/AddAssetsBluntheadMainDlg.Designer.cs
@@ -105,7 +105,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 6; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/EditAssetsBluntheadMainDlg.Designer.cs
@@ -105,7 +105,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 12; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/ViewAssetsBluntheadMainDlg.Designer.cs
@@ -101,7 +101,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 17; // // txtMaterial // txtDN // txtMaterial.Location = new Point(76, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/AddAssetsBluntheadFactorDlg.Designer.cs
@@ -201,7 +201,7 @@ txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(272, 12); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/EditAssetsBluntheadFactorDlg.Designer.cs
@@ -145,7 +145,7 @@ txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(264, 12); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/ViewAssetsBluntheadFactorDlg.Designer.cs
@@ -139,7 +139,7 @@ txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(301, 12); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.Designer.cs
@@ -143,16 +143,16 @@ generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26); generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26); generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26); generalOkAndCancelCtrl1.Location = new Point(12, 296); generalOkAndCancelCtrl1.Location = new Point(12, 320); generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1"; generalOkAndCancelCtrl1.Size = new Size(641, 50); generalOkAndCancelCtrl1.Size = new Size(641, 26); generalOkAndCancelCtrl1.TabIndex = 10; // // txtDescription // txtDescription.Location = new Point(76, 132); txtDescription.Name = "txtDescription"; txtDescription.Size = new Size(577, 160); txtDescription.Size = new Size(577, 184); txtDescription.StyleController = layoutControl1; txtDescription.TabIndex = 9; // @@ -240,16 +240,16 @@ layoutControlItem6.Control = txtDescription; layoutControlItem6.Location = new Point(0, 120); layoutControlItem6.Name = "layoutControlItem6"; layoutControlItem6.Size = new Size(645, 164); layoutControlItem6.Size = new Size(645, 188); layoutControlItem6.Text = "说明:"; layoutControlItem6.TextSize = new Size(52, 14); // // layoutControlItem7 // layoutControlItem7.Control = generalOkAndCancelCtrl1; layoutControlItem7.Location = new Point(0, 284); layoutControlItem7.Location = new Point(0, 308); layoutControlItem7.Name = "layoutControlItem7"; layoutControlItem7.Size = new Size(645, 54); layoutControlItem7.Size = new Size(645, 30); layoutControlItem7.TextSize = new Size(0, 0); layoutControlItem7.TextVisible = false; // WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.resx
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.Designer.cs
@@ -29,54 +29,66 @@ private void InitializeComponent() { layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); txtMinLevel = new DevExpress.XtraEditors.TextEdit(); txtMaxLevel = new DevExpress.XtraEditors.TextEdit(); txtMinVol = new DevExpress.XtraEditors.TextEdit(); txtTagName = new DevExpress.XtraEditors.TextEdit(); txtFlags = new DevExpress.XtraEditors.TextEdit(); txtKeyWord = new DevExpress.XtraEditors.TextEdit(); txtDescription = new DevExpress.XtraEditors.MemoEdit(); this.txtMinorLoss = new DevExpress.XtraEditors.TextEdit(); txtDiameter = new DevExpress.XtraEditors.TextEdit(); txtMaterial = new DevExpress.XtraEditors.TextEdit(); txtName = new DevExpress.XtraEditors.TextEdit(); textEditVoerFlow = new DevExpress.XtraEditors.CheckEdit(); Root = new DevExpress.XtraLayout.LayoutControlGroup(); layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); ((ISupportInitialize)layoutControl1).BeginInit(); layoutControl1.SuspendLayout(); ((ISupportInitialize)txtMinLevel.Properties).BeginInit(); ((ISupportInitialize)txtMaxLevel.Properties).BeginInit(); ((ISupportInitialize)txtMinVol.Properties).BeginInit(); ((ISupportInitialize)txtTagName.Properties).BeginInit(); ((ISupportInitialize)txtFlags.Properties).BeginInit(); ((ISupportInitialize)txtKeyWord.Properties).BeginInit(); ((ISupportInitialize)txtDescription.Properties).BeginInit(); ((ISupportInitialize)this.txtMinorLoss.Properties).BeginInit(); ((ISupportInitialize)txtDiameter.Properties).BeginInit(); ((ISupportInitialize)txtMaterial.Properties).BeginInit(); ((ISupportInitialize)txtName.Properties).BeginInit(); ((ISupportInitialize)textEditVoerFlow.Properties).BeginInit(); ((ISupportInitialize)Root).BeginInit(); ((ISupportInitialize)layoutControlItem1).BeginInit(); ((ISupportInitialize)layoutControlItem3).BeginInit(); ((ISupportInitialize)layoutControlItem4).BeginInit(); ((ISupportInitialize)layoutControlItem2).BeginInit(); ((ISupportInitialize)layoutControlItem6).BeginInit(); ((ISupportInitialize)layoutControlItem8).BeginInit(); ((ISupportInitialize)layoutControlItem9).BeginInit(); ((ISupportInitialize)layoutControlItem10).BeginInit(); ((ISupportInitialize)layoutControlItem3).BeginInit(); ((ISupportInitialize)layoutControlItem9).BeginInit(); ((ISupportInitialize)layoutControlItem5).BeginInit(); ((ISupportInitialize)layoutControlItem7).BeginInit(); ((ISupportInitialize)layoutControlItem12).BeginInit(); ((ISupportInitialize)layoutControlItem2).BeginInit(); ((ISupportInitialize)layoutControlItem8).BeginInit(); ((ISupportInitialize)layoutControlItem11).BeginInit(); SuspendLayout(); // // layoutControl1 // layoutControl1.Controls.Add(txtMinLevel); layoutControl1.Controls.Add(txtMaxLevel); layoutControl1.Controls.Add(txtMinVol); layoutControl1.Controls.Add(txtTagName); layoutControl1.Controls.Add(txtFlags); layoutControl1.Controls.Add(txtKeyWord); layoutControl1.Controls.Add(txtDescription); layoutControl1.Controls.Add(this.txtMinorLoss); layoutControl1.Controls.Add(txtDiameter); layoutControl1.Controls.Add(txtMaterial); layoutControl1.Controls.Add(txtName); layoutControl1.Controls.Add(textEditVoerFlow); layoutControl1.Dock = DockStyle.Fill; layoutControl1.Location = new Point(0, 0); layoutControl1.Name = "layoutControl1"; @@ -86,25 +98,58 @@ layoutControl1.TabIndex = 1; layoutControl1.Text = "layoutControl1"; // // txtMinLevel // txtMinLevel.Location = new Point(398, 60); txtMinLevel.Name = "txtMinLevel"; txtMinLevel.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False; txtMinLevel.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager)); txtMinLevel.Properties.ReadOnly = true; txtMinLevel.Properties.UseReadOnlyAppearance = false; txtMinLevel.Size = new Size(255, 20); txtMinLevel.StyleController = layoutControl1; txtMinLevel.TabIndex = 6; // // txtMaxLevel // txtMaxLevel.Location = new Point(76, 60); txtMaxLevel.Name = "txtMaxLevel"; txtMaxLevel.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False; txtMaxLevel.Properties.ReadOnly = true; txtMaxLevel.Properties.UseReadOnlyAppearance = false; txtMaxLevel.Size = new Size(254, 20); txtMaxLevel.StyleController = layoutControl1; txtMaxLevel.TabIndex = 5; // // txtMinVol // txtMinVol.Location = new Point(398, 36); txtMinVol.Name = "txtMinVol"; txtMinVol.Properties.ReadOnly = true; txtMinVol.Properties.UseReadOnlyAppearance = false; txtMinVol.Size = new Size(255, 20); txtMinVol.StyleController = layoutControl1; txtMinVol.TabIndex = 4; // // txtTagName // txtTagName.Location = new Point(398, 60); txtTagName.Location = new Point(76, 84); txtTagName.Name = "txtTagName"; txtTagName.Properties.ReadOnly = true; txtTagName.Properties.UseReadOnlyAppearance = false; txtTagName.Size = new Size(255, 20); txtTagName.Size = new Size(254, 20); txtTagName.StyleController = layoutControl1; txtTagName.TabIndex = 8; txtTagName.TabIndex = 7; // // txtFlags // txtFlags.Location = new Point(76, 84); txtFlags.Location = new Point(398, 84); txtFlags.Name = "txtFlags"; txtFlags.Properties.ReadOnly = true; txtFlags.Properties.UseReadOnlyAppearance = false; txtFlags.Size = new Size(577, 20); txtFlags.Size = new Size(255, 20); txtFlags.StyleController = layoutControl1; txtFlags.TabIndex = 7; txtFlags.TabIndex = 8; // // txtKeyWord // @@ -118,27 +163,15 @@ // // txtDescription // txtDescription.Location = new Point(76, 108); txtDescription.Location = new Point(76, 132); txtDescription.Name = "txtDescription"; txtDescription.Size = new Size(577, 261); txtDescription.Size = new Size(577, 237); txtDescription.StyleController = layoutControl1; txtDescription.TabIndex = 9; // // txtMinorLoss // this.txtMinorLoss.Location = new Point(76, 60); this.txtMinorLoss.Name = "txtMinorLoss"; this.txtMinorLoss.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False; this.txtMinorLoss.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager)); this.txtMinorLoss.Properties.ReadOnly = true; this.txtMinorLoss.Properties.UseReadOnlyAppearance = false; this.txtMinorLoss.Size = new Size(254, 20); this.txtMinorLoss.StyleController = layoutControl1; this.txtMinorLoss.TabIndex = 5; txtDescription.TabIndex = 10; // // txtDiameter // txtDiameter.Location = new Point(398, 36); txtDiameter.Location = new Point(76, 36); txtDiameter.Name = "txtDiameter"; txtDiameter.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True; txtDiameter.Properties.DisplayFormat.FormatString = "{0}mm"; @@ -147,20 +180,9 @@ txtDiameter.Properties.NullValuePrompt = "mm"; txtDiameter.Properties.ReadOnly = true; txtDiameter.Properties.UseReadOnlyAppearance = false; txtDiameter.Size = new Size(255, 20); txtDiameter.Size = new Size(254, 20); txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtMaterial.Location = new Point(76, 36); txtMaterial.Name = "txtMaterial"; txtMaterial.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False; txtMaterial.Properties.ReadOnly = true; txtMaterial.Properties.UseReadOnlyAppearance = false; txtMaterial.Size = new Size(254, 20); txtMaterial.StyleController = layoutControl1; txtMaterial.TabIndex = 3; txtDiameter.TabIndex = 3; // // txtName // @@ -173,13 +195,23 @@ txtName.StyleController = layoutControl1; txtName.TabIndex = 0; // // textEditVoerFlow // textEditVoerFlow.Location = new Point(12, 108); textEditVoerFlow.Name = "textEditVoerFlow"; textEditVoerFlow.Properties.Caption = "是否允许溢流"; textEditVoerFlow.Properties.ReadOnly = true; textEditVoerFlow.Size = new Size(641, 20); textEditVoerFlow.StyleController = layoutControl1; textEditVoerFlow.TabIndex = 9; // // Root // Root.AppearanceItemCaption.Options.UseTextOptions = true; Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; Root.GroupBordersVisible = false; Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem3, layoutControlItem4, layoutControlItem2, layoutControlItem6, layoutControlItem8, layoutControlItem9, layoutControlItem10 }); Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem6, layoutControlItem10, layoutControlItem3, layoutControlItem9, layoutControlItem5, layoutControlItem7, layoutControlItem12, layoutControlItem2, layoutControlItem8 }); Root.Name = "Root"; Root.Size = new Size(665, 381); Root.TextVisible = false; @@ -193,59 +225,14 @@ layoutControlItem1.Text = "名称:"; layoutControlItem1.TextSize = new Size(52, 14); // // layoutControlItem3 // layoutControlItem3.Control = txtDiameter; layoutControlItem3.Location = new Point(322, 24); layoutControlItem3.Name = "layoutControlItem3"; layoutControlItem3.Size = new Size(323, 24); layoutControlItem3.Text = "直径:"; layoutControlItem3.TextSize = new Size(52, 14); // // layoutControlItem4 // layoutControlItem4.Control = this.txtMinorLoss; layoutControlItem4.Location = new Point(0, 48); layoutControlItem4.Name = "layoutControlItem4"; layoutControlItem4.Size = new Size(322, 24); layoutControlItem4.Text = "局阻系数:"; layoutControlItem4.TextSize = new Size(52, 14); // // layoutControlItem2 // layoutControlItem2.Control = txtMaterial; layoutControlItem2.Location = new Point(0, 24); layoutControlItem2.Name = "layoutControlItem2"; layoutControlItem2.Size = new Size(322, 24); layoutControlItem2.Text = "材质:"; layoutControlItem2.TextSize = new Size(52, 14); // // layoutControlItem6 // layoutControlItem6.Control = txtDescription; layoutControlItem6.Location = new Point(0, 96); layoutControlItem6.Location = new Point(0, 120); layoutControlItem6.Name = "layoutControlItem6"; layoutControlItem6.Size = new Size(645, 265); layoutControlItem6.Size = new Size(645, 241); layoutControlItem6.Text = "说明:"; layoutControlItem6.TextSize = new Size(52, 14); // // layoutControlItem8 // layoutControlItem8.Control = txtFlags; layoutControlItem8.Location = new Point(0, 72); layoutControlItem8.Name = "layoutControlItem8"; layoutControlItem8.Size = new Size(645, 24); layoutControlItem8.Text = "标签:"; layoutControlItem8.TextSize = new Size(52, 14); // // layoutControlItem9 // layoutControlItem9.Control = txtTagName; layoutControlItem9.Location = new Point(322, 48); layoutControlItem9.Name = "layoutControlItem9"; layoutControlItem9.Size = new Size(323, 24); layoutControlItem9.Text = "标志:"; layoutControlItem9.TextSize = new Size(52, 14); // // layoutControlItem10 // @@ -255,6 +242,77 @@ layoutControlItem10.Size = new Size(323, 24); layoutControlItem10.Text = "关键字:"; layoutControlItem10.TextSize = new Size(52, 14); // // layoutControlItem3 // layoutControlItem3.Control = txtDiameter; layoutControlItem3.Location = new Point(0, 24); layoutControlItem3.Name = "layoutControlItem3"; layoutControlItem3.Size = new Size(322, 24); layoutControlItem3.Text = "公称直径:"; layoutControlItem3.TextSize = new Size(52, 14); // // layoutControlItem9 // layoutControlItem9.Control = txtTagName; layoutControlItem9.Location = new Point(0, 72); layoutControlItem9.Name = "layoutControlItem9"; layoutControlItem9.Size = new Size(322, 24); layoutControlItem9.Text = "标志:"; layoutControlItem9.TextSize = new Size(52, 14); // // layoutControlItem5 // layoutControlItem5.Control = txtMinVol; layoutControlItem5.Location = new Point(322, 24); layoutControlItem5.Name = "layoutControlItem5"; layoutControlItem5.Size = new Size(323, 24); layoutControlItem5.Text = "最低容积:"; layoutControlItem5.TextSize = new Size(52, 14); // // layoutControlItem7 // layoutControlItem7.Control = txtMaxLevel; layoutControlItem7.Location = new Point(0, 48); layoutControlItem7.Name = "layoutControlItem7"; layoutControlItem7.Size = new Size(322, 24); layoutControlItem7.Text = "最高水位:"; layoutControlItem7.TextSize = new Size(52, 14); // // layoutControlItem12 // layoutControlItem12.Control = textEditVoerFlow; layoutControlItem12.Location = new Point(0, 96); layoutControlItem12.Name = "layoutControlItem12"; layoutControlItem12.Size = new Size(645, 24); layoutControlItem12.TextSize = new Size(0, 0); layoutControlItem12.TextVisible = false; // // layoutControlItem2 // layoutControlItem2.Control = txtMinLevel; layoutControlItem2.Location = new Point(322, 48); layoutControlItem2.Name = "layoutControlItem2"; layoutControlItem2.Size = new Size(323, 24); layoutControlItem2.Text = "最低水位:"; layoutControlItem2.TextSize = new Size(52, 14); // // layoutControlItem8 // layoutControlItem8.Control = txtFlags; layoutControlItem8.Location = new Point(322, 72); layoutControlItem8.Name = "layoutControlItem8"; layoutControlItem8.Size = new Size(323, 24); layoutControlItem8.Text = "标签:"; layoutControlItem8.TextSize = new Size(52, 14); // // layoutControlItem11 // layoutControlItem11.Location = new Point(0, 96); layoutControlItem11.Name = "layoutControlItem11"; layoutControlItem11.Size = new Size(645, 24); layoutControlItem11.TextSize = new Size(0, 0); layoutControlItem11.TextVisible = false; // // ViewAssetsTankMainDlg // @@ -267,23 +325,28 @@ Text = "详细信息"; ((ISupportInitialize)layoutControl1).EndInit(); layoutControl1.ResumeLayout(false); ((ISupportInitialize)txtMinLevel.Properties).EndInit(); ((ISupportInitialize)txtMaxLevel.Properties).EndInit(); ((ISupportInitialize)txtMinVol.Properties).EndInit(); ((ISupportInitialize)txtTagName.Properties).EndInit(); ((ISupportInitialize)txtFlags.Properties).EndInit(); ((ISupportInitialize)txtKeyWord.Properties).EndInit(); ((ISupportInitialize)txtDescription.Properties).EndInit(); ((ISupportInitialize)this.txtMinorLoss.Properties).EndInit(); ((ISupportInitialize)txtDiameter.Properties).EndInit(); ((ISupportInitialize)txtMaterial.Properties).EndInit(); ((ISupportInitialize)txtName.Properties).EndInit(); ((ISupportInitialize)textEditVoerFlow.Properties).EndInit(); ((ISupportInitialize)Root).EndInit(); ((ISupportInitialize)layoutControlItem1).EndInit(); ((ISupportInitialize)layoutControlItem3).EndInit(); ((ISupportInitialize)layoutControlItem4).EndInit(); ((ISupportInitialize)layoutControlItem2).EndInit(); ((ISupportInitialize)layoutControlItem6).EndInit(); ((ISupportInitialize)layoutControlItem8).EndInit(); ((ISupportInitialize)layoutControlItem9).EndInit(); ((ISupportInitialize)layoutControlItem10).EndInit(); ((ISupportInitialize)layoutControlItem3).EndInit(); ((ISupportInitialize)layoutControlItem9).EndInit(); ((ISupportInitialize)layoutControlItem5).EndInit(); ((ISupportInitialize)layoutControlItem7).EndInit(); ((ISupportInitialize)layoutControlItem12).EndInit(); ((ISupportInitialize)layoutControlItem2).EndInit(); ((ISupportInitialize)layoutControlItem8).EndInit(); ((ISupportInitialize)layoutControlItem11).EndInit(); ResumeLayout(false); } @@ -294,7 +357,7 @@ private DevExpress.XtraEditors.TextEdit txtMinorLoss; private DevExpress.XtraEditors.TextEdit txtCoefficient; private DevExpress.XtraEditors.TextEdit txtDiameter; private DevExpress.XtraEditors.TextEdit txtMaterial; private DevExpress.XtraEditors.TextEdit txtDN; private DevExpress.XtraEditors.TextEdit txtName; private DevExpress.XtraLayout.LayoutControlGroup Root; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; @@ -309,5 +372,13 @@ private DevExpress.XtraEditors.TextEdit txtFlags; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; private DevExpress.XtraEditors.TextEdit txtMinLevel; private DevExpress.XtraEditors.TextEdit txtMaxLevel; private DevExpress.XtraEditors.TextEdit txtMinVol; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraEditors.CheckEdit checkEdit1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraEditors.CheckEdit textEditVoerFlow; } } WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.cs
@@ -22,6 +22,11 @@ } _vmo = vmo; this.txtName.EditValue = vmo.Name; this.txtMaxLevel.EditValue = vmo.MaxLevel; this.txtMinLevel.EditValue = vmo.MinLevel; this.txtMinVol.EditValue = vmo.MinVol; this.txtDiameter.EditValue = vmo.DN; this.textEditVoerFlow.Checked = vmo.OverFlow; this.txtKeyWord.EditValue = HStation.Service.Assets.KeyWordHelper.ToString(vmo.KeyWords); this.txtFlags.EditValue = Yw.Untity.FlagsHelper.ToString(vmo.Flags); this.txtTagName.EditValue = vmo.TagName; WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.resx
WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/AddAssetsHydrantMainDlg.Designer.cs
@@ -105,7 +105,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 6; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/EditAssetsHydrantMainDlg.Designer.cs
@@ -105,7 +105,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 12; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/ViewAssetsHydrantMainDlg.Designer.cs
@@ -101,7 +101,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 17; // // txtMaterial // txtDN // txtMaterial.Location = new Point(76, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/AddAssetsHydrantFactorDlg.Designer.cs
@@ -156,7 +156,7 @@ txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(299, 12); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/EditAssetsHydrantFactorDlg.Designer.cs
@@ -152,7 +152,7 @@ txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(264, 12); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/ViewAssetsHydrantFactorDlg.Designer.cs
@@ -139,7 +139,7 @@ txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(265, 12); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AddAssetsTranslationMainDlg.Designer.cs
@@ -127,7 +127,7 @@ textEditTranslationType.StyleController = layoutControl1; textEditTranslationType.TabIndex = 3; // // txtMaterial // txtDN // txtMaterial.Location = new Point(405, 84); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/EditAssetsTranslationMainDlg.Designer.cs
@@ -135,7 +135,7 @@ textEditTranslationType.StyleController = layoutControl1; textEditTranslationType.TabIndex = 3; // // txtMaterial // txtDN // txtMaterial.Location = new Point(405, 84); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/ViewAssetsTranslationMainDlg.Designer.cs
@@ -127,7 +127,7 @@ textEditTranslationType.StyleController = layoutControl1; textEditTranslationType.TabIndex = 9; // // txtMaterial // txtDN // txtMaterial.Location = new Point(76, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/AddAssetsTranslationFactorDlg.Designer.cs
@@ -91,7 +91,7 @@ layoutControlItem2.Text = "材质:"; layoutControlItem2.TextSize = new Size(59, 14); // // txtMaterial // txtDN // txtMaterial.Location = new Point(350, 12); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/EditAssetsTranslationFactorDlg.Designer.cs
@@ -136,7 +136,7 @@ textEditTranslationType.StyleController = layoutControl1; textEditTranslationType.TabIndex = 7; // // txtMaterial // txtDN // txtMaterial.Location = new Point(360, 12); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/ViewAssetsTranslationFactorDlg.Designer.cs
@@ -132,7 +132,7 @@ textEditTranslationType.StyleController = layoutControl1; textEditTranslationType.TabIndex = 7; // // txtMaterial // txtDN // txtMaterial.Location = new Point(354, 12); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/AddAssetsExchangerMainDlg.Designer.cs
@@ -159,7 +159,7 @@ txtDiameter.TabIndex = 4; txtDiameter.EditValueChanged += txtCaliber_EditValueChanged; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/EditAssetsExchangerMainDlg.Designer.cs
@@ -158,7 +158,7 @@ txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/ViewAssetsExchangerMainDlg.Designer.cs
@@ -151,7 +151,7 @@ txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(76, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/AddAssetsExchangerFactorDlg.Designer.cs
@@ -120,7 +120,7 @@ txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(335, 12); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/EditAssetsExchangerFactorDlg.Designer.cs
@@ -120,7 +120,7 @@ txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(335, 12); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/ViewAssetsExchangerFactorDlg.Designer.cs
@@ -108,7 +108,7 @@ txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(328, 12); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/AddAssetsCompressorMainDlg.Designer.cs
@@ -159,7 +159,7 @@ txtDiameter.TabIndex = 4; txtDiameter.EditValueChanged += txtCaliber_EditValueChanged; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/EditAssetsCompressorMainDlg.Designer.cs
@@ -158,7 +158,7 @@ txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/ViewAssetsCompressorMainDlg.Designer.cs
@@ -151,7 +151,7 @@ txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(76, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/AddAssetsCompressorFactorDlg.Designer.cs
@@ -120,7 +120,7 @@ txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(335, 12); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/EditAssetsCompressorFactorDlg.Designer.cs
@@ -120,7 +120,7 @@ txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(335, 12); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/ViewAssetsCompressorFactorDlg.Designer.cs
@@ -108,7 +108,7 @@ txtDiameter.StyleController = layoutControl1; txtDiameter.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(328, 12); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/AddAssetsCoolingMainDlg.Designer.cs
@@ -177,7 +177,7 @@ txtCaliber.TabIndex = 4; txtCaliber.EditValueChanged += txtCaliber_EditValueChanged; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/EditAssetsCoolingMainDlg.Designer.cs
@@ -176,7 +176,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/ViewAssetsCoolingMainDlg.Designer.cs
@@ -151,7 +151,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(76, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/AddAssetsCoolingFactorDlg.Designer.cs
@@ -140,7 +140,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/EditAssetsCoolingFactorDlg.Designer.cs
@@ -140,7 +140,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(83, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/ViewAssetsCoolingFactorDlg.Designer.cs
@@ -130,7 +130,7 @@ txtCaliber.StyleController = layoutControl1; txtCaliber.TabIndex = 4; // // txtMaterial // txtDN // txtMaterial.Location = new Point(76, 36); txtMaterial.Name = "txtMaterial"; WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs
@@ -367,6 +367,7 @@ this.MarkPropertyValueChangedEvent?.Invoke(vm.Vmo); this.GradingPropertyValueChangedEvent?.Invoke(vm.Vmo); }; dlg.SetBindingData(input); dlg.ShowDialog(); } break; WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.cs
@@ -84,7 +84,6 @@ _pump_matching_vm.MatchingRatedN = pump_mian.RatedSpeed; _pump_matching_vm.MatchingRatedP = pump_mian.RatedPower; _pump_matching_vm.MatchingRatedQ = pump_mian.RatedFlow; this.ReloadDataEvent?.Invoke(_pump_matching_vm); this.Close(); } WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/03-valve/AssetsValveSingleMatchingCtrl.cs
@@ -43,6 +43,8 @@ public async void SetBindingData(string dbId, string curveDbId) { var allList = await BLLFactory<HStation.BLL.AssetsValveMain>.Instance.GetAll(); if (allList != null) { _allList = new List<AssetsValveSingleMatchingViewModel>(); allList.ForEach(x => _allList.Add(new AssetsValveSingleMatchingViewModel(x))); if (long.TryParse(dbId, out long id)) @@ -55,6 +57,7 @@ _curveDbId = curveId; } Search(); } await Task.Delay(300); if (_selected != null) { WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/04-pipe/AssetsPipeSingleMatchingCtrl.cs
@@ -24,6 +24,8 @@ public async void SetBindingData(string dbId) { var allList = await BLLFactory<HStation.BLL.AssetsPipeMain>.Instance.GetAll(); if (allList != null) { _allList = new List<AssetsPipeSingleMatchingViewModel>(); allList.ForEach(x => _allList.Add(new AssetsPipeSingleMatchingViewModel(x))); if (long.TryParse(dbId, out long id)) @@ -32,6 +34,7 @@ _selected = item; } Search(); } await Task.Delay(300); if (_selected != null) { WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/05-elbows/AssetsElbowSingleMatchingCtrl.cs
@@ -24,6 +24,8 @@ public async void SetBindingData(string dbId) { var allList = await BLLFactory<HStation.BLL.AssetsElbowMain>.Instance.GetAll(); if (allList != null) { _allList = new List<AssetsElbowSingleMatchingViewModel>(); allList.ForEach(x => _allList.Add(new AssetsElbowSingleMatchingViewModel(x))); if (long.TryParse(dbId, out long id)) @@ -32,6 +34,7 @@ _selected = item; } Search(); } await Task.Delay(300); if (_selected != null) { WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/05-elbows/AssetsElbowSingleMatchingDlg.cs
@@ -42,7 +42,10 @@ _input.MatchingMaterial = vm.Material; _input.MatchingCaliber = vm.Caliber; _input.MatchingBendingAngle = vm.Angle; if (vm.ElbowType != null) { _input.MatchingElbowType = (Yw.WinFrmUI.eElbowType)(int)vm.ElbowType; } _input.MatchingMinorLoss = vm.MinorLoss; this.ReloadDataEvent?.Invoke(_input); this.DialogResult = DialogResult.OK; WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/06-threelink/AssetsThreelinkSingleMatchingCtrl.cs
@@ -24,6 +24,8 @@ public async void SetBindingData(string dbId) { var allList = await BLLFactory<HStation.BLL.AssetsThreelinkMain>.Instance.GetAll(); if (allList != null) { _allList = new List<AssetsThreelinkSingleMatchingViewModel>(); allList.ForEach(x => _allList.Add(new AssetsThreelinkSingleMatchingViewModel(x))); if (long.TryParse(dbId, out long id)) @@ -32,6 +34,7 @@ _selected = item; } Search(); } await Task.Delay(300); if (_selected != null) { WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/07-fourlink/AssetsFourlinkSingleMatchingCtrl.cs
@@ -24,6 +24,8 @@ public async void SetBindingData(string dbId) { var allList = await BLLFactory<HStation.BLL.AssetsFourlinkMain>.Instance.GetAll(); if (allList != null) { _allList = new List<AssetsFourlinkSingleMatchingViewModel>(); allList.ForEach(x => _allList.Add(new AssetsFourlinkSingleMatchingViewModel(x))); if (long.TryParse(dbId, out long id)) @@ -32,6 +34,7 @@ _selected = item; } Search(); } await Task.Delay(300); if (_selected != null) { WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs
@@ -42,6 +42,8 @@ public async void SetBindingData(string dbId, string curveDbId) { var allList = await BLLFactory<HStation.BLL.AssetsTankMain>.Instance.GetAll(); if (allList != null) { _allList = new List<AssetsTankSingleMatchingViewModel>(); allList.ForEach(x => _allList.Add(new AssetsTankSingleMatchingViewModel(x))); if (long.TryParse(dbId, out long id)) @@ -54,6 +56,7 @@ _curveDbid = curveId; } Search(); } await Task.Delay(300); if (_selected != null) { WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/12-Hydrant/AssetsHydrantSingleMatchingCtrl.cs
@@ -24,6 +24,8 @@ public async void SetBindingData(string dbId) { var allList = await BLLFactory<HStation.BLL.AssetsHydrantMain>.Instance.GetAll(); if (allList != null) { _allList = new List<AssetsHydrantSingleMatchingViewModel>(); allList.ForEach(x => _allList.Add(new AssetsHydrantSingleMatchingViewModel(x))); if (long.TryParse(dbId, out long id)) @@ -32,6 +34,7 @@ _selected = item; } Search(); } await Task.Delay(300); if (_selected != null) { WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/14-Blunthead/AssetsBluntheadSingleMatchingCtrl.cs
@@ -24,6 +24,8 @@ public async void SetBindingData(string dbId) { var allList = await BLLFactory<HStation.BLL.AssetsBluntheadMain>.Instance.GetAll(); if (allList != null) { _allList = new List<AssetsBluntheadSingleMatchingViewModel>(); allList.ForEach(x => _allList.Add(new AssetsBluntheadSingleMatchingViewModel(x))); if (long.TryParse(dbId, out long id)) @@ -32,6 +34,7 @@ _selected = item; } Search(); } await Task.Delay(300); if (_selected != null) { WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.Designer.cs
@@ -48,7 +48,6 @@ colDescription = new DevExpress.XtraGrid.Columns.GridColumn(); colStartDiameter = new DevExpress.XtraGrid.Columns.GridColumn(); colEndDiameter = new DevExpress.XtraGrid.Columns.GridColumn(); coleAlgorithmType = new DevExpress.XtraGrid.Columns.GridColumn(); Root = new DevExpress.XtraLayout.LayoutControlGroup(); layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); @@ -163,7 +162,7 @@ // // gridView1 // gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colMaterial, colCaliber, colCoefficient, colKeyWords, colFlags, colTagName, colDescription, colStartDiameter, colEndDiameter, coleAlgorithmType }); gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colMaterial, colCaliber, colCoefficient, colKeyWords, colFlags, colTagName, colDescription, colStartDiameter, colEndDiameter }); gridView1.GridControl = gridControl1; gridView1.Name = "gridView1"; // @@ -204,7 +203,7 @@ colCoefficient.MinWidth = 80; colCoefficient.Name = "colCoefficient"; colCoefficient.Visible = true; colCoefficient.VisibleIndex = 6; colCoefficient.VisibleIndex = 5; colCoefficient.Width = 80; // // colKeyWords @@ -213,7 +212,7 @@ colKeyWords.MinWidth = 100; colKeyWords.Name = "colKeyWords"; colKeyWords.Visible = true; colKeyWords.VisibleIndex = 7; colKeyWords.VisibleIndex = 6; colKeyWords.Width = 100; // // colFlags @@ -222,7 +221,7 @@ colFlags.MinWidth = 100; colFlags.Name = "colFlags"; colFlags.Visible = true; colFlags.VisibleIndex = 8; colFlags.VisibleIndex = 7; colFlags.Width = 100; // // colTagName @@ -232,7 +231,7 @@ colTagName.MinWidth = 100; colTagName.Name = "colTagName"; colTagName.Visible = true; colTagName.VisibleIndex = 9; colTagName.VisibleIndex = 8; colTagName.Width = 100; // // colDescription @@ -241,7 +240,7 @@ colDescription.MinWidth = 100; colDescription.Name = "colDescription"; colDescription.Visible = true; colDescription.VisibleIndex = 10; colDescription.VisibleIndex = 9; colDescription.Width = 100; // // colStartDiameter @@ -257,13 +256,6 @@ colEndDiameter.Name = "colEndDiameter"; colEndDiameter.Visible = true; colEndDiameter.VisibleIndex = 4; // // coleAlgorithmType // coleAlgorithmType.FieldName = "eAlgorithmType"; coleAlgorithmType.Name = "coleAlgorithmType"; coleAlgorithmType.Visible = true; coleAlgorithmType.VisibleIndex = 5; // // Root // @@ -429,6 +421,5 @@ private DevExpress.XtraGrid.Columns.GridColumn colDescription; private DevExpress.XtraGrid.Columns.GridColumn colStartDiameter; private DevExpress.XtraGrid.Columns.GridColumn colEndDiameter; private DevExpress.XtraGrid.Columns.GridColumn coleAlgorithmType; } } WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.cs
@@ -24,6 +24,8 @@ public async void SetBindingData(string dbId) { var allList = await BLLFactory<HStation.BLL.AssetsTranslationMain>.Instance.GetAll(); if (allList != null) { _allList = new List<AssetsTranslationSingleMatchingViewModel>(); allList.ForEach(x => _allList.Add(new AssetsTranslationSingleMatchingViewModel(x))); if (long.TryParse(dbId, out long id)) @@ -32,6 +34,7 @@ _selected = item; } Search(); } await Task.Delay(300); if (_selected != null) { WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingViewModel.cs
@@ -53,9 +53,9 @@ public double? Caliber { get; set; } /// <summary> /// 喷射系数 /// 局阻系数 /// </summary> [DisplayName("喷射系数")] [DisplayName("局阻系数")] public double Coefficient { get; set; } /// <summary> @@ -75,12 +75,6 @@ /// </summary> [DisplayName("粗糙系数")] public double Roughness { get; set; } /// <summary> /// 算法类型 /// </summary> [DisplayName("算法类型")] public HStation.Assets.eTranslationType eAlgorithmType { get; set; } /// <summary> /// 关键字 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/16-meter/AssetsMeterSingleMatchingCtrl.cs
@@ -24,6 +24,8 @@ public async void SetBindingData(string dbId) { var allList = await BLLFactory<HStation.BLL.AssetsMeterMain>.Instance.GetAll(); if (allList != null) { _allList = new List<AssetsMeterSingleMatchingViewModel>(); allList.ForEach(x => _allList.Add(new AssetsMeterSingleMatchingViewModel(x))); if (long.TryParse(dbId, out long id)) @@ -32,6 +34,7 @@ _selected = item; } Search(); } await Task.Delay(300); if (_selected != null) { WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/16-sprinkler/AssetsSprinklerSingleMatchingCtrl.cs
@@ -24,6 +24,8 @@ public async void SetBindingData(string dbId) { var allList = await BLLFactory<HStation.BLL.AssetsSprinklerMain>.Instance.GetAll(); if (allList != null) { _allList = new List<AssetsSprinklerSingleMatchingViewModel>(); allList.ForEach(x => _allList.Add(new AssetsSprinklerSingleMatchingViewModel(x))); if (long.TryParse(dbId, out long id)) @@ -32,6 +34,7 @@ _selected = item; } Search(); } await Task.Delay(300); if (_selected != null) { WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingCtrl.cs
@@ -41,6 +41,8 @@ public async void SetBindingData(string dbId, string curveDbId) { var allList = await BLLFactory<HStation.BLL.AssetsCompressorMain>.Instance.GetAll(); if (allList != null) { _allList = new List<AssetsCompressorSingleMatchingViewModel>(); allList.ForEach(x => _allList.Add(new AssetsCompressorSingleMatchingViewModel(x))); if (long.TryParse(dbId, out long id)) @@ -53,6 +55,7 @@ _curveDbId = curveid; } Search(); } await Task.Delay(300); if (_selected != null) { WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-flowmeter/AssetsFlowmeterSingleMatchingCtrl.cs
@@ -24,6 +24,8 @@ public async void SetBindingData(string dbId) { var allList = await BLLFactory<HStation.BLL.AssetsFlowmeterMain>.Instance.GetAll(); if (allList != null) { _allList = new List<AssetsFlowmeterSingleMatchingViewModel>(); allList.ForEach(x => _allList.Add(new AssetsFlowmeterSingleMatchingViewModel(x))); if (long.TryParse(dbId, out long id)) @@ -32,6 +34,7 @@ _selected = item; } Search(); } await Task.Delay(300); if (_selected != null) { WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.cs
@@ -41,6 +41,8 @@ public async void SetBindingData(string dbId, string curveDbId) { var allList = await BLLFactory<HStation.BLL.AssetsExchangerMain>.Instance.GetAll(); if (allList != null) { _allList = new List<AssetsExchangerSingleMatchingViewModel>(); allList.ForEach(x => _allList.Add(new AssetsExchangerSingleMatchingViewModel(x))); if (long.TryParse(dbId, out long id)) @@ -52,6 +54,7 @@ { _curveDbId = curveId; } } Search(); await Task.Delay(300); if (_selected != null) WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.resx
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-pressmeter/AssetsPressmeterSingleMatchingCtrl.cs
@@ -25,6 +25,8 @@ { var allList = await BLLFactory<HStation.BLL.AssetsPressmeterMain>.Instance.GetAll(); _allList = new List<AssetsPressmeterSingleMatchingViewModel>(); if (allList != null) { allList.ForEach(x => _allList.Add(new AssetsPressmeterSingleMatchingViewModel(x))); if (long.TryParse(dbId, out long id)) { @@ -32,6 +34,7 @@ _selected = item; } Search(); } await Task.Delay(300); if (_selected != null) { WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/21-cooling/AssetsCoolingSingleMatchingCtrl.cs
@@ -25,12 +25,15 @@ { var allList = await BLLFactory<HStation.BLL.AssetsCoolingMain>.Instance.GetAll(); _allList = new List<AssetsCoolingSingleMatchingViewModel>(); if (allList != null) { allList.ForEach(x => _allList.Add(new AssetsCoolingSingleMatchingViewModel(x))); if (long.TryParse(dbId, out long id)) { var item = allList?.Find(x => x.ID == id); _selected = item; } } Search(); await Task.Delay(300); if (_selected != null)
