Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

duheng

2024-11-14 60908c00556f4f53d82f5588ae3013f80c443590

 WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddThreeLinkMainDlg.Designer.cs

@@ -32,12 +32,14 @@
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            BtnOk = new DevExpress.XtraEditors.SimpleButton();
            simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
            textEditBranchThroughCoefficient = new DevExpress.XtraEditors.TextEdit();
            textEditRunThroughCoefficient = new DevExpress.XtraEditors.TextEdit();
            TextEditName = new DevExpress.XtraEditors.TextEdit();
            DescriptionTextEdit = new DevExpress.XtraEditors.MemoEdit();
            TextEditCaliber = new DevExpress.XtraEditors.ImageComboBoxEdit();
            TextEditMaterial = new DevExpress.XtraEditors.ImageComboBoxEdit();
            TextEditCoefficient = new DevExpress.XtraEditors.TextEdit();
            TextEditKeyWorld = new DevExpress.XtraEditors.TextEdit();
            TextEditKeyWord = new DevExpress.XtraEditors.TextEdit();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
@@ -49,6 +51,8 @@
            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            imageComboBoxEdit1 = new DevExpress.XtraEditors.ImageComboBoxEdit();
@@ -59,18 +63,16 @@
            layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            toolTipController1 = new DevExpress.Utils.ToolTipController(components);
            textEditRunThroughCoefficient = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            textEditBranchThroughCoefficient = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)textEditBranchThroughCoefficient.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditRunThroughCoefficient.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)TextEditName.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)TextEditCaliber.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)TextEditMaterial.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)TextEditCoefficient.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)TextEditKeyWorld.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
@@ -82,6 +84,8 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
            ((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).BeginInit();
@@ -91,10 +95,6 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem27).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditRunThroughCoefficient.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditBranchThroughCoefficient.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
@@ -108,7 +108,7 @@
            layoutControl1.Controls.Add(TextEditCaliber);
            layoutControl1.Controls.Add(TextEditMaterial);
            layoutControl1.Controls.Add(TextEditCoefficient);
            layoutControl1.Controls.Add(TextEditKeyWorld);
            layoutControl1.Controls.Add(TextEditKeyWord);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Name = "layoutControl1";
@@ -122,9 +122,9 @@
            // 
            BtnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
            BtnOk.Appearance.Options.UseBackColor = true;
            BtnOk.Location = new Point(231, 452);
            BtnOk.Location = new Point(504, 452);
            BtnOk.Name = "BtnOk";
            BtnOk.Size = new Size(219, 22);
            BtnOk.Size = new Size(82, 22);
            BtnOk.StyleController = layoutControl1;
            BtnOk.TabIndex = 9;
            BtnOk.Text = "完成";
@@ -135,12 +135,28 @@
            simpleButton1.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
            simpleButton1.Appearance.Options.UseBackColor = true;
            simpleButton1.DialogResult = DialogResult.Cancel;
            simpleButton1.Location = new Point(454, 452);
            simpleButton1.Location = new Point(590, 452);
            simpleButton1.Name = "simpleButton1";
            simpleButton1.Size = new Size(219, 22);
            simpleButton1.Size = new Size(83, 22);
            simpleButton1.StyleController = layoutControl1;
            simpleButton1.TabIndex = 10;
            simpleButton1.Text = "取消";
            // 
            // textEditBranchThroughCoefficient
            // 
            textEditBranchThroughCoefficient.Location = new Point(454, 56);
            textEditBranchThroughCoefficient.Name = "textEditBranchThroughCoefficient";
            textEditBranchThroughCoefficient.Size = new Size(219, 20);
            textEditBranchThroughCoefficient.StyleController = layoutControl1;
            textEditBranchThroughCoefficient.TabIndex = 0;
            // 
            // textEditRunThroughCoefficient
            // 
            textEditRunThroughCoefficient.Location = new Point(120, 56);
            textEditRunThroughCoefficient.Name = "textEditRunThroughCoefficient";
            textEditRunThroughCoefficient.Size = new Size(218, 20);
            textEditRunThroughCoefficient.StyleController = layoutControl1;
            textEditRunThroughCoefficient.TabIndex = 0;
            // 
            // TextEditName
            // 
@@ -150,7 +166,7 @@
            TextEditName.StyleController = layoutControl1;
            TextEditName.TabIndex = 0;
            // 
            // DescriptionTextEdit
            // textEditDescription
            // 
            DescriptionTextEdit.Location = new Point(20, 137);
            DescriptionTextEdit.Name = "DescriptionTextEdit";
@@ -184,13 +200,13 @@
            TextEditCoefficient.StyleController = layoutControl1;
            TextEditCoefficient.TabIndex = 2;
            // 
            // TextEditKeyWorld
            // TextEditKeyWord
            // 
            TextEditKeyWorld.Location = new Point(454, 8);
            TextEditKeyWorld.Name = "TextEditKeyWorld";
            TextEditKeyWorld.Size = new Size(219, 20);
            TextEditKeyWorld.StyleController = layoutControl1;
            TextEditKeyWorld.TabIndex = 2;
            TextEditKeyWord.Location = new Point(454, 8);
            TextEditKeyWord.Name = "TextEditKeyWord";
            TextEditKeyWord.Size = new Size(219, 20);
            TextEditKeyWord.StyleController = layoutControl1;
            TextEditKeyWord.TabIndex = 2;
            // 
            // Root
            // 
