From 630b88ea44380933602ae73b725b3772fc105c35 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 23 十二月 2024 17:11:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs | 226 ++++++++++++++++++++++++++++----------------------------
1 files changed, 113 insertions(+), 113 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs
index 8226085..5b2fe69 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs
@@ -30,6 +30,11 @@
{
components = new Container();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ textEditVoerFlow = new DevExpress.XtraEditors.CheckEdit();
+ txtMinLevel = new DevExpress.XtraEditors.TextEdit();
+ txtDN = new DevExpress.XtraEditors.TextEdit();
+ txtMaxLevel = new DevExpress.XtraEditors.TextEdit();
+ txtMinVol = new DevExpress.XtraEditors.TextEdit();
txtKeyWord = new DevExpress.XtraEditors.TextEdit();
txtTagName = new DevExpress.XtraEditors.TextEdit();
setFlagsEditCtrl1 = new SetFlagsEditCtrl();
@@ -40,22 +45,22 @@
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
- textEditVoerFlow = new DevExpress.XtraEditors.CheckEdit();
- txtMinLevel = new DevExpress.XtraEditors.TextEdit();
- txtDN = new DevExpress.XtraEditors.TextEdit();
- txtMaxLevel = new DevExpress.XtraEditors.TextEdit();
- txtMinVol = new DevExpress.XtraEditors.TextEdit();
+ layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
+ ((ISupportInitialize)textEditVoerFlow.Properties).BeginInit();
+ ((ISupportInitialize)txtMinLevel.Properties).BeginInit();
+ ((ISupportInitialize)txtDN.Properties).BeginInit();
+ ((ISupportInitialize)txtMaxLevel.Properties).BeginInit();
+ ((ISupportInitialize)txtMinVol.Properties).BeginInit();
((ISupportInitialize)txtKeyWord.Properties).BeginInit();
((ISupportInitialize)txtTagName.Properties).BeginInit();
((ISupportInitialize)txtDescription.Properties).BeginInit();
@@ -64,20 +69,15 @@
((ISupportInitialize)layoutControlItem1).BeginInit();
((ISupportInitialize)layoutControlItem6).BeginInit();
((ISupportInitialize)layoutControlItem7).BeginInit();
- ((ISupportInitialize)layoutControlItem8).BeginInit();
- ((ISupportInitialize)layoutControlItem9).BeginInit();
((ISupportInitialize)layoutControlItem10).BeginInit();
- ((ISupportInitialize)dxErrorProvider1).BeginInit();
- ((ISupportInitialize)textEditVoerFlow.Properties).BeginInit();
- ((ISupportInitialize)txtMinLevel.Properties).BeginInit();
- ((ISupportInitialize)txtDN.Properties).BeginInit();
- ((ISupportInitialize)txtMaxLevel.Properties).BeginInit();
- ((ISupportInitialize)txtMinVol.Properties).BeginInit();
+ ((ISupportInitialize)layoutControlItem15).BeginInit();
+ ((ISupportInitialize)layoutControlItem13).BeginInit();
((ISupportInitialize)layoutControlItem11).BeginInit();
((ISupportInitialize)layoutControlItem12).BeginInit();
- ((ISupportInitialize)layoutControlItem13).BeginInit();
+ ((ISupportInitialize)layoutControlItem9).BeginInit();
+ ((ISupportInitialize)layoutControlItem8).BeginInit();
((ISupportInitialize)layoutControlItem14).BeginInit();
- ((ISupportInitialize)layoutControlItem15).BeginInit();
+ ((ISupportInitialize)dxErrorProvider1).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -101,6 +101,57 @@
layoutControl1.Size = new Size(665, 381);
layoutControl1.TabIndex = 1;
layoutControl1.Text = "layoutControl1";
+ //
+ // textEditVoerFlow
+ //
+ textEditVoerFlow.EditValue = null;
+ textEditVoerFlow.Location = new Point(12, 108);
+ textEditVoerFlow.Name = "textEditVoerFlow";
+ textEditVoerFlow.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Default;
+ textEditVoerFlow.Properties.Caption = "鏄惁鍏佽婧㈡祦";
+ textEditVoerFlow.Size = new Size(641, 20);
+ textEditVoerFlow.StyleController = layoutControl1;
+ textEditVoerFlow.TabIndex = 9;
+ //
+ // txtMinLevel
+ //
+ txtMinLevel.Location = new Point(76, 60);
+ txtMinLevel.Name = "txtMinLevel";
+ txtMinLevel.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
+ txtMinLevel.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtMinLevel.Size = new Size(254, 20);
+ txtMinLevel.StyleController = layoutControl1;
+ txtMinLevel.TabIndex = 5;
+ //
+ // txtDN
+ //
+ txtDN.Location = new Point(76, 36);
+ txtDN.Name = "txtDN";
+ txtDN.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
+ txtDN.Properties.DisplayFormat.FormatString = "{0}m";
+ txtDN.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Custom;
+ txtDN.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtDN.Properties.NullValuePrompt = "mm";
+ txtDN.Size = new Size(254, 20);
+ txtDN.StyleController = layoutControl1;
+ txtDN.TabIndex = 3;
+ //
+ // txtMaxLevel
+ //
+ txtMaxLevel.Location = new Point(398, 60);
+ txtMaxLevel.Name = "txtMaxLevel";
+ txtMaxLevel.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
+ txtMaxLevel.Size = new Size(255, 20);
+ txtMaxLevel.StyleController = layoutControl1;
+ txtMaxLevel.TabIndex = 6;
+ //
+ // txtMinVol
+ //
+ txtMinVol.Location = new Point(398, 84);
+ txtMinVol.Name = "txtMinVol";
+ txtMinVol.Size = new Size(255, 20);
+ txtMinVol.StyleController = layoutControl1;
+ txtMinVol.TabIndex = 8;
//
// txtKeyWord
//
@@ -193,24 +244,6 @@
layoutControlItem7.TextSize = new Size(0, 0);
layoutControlItem7.TextVisible = false;
//
- // layoutControlItem8
- //
- layoutControlItem8.Control = setFlagsEditCtrl1;
- layoutControlItem8.Location = new Point(322, 24);
- layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(323, 24);
- layoutControlItem8.Text = "鏍囩:";
- layoutControlItem8.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);
- //
// layoutControlItem10
//
layoutControlItem10.Control = txtKeyWord;
@@ -220,60 +253,23 @@
layoutControlItem10.Text = "鍏抽敭瀛�:";
layoutControlItem10.TextSize = new Size(52, 14);
//
- // dxErrorProvider1
+ // layoutControlItem15
//
- dxErrorProvider1.ContainerControl = this;
+ layoutControlItem15.Control = textEditVoerFlow;
+ layoutControlItem15.Location = new Point(0, 96);
+ layoutControlItem15.Name = "layoutControlItem15";
+ layoutControlItem15.Size = new Size(645, 24);
+ layoutControlItem15.TextSize = new Size(0, 0);
+ layoutControlItem15.TextVisible = false;
//
- // textEditVoerFlow
+ // layoutControlItem13
//
- textEditVoerFlow.EditValue = null;
- textEditVoerFlow.Location = new Point(12, 108);
- textEditVoerFlow.Name = "textEditVoerFlow";
- textEditVoerFlow.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Default;
- textEditVoerFlow.Properties.Caption = "鏄惁鍏佽婧㈡祦";
- textEditVoerFlow.Size = new Size(641, 20);
- textEditVoerFlow.StyleController = layoutControl1;
- textEditVoerFlow.TabIndex = 9;
- //
- // txtMinLevel
- //
- txtMinLevel.Location = new Point(76, 60);
- txtMinLevel.Name = "txtMinLevel";
- txtMinLevel.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
- txtMinLevel.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
- txtMinLevel.Size = new Size(254, 20);
- txtMinLevel.StyleController = layoutControl1;
- txtMinLevel.TabIndex = 5;
- //
- // txtDN
- //
- txtDN.Location = new Point(76, 36);
- txtDN.Name = "txtDN";
- txtDN.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
- txtDN.Properties.DisplayFormat.FormatString = "{0}mm";
- txtDN.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Custom;
- txtDN.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
- txtDN.Properties.NullValuePrompt = "mm";
- txtDN.Size = new Size(254, 20);
- txtDN.StyleController = layoutControl1;
- txtDN.TabIndex = 3;
- //
- // txtMaxLevel
- //
- txtMaxLevel.Location = new Point(398, 60);
- txtMaxLevel.Name = "txtMaxLevel";
- txtMaxLevel.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
- txtMaxLevel.Size = new Size(255, 20);
- txtMaxLevel.StyleController = layoutControl1;
- txtMaxLevel.TabIndex = 6;
- //
- // txtMinVol
- //
- txtMinVol.Location = new Point(398, 84);
- txtMinVol.Name = "txtMinVol";
- txtMinVol.Size = new Size(255, 20);
- txtMinVol.StyleController = layoutControl1;
- txtMinVol.TabIndex = 8;
+ layoutControlItem13.Control = txtMaxLevel;
+ layoutControlItem13.Location = new Point(322, 48);
+ layoutControlItem13.Name = "layoutControlItem13";
+ layoutControlItem13.Size = new Size(323, 24);
+ layoutControlItem13.Text = "鏈�楂樻按浣�:";
+ layoutControlItem13.TextSize = new Size(52, 14);
//
// layoutControlItem11
//
@@ -293,14 +289,23 @@
layoutControlItem12.Text = "鏈�浣庡绉�:";
layoutControlItem12.TextSize = new Size(52, 14);
//
- // layoutControlItem13
+ // layoutControlItem9
//
- layoutControlItem13.Control = txtMaxLevel;
- layoutControlItem13.Location = new Point(322, 48);
- layoutControlItem13.Name = "layoutControlItem13";
- layoutControlItem13.Size = new Size(323, 24);
- layoutControlItem13.Text = "鏈�楂樻按浣�:";
- layoutControlItem13.TextSize = new Size(52, 14);
+ 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);
+ //
+ // layoutControlItem8
+ //
+ layoutControlItem8.Control = setFlagsEditCtrl1;
+ layoutControlItem8.Location = new Point(322, 24);
+ layoutControlItem8.Name = "layoutControlItem8";
+ layoutControlItem8.Size = new Size(323, 24);
+ layoutControlItem8.Text = "鏍囩:";
+ layoutControlItem8.TextSize = new Size(52, 14);
//
// layoutControlItem14
//
@@ -311,14 +316,9 @@
layoutControlItem14.Text = "鏈�浣庢按浣�:";
layoutControlItem14.TextSize = new Size(52, 14);
//
- // layoutControlItem15
+ // dxErrorProvider1
//
- layoutControlItem15.Control = textEditVoerFlow;
- layoutControlItem15.Location = new Point(0, 96);
- layoutControlItem15.Name = "layoutControlItem15";
- layoutControlItem15.Size = new Size(645, 24);
- layoutControlItem15.TextSize = new Size(0, 0);
- layoutControlItem15.TextVisible = false;
+ dxErrorProvider1.ContainerControl = this;
//
// EditAssetsTankMainDlg
//
@@ -331,6 +331,11 @@
Text = "缂栬緫";
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
+ ((ISupportInitialize)textEditVoerFlow.Properties).EndInit();
+ ((ISupportInitialize)txtMinLevel.Properties).EndInit();
+ ((ISupportInitialize)txtDN.Properties).EndInit();
+ ((ISupportInitialize)txtMaxLevel.Properties).EndInit();
+ ((ISupportInitialize)txtMinVol.Properties).EndInit();
((ISupportInitialize)txtKeyWord.Properties).EndInit();
((ISupportInitialize)txtTagName.Properties).EndInit();
((ISupportInitialize)txtDescription.Properties).EndInit();
@@ -339,20 +344,15 @@
((ISupportInitialize)layoutControlItem1).EndInit();
((ISupportInitialize)layoutControlItem6).EndInit();
((ISupportInitialize)layoutControlItem7).EndInit();
- ((ISupportInitialize)layoutControlItem8).EndInit();
- ((ISupportInitialize)layoutControlItem9).EndInit();
((ISupportInitialize)layoutControlItem10).EndInit();
- ((ISupportInitialize)dxErrorProvider1).EndInit();
- ((ISupportInitialize)textEditVoerFlow.Properties).EndInit();
- ((ISupportInitialize)txtMinLevel.Properties).EndInit();
- ((ISupportInitialize)txtDN.Properties).EndInit();
- ((ISupportInitialize)txtMaxLevel.Properties).EndInit();
- ((ISupportInitialize)txtMinVol.Properties).EndInit();
+ ((ISupportInitialize)layoutControlItem15).EndInit();
+ ((ISupportInitialize)layoutControlItem13).EndInit();
((ISupportInitialize)layoutControlItem11).EndInit();
((ISupportInitialize)layoutControlItem12).EndInit();
- ((ISupportInitialize)layoutControlItem13).EndInit();
+ ((ISupportInitialize)layoutControlItem9).EndInit();
+ ((ISupportInitialize)layoutControlItem8).EndInit();
((ISupportInitialize)layoutControlItem14).EndInit();
- ((ISupportInitialize)layoutControlItem15).EndInit();
+ ((ISupportInitialize)dxErrorProvider1).EndInit();
ResumeLayout(false);
}
--
Gitblit v1.9.3