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

qin

2025-03-19 342b10ed5f4ebbccf2d2868d211fbe91cf3e8d5d

 WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs

@@ -30,7 +30,7 @@
        {
            components = new System.ComponentModel.Container();
            FacilitiesWizardFormlayoutControl1ConvertedLayout = new DevExpress.XtraLayout.LayoutControl();
            txtEditRegion = new DevExpress.XtraEditors.TreeListLookUpEdit();
            txtEditPlace = new DevExpress.XtraEditors.TreeListLookUpEdit();
            treeListLookUpEdit1TreeList = new DevExpress.XtraTreeList.TreeList();
            treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            txtFloorHeight = new DevExpress.XtraEditors.TextEdit();
@@ -39,7 +39,7 @@
            txtWaterPressure = new DevExpress.XtraEditors.TextEdit();
            txtMaxWaterDemand = new DevExpress.XtraEditors.TextEdit();
            comboBoxWaterSupply = new DevExpress.XtraEditors.ImageComboBoxEdit();
            comboBoxCompletePlant = new DevExpress.XtraEditors.ImageComboBoxEdit();
            comboBoxPackages = new DevExpress.XtraEditors.ImageComboBoxEdit();
            txtFloorHouseHolds = new DevExpress.XtraEditors.TextEdit();
            txtConstantP = new DevExpress.XtraEditors.TextEdit();
            textEditWaterModel = new DevExpress.XtraEditors.ImageComboBoxEdit();
@@ -56,10 +56,9 @@
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            txtWaterPressureitem = new DevExpress.XtraLayout.LayoutControlItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            treeListColumn2 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            ((System.ComponentModel.ISupportInitialize)FacilitiesWizardFormlayoutControl1ConvertedLayout).BeginInit();
            FacilitiesWizardFormlayoutControl1ConvertedLayout.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)txtEditRegion.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtEditPlace.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)treeListLookUpEdit1TreeList).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtFloorHeight.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtFloor.Properties).BeginInit();
@@ -67,7 +66,7 @@
            ((System.ComponentModel.ISupportInitialize)txtWaterPressure.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtMaxWaterDemand.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)comboBoxWaterSupply.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)comboBoxCompletePlant.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)comboBoxPackages.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtFloorHouseHolds.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtConstantP.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEditWaterModel.Properties).BeginInit();
@@ -88,14 +87,14 @@
            // 
            // FacilitiesWizardFormlayoutControl1ConvertedLayout
            // 
            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtEditRegion);
            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtEditPlace);
            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtFloorHeight);
            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtFloor);
            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtName);
            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtWaterPressure);
            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtMaxWaterDemand);
            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(comboBoxWaterSupply);
            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(comboBoxCompletePlant);
            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(comboBoxPackages);
            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtFloorHouseHolds);
            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtConstantP);
            FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEditWaterModel);
@@ -108,24 +107,24 @@
            FacilitiesWizardFormlayoutControl1ConvertedLayout.Size = new Size(889, 396);
            FacilitiesWizardFormlayoutControl1ConvertedLayout.TabIndex = 146;
            // 
            // txtEditRegion
            // txtEditPlace
            // 
            txtEditRegion.Location = new Point(592, 12);
            txtEditRegion.Margin = new Padding(3, 4, 3, 4);
            txtEditRegion.MinimumSize = new Size(0, 36);
            txtEditRegion.Name = "txtEditRegion";
            txtEditRegion.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
            txtEditRegion.Properties.DisplayMember = "Name";
            txtEditRegion.Properties.NullText = "";
            txtEditRegion.Properties.TreeList = treeListLookUpEdit1TreeList;
            txtEditRegion.Properties.ValueMember = "ID";
            txtEditRegion.Size = new Size(285, 36);
            txtEditRegion.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
            txtEditRegion.TabIndex = 2;
            txtEditPlace.Location = new Point(592, 12);
            txtEditPlace.Margin = new Padding(3, 4, 3, 4);
            txtEditPlace.MinimumSize = new Size(0, 36);
            txtEditPlace.Name = "txtEditPlace";
            txtEditPlace.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
            txtEditPlace.Properties.DisplayMember = "Name";
            txtEditPlace.Properties.NullText = "";
            txtEditPlace.Properties.TreeList = treeListLookUpEdit1TreeList;
            txtEditPlace.Properties.ValueMember = "ID";
            txtEditPlace.Size = new Size(285, 36);
            txtEditPlace.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
            txtEditPlace.TabIndex = 2;
            // 
            // treeListLookUpEdit1TreeList
            // 
            treeListLookUpEdit1TreeList.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { treeListColumn1, treeListColumn2 });
            treeListLookUpEdit1TreeList.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { treeListColumn1 });
            treeListLookUpEdit1TreeList.Location = new Point(45, 98);
            treeListLookUpEdit1TreeList.Name = "treeListLookUpEdit1TreeList";
            treeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true;