@@ -207,9 +223,9 @@
            // layoutControlItem4
            // 
            layoutControlItem4.Control = BtnOk;
            layoutControlItem4.Location = new Point(223, 444);
            layoutControlItem4.Location = new Point(496, 444);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(223, 26);
            layoutControlItem4.Size = new Size(86, 26);
            layoutControlItem4.TextSize = new Size(0, 0);
            layoutControlItem4.TextVisible = false;
            // 
@@ -218,15 +234,15 @@
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 444);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(223, 26);
            emptySpaceItem1.Size = new Size(496, 26);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // layoutControlItem8
            // 
            layoutControlItem8.Control = simpleButton1;
            layoutControlItem8.Location = new Point(446, 444);
            layoutControlItem8.Location = new Point(582, 444);
            layoutControlItem8.Name = "layoutControlItem8";
            layoutControlItem8.Size = new Size(223, 26);
            layoutControlItem8.Size = new Size(87, 26);
            layoutControlItem8.TextSize = new Size(0, 0);
            layoutControlItem8.TextVisible = false;
            // 
@@ -282,7 +298,7 @@
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = TextEditKeyWorld;
            layoutControlItem2.Control = TextEditKeyWord;
            layoutControlItem2.Location = new Point(334, 0);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(335, 24);
@@ -297,6 +313,24 @@
            layoutControlItem3.Size = new Size(669, 24);
            layoutControlItem3.Text = "损失系数:";
            layoutControlItem3.TextSize = new Size(100, 14);
            // 
            // layoutControlItem6
            // 
            layoutControlItem6.Control = textEditRunThroughCoefficient;
            layoutControlItem6.Location = new Point(0, 48);
            layoutControlItem6.Name = "layoutControlItem6";
            layoutControlItem6.Size = new Size(334, 24);
            layoutControlItem6.Text = "运行通过损失系数:";
            layoutControlItem6.TextSize = new Size(100, 14);
            // 
            // layoutControlItem7
            // 
            layoutControlItem7.Control = textEditBranchThroughCoefficient;
            layoutControlItem7.Location = new Point(334, 48);
            layoutControlItem7.Name = "layoutControlItem7";
            layoutControlItem7.Size = new Size(335, 24);
            layoutControlItem7.Text = "支管通过损失系数:";
            layoutControlItem7.TextSize = new Size(100, 14);
            // 
            // dxErrorProvider1
            // 
@@ -368,40 +402,6 @@
            layoutControlItem27.Text = "说明:";
            layoutControlItem27.TextSize = new Size(59, 14);
            // 
            // textEditRunThroughCoefficient
            // 
            textEditRunThroughCoefficient.Location = new Point(120, 56);
            textEditRunThroughCoefficient.Name = "textEditRunThroughCoefficient";
            textEditRunThroughCoefficient.Size = new Size(218, 20);
            textEditRunThroughCoefficient.StyleController = layoutControl1;
            textEditRunThroughCoefficient.TabIndex = 0;
            // 
            // layoutControlItem6
            // 
            layoutControlItem6.Control = textEditRunThroughCoefficient;
            layoutControlItem6.Location = new Point(0, 48);
            layoutControlItem6.Name = "layoutControlItem6";
            layoutControlItem6.Size = new Size(334, 24);
            layoutControlItem6.Text = "运行通过损失系数:";
            layoutControlItem6.TextSize = new Size(100, 14);
            // 
            // textEditBranchThroughCoefficient
            // 
            textEditBranchThroughCoefficient.Location = new Point(454, 56);
            textEditBranchThroughCoefficient.Name = "textEditBranchThroughCoefficient";
            textEditBranchThroughCoefficient.Size = new Size(219, 20);
            textEditBranchThroughCoefficient.StyleController = layoutControl1;
            textEditBranchThroughCoefficient.TabIndex = 0;
            // 
            // layoutControlItem7
            // 
            layoutControlItem7.Control = textEditBranchThroughCoefficient;
            layoutControlItem7.Location = new Point(334, 48);
            layoutControlItem7.Name = "layoutControlItem7";
            layoutControlItem7.Size = new Size(335, 24);
            layoutControlItem7.Text = "支管通过损失系数:";
            layoutControlItem7.TextSize = new Size(100, 14);
            // 
            // AddAssetsThreelinkMainDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
@@ -413,12 +413,14 @@
            Text = "添加三通";
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)textEditBranchThroughCoefficient.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditRunThroughCoefficient.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)TextEditName.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)TextEditCaliber.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)TextEditMaterial.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)TextEditCoefficient.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)TextEditKeyWorld.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
@@ -430,6 +432,8 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
            ((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).EndInit();
@@ -439,10 +443,6 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem27).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditRunThroughCoefficient.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditBranchThroughCoefficient.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
            ResumeLayout(false);
        }

@@ -478,7 +478,7 @@
        private DevExpress.XtraEditors.ImageComboBoxEdit TextEditMaterial;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup5;
        private DevExpress.Utils.ToolTipController toolTipController1;
        private DevExpress.XtraEditors.TextEdit TextEditKeyWorld;
        private DevExpress.XtraEditors.TextEdit TextEditKeyWord;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraEditors.TextEdit TextEditCoefficient;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;