冲突处理

lixiaojun

2025-01-20 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/ViewAssetsValveFactorDlg.Designer.cs

@@ -37,9 +37,9 @@
            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();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)txtDescription.Properties).BeginInit();
@@ -50,9 +50,9 @@
            ((ISupportInitialize)Root).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)layoutControlItem3).BeginInit();
            ((ISupportInitialize)layoutControlItem4).BeginInit();
            ((ISupportInitialize)layoutControlItem2).BeginInit();
            ((ISupportInitialize)layoutControlItem6).BeginInit();
            ((ISupportInitialize)layoutControlItem4).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
@@ -108,7 +108,7 @@
            txtCaliber.StyleController = layoutControl1;
            txtCaliber.TabIndex = 4;
            // 
            // txtDN
            // txtMaterial
            // 
            txtMaterial.Location = new Point(76, 36);
            txtMaterial.Name = "txtMaterial";
@@ -159,15 +159,6 @@
            layoutControlItem3.Text = "口径:";
            layoutControlItem3.TextSize = new Size(52, 14);
            // 
            // layoutControlItem4
            // 
            layoutControlItem4.Control = txtCoefficient;
            layoutControlItem4.Location = new Point(252, 24);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(253, 24);
            layoutControlItem4.Text = "流量系数:";
            layoutControlItem4.TextSize = new Size(52, 14);
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = txtMaterial;
@@ -185,6 +176,15 @@
            layoutControlItem6.Size = new Size(505, 248);
            layoutControlItem6.Text = "说明:";
            layoutControlItem6.TextSize = new Size(52, 14);
            // 
            // layoutControlItem4
            // 
            layoutControlItem4.Control = txtCoefficient;
            layoutControlItem4.Location = new Point(252, 24);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(253, 24);
            layoutControlItem4.Text = "局阻系数:";
            layoutControlItem4.TextSize = new Size(52, 14);
            // 
            // ViewAssetsValveFactorDlg
            // 
@@ -205,9 +205,9 @@
            ((ISupportInitialize)Root).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)layoutControlItem3).EndInit();
            ((ISupportInitialize)layoutControlItem4).EndInit();
            ((ISupportInitialize)layoutControlItem2).EndInit();
            ((ISupportInitialize)layoutControlItem6).EndInit();
            ((ISupportInitialize)layoutControlItem4).EndInit();
            ResumeLayout(false);
        }