@@ -207,15 +206,15 @@
            // 
            // comboBoxCompletePlant
            // 
            comboBoxCompletePlant.Location = new Point(158, 132);
            comboBoxCompletePlant.Margin = new Padding(2, 3, 2, 3);
            comboBoxCompletePlant.MinimumSize = new Size(0, 36);
            comboBoxCompletePlant.Name = "comboBoxCompletePlant";
            comboBoxCompletePlant.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
            comboBoxCompletePlant.Properties.NullText = "请选择";
            comboBoxCompletePlant.Size = new Size(284, 36);
            comboBoxCompletePlant.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
            comboBoxCompletePlant.TabIndex = 7;
            comboBoxPackages.Location = new Point(158, 132);
            comboBoxPackages.Margin = new Padding(2, 3, 2, 3);
            comboBoxPackages.MinimumSize = new Size(0, 36);
            comboBoxPackages.Name = "comboBoxCompletePlant";
            comboBoxPackages.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
            comboBoxPackages.Properties.NullText = "请选择";
            comboBoxPackages.Size = new Size(284, 36);
            comboBoxPackages.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
            comboBoxPackages.TabIndex = 7;
            // 
            // txtFloorHouseHolds
            // 
@@ -271,7 +270,7 @@
            // comboBoxCompletePlantitem
            // 
            comboBoxCompletePlantitem.AllowHtmlStringInCaption = true;
            comboBoxCompletePlantitem.Control = comboBoxCompletePlant;
            comboBoxCompletePlantitem.Control = comboBoxPackages;
            comboBoxCompletePlantitem.Location = new Point(0, 120);
            comboBoxCompletePlantitem.Name = "comboBoxCompletePlantitem";
            comboBoxCompletePlantitem.Size = new Size(434, 40);
@@ -357,11 +356,11 @@
            // layoutControlItem2
            // 
            layoutControlItem2.AllowHtmlStringInCaption = true;
            layoutControlItem2.Control = txtEditRegion;
            layoutControlItem2.Control = txtEditPlace;
            layoutControlItem2.Location = new Point(434, 0);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(435, 40);
            layoutControlItem2.Text = "<color=red>*</color>地区:";
            layoutControlItem2.Text = "<color=red>*</color>场所:";
            layoutControlItem2.TextSize = new Size(134, 18);
            // 
            // txtWaterPressureitem
@@ -379,14 +378,6 @@
            // 
            dxErrorProvider1.ContainerControl = this;
            // 
            // treeListColumn2
            // 
            treeListColumn2.Caption = "类型";
            treeListColumn2.FieldName = "Type";
            treeListColumn2.Name = "treeListColumn2";
            treeListColumn2.Visible = true;
            treeListColumn2.VisibleIndex = 1;
            // 
            // FacilitiesCtrl
            // 
            AutoScaleDimensions = new SizeF(8F, 18F);
@@ -397,7 +388,7 @@
            Size = new Size(889, 396);
            ((System.ComponentModel.ISupportInitialize)FacilitiesWizardFormlayoutControl1ConvertedLayout).EndInit();
            FacilitiesWizardFormlayoutControl1ConvertedLayout.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)txtEditRegion.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtEditPlace.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)treeListLookUpEdit1TreeList).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtFloorHeight.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtFloor.Properties).EndInit();
@@ -405,7 +396,7 @@
            ((System.ComponentModel.ISupportInitialize)txtWaterPressure.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtMaxWaterDemand.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)comboBoxWaterSupply.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)comboBoxCompletePlant.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)comboBoxPackages.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtFloorHouseHolds.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtConstantP.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEditWaterModel.Properties).EndInit();
@@ -446,7 +437,7 @@
        public DevExpress.XtraEditors.TextEdit textEditCount;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraEditors.ImageComboBoxEdit comboBoxWaterSupply;
        private DevExpress.XtraEditors.ImageComboBoxEdit comboBoxCompletePlant;
        private DevExpress.XtraEditors.ImageComboBoxEdit comboBoxPackages;
        private DevExpress.XtraEditors.TextEdit txtConstantP;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
@@ -455,10 +446,9 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraEditors.ImageComboBoxEdit textEditWaterModel;
        public DevExpress.XtraEditors.TextEdit txtFloorHouseHolds;
        private DevExpress.XtraEditors.TreeListLookUpEdit txtEditRegion;
        private DevExpress.XtraEditors.TreeListLookUpEdit txtEditPlace;
        private DevExpress.XtraTreeList.TreeList treeListLookUpEdit1TreeList;
        private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn2;
    }
}