From 580201d86a324677a1d64a87c7ff79dceb27a58e Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 05 十二月 2024 22:12:51 +0800
Subject: [PATCH] 阀门单独修改提交
---
Dto/HStation.Dto.Assets.Core/17-Flowmeter/02-AssetsFlowmeterMain/UpdateAssetsFlowmeterMainInput.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/PipeManageMainPage.cs | 3
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.cs | 2
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.cs | 197 ++++++------
WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs | 93 ++++++
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.resx | 4
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.Designer.cs | 58 ++-
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.cs | 9
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.cs | 7
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.Designer.cs | 226 ++++++++------
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/05-import/01-excel/ImportValvePerform2dByExcelCtrl.designer.cs | 40 --
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.Designer.cs | 228 ++++++++------
13 files changed, 509 insertions(+), 364 deletions(-)
diff --git a/Dto/HStation.Dto.Assets.Core/17-Flowmeter/02-AssetsFlowmeterMain/UpdateAssetsFlowmeterMainInput.cs b/Dto/HStation.Dto.Assets.Core/17-Flowmeter/02-AssetsFlowmeterMain/UpdateAssetsFlowmeterMainInput.cs
index 7796e1c..cd426ae 100644
--- a/Dto/HStation.Dto.Assets.Core/17-Flowmeter/02-AssetsFlowmeterMain/UpdateAssetsFlowmeterMainInput.cs
+++ b/Dto/HStation.Dto.Assets.Core/17-Flowmeter/02-AssetsFlowmeterMain/UpdateAssetsFlowmeterMainInput.cs
@@ -33,7 +33,7 @@
/// <summary>
/// 璇嗗埆鍏抽敭瀛�
///</summary>
- public string KeyWord { get; set; }
+ public List<string> KeyWord { get; set; }
/// <summary>
/// 鍙傛暟
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.cs
index 86a1987..def8e88 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.cs
@@ -115,7 +115,7 @@
}
var model = new Vmo.AssetsValveCoefficientVmo();
model.MainID = _valve_main_id;
- model.MinorLossCurve = pt_list_json;
+ model.OpenLossCurve = pt_list_json;
this.xtrPerform2dChart1.SetBindingData(pt_list_json);
_xhs_phart_diagram_ex_std_dto = model;
return await _bll.Insert(model) > 0;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/05-import/01-excel/ImportValvePerform2dByExcelCtrl.designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/05-import/01-excel/ImportValvePerform2dByExcelCtrl.designer.cs
index c1be273..7f09695 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/05-import/01-excel/ImportValvePerform2dByExcelCtrl.designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/05-import/01-excel/ImportValvePerform2dByExcelCtrl.designer.cs
@@ -45,11 +45,9 @@
colQ = new DevExpress.XtraGrid.Columns.GridColumn();
colL = new DevExpress.XtraGrid.Columns.GridColumn();
btnExcelFilePath = new DevExpress.XtraEditors.ButtonEdit();
- txtCurveCode = new DevExpress.XtraEditors.TextEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
sidePanel1 = new DevExpress.XtraEditors.SidePanel();
@@ -60,11 +58,9 @@
((System.ComponentModel.ISupportInitialize)bindingSource1).BeginInit();
((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
((System.ComponentModel.ISupportInitialize)btnExcelFilePath.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)txtCurveCode.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup2).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
sidePanel1.SuspendLayout();
@@ -74,7 +70,6 @@
//
layoutControl1.Controls.Add(gridControl1);
layoutControl1.Controls.Add(btnExcelFilePath);
- layoutControl1.Controls.Add(txtCurveCode);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
@@ -87,10 +82,10 @@
// gridControl1
//
gridControl1.DataSource = bindingSource1;
- gridControl1.Location = new Point(0, 114);
+ gridControl1.Location = new Point(0, 90);
gridControl1.MainView = gridView1;
gridControl1.Name = "gridControl1";
- gridControl1.Size = new Size(425, 546);
+ gridControl1.Size = new Size(425, 570);
gridControl1.TabIndex = 9;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
@@ -143,14 +138,6 @@
btnExcelFilePath.TabIndex = 18;
btnExcelFilePath.ButtonClick += btnExcelFilePath_ButtonClick;
//
- // txtCurveCode
- //
- txtCurveCode.Location = new Point(56, 60);
- txtCurveCode.Name = "txtCurveCode";
- txtCurveCode.Size = new Size(357, 20);
- txtCurveCode.StyleController = layoutControl1;
- txtCurveCode.TabIndex = 19;
- //
// Root
//
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -164,10 +151,10 @@
// layoutControlGroup1
//
layoutControlGroup1.GroupStyle = DevExpress.Utils.GroupStyle.Title;
- layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem6, layoutControlItem7 });
+ layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem6 });
layoutControlGroup1.Location = new Point(0, 0);
layoutControlGroup1.Name = "layoutControlGroup1";
- layoutControlGroup1.Size = new Size(425, 92);
+ layoutControlGroup1.Size = new Size(425, 68);
layoutControlGroup1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
layoutControlGroup1.Text = "鏇茬嚎淇℃伅";
//
@@ -180,23 +167,14 @@
layoutControlItem6.Text = "Excel:";
layoutControlItem6.TextSize = new Size(32, 14);
//
- // layoutControlItem7
- //
- layoutControlItem7.Control = txtCurveCode;
- layoutControlItem7.Location = new Point(0, 26);
- layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(405, 24);
- layoutControlItem7.Text = "鍚嶇О:";
- layoutControlItem7.TextSize = new Size(32, 14);
- //
// layoutControlGroup2
//
layoutControlGroup2.GroupStyle = DevExpress.Utils.GroupStyle.Title;
layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3 });
- layoutControlGroup2.Location = new Point(0, 92);
+ layoutControlGroup2.Location = new Point(0, 68);
layoutControlGroup2.Name = "layoutControlGroup2";
layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlGroup2.Size = new Size(425, 568);
+ layoutControlGroup2.Size = new Size(425, 592);
layoutControlGroup2.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
layoutControlGroup2.Text = "鏇茬嚎瀹氫箟鐐�";
//
@@ -206,7 +184,7 @@
layoutControlItem3.Location = new Point(0, 0);
layoutControlItem3.Name = "layoutControlItem3";
layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItem3.Size = new Size(425, 546);
+ layoutControlItem3.Size = new Size(425, 570);
layoutControlItem3.TextSize = new Size(0, 0);
layoutControlItem3.TextVisible = false;
//
@@ -246,11 +224,9 @@
((System.ComponentModel.ISupportInitialize)bindingSource1).EndInit();
((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
((System.ComponentModel.ISupportInitialize)btnExcelFilePath.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)txtCurveCode.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup2).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
sidePanel1.ResumeLayout(false);
@@ -269,8 +245,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraEditors.ButtonEdit btnExcelFilePath;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraEditors.TextEdit txtCurveCode;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
private DevExpress.XtraEditors.SidePanel sidePanel1;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/PipeManageMainPage.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/PipeManageMainPage.cs
index d23d7d6..b5ec33d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/PipeManageMainPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/PipeManageMainPage.cs
@@ -79,9 +79,6 @@
var PipeLine = await _bll.GetByID(vm.ID);
if (PipeLine == null)
return;
- var cofficientList = await new BLL.AssetsPipeCoefficient().GetByPipeID(vm.ID);
- if (cofficientList == null)
- return;
dlg.SetBindingData(PipeLine);
dlg.ReloadDataEvent += async (rhs) =>
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.Designer.cs
index 7fba084..631057b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.Designer.cs
@@ -47,6 +47,10 @@
TextEditMaterial = new DevExpress.XtraEditors.ImageComboBoxEdit();
TextEditKeyWord = new DevExpress.XtraEditors.TextEdit();
TextEditMinorLoss = new DevExpress.XtraEditors.PopupContainerEdit();
+ textEditDN = new DevExpress.XtraEditors.TextEdit();
+ textEditMinLevel = new DevExpress.XtraEditors.TextEdit();
+ textEditMinVol = new DevExpress.XtraEditors.TextEdit();
+ textEditVoerFlow = new DevExpress.XtraEditors.CheckEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
@@ -59,6 +63,10 @@
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
imageComboBoxEdit1 = new DevExpress.XtraEditors.ImageComboBoxEdit();
@@ -69,14 +77,8 @@
layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
toolTipController1 = new DevExpress.Utils.ToolTipController(components);
- textEditDN = new DevExpress.XtraEditors.TextEdit();
- layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- textEditMinLevel = new DevExpress.XtraEditors.TextEdit();
- layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- textEditMinVol = new DevExpress.XtraEditors.TextEdit();
- layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- textEditVoerFlow = new DevExpress.XtraEditors.CheckEdit();
+ textEditMaxLevel = new DevExpress.XtraEditors.TextEdit();
+ layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)popupContainerControl1).BeginInit();
@@ -89,6 +91,10 @@
((System.ComponentModel.ISupportInitialize)TextEditMaterial.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditMinorLoss.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditDN.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditMinLevel.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditMinVol.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditVoerFlow.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
@@ -101,6 +107,10 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem14).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem16).BeginInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).BeginInit();
@@ -110,14 +120,8 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem27).BeginInit();
- ((System.ComponentModel.ISupportInitialize)textEditDN.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
- ((System.ComponentModel.ISupportInitialize)textEditMinLevel.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
- ((System.ComponentModel.ISupportInitialize)textEditMinVol.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem14).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem16).BeginInit();
- ((System.ComponentModel.ISupportInitialize)textEditVoerFlow.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditMaxLevel.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem17).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -136,6 +140,7 @@
layoutControl1.Controls.Add(textEditMinLevel);
layoutControl1.Controls.Add(textEditMinVol);
layoutControl1.Controls.Add(textEditVoerFlow);
+ layoutControl1.Controls.Add(textEditMaxLevel);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
@@ -223,7 +228,7 @@
BtnOk.Name = "BtnOk";
BtnOk.Size = new Size(88, 22);
BtnOk.StyleController = layoutControl1;
- BtnOk.TabIndex = 12;
+ BtnOk.TabIndex = 13;
BtnOk.Text = "纭畾";
BtnOk.Click += BtnOk_ClickAsync;
//
@@ -236,7 +241,7 @@
simpleButton1.Name = "simpleButton1";
simpleButton1.Size = new Size(85, 22);
simpleButton1.StyleController = layoutControl1;
- simpleButton1.TabIndex = 13;
+ simpleButton1.TabIndex = 14;
simpleButton1.Text = "鍙栨秷";
//
// TextEditName
@@ -249,11 +254,11 @@
//
// DescriptionTextEdit
//
- DescriptionTextEdit.Location = new Point(20, 161);
+ DescriptionTextEdit.Location = new Point(20, 185);
DescriptionTextEdit.Name = "DescriptionTextEdit";
- DescriptionTextEdit.Size = new Size(637, 281);
+ DescriptionTextEdit.Size = new Size(637, 257);
DescriptionTextEdit.StyleController = layoutControl1;
- DescriptionTextEdit.TabIndex = 11;
+ DescriptionTextEdit.TabIndex = 12;
//
// TextEditCaliber
//
@@ -294,13 +299,48 @@
TextEditMinorLoss.StyleController = layoutControl1;
TextEditMinorLoss.TabIndex = 5;
//
+ // textEditDN
+ //
+ textEditDN.Location = new Point(404, 56);
+ textEditDN.Name = "textEditDN";
+ textEditDN.Size = new Size(265, 20);
+ textEditDN.StyleController = layoutControl1;
+ textEditDN.TabIndex = 6;
+ //
+ // textEditMinLevel
+ //
+ textEditMinLevel.Location = new Point(404, 80);
+ textEditMinLevel.Name = "textEditMinLevel";
+ textEditMinLevel.Size = new Size(265, 20);
+ textEditMinLevel.StyleController = layoutControl1;
+ textEditMinLevel.TabIndex = 8;
+ //
+ // textEditMinVol
+ //
+ textEditMinVol.Location = new Point(72, 104);
+ textEditMinVol.Name = "textEditMinVol";
+ textEditMinVol.Size = new Size(264, 20);
+ textEditMinVol.StyleController = layoutControl1;
+ textEditMinVol.TabIndex = 9;
+ //
+ // textEditVoerFlow
+ //
+ textEditVoerFlow.EditValue = null;
+ textEditVoerFlow.Location = new Point(8, 128);
+ textEditVoerFlow.Name = "textEditVoerFlow";
+ textEditVoerFlow.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Default;
+ textEditVoerFlow.Properties.Caption = "鏄惁鍏佽婧㈡祦";
+ textEditVoerFlow.Size = new Size(661, 20);
+ textEditVoerFlow.StyleController = layoutControl1;
+ textEditVoerFlow.TabIndex = 11;
+ //
// 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[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem1, layoutControlItem12, layoutControlGroup5, layoutControlItem9, layoutControlItem2, layoutControlItem7, layoutControlItem3, layoutControlItem10, layoutControlItem11, layoutControlItem14, layoutControlItem16 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem1, layoutControlItem12, layoutControlGroup5, layoutControlItem9, layoutControlItem2, layoutControlItem7, layoutControlItem3, layoutControlItem10, layoutControlItem11, layoutControlItem14, layoutControlItem17, layoutControlItem16 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
Root.Size = new Size(677, 488);
@@ -356,9 +396,9 @@
layoutControlGroup5.AppearanceGroup.FontSizeDelta = 1;
layoutControlGroup5.AppearanceGroup.Options.UseFont = true;
layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
- layoutControlGroup5.Location = new Point(0, 120);
+ layoutControlGroup5.Location = new Point(0, 144);
layoutControlGroup5.Name = "layoutControlGroup5";
- layoutControlGroup5.Size = new Size(665, 330);
+ layoutControlGroup5.Size = new Size(665, 306);
layoutControlGroup5.Text = "璇存槑";
//
// layoutControlItem5
@@ -366,7 +406,7 @@
layoutControlItem5.Control = DescriptionTextEdit;
layoutControlItem5.Location = new Point(0, 0);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(641, 285);
+ layoutControlItem5.Size = new Size(641, 261);
layoutControlItem5.Text = "璇存槑:";
layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
layoutControlItem5.TextSize = new Size(0, 0);
@@ -408,6 +448,43 @@
layoutControlItem3.Size = new Size(332, 24);
layoutControlItem3.Text = "鏍囩鍒楄〃:";
layoutControlItem3.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem10
+ //
+ layoutControlItem10.Control = textEditDN;
+ layoutControlItem10.Location = new Point(332, 48);
+ layoutControlItem10.Name = "layoutControlItem10";
+ layoutControlItem10.Size = new Size(333, 24);
+ layoutControlItem10.Text = "鍏О鐩村緞:";
+ layoutControlItem10.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem11
+ //
+ layoutControlItem11.Control = textEditMinLevel;
+ layoutControlItem11.Location = new Point(332, 72);
+ layoutControlItem11.Name = "layoutControlItem11";
+ layoutControlItem11.Size = new Size(333, 24);
+ layoutControlItem11.Text = "鏈�浣庢按浣�:";
+ layoutControlItem11.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem14
+ //
+ layoutControlItem14.Control = textEditMinVol;
+ layoutControlItem14.Location = new Point(0, 96);
+ layoutControlItem14.Name = "layoutControlItem14";
+ layoutControlItem14.Size = new Size(332, 24);
+ layoutControlItem14.Text = "鏈�灏忓绉�:";
+ layoutControlItem14.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem16
+ //
+ layoutControlItem16.Control = textEditVoerFlow;
+ layoutControlItem16.Location = new Point(0, 120);
+ layoutControlItem16.Name = "layoutControlItem16";
+ layoutControlItem16.Size = new Size(665, 24);
+ layoutControlItem16.Text = "鏄惁鍏佽婧㈡祦:";
+ layoutControlItem16.TextSize = new Size(0, 0);
+ layoutControlItem16.TextVisible = false;
//
// dxErrorProvider1
//
@@ -479,77 +556,22 @@
layoutControlItem27.Text = "璇存槑:";
layoutControlItem27.TextSize = new Size(59, 14);
//
- // textEditDN
+ // textEditMaxLevel
//
- textEditDN.Location = new Point(404, 56);
- textEditDN.Name = "textEditDN";
- textEditDN.Size = new Size(265, 20);
- textEditDN.StyleController = layoutControl1;
- textEditDN.TabIndex = 6;
+ textEditMaxLevel.Location = new Point(404, 104);
+ textEditMaxLevel.Name = "textEditMaxLevel";
+ textEditMaxLevel.Size = new Size(265, 20);
+ textEditMaxLevel.StyleController = layoutControl1;
+ textEditMaxLevel.TabIndex = 10;
//
- // layoutControlItem10
+ // layoutControlItem17
//
- layoutControlItem10.Control = textEditDN;
- layoutControlItem10.Location = new Point(332, 48);
- layoutControlItem10.Name = "layoutControlItem10";
- layoutControlItem10.Size = new Size(333, 24);
- layoutControlItem10.Text = "鍏О鐩村緞:";
- layoutControlItem10.TextSize = new Size(52, 14);
- //
- // textEditMinLevel
- //
- textEditMinLevel.Location = new Point(404, 80);
- textEditMinLevel.Name = "textEditMinLevel";
- textEditMinLevel.Size = new Size(265, 20);
- textEditMinLevel.StyleController = layoutControl1;
- textEditMinLevel.TabIndex = 8;
- //
- // layoutControlItem11
- //
- layoutControlItem11.Control = textEditMinLevel;
- layoutControlItem11.Location = new Point(332, 72);
- layoutControlItem11.Name = "layoutControlItem11";
- layoutControlItem11.Size = new Size(333, 24);
- layoutControlItem11.Text = "鏈�浣庢按浣�:";
- layoutControlItem11.TextSize = new Size(52, 14);
- //
- // textEditMinVol
- //
- textEditMinVol.Location = new Point(72, 104);
- textEditMinVol.Name = "textEditMinVol";
- textEditMinVol.Size = new Size(264, 20);
- textEditMinVol.StyleController = layoutControl1;
- textEditMinVol.TabIndex = 9;
- //
- // layoutControlItem14
- //
- layoutControlItem14.Control = textEditMinVol;
- layoutControlItem14.Location = new Point(0, 96);
- layoutControlItem14.Name = "layoutControlItem14";
- layoutControlItem14.Size = new Size(332, 24);
- layoutControlItem14.Text = "鏈�灏忓绉�:";
- layoutControlItem14.TextSize = new Size(52, 14);
- //
- // layoutControlItem16
- //
- layoutControlItem16.Control = textEditVoerFlow;
- layoutControlItem16.Location = new Point(332, 96);
- layoutControlItem16.Name = "layoutControlItem16";
- layoutControlItem16.Size = new Size(333, 24);
- layoutControlItem16.Text = "鏄惁鍏佽婧㈡祦:";
- layoutControlItem16.TextSize = new Size(0, 0);
- layoutControlItem16.TextVisible = false;
- //
- // textEditVoerFlow
- //
- textEditVoerFlow.EditValue = null;
- textEditVoerFlow.Location = new Point(340, 104);
- textEditVoerFlow.Name = "textEditVoerFlow";
- textEditVoerFlow.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Default;
- textEditVoerFlow.Properties.Caption = "鏄惁鍏佽婧㈡祦";
- textEditVoerFlow.Size = new Size(329, 20);
- textEditVoerFlow.StyleController = layoutControl1;
- textEditVoerFlow.TabIndex = 10;
+ layoutControlItem17.Control = textEditMaxLevel;
+ layoutControlItem17.Location = new Point(332, 96);
+ layoutControlItem17.Name = "layoutControlItem17";
+ layoutControlItem17.Size = new Size(333, 24);
+ layoutControlItem17.Text = "鏈�澶ф按浣�:";
+ layoutControlItem17.TextSize = new Size(52, 14);
//
// AddAssetsTankMainDlg
//
@@ -572,6 +594,10 @@
((System.ComponentModel.ISupportInitialize)TextEditMaterial.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditMinorLoss.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditDN.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditMinLevel.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditMinVol.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditVoerFlow.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
@@ -584,6 +610,10 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem14).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem16).EndInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).EndInit();
@@ -593,14 +623,8 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem27).EndInit();
- ((System.ComponentModel.ISupportInitialize)textEditDN.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
- ((System.ComponentModel.ISupportInitialize)textEditMinLevel.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
- ((System.ComponentModel.ISupportInitialize)textEditMinVol.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem14).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem16).EndInit();
- ((System.ComponentModel.ISupportInitialize)textEditVoerFlow.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditMaxLevel.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem17).EndInit();
ResumeLayout(false);
}
@@ -661,5 +685,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraEditors.CheckEdit textEditVoerFlow;
+ private DevExpress.XtraEditors.TextEdit textEditMaxLevel;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.cs
index 0162663..cd0a9f6 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.cs
@@ -142,6 +142,10 @@
{
_TankVmo.MinLevel = MinLevel;
}
+ if (double.TryParse(this.textEditMaxLevel.Text, out double MaxLevel))
+ {
+ _TankVmo.MaxLevel = MaxLevel;
+ }
if (double.TryParse(this.textEditMinVol.Text, out double MinVol))
{
_TankVmo.MinVol = MinVol;
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 1449869..f5e76f3 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,10 @@
{
components = new System.ComponentModel.Container();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ textEditDN = new DevExpress.XtraEditors.TextEdit();
+ textEditMinLevel = new DevExpress.XtraEditors.TextEdit();
+ textEditMinVol = new DevExpress.XtraEditors.TextEdit();
+ textEditVoerFlow = new DevExpress.XtraEditors.CheckEdit();
selectFlagsPopupCtrl1 = new SelectFlagsPopupCtrl();
popupContainerControl1 = new DevExpress.XtraEditors.PopupContainerControl();
treeList1 = new DevExpress.XtraTreeList.TreeList();
@@ -59,6 +63,10 @@
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
imageComboBoxEdit1 = new DevExpress.XtraEditors.ImageComboBoxEdit();
@@ -71,16 +79,14 @@
toolTipController1 = new DevExpress.Utils.ToolTipController(components);
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- textEditDN = new DevExpress.XtraEditors.TextEdit();
- textEditMinLevel = new DevExpress.XtraEditors.TextEdit();
- textEditMinVol = new DevExpress.XtraEditors.TextEdit();
- textEditVoerFlow = new DevExpress.XtraEditors.CheckEdit();
- layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ textEditMaxLevel = new DevExpress.XtraEditors.TextEdit();
+ layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)textEditDN.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditMinLevel.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditMinVol.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditVoerFlow.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)popupContainerControl1).BeginInit();
popupContainerControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)treeList1).BeginInit();
@@ -103,6 +109,10 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem14).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem16).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem17).BeginInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).BeginInit();
@@ -114,18 +124,13 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem27).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
- ((System.ComponentModel.ISupportInitialize)textEditDN.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)textEditMinLevel.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)textEditMinVol.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)textEditVoerFlow.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem14).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem16).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem17).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditMaxLevel.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem18).BeginInit();
SuspendLayout();
//
// layoutControl1
//
+ layoutControl1.Controls.Add(textEditMaxLevel);
layoutControl1.Controls.Add(textEditDN);
layoutControl1.Controls.Add(textEditMinLevel);
layoutControl1.Controls.Add(textEditMinVol);
@@ -148,6 +153,41 @@
layoutControl1.Size = new Size(681, 482);
layoutControl1.TabIndex = 0;
layoutControl1.Text = "layoutControl1";
+ //
+ // textEditDN
+ //
+ textEditDN.Location = new Point(406, 56);
+ textEditDN.Name = "textEditDN";
+ textEditDN.Size = new Size(267, 20);
+ textEditDN.StyleController = layoutControl1;
+ textEditDN.TabIndex = 6;
+ //
+ // textEditMinLevel
+ //
+ textEditMinLevel.Location = new Point(406, 80);
+ textEditMinLevel.Name = "textEditMinLevel";
+ textEditMinLevel.Size = new Size(267, 20);
+ textEditMinLevel.StyleController = layoutControl1;
+ textEditMinLevel.TabIndex = 8;
+ //
+ // textEditMinVol
+ //
+ textEditMinVol.Location = new Point(72, 104);
+ textEditMinVol.Name = "textEditMinVol";
+ textEditMinVol.Size = new Size(266, 20);
+ textEditMinVol.StyleController = layoutControl1;
+ textEditMinVol.TabIndex = 9;
+ //
+ // textEditVoerFlow
+ //
+ textEditVoerFlow.EditValue = null;
+ textEditVoerFlow.Location = new Point(8, 128);
+ textEditVoerFlow.Name = "textEditVoerFlow";
+ textEditVoerFlow.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Default;
+ textEditVoerFlow.Properties.Caption = "鏄惁鍏佽婧㈡祦";
+ textEditVoerFlow.Size = new Size(665, 20);
+ textEditVoerFlow.StyleController = layoutControl1;
+ textEditVoerFlow.TabIndex = 11;
//
// selectFlagsPopupCtrl1
//
@@ -227,7 +267,7 @@
BtnOk.Name = "BtnOk";
BtnOk.Size = new Size(67, 22);
BtnOk.StyleController = layoutControl1;
- BtnOk.TabIndex = 12;
+ BtnOk.TabIndex = 13;
BtnOk.Text = "纭畾";
BtnOk.Click += BtnOk_ClickAsync;
//
@@ -240,7 +280,7 @@
simpleButton1.Name = "simpleButton1";
simpleButton1.Size = new Size(71, 22);
simpleButton1.StyleController = layoutControl1;
- simpleButton1.TabIndex = 13;
+ simpleButton1.TabIndex = 14;
simpleButton1.Text = "鍙栨秷";
//
// TextEditName
@@ -253,11 +293,11 @@
//
// DescriptionTextEdit
//
- DescriptionTextEdit.Location = new Point(20, 161);
+ DescriptionTextEdit.Location = new Point(20, 185);
DescriptionTextEdit.Name = "DescriptionTextEdit";
- DescriptionTextEdit.Size = new Size(641, 275);
+ DescriptionTextEdit.Size = new Size(641, 251);
DescriptionTextEdit.StyleController = layoutControl1;
- DescriptionTextEdit.TabIndex = 11;
+ DescriptionTextEdit.TabIndex = 12;
//
// TextEditCaliber
//
@@ -304,7 +344,7 @@
Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem1, layoutControlItem9, layoutControlGroup5, layoutControlItem12, layoutControlItem7, layoutControlItem11, layoutControlItem6, layoutControlItem14, layoutControlItem10, layoutControlItem16, layoutControlItem17 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem1, layoutControlItem9, layoutControlGroup5, layoutControlItem12, layoutControlItem7, layoutControlItem11, layoutControlItem6, layoutControlItem16, layoutControlItem17, layoutControlItem18, layoutControlItem10, layoutControlItem14 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
Root.Size = new Size(681, 482);
@@ -358,9 +398,9 @@
// layoutControlGroup5
//
layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
- layoutControlGroup5.Location = new Point(0, 120);
+ layoutControlGroup5.Location = new Point(0, 144);
layoutControlGroup5.Name = "layoutControlGroup5";
- layoutControlGroup5.Size = new Size(669, 324);
+ layoutControlGroup5.Size = new Size(669, 300);
layoutControlGroup5.Text = "璇存槑";
//
// layoutControlItem5
@@ -368,7 +408,7 @@
layoutControlItem5.Control = DescriptionTextEdit;
layoutControlItem5.Location = new Point(0, 0);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(645, 279);
+ layoutControlItem5.Size = new Size(645, 255);
layoutControlItem5.Text = "璇存槑:";
layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
layoutControlItem5.TextSize = new Size(0, 0);
@@ -410,6 +450,42 @@
layoutControlItem6.Size = new Size(334, 24);
layoutControlItem6.Text = "鏍囩鍒楄〃:";
layoutControlItem6.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem14
+ //
+ layoutControlItem14.Control = textEditMinVol;
+ layoutControlItem14.Location = new Point(0, 96);
+ layoutControlItem14.Name = "layoutControlItem14";
+ layoutControlItem14.Size = new Size(334, 24);
+ layoutControlItem14.Text = "鏈�灏忓绉�:";
+ layoutControlItem14.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem10
+ //
+ layoutControlItem10.Control = textEditVoerFlow;
+ layoutControlItem10.Location = new Point(0, 120);
+ layoutControlItem10.Name = "layoutControlItem10";
+ layoutControlItem10.Size = new Size(669, 24);
+ layoutControlItem10.TextSize = new Size(0, 0);
+ layoutControlItem10.TextVisible = false;
+ //
+ // layoutControlItem16
+ //
+ layoutControlItem16.Control = textEditMinLevel;
+ layoutControlItem16.Location = new Point(334, 72);
+ layoutControlItem16.Name = "layoutControlItem16";
+ layoutControlItem16.Size = new Size(335, 24);
+ layoutControlItem16.Text = "鏈�浣庢按浣�:";
+ layoutControlItem16.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem17
+ //
+ layoutControlItem17.Control = textEditDN;
+ layoutControlItem17.Location = new Point(334, 48);
+ layoutControlItem17.Name = "layoutControlItem17";
+ layoutControlItem17.Size = new Size(335, 24);
+ layoutControlItem17.Text = "鍏О鐩村緞:";
+ layoutControlItem17.TextSize = new Size(52, 14);
//
// dxErrorProvider1
//
@@ -497,76 +573,22 @@
layoutControlItem3.Text = "鎹熷け绯绘暟:";
layoutControlItem3.TextSize = new Size(52, 14);
//
- // textEditDN
+ // textEditMaxLevel
//
- textEditDN.Location = new Point(406, 56);
- textEditDN.Name = "textEditDN";
- textEditDN.Size = new Size(267, 20);
- textEditDN.StyleController = layoutControl1;
- textEditDN.TabIndex = 6;
+ textEditMaxLevel.Location = new Point(406, 104);
+ textEditMaxLevel.Name = "textEditMaxLevel";
+ textEditMaxLevel.Size = new Size(267, 20);
+ textEditMaxLevel.StyleController = layoutControl1;
+ textEditMaxLevel.TabIndex = 10;
//
- // textEditMinLevel
+ // layoutControlItem18
//
- textEditMinLevel.Location = new Point(406, 80);
- textEditMinLevel.Name = "textEditMinLevel";
- textEditMinLevel.Size = new Size(267, 20);
- textEditMinLevel.StyleController = layoutControl1;
- textEditMinLevel.TabIndex = 8;
- //
- // textEditMinVol
- //
- textEditMinVol.Location = new Point(72, 104);
- textEditMinVol.Name = "textEditMinVol";
- textEditMinVol.Size = new Size(266, 20);
- textEditMinVol.StyleController = layoutControl1;
- textEditMinVol.TabIndex = 9;
- //
- // textEditVoerFlow
- //
- textEditVoerFlow.EditValue = null;
- textEditVoerFlow.Location = new Point(342, 104);
- textEditVoerFlow.Name = "textEditVoerFlow";
- textEditVoerFlow.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Default;
- textEditVoerFlow.Properties.Caption = "鏄惁鍏佽婧㈡祦";
- textEditVoerFlow.Size = new Size(331, 20);
- textEditVoerFlow.StyleController = layoutControl1;
- textEditVoerFlow.TabIndex = 10;
- //
- // layoutControlItem10
- //
- layoutControlItem10.Control = textEditVoerFlow;
- layoutControlItem10.Location = new Point(334, 96);
- layoutControlItem10.Name = "layoutControlItem10";
- layoutControlItem10.Size = new Size(335, 24);
- layoutControlItem10.TextSize = new Size(0, 0);
- layoutControlItem10.TextVisible = false;
- //
- // layoutControlItem14
- //
- layoutControlItem14.Control = textEditMinVol;
- layoutControlItem14.Location = new Point(0, 96);
- layoutControlItem14.Name = "layoutControlItem14";
- layoutControlItem14.Size = new Size(334, 24);
- layoutControlItem14.Text = "鏈�灏忓绉�:";
- layoutControlItem14.TextSize = new Size(52, 14);
- //
- // layoutControlItem16
- //
- layoutControlItem16.Control = textEditMinLevel;
- layoutControlItem16.Location = new Point(334, 72);
- layoutControlItem16.Name = "layoutControlItem16";
- layoutControlItem16.Size = new Size(335, 24);
- layoutControlItem16.Text = "鏈�浣庢按浣�:";
- layoutControlItem16.TextSize = new Size(52, 14);
- //
- // layoutControlItem17
- //
- layoutControlItem17.Control = textEditDN;
- layoutControlItem17.Location = new Point(334, 48);
- layoutControlItem17.Name = "layoutControlItem17";
- layoutControlItem17.Size = new Size(335, 24);
- layoutControlItem17.Text = "鍏О鐩村緞:";
- layoutControlItem17.TextSize = new Size(52, 14);
+ layoutControlItem18.Control = textEditMaxLevel;
+ layoutControlItem18.Location = new Point(334, 96);
+ layoutControlItem18.Name = "layoutControlItem18";
+ layoutControlItem18.Size = new Size(335, 24);
+ layoutControlItem18.Text = "鏈�澶ф按浣�:";
+ layoutControlItem18.TextSize = new Size(52, 14);
//
// EditAssetsTankMainDlg
//
@@ -579,6 +601,10 @@
Text = "缂栬緫鍠峰ご";
((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)textEditDN.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditMinLevel.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditMinVol.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditVoerFlow.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)popupContainerControl1).EndInit();
popupContainerControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)treeList1).EndInit();
@@ -601,6 +627,10 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem14).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem16).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem17).EndInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).EndInit();
@@ -612,14 +642,8 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem27).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
- ((System.ComponentModel.ISupportInitialize)textEditDN.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)textEditMinLevel.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)textEditMinVol.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)textEditVoerFlow.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem14).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem16).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem17).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditMaxLevel.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem18).EndInit();
ResumeLayout(false);
}
@@ -679,5 +703,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraEditors.TextEdit textEditMaxLevel;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.cs
index f0f5632..35207d9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/EditAssetsTankMainDlg.cs
@@ -49,7 +49,8 @@
this.selectFlagsPopupCtrl1.SetBindingData<AssetsFlags>(_TankVmo.Flags);
this.textEditDN.Text = _TankVmo.DN.ToString();
this.textEditMinLevel.Text = _TankVmo.MinLevel.ToString();
- this.textEditMinVol.Text = _TankVmo.MinVol.ToString();
+ this.textEditMaxLevel.Text = _TankVmo.MaxLevel.ToString();
+ this.textEditMinVol.Text = _TankVmo.MinVol.ToString();
this.textEditVoerFlow.Checked = _TankVmo.OverFlow;
}
@@ -143,6 +144,10 @@
{
_TankVmo.MinLevel = MinLevel;
}
+ if (double.TryParse(this.textEditMaxLevel.Text, out double MaxLevel))
+ {
+ _TankVmo.MaxLevel = MaxLevel;
+ }
if (double.TryParse(this.textEditMinVol.Text, out double MinVol))
{
_TankVmo.MinVol = MinVol;
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.Designer.cs
index e2822c4..1e96629 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.Designer.cs
@@ -65,10 +65,10 @@
xtrPerform2dChart1.DefinePointVisible = false;
xtrPerform2dChart1.Dock = DockStyle.Fill;
xtrPerform2dChart1.LineVisible = false;
- xtrPerform2dChart1.Location = new Point(235, 148);
- xtrPerform2dChart1.Margin = new Padding(1, 2, 1, 2);
+ xtrPerform2dChart1.Location = new Point(0, 101);
+ xtrPerform2dChart1.Margin = new Padding(1);
xtrPerform2dChart1.Name = "xtrPerform2dChart1";
- xtrPerform2dChart1.Size = new Size(554, 657);
+ xtrPerform2dChart1.Size = new Size(552, 411);
xtrPerform2dChart1.TabIndex = 1;
//
// sidePanel2
@@ -76,8 +76,9 @@
sidePanel2.Controls.Add(xhsValveMainPhartListCtrl1);
sidePanel2.Dock = DockStyle.Fill;
sidePanel2.Location = new Point(0, 0);
+ sidePanel2.Margin = new Padding(2);
sidePanel2.Name = "sidePanel2";
- sidePanel2.Size = new Size(234, 623);
+ sidePanel2.Size = new Size(234, 388);
sidePanel2.TabIndex = 4;
sidePanel2.Text = "sidePanel2";
//
@@ -87,18 +88,18 @@
xhsValveMainPhartListCtrl1.Appearance.Options.UseBackColor = true;
xhsValveMainPhartListCtrl1.Dock = DockStyle.Fill;
xhsValveMainPhartListCtrl1.Location = new Point(0, 0);
- xhsValveMainPhartListCtrl1.Margin = new Padding(4, 5, 4, 5);
xhsValveMainPhartListCtrl1.Name = "xhsValveMainPhartListCtrl1";
- xhsValveMainPhartListCtrl1.Size = new Size(234, 623);
+ xhsValveMainPhartListCtrl1.Size = new Size(234, 388);
xhsValveMainPhartListCtrl1.TabIndex = 0;
//
// sidePanel1
//
sidePanel1.Controls.Add(tabPane1);
sidePanel1.Dock = DockStyle.Right;
- sidePanel1.Location = new Point(789, 148);
+ sidePanel1.Location = new Point(552, 101);
+ sidePanel1.Margin = new Padding(2);
sidePanel1.Name = "sidePanel1";
- sidePanel1.Size = new Size(271, 657);
+ sidePanel1.Size = new Size(190, 411);
sidePanel1.TabIndex = 3;
sidePanel1.Text = "sidePanel1";
//
@@ -108,43 +109,43 @@
tabPane1.Controls.Add(tabNavigationPage2);
tabPane1.Dock = DockStyle.Top;
tabPane1.Location = new Point(1, 0);
+ tabPane1.Margin = new Padding(2);
tabPane1.Name = "tabPane1";
tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabNavigationPage1, tabNavigationPage2 });
- tabPane1.RegularSize = new Size(270, 655);
+ tabPane1.RegularSize = new Size(189, 417);
tabPane1.SelectedPage = tabNavigationPage1;
- tabPane1.Size = new Size(270, 655);
+ tabPane1.Size = new Size(189, 417);
tabPane1.TabIndex = 0;
tabPane1.Text = "tabPane1";
//
// tabNavigationPage1
//
tabNavigationPage1.Caption = "杩愯鍙傛暟";
+ tabNavigationPage1.Margin = new Padding(2);
tabNavigationPage1.Name = "tabNavigationPage1";
- tabNavigationPage1.Size = new Size(270, 606);
+ tabNavigationPage1.Size = new Size(189, 384);
//
// tabNavigationPage2
//
tabNavigationPage2.Caption = "灞炴��";
+ tabNavigationPage2.Margin = new Padding(2);
tabNavigationPage2.Name = "tabNavigationPage2";
- tabNavigationPage2.Size = new Size(270, 606);
+ tabNavigationPage2.Size = new Size(189, 386);
//
// ribbonControl1
//
- ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(43, 47, 43, 47);
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, BtnAdd, barBtnImportByExcel, barBtnDelete, barBtnUpdateimportance, barBtnOtherName, barBtnEditChart });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.Margin = new Padding(4, 5, 4, 5);
ribbonControl1.MaxItemId = 33;
ribbonControl1.Name = "ribbonControl1";
- ribbonControl1.OptionsMenuMinWidth = 471;
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
- ribbonControl1.Size = new Size(1060, 148);
+ ribbonControl1.Size = new Size(742, 101);
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
// BtnAdd
@@ -176,6 +177,7 @@
barBtnUpdateimportance.Id = 29;
barBtnUpdateimportance.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUpdateimportance.ImageOptions.SvgImage");
barBtnUpdateimportance.Name = "barBtnUpdateimportance";
+ barBtnUpdateimportance.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
barBtnUpdateimportance.ItemClick += barBtnUpdateimportance_ItemClick;
//
// barBtnOtherName
@@ -184,6 +186,7 @@
barBtnOtherName.Id = 30;
barBtnOtherName.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnOtherName.ImageOptions.SvgImage");
barBtnOtherName.Name = "barBtnOtherName";
+ barBtnOtherName.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
barBtnOtherName.ItemClick += barBtnOtherName_ItemClick;
//
// barBtnEditChart
@@ -192,6 +195,7 @@
barBtnEditChart.Id = 31;
barBtnEditChart.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEditChart.ImageOptions.SvgImage");
barBtnEditChart.Name = "barBtnEditChart";
+ barBtnEditChart.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
barBtnEditChart.ItemClick += barBtnEditChart_ItemClick;
//
// ribbonPage1
@@ -219,7 +223,7 @@
//
dockManager1.DockingOptions.ShowCloseButton = false;
dockManager1.Form = this;
- dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 });
+ dockManager1.HiddenPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 });
dockManager1.Style = DevExpress.XtraBars.Docking2010.Views.DockingViewStyle.Light;
dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
//
@@ -228,33 +232,37 @@
dockPanel1.Controls.Add(dockPanel1_Container);
dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left;
dockPanel1.ID = new Guid("202c2203-fb3a-4b47-a9cb-083c698bd2ac");
- dockPanel1.Location = new Point(0, 148);
+ dockPanel1.Location = new Point(0, 0);
+ dockPanel1.Margin = new Padding(2);
dockPanel1.Name = "dockPanel1";
dockPanel1.OriginalSize = new Size(235, 200);
- dockPanel1.Size = new Size(235, 657);
+ dockPanel1.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Left;
+ dockPanel1.SavedIndex = 0;
+ dockPanel1.Size = new Size(235, 411);
dockPanel1.Text = "鏇茬嚎鍒楄〃";
+ dockPanel1.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
//
// dockPanel1_Container
//
dockPanel1_Container.Controls.Add(sidePanel2);
- dockPanel1_Container.Location = new Point(0, 34);
+ dockPanel1_Container.Location = new Point(0, 23);
+ dockPanel1_Container.Margin = new Padding(2);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(234, 623);
+ dockPanel1_Container.Size = new Size(234, 388);
dockPanel1_Container.TabIndex = 0;
//
// XhsValveMainPhartPanel
//
Appearance.BackColor = SystemColors.Control;
Appearance.Options.UseBackColor = true;
- AutoScaleDimensions = new SizeF(10F, 22F);
+ AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(xtrPerform2dChart1);
Controls.Add(sidePanel1);
- Controls.Add(dockPanel1);
Controls.Add(ribbonControl1);
- Margin = new Padding(6, 8, 6, 8);
+ Margin = new Padding(4, 5, 4, 5);
Name = "XhsValveMainPhartPanel";
- Size = new Size(1060, 805);
+ Size = new Size(742, 512);
sidePanel2.ResumeLayout(false);
sidePanel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)tabPane1).EndInit();
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.cs b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.cs
index 21887b3..0678d82 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.cs
@@ -1,4 +1,6 @@
-锘縰sing Yw.DAL.PostgreSql;
+锘縰sing DevExpress.XtraEditors;
+using NetTaste;
+using Yw.WinFrmUI.Phart;
namespace HStation.WinFrmUI.PhartRelation
{
@@ -7,19 +9,19 @@
public XhsValveMainPhartPanel()
{
InitializeComponent();
- this.PageTitle.Caption = "闃�闂ㄥ瀷鍙锋洸绾�";
+ this.PageTitle.Caption = "闃�闂ㄦ崯澶辩郴鏁版洸绾�";
this.xhsValveMainPhartListCtrl1.FocusedChangedEvent += XhsValveMainPhartListCtrl1_FocusedChangedEvent;
}
private long _valve_main_id;
- private Vmo.XhsValveMainPhartMappingExtensions _xhs_phart_diagram_ex_std_dto = null;
- private readonly BLL.XhsValveMainPhartMappingExtensions _bll_ex = new();
+ private Vmo.AssetsValveCoefficientVmo _xhs_phart_diagram_ex_std_dto = null;
+ private readonly BLL.AssetsValveCoefficient _bll = new();
/// <summary>
/// 鍒濆鍖栨暟鎹�
/// </summary>
- public void InitialDataSource(long valve_main_id)
+ public async void InitialDataSource(long valve_main_id)
{
_valve_main_id = valve_main_id;
if (_valve_main_id < 1)
@@ -27,13 +29,22 @@
this.xhsValveMainPhartListCtrl1.Clear();
return;
}
- this.xhsValveMainPhartListCtrl1.SetBindingData(valve_main_id);
+ //this.xhsValveMainPhartListCtrl1.SetBindingData(valve_main_id);
+ var chart = await new BLL.AssetsValveCoefficient().GetByMainID(valve_main_id);
+ if (chart.Count > 0)
+ {
+ _xhs_phart_diagram_ex_std_dto = chart.First();
+ this.xtrPerform2dChart1.SetBindingData(_xhs_phart_diagram_ex_std_dto.MinorLossCurve);
+ }
+ this.xtrPerform2dChart1.SetAxisTitle("闃�闂ㄥ紑搴�", "鎹熷け绯绘暟");
}
//閫夋嫨鏇茬嚎鍙樻崲浜嬩欢
private void XhsValveMainPhartListCtrl1_FocusedChangedEvent(Vmo.AssetsValveCoefficientVmo obj)
{
- this.xtrPerform2dChart1.SetBindingData(obj.MinorLossCurve);
+ _xhs_phart_diagram_ex_std_dto = obj;
+ this.xtrPerform2dChart1.SetBindingData(obj.MinorLossCurve);
+ // InitChart(_xhs_phart_diagram_ex_std_dto);
}
#region 鍥捐〃
@@ -56,7 +67,7 @@
return;
}
- var graph_ql = graph_list.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.ValveQL);
+ var graph_ql = graph_list.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.ValveOL);
if (graph_ql == null)
{
return;
@@ -85,9 +96,10 @@
//Excel 瀵煎叆
private void barBtnImportByExcel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- var dlg = new Yw.WinFrmUI.Phart.ImportValvePerform2dByExcelDlg();
+ var dlg = new ImportValvePerform2dByExcelDlg();
+ // dlg.SetBindingData("闃�闂ㄥ紑搴�", "鍘嬪姏鎹熷け绯绘暟");
dlg.ReloadDataEvent += async (pt_list_json) =>
- {
+ {
var bol = await Import(pt_list_json);
return bol;
};
@@ -102,12 +114,12 @@
XtraMessageBox.Show("ValveMain is null!");
return false;
}
- var bll = new BLL.AssetsValveCoefficient();
var model = new Vmo.AssetsValveCoefficientVmo();
model.MainID = _valve_main_id;
model.MinorLossCurve = pt_list_json;
- return await bll.Insert(model) > 0;
-
+ this.xtrPerform2dChart1.SetBindingData(pt_list_json);
+ _xhs_phart_diagram_ex_std_dto = model;
+ return await _bll.Insert(model) > 0;
}
#endregion 瀵煎叆
@@ -117,97 +129,98 @@
//缂栬緫
private void barBtnEditChart_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- if (_xhs_phart_diagram_ex_std_dto == null)
- {
- return;
- }
- var diagram = _xhs_phart_diagram_ex_std_dto.Diagram;
- if (diagram == null)
- {
- return;
- }
- var graph_list = diagram.GraphList;
- if (graph_list == null || !graph_list.Any())
- {
- return;
- }
+ /* if (_xhs_phart_diagram_ex_std_dto == null)
+ {
+ return;
+ }
+ var diagram = _xhs_phart_diagram_ex_std_dto.Diagram;
+ if (diagram == null)
+ {
+ return;
+ }
+ var graph_list = diagram.GraphList;
+ if (graph_list == null || !graph_list.Any())
+ {
+ return;
+ }
- var graph_ql = graph_list.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.ValveQL);
+ var graph_ql = graph_list.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.ValveOL);
- if (graph_ql == null)
- {
- return;
- }
- Yw.Geometry.CubicSpline2d ql = null;
- List<Yw.Geometry.Point2d> points_ql = null;
- points_ql = PhartPerformCurveHelper.GetFeatPointList(graph_ql.GraphType, graph_ql.GeometryInfo, 12, null);
- ql = new Yw.Geometry.CubicSpline2d(points_ql);
+ if (graph_ql == null)
+ {
+ return;
+ }
+ Yw.Geometry.CubicSpline2d ql = null;
+ List<Yw.Geometry.Point2d> points_ql = null;
+ points_ql = PhartPerformCurveHelper.GetFeatPointList(graph_ql.GraphType, graph_ql.GeometryInfo, 12, null);
+ ql = new Yw.Geometry.CubicSpline2d(points_ql);
- var dlg = new Yw.WinFrmUI.Phart.ValveEditDlg();
- dlg.SetBindingData(ql.ToDbString());
- dlg.ReloadDataEvent += async (new_ql) =>
- {
- graph_ql.GeometryInfo = new_ql.ToDbString();
- _xhs_phart_diagram_ex_std_dto.Diagram.GraphList = new List<Vmo.PhartGraph>()
- {
- graph_ql
- };
- var bol = await _bll_ex.Update(_xhs_phart_diagram_ex_std_dto);
- if (bol)
- {
- InitChart(_xhs_phart_diagram_ex_std_dto);
- }
- return bol;
- };
- dlg.ShowDialog();
+ var dlg = new ValvePerform2dEditDlg();
+ dlg.SetBindingData(ql);
+ dlg.SetAxisTile("闃�闂ㄥ紑搴�", "鍘嬪姏鎹熷け绯绘暟");
+ dlg.ReloadDataEvent += async (new_ql) =>
+ {
+ graph_ql.GeometryInfo = new_ql.ToDbString();
+ _xhs_phart_diagram_ex_std_dto.Diagram.GraphList = new List<Vmo.PhartGraph>()
+ {
+ graph_ql
+ };
+ var bol = await _bll.Update(_xhs_phart_diagram_ex_std_dto);
+ if (bol)
+ {
+ InitChart(_xhs_phart_diagram_ex_std_dto);
+ }
+ return bol;
+ };
+ dlg.ShowDialog();*/
}
//鍒悕
private void barBtnOtherName_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- if (_xhs_phart_diagram_ex_std_dto == null)
- {
- return;
- }
- var dlg = new SetOtherNameDlg();
- dlg.SetBindingData(_xhs_phart_diagram_ex_std_dto.OtherName);
- dlg.VerifyValueChanged += async (value) =>
- {
- _xhs_phart_diagram_ex_std_dto.OtherName = value;
- var bol = await _bll_ex.Update(_xhs_phart_diagram_ex_std_dto);
- if (!bol)
- {
- XtraMessageBox.Show("鏇存柊澶辫触!");
- return false;
- }
- this.xhsValveMainPhartListCtrl1.UpdateOtherName(_xhs_phart_diagram_ex_std_dto.ID, value);
- XtraMessageBox.Show("鏇存柊鎴愬姛!");
- return true;
- };
+ /* if (_xhs_phart_diagram_ex_std_dto == null)
+ {
+ return;
+ }
+ var dlg = new SetOtherNameDlg();
+ dlg.SetBindingData(_xhs_phart_diagram_ex_std_dto.OtherName);
+ dlg.VerifyValueChanged += async (value) =>
+ {
+ _xhs_phart_diagram_ex_std_dto.OtherName = value;
+ var bol = await _bll.Update(_xhs_phart_diagram_ex_std_dto);
+ if (!bol)
+ {
+ XtraMessageBox.Show("鏇存柊澶辫触!");
+ return false;
+ }
+ this.xhsValveMainPhartListCtrl1.UpdateOtherName(_xhs_phart_diagram_ex_std_dto.ID, value);
+ XtraMessageBox.Show("鏇存柊鎴愬姛!");
+ return true;
+ };
- dlg.ShowDialog();
+ dlg.ShowDialog();*/
}
//閲嶈搴�
private void barBtnUpdateimportance_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- var dlg = new SetImportanceDlg();
- dlg.SetBindingData(_xhs_phart_diagram_ex_std_dto.Importance);
- dlg.VerifyValueChanged += async (value) =>
- {
- _xhs_phart_diagram_ex_std_dto.Importance = value;
- var bol = await _bll_ex.Update(_xhs_phart_diagram_ex_std_dto);
- if (!bol)
- {
- XtraMessageBox.Show("鏇存柊澶辫触!");
- return false;
- }
- this.xhsValveMainPhartListCtrl1.UpdateImportance(_xhs_phart_diagram_ex_std_dto.ID, value);
- XtraMessageBox.Show("鏇存柊鎴愬姛!");
- return true;
- };
+ /* var dlg = new SetImportanceDlg();
+ dlg.SetBindingData(_xhs_phart_diagram_ex_std_dto.Importance);
+ dlg.VerifyValueChanged += async (value) =>
+ {
+ _xhs_phart_diagram_ex_std_dto.Importance = value;
+ var bol = await _bll.Update(_xhs_phart_diagram_ex_std_dto);
+ if (!bol)
+ {
+ XtraMessageBox.Show("鏇存柊澶辫触!");
+ return false;
+ }
+ this.xhsValveMainPhartListCtrl1.UpdateImportance(_xhs_phart_diagram_ex_std_dto.ID, value);
+ XtraMessageBox.Show("鏇存柊鎴愬姛!");
+ return true;
+ };
- dlg.ShowDialog();
+ dlg.ShowDialog();*/
}
#region 鍒犻櫎
@@ -225,8 +238,7 @@
{
return false;
}
- var diagramId = _xhs_phart_diagram_ex_std_dto.Diagram.ID;
- var bol = await _bll_ex.DeleteByDiagramID(diagramId);
+ var bol = await _bll.DeleteByID(_xhs_phart_diagram_ex_std_dto.ID);
if (!bol)
{
XtraMessageBox.Show("鍒犻櫎澶辫触!");
@@ -234,8 +246,7 @@
}
XtraMessageBox.Show("鍒犻櫎鎴愬姛!");
ClearChart();
- this.xhsValveMainPhartListCtrl1.Delete(_xhs_phart_diagram_ex_std_dto.ID);
-
+ // this.xhsValveMainPhartListCtrl1.Delete(_xhs_phart_diagram_ex_std_dto.ID);
return true;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.resx b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.resx
index a7d6557..773814f 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.resx
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-valve-main/XhsValveMainPhartPanel.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
index 1c71dcb..d065639 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
@@ -345,6 +345,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -352,6 +354,8 @@
}
else if (nameMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = nameMatching.First();
}
else
@@ -375,6 +379,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -386,7 +392,7 @@
{
if (input.CurveDbId == null)
{
- if (vmo.ValveType == HStation.Assets.eValveType.GPV)
+ if ((int)input.ValveType == (int)HStation.Assets.eValveType.GPV)
{
var curveList = Task.Run(async () => await new BLL.AssetsValveCoefficient().GetByMainID(vmo.ID)).Result;
if (curveList != null && curveList.Count > 0)
@@ -396,7 +402,7 @@
input.MatchingCurveQL = pt_list;
}
}
- else if (vmo.ValveType == HStation.Assets.eValveType.TCV)
+ else if ((int)vmo.ValveType == (int)HStation.Assets.eValveType.TCV)
{
var curveList = Task.Run(async () => await new BLL.AssetsValveCoefficient().GetByMainID(vmo.ID)).Result;
if (curveList != null && curveList.Count > 0)
@@ -490,6 +496,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -497,6 +505,8 @@
}
else if (nameMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = nameMatching.First();
}
else
@@ -520,6 +530,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -535,6 +547,24 @@
input.MatchingMaterial = vmo.Material;
if (input.MinorLoss < 0)
input.MatchingMinorLoss = vmo.MinorLoss;
+ switch (input.eAlgorithmType)
+ {
+ case eAlgorithmType.Hazen:
+ input.MatchingRoughness = vmo.Hazen;
+ break;
+
+ case eAlgorithmType.Manning:
+ input.MatchingRoughness = vmo.Manning;
+ break;
+
+ case eAlgorithmType.Darcy:
+ input.MatchingRoughness = vmo.Darcy;
+ break;
+
+ default:
+ input.MatchingRoughness = vmo.Hazen;
+ break;
+ }
}
else
{
@@ -604,6 +634,7 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
vmo = absoluteMatching.First();
}
else
@@ -611,6 +642,7 @@
}
else if (nameMatching.Count == 1)
{
+ isNotarize = true;
vmo = nameMatching.First();
}
else
@@ -625,7 +657,6 @@
//鍙栭粯璁�
if (defaultList.Count > 0)
{
- isNotarize = true;
vmo = defaultList.First();
}
else if (defaultList.Count <= 0)
@@ -635,6 +666,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -721,6 +754,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -728,6 +763,8 @@
}
else if (nameMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = nameMatching.First();
}
else
@@ -751,6 +788,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -821,6 +860,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -828,6 +869,8 @@
}
else if (nameMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = nameMatching.First();
}
else
@@ -851,6 +894,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -919,6 +964,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -926,6 +973,8 @@
}
else if (nameMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = nameMatching.First();
}
else
@@ -949,6 +998,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -1017,6 +1068,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -1024,6 +1077,8 @@
}
else if (nameMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = nameMatching.First();
}
else
@@ -1046,6 +1101,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -1130,6 +1187,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -1137,6 +1196,8 @@
}
else if (nameMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = nameMatching.First();
}
else
@@ -1159,6 +1220,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -1244,6 +1307,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -1251,6 +1316,8 @@
}
else if (nameMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = nameMatching.First();
}
else
@@ -1274,6 +1341,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -1336,6 +1405,8 @@
}
else if (nameMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = nameMatching.First();
}
else
@@ -1414,6 +1485,8 @@
}
else if (nameMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = nameMatching.First();
}
else
@@ -1473,6 +1546,8 @@
}
else if (nameMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = nameMatching.First();
}
else
@@ -1539,6 +1614,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -1569,6 +1646,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -1629,6 +1708,8 @@
}
else if (nameMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = nameMatching.First();
}
else
@@ -1695,6 +1776,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
@@ -1702,6 +1785,8 @@
}
else if (nameMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = nameMatching.First();
}
else
@@ -1724,6 +1809,8 @@
}
else if (absoluteMatching.Count == 1)
{
+ isNotarize = true;
+
vmo = absoluteMatching.First();
}
else
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.cs
index f5d6be2..e77d408 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.cs
@@ -125,7 +125,14 @@
if (vmo != null)
{
var dlg = new ValveChartShowDlg();
- dlg.InitChart(vmo.OpenLossCurve);
+ if (vmo.MinorLossCurve != null)
+ {
+ dlg.InitChart(vmo.MinorLossCurve);
+ }
+ else if (vmo.OpenLossCurve != null)
+ {
+ dlg.InitChart(vmo.OpenLossCurve);
+ }
dlg.ShowDialog();
}
return;
--
Gitblit v1.9.3