From be3e4f6d2dd0529b87204169bce6df55c37a4199 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 14 一月 2025 17:31:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/05-elbows/AssetsElbowSingleMatchingDlg.cs | 5
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.cs | 5
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.resx | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/AddAssetsHydrantMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.cs | 21
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/ViewAssetsSprinklerMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.resx | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.resx | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/ViewAssetsFourlinkFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/AddAssetsSprinklerMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/ViewAssetsExchangerFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/EditAssetsThreelinkFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/06-threelink/AssetsThreelinkSingleMatchingCtrl.cs | 15
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ViewAssetsElbowMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/04-pipe/AssetsPipeSingleMatchingCtrl.cs | 15
WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/EditAssetsBluntheadMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs | 1
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/EditAssetsFourlinkFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/AddAssetsExchangerMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/16-sprinkler/AssetsSprinklerSingleMatchingCtrl.cs | 15
WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/ViewAssetsHydrantFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/ViewAssetsFourlinkMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddAssetsValveMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/ViewAssetsCoolingMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/EditAssetsTranslationFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/EditAssetsHydrantFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/AddAssetsTranslationFactorDlg.Designer.cs | 2
Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj.user | 5
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/21-cooling/AssetsCoolingSingleMatchingCtrl.cs | 11
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/EditAssetsFourlinkMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/ViewAssetsTranslationMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddAssetsPipeMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AddAssetsTranslationMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/AddAssetsThreelinkFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/05-elbows/AssetsElbowSingleMatchingCtrl.cs | 15
WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/EditAssetsCoolingMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/07-fourlink/AssetsFourlinkSingleMatchingCtrl.cs | 15
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.cs | 7
WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/AddAssetsBluntheadFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/ViewAssetsValveFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/AddAssetsExchangerFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/03-valve/AssetsValveSingleMatchingCtrl.cs | 23
Desktop/HStation.Desktop.Xhs.Core/Login/LoginFrm.resx | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/16-meter/AssetsMeterSingleMatchingCtrl.cs | 15
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/EditAssetsValveFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/EditAssetsCompressorMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingCtrl.cs | 23
WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/EditAssetsExchangerFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/AddAssetsValveFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ViewAssetsThreelinkMainDlg.Designer.cs | 24
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddAssetsThreelinkMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/ViewAssetsExchangerMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.Designer.cs | 21 -
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-flowmeter/AssetsFlowmeterSingleMatchingCtrl.cs | 15
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddAssetsFourlinkMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/ViewAssetsElbowFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditAssetsPipeMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/ViewAssetsValveMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/ViewAssetsCompressorFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/AddAssetsCompressorFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.Designer.cs | 285 ++++++++++++-------
WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/ViewAssetsBluntheadMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditAssetsValveMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/AddAssetsSprinklerFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/EditAssetsSprinklerFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/AddAssetsBluntheadMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.cs | 15
WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/EditAssetsCompressorFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/EditAssetsCoolingFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/AddAssetsElbowMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/ViewAssetsCompressorMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.cs | 1
WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/ViewAssetsBluntheadFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-pressmeter/AssetsPressmeterSingleMatchingCtrl.cs | 13
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ViewAssetsElbowMainDlg.cs | 5
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs | 23
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/12-Hydrant/AssetsHydrantSingleMatchingCtrl.cs | 15
WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/EditAssetsTranslationMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ViewAssetsThreelinkMainDlg.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/AddAssetsHydrantFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/ViewAssetsThreelinkFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/ViewAssetsTranslationFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingViewModel.cs | 10
WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/AddAssetsCoolingMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/ViewAssetsPipeMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/AddAssetsElbowFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/EditAssetsHydrantMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/EditAssetsElbowFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/AddAssetsCompressorMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/ViewAssetsCoolingFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/AddAssetsCoolingFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/EditAssetsExchangerMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/EditAssetsSprinklerMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/EditAssetsBluntheadFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/ViewAssetsHydrantMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/ViewAssetsSprinklerFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/EditAssetsThreelinkMainDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/AddAssetsFourlinkFactorDlg.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.Designer.cs | 16
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/14-Blunthead/AssetsBluntheadSingleMatchingCtrl.cs | 15
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditAssetsElbowMainDlg.Designer.cs | 2
101 files changed, 464 insertions(+), 339 deletions(-)
diff --git a/Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj.user b/Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj.user
index a7a1158..0e15bb4 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj.user
+++ b/Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj.user
@@ -20,4 +20,9 @@
<SubType>Form</SubType>
</Compile>
</ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Update="Login\LoginFrm.resx">
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/Desktop/HStation.Desktop.Xhs.Core/Login/LoginFrm.resx b/Desktop/HStation.Desktop.Xhs.Core/Login/LoginFrm.resx
index af32865..8b2ff64 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/Login/LoginFrm.resx
+++ b/Desktop/HStation.Desktop.Xhs.Core/Login/LoginFrm.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.Assets.Core/01-pump/PumpProductMainPage.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.cs
index b972f88..fc5b1ec 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.cs
@@ -48,9 +48,12 @@
{
var alllist = await _bll.GetByPumpSeriesID(obj);
_allBindingList.Clear();
- foreach (var item in alllist)
+ if (alllist != null)
{
- _allBindingList.Add(new AssetsPumpMainViewModel(item));
+ foreach (var item in alllist)
+ {
+ _allBindingList.Add(new AssetsPumpMainViewModel(item));
+ }
}
}
else
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddAssetsValveMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddAssetsValveMainDlg.Designer.cs
index 891849b..a5d7010 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddAssetsValveMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddAssetsValveMainDlg.Designer.cs
@@ -159,7 +159,7 @@
txtCaliber.TabIndex = 4;
txtCaliber.EditValueChanged += txtCaliber_EditValueChanged;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditAssetsValveMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditAssetsValveMainDlg.Designer.cs
index 30bdde5..e014098 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditAssetsValveMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditAssetsValveMainDlg.Designer.cs
@@ -158,7 +158,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/ViewAssetsValveMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/ViewAssetsValveMainDlg.Designer.cs
index 9b31830..f627f2c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/ViewAssetsValveMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/ViewAssetsValveMainDlg.Designer.cs
@@ -151,7 +151,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(76, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/AddAssetsValveFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/AddAssetsValveFactorDlg.Designer.cs
index 9ecd4f7..eae1878 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/AddAssetsValveFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/AddAssetsValveFactorDlg.Designer.cs
@@ -120,7 +120,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/EditAssetsValveFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/EditAssetsValveFactorDlg.Designer.cs
index 19efc09..6176b99 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/EditAssetsValveFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/EditAssetsValveFactorDlg.Designer.cs
@@ -120,7 +120,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/ViewAssetsValveFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/ViewAssetsValveFactorDlg.Designer.cs
index 1b696b7..51ae4b7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/ViewAssetsValveFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/03-factor/ViewAssetsValveFactorDlg.Designer.cs
@@ -108,7 +108,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(76, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddAssetsPipeMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddAssetsPipeMainDlg.Designer.cs
index 4230905..4b79d6b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddAssetsPipeMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddAssetsPipeMainDlg.Designer.cs
@@ -113,7 +113,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(107, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditAssetsPipeMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditAssetsPipeMainDlg.Designer.cs
index 43b46d8..20b2027 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditAssetsPipeMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditAssetsPipeMainDlg.Designer.cs
@@ -121,7 +121,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(107, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/ViewAssetsPipeMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/ViewAssetsPipeMainDlg.Designer.cs
index af5f4ef..5aa1f6a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/ViewAssetsPipeMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/ViewAssetsPipeMainDlg.Designer.cs
@@ -116,7 +116,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(100, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/AddAssetsElbowMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/AddAssetsElbowMainDlg.Designer.cs
index c3dea5c..4d236da 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/AddAssetsElbowMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/AddAssetsElbowMainDlg.Designer.cs
@@ -189,7 +189,7 @@
txtCaliber.TabIndex = 4;
txtCaliber.EditValueChanged += txtCaliber_EditValueChanged;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditAssetsElbowMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditAssetsElbowMainDlg.Designer.cs
index 2af4829..451cf60 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditAssetsElbowMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditAssetsElbowMainDlg.Designer.cs
@@ -188,7 +188,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ViewAssetsElbowMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ViewAssetsElbowMainDlg.Designer.cs
index c4be5d6..27b4382 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ViewAssetsElbowMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ViewAssetsElbowMainDlg.Designer.cs
@@ -161,7 +161,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(76, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ViewAssetsElbowMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ViewAssetsElbowMainDlg.cs
index 1274ca2..73a9f4a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ViewAssetsElbowMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ViewAssetsElbowMainDlg.cs
@@ -1,4 +1,6 @@
-锘縩amespace HStation.WinFrmUI
+锘縰sing HStation.Assets;
+
+namespace HStation.WinFrmUI
{
public partial class ViewAssetsElbowMainDlg : DevExpress.XtraEditors.XtraForm
{
@@ -29,6 +31,7 @@
this.txtFlags.EditValue = Yw.Untity.FlagsHelper.ToString(vmo.Flags);
this.txtTagName.EditValue = vmo.TagName;
this.txtDescription.EditValue = vmo.Description;
+ this.imageComboBoxEditConnectlenght.Properties.AddEnum(typeof(eElbowType));
this.imageComboBoxEditConnectlenght.EditValue = vmo.ElbowType;
this.txtAngle.EditValue = vmo.Angle;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/AddAssetsElbowFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/AddAssetsElbowFactorDlg.Designer.cs
index f868133..cac6afc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/AddAssetsElbowFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/AddAssetsElbowFactorDlg.Designer.cs
@@ -125,7 +125,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 2;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/EditAssetsElbowFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/EditAssetsElbowFactorDlg.Designer.cs
index fc8d12d..bf24d35 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/EditAssetsElbowFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/EditAssetsElbowFactorDlg.Designer.cs
@@ -125,7 +125,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/ViewAssetsElbowFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/ViewAssetsElbowFactorDlg.Designer.cs
index 07c650c..3a8421a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/ViewAssetsElbowFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/ViewAssetsElbowFactorDlg.Designer.cs
@@ -113,7 +113,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(76, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddAssetsThreelinkMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddAssetsThreelinkMainDlg.Designer.cs
index 821f3d5..7c9d670 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddAssetsThreelinkMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddAssetsThreelinkMainDlg.Designer.cs
@@ -126,7 +126,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(131, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/EditAssetsThreelinkMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/EditAssetsThreelinkMainDlg.Designer.cs
index 82a79c1..d92eb33 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/EditAssetsThreelinkMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/EditAssetsThreelinkMainDlg.Designer.cs
@@ -126,7 +126,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(131, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ViewAssetsThreelinkMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ViewAssetsThreelinkMainDlg.Designer.cs
index 695e6eb..bb5c0c2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ViewAssetsThreelinkMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ViewAssetsThreelinkMainDlg.Designer.cs
@@ -45,9 +45,9 @@
layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)textEditBranchThroughCoefficient.Properties).BeginInit();
@@ -66,9 +66,9 @@
((ISupportInitialize)layoutControlItem9).BeginInit();
((ISupportInitialize)layoutControlItem4).BeginInit();
((ISupportInitialize)layoutControlItem13).BeginInit();
- ((ISupportInitialize)layoutControlItem8).BeginInit();
((ISupportInitialize)layoutControlItem3).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
+ ((ISupportInitialize)layoutControlItem8).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -251,15 +251,6 @@
layoutControlItem13.Text = "鍙ｅ緞:";
layoutControlItem13.TextSize = new Size(100, 14);
//
- // layoutControlItem8
- //
- layoutControlItem8.Control = txtFlags;
- layoutControlItem8.Location = new Point(322, 72);
- layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(323, 24);
- layoutControlItem8.Text = "鏍囩:";
- layoutControlItem8.TextSize = new Size(100, 14);
- //
// layoutControlItem3
//
layoutControlItem3.Control = textEditBranchThroughCoefficient;
@@ -277,6 +268,15 @@
layoutControlItem2.Size = new Size(322, 24);
layoutControlItem2.Text = "涓荤閫氳繃鎹熷け绯绘暟:";
layoutControlItem2.TextSize = new Size(100, 14);
+ //
+ // layoutControlItem8
+ //
+ layoutControlItem8.Control = txtFlags;
+ layoutControlItem8.Location = new Point(322, 72);
+ layoutControlItem8.Name = "layoutControlItem8";
+ layoutControlItem8.Size = new Size(323, 24);
+ layoutControlItem8.Text = "鏍囩:";
+ layoutControlItem8.TextSize = new Size(100, 14);
//
// ViewAssetsThreelinkMainDlg
//
@@ -305,9 +305,9 @@
((ISupportInitialize)layoutControlItem9).EndInit();
((ISupportInitialize)layoutControlItem4).EndInit();
((ISupportInitialize)layoutControlItem13).EndInit();
- ((ISupportInitialize)layoutControlItem8).EndInit();
((ISupportInitialize)layoutControlItem3).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
+ ((ISupportInitialize)layoutControlItem8).EndInit();
ResumeLayout(false);
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ViewAssetsThreelinkMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ViewAssetsThreelinkMainDlg.cs
index e827172..925f385 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ViewAssetsThreelinkMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ViewAssetsThreelinkMainDlg.cs
@@ -28,6 +28,8 @@
this.txtDescription.EditValue = vmo.Description;
this.txtCaliber.EditValue = vmo.Caliber;
this.txtMaterial.EditValue = vmo.Material;
+ this.textEditRunThroughCoefficient.EditValue = vmo.RunThroughMinorLoss;
+ this.textEditBranchThroughCoefficient.EditValue = vmo.BranchThroughMinorLoss;
}
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/AddAssetsThreelinkFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/AddAssetsThreelinkFactorDlg.Designer.cs
index 8e398cb..67a0fb9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/AddAssetsThreelinkFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/AddAssetsThreelinkFactorDlg.Designer.cs
@@ -203,7 +203,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 2;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(131, 60);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/EditAssetsThreelinkFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/EditAssetsThreelinkFactorDlg.Designer.cs
index 7a03ea8..5a23f56 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/EditAssetsThreelinkFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/EditAssetsThreelinkFactorDlg.Designer.cs
@@ -289,7 +289,7 @@
txtCaliber.StyleController = layoutControl2;
txtCaliber.TabIndex = 2;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(131, 60);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/ViewAssetsThreelinkFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/ViewAssetsThreelinkFactorDlg.Designer.cs
index 1ec9907..720db30 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/ViewAssetsThreelinkFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-factor/ViewAssetsThreelinkFactorDlg.Designer.cs
@@ -216,7 +216,7 @@
layoutControlItem4.Text = "鍙ｅ緞:";
layoutControlItem4.TextSize = new Size(100, 14);
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(124, 60);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddAssetsFourlinkMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddAssetsFourlinkMainDlg.Designer.cs
index c9fbc07..e58f6a5 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddAssetsFourlinkMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddAssetsFourlinkMainDlg.Designer.cs
@@ -159,7 +159,7 @@
txtCaliber.TabIndex = 4;
txtCaliber.EditValueChanged += txtCaliber_EditValueChanged;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/EditAssetsFourlinkMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/EditAssetsFourlinkMainDlg.Designer.cs
index 4db956c..3ea48bb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/EditAssetsFourlinkMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/EditAssetsFourlinkMainDlg.Designer.cs
@@ -158,7 +158,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/ViewAssetsFourlinkMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/ViewAssetsFourlinkMainDlg.Designer.cs
index 22b93f0..ba39a72 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/ViewAssetsFourlinkMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/ViewAssetsFourlinkMainDlg.Designer.cs
@@ -151,7 +151,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(76, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/AddAssetsFourlinkFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/AddAssetsFourlinkFactorDlg.Designer.cs
index 67e101c..cc1b777 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/AddAssetsFourlinkFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/AddAssetsFourlinkFactorDlg.Designer.cs
@@ -120,7 +120,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 2;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/EditAssetsFourlinkFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/EditAssetsFourlinkFactorDlg.Designer.cs
index 5aa943e..14131bb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/EditAssetsFourlinkFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/EditAssetsFourlinkFactorDlg.Designer.cs
@@ -120,7 +120,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 2;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/ViewAssetsFourlinkFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/ViewAssetsFourlinkFactorDlg.Designer.cs
index 6534042..46a7252 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/ViewAssetsFourlinkFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/ViewAssetsFourlinkFactorDlg.Designer.cs
@@ -108,7 +108,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 2;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(76, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/AddAssetsSprinklerMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/AddAssetsSprinklerMainDlg.Designer.cs
index dfc5488..b839d55 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/AddAssetsSprinklerMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/AddAssetsSprinklerMainDlg.Designer.cs
@@ -121,7 +121,7 @@
TextEditAngle.StyleController = layoutControl1;
TextEditAngle.TabIndex = 9;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/EditAssetsSprinklerMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/EditAssetsSprinklerMainDlg.Designer.cs
index 35c74e9..a0e000a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/EditAssetsSprinklerMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/EditAssetsSprinklerMainDlg.Designer.cs
@@ -121,7 +121,7 @@
TextEditAngle.StyleController = layoutControl1;
TextEditAngle.TabIndex = 14;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/ViewAssetsSprinklerMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/ViewAssetsSprinklerMainDlg.Designer.cs
index 01ddc6d..0e13180 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/ViewAssetsSprinklerMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/ViewAssetsSprinklerMainDlg.Designer.cs
@@ -116,7 +116,7 @@
TextEditAngle.StyleController = layoutControl1;
TextEditAngle.TabIndex = 7;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(76, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/AddAssetsSprinklerFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/AddAssetsSprinklerFactorDlg.Designer.cs
index b95fd7d..b6191a0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/AddAssetsSprinklerFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/AddAssetsSprinklerFactorDlg.Designer.cs
@@ -107,7 +107,7 @@
TextEditAngle.StyleController = layoutControl1;
TextEditAngle.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 60);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/EditAssetsSprinklerFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/EditAssetsSprinklerFactorDlg.Designer.cs
index 2c445e4..cc65182 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/EditAssetsSprinklerFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/EditAssetsSprinklerFactorDlg.Designer.cs
@@ -122,7 +122,7 @@
TextEditAngle.StyleController = layoutControl1;
TextEditAngle.TabIndex = 3;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 60);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/ViewAssetsSprinklerFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/ViewAssetsSprinklerFactorDlg.Designer.cs
index 1072d8a..d4eda04 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/ViewAssetsSprinklerFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/03-factor/ViewAssetsSprinklerFactorDlg.Designer.cs
@@ -175,7 +175,7 @@
TextEditAngle.StyleController = layoutControl1;
TextEditAngle.TabIndex = 3;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(76, 60);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/AddAssetsBluntheadMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/AddAssetsBluntheadMainDlg.Designer.cs
index 0e214a0..c6020bb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/AddAssetsBluntheadMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/AddAssetsBluntheadMainDlg.Designer.cs
@@ -105,7 +105,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 6;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/EditAssetsBluntheadMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/EditAssetsBluntheadMainDlg.Designer.cs
index 0cc7087..9df1685 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/EditAssetsBluntheadMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/EditAssetsBluntheadMainDlg.Designer.cs
@@ -105,7 +105,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 12;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/ViewAssetsBluntheadMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/ViewAssetsBluntheadMainDlg.Designer.cs
index bcd0846..b4d6196 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/ViewAssetsBluntheadMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/ViewAssetsBluntheadMainDlg.Designer.cs
@@ -101,7 +101,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 17;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(76, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/AddAssetsBluntheadFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/AddAssetsBluntheadFactorDlg.Designer.cs
index aef1ddd..b423823 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/AddAssetsBluntheadFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/AddAssetsBluntheadFactorDlg.Designer.cs
@@ -201,7 +201,7 @@
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(272, 12);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/EditAssetsBluntheadFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/EditAssetsBluntheadFactorDlg.Designer.cs
index 1877c9c..3bb8794 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/EditAssetsBluntheadFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/EditAssetsBluntheadFactorDlg.Designer.cs
@@ -145,7 +145,7 @@
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(264, 12);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/ViewAssetsBluntheadFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/ViewAssetsBluntheadFactorDlg.Designer.cs
index 515b8f8..26c9843 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/ViewAssetsBluntheadFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/ViewAssetsBluntheadFactorDlg.Designer.cs
@@ -139,7 +139,7 @@
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(301, 12);
txtMaterial.Name = "txtMaterial";
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 471230f..b4ba936 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
@@ -143,16 +143,16 @@
generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26);
generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26);
generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26);
- generalOkAndCancelCtrl1.Location = new Point(12, 296);
+ generalOkAndCancelCtrl1.Location = new Point(12, 320);
generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
- generalOkAndCancelCtrl1.Size = new Size(641, 50);
+ generalOkAndCancelCtrl1.Size = new Size(641, 26);
generalOkAndCancelCtrl1.TabIndex = 10;
//
// txtDescription
//
txtDescription.Location = new Point(76, 132);
txtDescription.Name = "txtDescription";
- txtDescription.Size = new Size(577, 160);
+ txtDescription.Size = new Size(577, 184);
txtDescription.StyleController = layoutControl1;
txtDescription.TabIndex = 9;
//
@@ -178,7 +178,7 @@
txtDN.Size = new Size(254, 20);
txtDN.StyleController = layoutControl1;
txtDN.TabIndex = 3;
- //
+ //
// txtMaxLevel
//
txtMaxLevel.Location = new Point(398, 60);
@@ -187,7 +187,7 @@
txtMaxLevel.Size = new Size(255, 20);
txtMaxLevel.StyleController = layoutControl1;
txtMaxLevel.TabIndex = 6;
- //
+ //
// txtName
//
txtName.Location = new Point(76, 12);
@@ -240,16 +240,16 @@
layoutControlItem6.Control = txtDescription;
layoutControlItem6.Location = new Point(0, 120);
layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(645, 164);
+ layoutControlItem6.Size = new Size(645, 188);
layoutControlItem6.Text = "璇存槑:";
layoutControlItem6.TextSize = new Size(52, 14);
//
// layoutControlItem7
//
layoutControlItem7.Control = generalOkAndCancelCtrl1;
- layoutControlItem7.Location = new Point(0, 284);
+ layoutControlItem7.Location = new Point(0, 308);
layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(645, 54);
+ layoutControlItem7.Size = new Size(645, 30);
layoutControlItem7.TextSize = new Size(0, 0);
layoutControlItem7.TextVisible = false;
//
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.resx
index d438392..43b467c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AddAssetsTankMainDlg.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.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.Designer.cs
index fc16636..a4b3611 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.Designer.cs
@@ -29,54 +29,66 @@
private void InitializeComponent()
{
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ txtMinLevel = new DevExpress.XtraEditors.TextEdit();
+ txtMaxLevel = new DevExpress.XtraEditors.TextEdit();
+ txtMinVol = new DevExpress.XtraEditors.TextEdit();
txtTagName = new DevExpress.XtraEditors.TextEdit();
txtFlags = new DevExpress.XtraEditors.TextEdit();
txtKeyWord = new DevExpress.XtraEditors.TextEdit();
txtDescription = new DevExpress.XtraEditors.MemoEdit();
- this.txtMinorLoss = new DevExpress.XtraEditors.TextEdit();
txtDiameter = new DevExpress.XtraEditors.TextEdit();
- txtMaterial = new DevExpress.XtraEditors.TextEdit();
txtName = new DevExpress.XtraEditors.TextEdit();
+ textEditVoerFlow = new DevExpress.XtraEditors.CheckEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
+ ((ISupportInitialize)txtMinLevel.Properties).BeginInit();
+ ((ISupportInitialize)txtMaxLevel.Properties).BeginInit();
+ ((ISupportInitialize)txtMinVol.Properties).BeginInit();
((ISupportInitialize)txtTagName.Properties).BeginInit();
((ISupportInitialize)txtFlags.Properties).BeginInit();
((ISupportInitialize)txtKeyWord.Properties).BeginInit();
((ISupportInitialize)txtDescription.Properties).BeginInit();
- ((ISupportInitialize)this.txtMinorLoss.Properties).BeginInit();
((ISupportInitialize)txtDiameter.Properties).BeginInit();
- ((ISupportInitialize)txtMaterial.Properties).BeginInit();
((ISupportInitialize)txtName.Properties).BeginInit();
+ ((ISupportInitialize)textEditVoerFlow.Properties).BeginInit();
((ISupportInitialize)Root).BeginInit();
((ISupportInitialize)layoutControlItem1).BeginInit();
- ((ISupportInitialize)layoutControlItem3).BeginInit();
- ((ISupportInitialize)layoutControlItem4).BeginInit();
- ((ISupportInitialize)layoutControlItem2).BeginInit();
((ISupportInitialize)layoutControlItem6).BeginInit();
- ((ISupportInitialize)layoutControlItem8).BeginInit();
- ((ISupportInitialize)layoutControlItem9).BeginInit();
((ISupportInitialize)layoutControlItem10).BeginInit();
+ ((ISupportInitialize)layoutControlItem3).BeginInit();
+ ((ISupportInitialize)layoutControlItem9).BeginInit();
+ ((ISupportInitialize)layoutControlItem5).BeginInit();
+ ((ISupportInitialize)layoutControlItem7).BeginInit();
+ ((ISupportInitialize)layoutControlItem12).BeginInit();
+ ((ISupportInitialize)layoutControlItem2).BeginInit();
+ ((ISupportInitialize)layoutControlItem8).BeginInit();
+ ((ISupportInitialize)layoutControlItem11).BeginInit();
SuspendLayout();
//
// layoutControl1
//
+ layoutControl1.Controls.Add(txtMinLevel);
+ layoutControl1.Controls.Add(txtMaxLevel);
+ layoutControl1.Controls.Add(txtMinVol);
layoutControl1.Controls.Add(txtTagName);
layoutControl1.Controls.Add(txtFlags);
layoutControl1.Controls.Add(txtKeyWord);
layoutControl1.Controls.Add(txtDescription);
- layoutControl1.Controls.Add(this.txtMinorLoss);
layoutControl1.Controls.Add(txtDiameter);
- layoutControl1.Controls.Add(txtMaterial);
layoutControl1.Controls.Add(txtName);
+ layoutControl1.Controls.Add(textEditVoerFlow);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
@@ -86,25 +98,58 @@
layoutControl1.TabIndex = 1;
layoutControl1.Text = "layoutControl1";
//
+ // txtMinLevel
+ //
+ txtMinLevel.Location = new Point(398, 60);
+ txtMinLevel.Name = "txtMinLevel";
+ txtMinLevel.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
+ txtMinLevel.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtMinLevel.Properties.ReadOnly = true;
+ txtMinLevel.Properties.UseReadOnlyAppearance = false;
+ txtMinLevel.Size = new Size(255, 20);
+ txtMinLevel.StyleController = layoutControl1;
+ txtMinLevel.TabIndex = 6;
+ //
+ // txtMaxLevel
+ //
+ txtMaxLevel.Location = new Point(76, 60);
+ txtMaxLevel.Name = "txtMaxLevel";
+ txtMaxLevel.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
+ txtMaxLevel.Properties.ReadOnly = true;
+ txtMaxLevel.Properties.UseReadOnlyAppearance = false;
+ txtMaxLevel.Size = new Size(254, 20);
+ txtMaxLevel.StyleController = layoutControl1;
+ txtMaxLevel.TabIndex = 5;
+ //
+ // txtMinVol
+ //
+ txtMinVol.Location = new Point(398, 36);
+ txtMinVol.Name = "txtMinVol";
+ txtMinVol.Properties.ReadOnly = true;
+ txtMinVol.Properties.UseReadOnlyAppearance = false;
+ txtMinVol.Size = new Size(255, 20);
+ txtMinVol.StyleController = layoutControl1;
+ txtMinVol.TabIndex = 4;
+ //
// txtTagName
//
- txtTagName.Location = new Point(398, 60);
+ txtTagName.Location = new Point(76, 84);
txtTagName.Name = "txtTagName";
txtTagName.Properties.ReadOnly = true;
txtTagName.Properties.UseReadOnlyAppearance = false;
- txtTagName.Size = new Size(255, 20);
+ txtTagName.Size = new Size(254, 20);
txtTagName.StyleController = layoutControl1;
- txtTagName.TabIndex = 8;
+ txtTagName.TabIndex = 7;
//
// txtFlags
//
- txtFlags.Location = new Point(76, 84);
+ txtFlags.Location = new Point(398, 84);
txtFlags.Name = "txtFlags";
txtFlags.Properties.ReadOnly = true;
txtFlags.Properties.UseReadOnlyAppearance = false;
- txtFlags.Size = new Size(577, 20);
+ txtFlags.Size = new Size(255, 20);
txtFlags.StyleController = layoutControl1;
- txtFlags.TabIndex = 7;
+ txtFlags.TabIndex = 8;
//
// txtKeyWord
//
@@ -118,27 +163,15 @@
//
// txtDescription
//
- txtDescription.Location = new Point(76, 108);
+ txtDescription.Location = new Point(76, 132);
txtDescription.Name = "txtDescription";
- txtDescription.Size = new Size(577, 261);
+ txtDescription.Size = new Size(577, 237);
txtDescription.StyleController = layoutControl1;
- txtDescription.TabIndex = 9;
- //
- // txtMinorLoss
- //
- this.txtMinorLoss.Location = new Point(76, 60);
- this.txtMinorLoss.Name = "txtMinorLoss";
- this.txtMinorLoss.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
- this.txtMinorLoss.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
- this.txtMinorLoss.Properties.ReadOnly = true;
- this.txtMinorLoss.Properties.UseReadOnlyAppearance = false;
- this.txtMinorLoss.Size = new Size(254, 20);
- this.txtMinorLoss.StyleController = layoutControl1;
- this.txtMinorLoss.TabIndex = 5;
+ txtDescription.TabIndex = 10;
//
// txtDiameter
//
- txtDiameter.Location = new Point(398, 36);
+ txtDiameter.Location = new Point(76, 36);
txtDiameter.Name = "txtDiameter";
txtDiameter.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
txtDiameter.Properties.DisplayFormat.FormatString = "{0}mm";
@@ -147,20 +180,9 @@
txtDiameter.Properties.NullValuePrompt = "mm";
txtDiameter.Properties.ReadOnly = true;
txtDiameter.Properties.UseReadOnlyAppearance = false;
- txtDiameter.Size = new Size(255, 20);
+ txtDiameter.Size = new Size(254, 20);
txtDiameter.StyleController = layoutControl1;
- txtDiameter.TabIndex = 4;
- //
- // txtMaterial
- //
- txtMaterial.Location = new Point(76, 36);
- txtMaterial.Name = "txtMaterial";
- txtMaterial.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
- txtMaterial.Properties.ReadOnly = true;
- txtMaterial.Properties.UseReadOnlyAppearance = false;
- txtMaterial.Size = new Size(254, 20);
- txtMaterial.StyleController = layoutControl1;
- txtMaterial.TabIndex = 3;
+ txtDiameter.TabIndex = 3;
//
// txtName
//
@@ -173,13 +195,23 @@
txtName.StyleController = layoutControl1;
txtName.TabIndex = 0;
//
+ // textEditVoerFlow
+ //
+ textEditVoerFlow.Location = new Point(12, 108);
+ textEditVoerFlow.Name = "textEditVoerFlow";
+ textEditVoerFlow.Properties.Caption = "鏄惁鍏佽婧㈡祦";
+ textEditVoerFlow.Properties.ReadOnly = true;
+ textEditVoerFlow.Size = new Size(641, 20);
+ textEditVoerFlow.StyleController = layoutControl1;
+ textEditVoerFlow.TabIndex = 9;
+ //
// 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[] { layoutControlItem1, layoutControlItem3, layoutControlItem4, layoutControlItem2, layoutControlItem6, layoutControlItem8, layoutControlItem9, layoutControlItem10 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem6, layoutControlItem10, layoutControlItem3, layoutControlItem9, layoutControlItem5, layoutControlItem7, layoutControlItem12, layoutControlItem2, layoutControlItem8 });
Root.Name = "Root";
Root.Size = new Size(665, 381);
Root.TextVisible = false;
@@ -193,59 +225,14 @@
layoutControlItem1.Text = "鍚嶇О:";
layoutControlItem1.TextSize = new Size(52, 14);
//
- // layoutControlItem3
- //
- layoutControlItem3.Control = txtDiameter;
- layoutControlItem3.Location = new Point(322, 24);
- layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(323, 24);
- layoutControlItem3.Text = "鐩村緞:";
- layoutControlItem3.TextSize = new Size(52, 14);
- //
- // layoutControlItem4
- //
- layoutControlItem4.Control = this.txtMinorLoss;
- layoutControlItem4.Location = new Point(0, 48);
- layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(322, 24);
- layoutControlItem4.Text = "灞�闃荤郴鏁�:";
- layoutControlItem4.TextSize = new Size(52, 14);
- //
- // layoutControlItem2
- //
- layoutControlItem2.Control = txtMaterial;
- layoutControlItem2.Location = new Point(0, 24);
- layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(322, 24);
- layoutControlItem2.Text = "鏉愯川:";
- layoutControlItem2.TextSize = new Size(52, 14);
- //
// layoutControlItem6
//
layoutControlItem6.Control = txtDescription;
- layoutControlItem6.Location = new Point(0, 96);
+ layoutControlItem6.Location = new Point(0, 120);
layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(645, 265);
+ layoutControlItem6.Size = new Size(645, 241);
layoutControlItem6.Text = "璇存槑:";
layoutControlItem6.TextSize = new Size(52, 14);
- //
- // layoutControlItem8
- //
- layoutControlItem8.Control = txtFlags;
- layoutControlItem8.Location = new Point(0, 72);
- layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(645, 24);
- layoutControlItem8.Text = "鏍囩:";
- layoutControlItem8.TextSize = new Size(52, 14);
- //
- // layoutControlItem9
- //
- layoutControlItem9.Control = txtTagName;
- layoutControlItem9.Location = new Point(322, 48);
- layoutControlItem9.Name = "layoutControlItem9";
- layoutControlItem9.Size = new Size(323, 24);
- layoutControlItem9.Text = "鏍囧織:";
- layoutControlItem9.TextSize = new Size(52, 14);
//
// layoutControlItem10
//
@@ -255,6 +242,77 @@
layoutControlItem10.Size = new Size(323, 24);
layoutControlItem10.Text = "鍏抽敭瀛�:";
layoutControlItem10.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem3
+ //
+ layoutControlItem3.Control = txtDiameter;
+ layoutControlItem3.Location = new Point(0, 24);
+ layoutControlItem3.Name = "layoutControlItem3";
+ layoutControlItem3.Size = new Size(322, 24);
+ layoutControlItem3.Text = "鍏О鐩村緞:";
+ layoutControlItem3.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);
+ //
+ // layoutControlItem5
+ //
+ layoutControlItem5.Control = txtMinVol;
+ layoutControlItem5.Location = new Point(322, 24);
+ layoutControlItem5.Name = "layoutControlItem5";
+ layoutControlItem5.Size = new Size(323, 24);
+ layoutControlItem5.Text = "鏈�浣庡绉�:";
+ layoutControlItem5.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem7
+ //
+ layoutControlItem7.Control = txtMaxLevel;
+ layoutControlItem7.Location = new Point(0, 48);
+ layoutControlItem7.Name = "layoutControlItem7";
+ layoutControlItem7.Size = new Size(322, 24);
+ layoutControlItem7.Text = "鏈�楂樻按浣�:";
+ layoutControlItem7.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem12
+ //
+ layoutControlItem12.Control = textEditVoerFlow;
+ layoutControlItem12.Location = new Point(0, 96);
+ layoutControlItem12.Name = "layoutControlItem12";
+ layoutControlItem12.Size = new Size(645, 24);
+ layoutControlItem12.TextSize = new Size(0, 0);
+ layoutControlItem12.TextVisible = false;
+ //
+ // layoutControlItem2
+ //
+ layoutControlItem2.Control = txtMinLevel;
+ layoutControlItem2.Location = new Point(322, 48);
+ layoutControlItem2.Name = "layoutControlItem2";
+ layoutControlItem2.Size = new Size(323, 24);
+ layoutControlItem2.Text = "鏈�浣庢按浣�:";
+ layoutControlItem2.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem8
+ //
+ layoutControlItem8.Control = txtFlags;
+ layoutControlItem8.Location = new Point(322, 72);
+ layoutControlItem8.Name = "layoutControlItem8";
+ layoutControlItem8.Size = new Size(323, 24);
+ layoutControlItem8.Text = "鏍囩:";
+ layoutControlItem8.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem11
+ //
+ layoutControlItem11.Location = new Point(0, 96);
+ layoutControlItem11.Name = "layoutControlItem11";
+ layoutControlItem11.Size = new Size(645, 24);
+ layoutControlItem11.TextSize = new Size(0, 0);
+ layoutControlItem11.TextVisible = false;
//
// ViewAssetsTankMainDlg
//
@@ -267,23 +325,28 @@
Text = "璇︾粏淇℃伅";
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
+ ((ISupportInitialize)txtMinLevel.Properties).EndInit();
+ ((ISupportInitialize)txtMaxLevel.Properties).EndInit();
+ ((ISupportInitialize)txtMinVol.Properties).EndInit();
((ISupportInitialize)txtTagName.Properties).EndInit();
((ISupportInitialize)txtFlags.Properties).EndInit();
((ISupportInitialize)txtKeyWord.Properties).EndInit();
((ISupportInitialize)txtDescription.Properties).EndInit();
- ((ISupportInitialize)this.txtMinorLoss.Properties).EndInit();
((ISupportInitialize)txtDiameter.Properties).EndInit();
- ((ISupportInitialize)txtMaterial.Properties).EndInit();
((ISupportInitialize)txtName.Properties).EndInit();
+ ((ISupportInitialize)textEditVoerFlow.Properties).EndInit();
((ISupportInitialize)Root).EndInit();
((ISupportInitialize)layoutControlItem1).EndInit();
- ((ISupportInitialize)layoutControlItem3).EndInit();
- ((ISupportInitialize)layoutControlItem4).EndInit();
- ((ISupportInitialize)layoutControlItem2).EndInit();
((ISupportInitialize)layoutControlItem6).EndInit();
- ((ISupportInitialize)layoutControlItem8).EndInit();
- ((ISupportInitialize)layoutControlItem9).EndInit();
((ISupportInitialize)layoutControlItem10).EndInit();
+ ((ISupportInitialize)layoutControlItem3).EndInit();
+ ((ISupportInitialize)layoutControlItem9).EndInit();
+ ((ISupportInitialize)layoutControlItem5).EndInit();
+ ((ISupportInitialize)layoutControlItem7).EndInit();
+ ((ISupportInitialize)layoutControlItem12).EndInit();
+ ((ISupportInitialize)layoutControlItem2).EndInit();
+ ((ISupportInitialize)layoutControlItem8).EndInit();
+ ((ISupportInitialize)layoutControlItem11).EndInit();
ResumeLayout(false);
}
@@ -294,7 +357,7 @@
private DevExpress.XtraEditors.TextEdit txtMinorLoss;
private DevExpress.XtraEditors.TextEdit txtCoefficient;
private DevExpress.XtraEditors.TextEdit txtDiameter;
- private DevExpress.XtraEditors.TextEdit txtMaterial;
+ private DevExpress.XtraEditors.TextEdit txtDN;
private DevExpress.XtraEditors.TextEdit txtName;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
@@ -309,5 +372,13 @@
private DevExpress.XtraEditors.TextEdit txtFlags;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraEditors.TextEdit txtMinLevel;
+ private DevExpress.XtraEditors.TextEdit txtMaxLevel;
+ private DevExpress.XtraEditors.TextEdit txtMinVol;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraEditors.CheckEdit checkEdit1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraEditors.CheckEdit textEditVoerFlow;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.cs
index dc4c99e..afc74b3 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.cs
@@ -22,6 +22,11 @@
}
_vmo = vmo;
this.txtName.EditValue = vmo.Name;
+ this.txtMaxLevel.EditValue = vmo.MaxLevel;
+ this.txtMinLevel.EditValue = vmo.MinLevel;
+ this.txtMinVol.EditValue = vmo.MinVol;
+ this.txtDiameter.EditValue = vmo.DN;
+ this.textEditVoerFlow.Checked = vmo.OverFlow;
this.txtKeyWord.EditValue = HStation.Service.Assets.KeyWordHelper.ToString(vmo.KeyWords);
this.txtFlags.EditValue = Yw.Untity.FlagsHelper.ToString(vmo.Flags);
this.txtTagName.EditValue = vmo.TagName;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.resx
index af32865..8b2ff64 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/ViewAssetsTankMainDlg.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.Assets.Core/17-hydrant/02-main/AddAssetsHydrantMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/AddAssetsHydrantMainDlg.Designer.cs
index 4ba413b..c205709 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/AddAssetsHydrantMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/AddAssetsHydrantMainDlg.Designer.cs
@@ -105,7 +105,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 6;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/EditAssetsHydrantMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/EditAssetsHydrantMainDlg.Designer.cs
index f756add..77bc413 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/EditAssetsHydrantMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/EditAssetsHydrantMainDlg.Designer.cs
@@ -105,7 +105,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 12;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/ViewAssetsHydrantMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/ViewAssetsHydrantMainDlg.Designer.cs
index d629ea9..19b495e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/ViewAssetsHydrantMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/ViewAssetsHydrantMainDlg.Designer.cs
@@ -101,7 +101,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 17;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(76, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/AddAssetsHydrantFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/AddAssetsHydrantFactorDlg.Designer.cs
index 7ca7332..fa6217f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/AddAssetsHydrantFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/AddAssetsHydrantFactorDlg.Designer.cs
@@ -156,7 +156,7 @@
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(299, 12);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/EditAssetsHydrantFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/EditAssetsHydrantFactorDlg.Designer.cs
index e841884..fc24396 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/EditAssetsHydrantFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/EditAssetsHydrantFactorDlg.Designer.cs
@@ -152,7 +152,7 @@
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(264, 12);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/ViewAssetsHydrantFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/ViewAssetsHydrantFactorDlg.Designer.cs
index 9c318bd..a636e95 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/ViewAssetsHydrantFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/ViewAssetsHydrantFactorDlg.Designer.cs
@@ -139,7 +139,7 @@
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(265, 12);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AddAssetsTranslationMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AddAssetsTranslationMainDlg.Designer.cs
index 201d0bc..3b16e0b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AddAssetsTranslationMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AddAssetsTranslationMainDlg.Designer.cs
@@ -127,7 +127,7 @@
textEditTranslationType.StyleController = layoutControl1;
textEditTranslationType.TabIndex = 3;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(405, 84);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/EditAssetsTranslationMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/EditAssetsTranslationMainDlg.Designer.cs
index b70a139..cb0679c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/EditAssetsTranslationMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/EditAssetsTranslationMainDlg.Designer.cs
@@ -135,7 +135,7 @@
textEditTranslationType.StyleController = layoutControl1;
textEditTranslationType.TabIndex = 3;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(405, 84);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/ViewAssetsTranslationMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/ViewAssetsTranslationMainDlg.Designer.cs
index dd644b0..2578407 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/ViewAssetsTranslationMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/ViewAssetsTranslationMainDlg.Designer.cs
@@ -127,7 +127,7 @@
textEditTranslationType.StyleController = layoutControl1;
textEditTranslationType.TabIndex = 9;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(76, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/AddAssetsTranslationFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/AddAssetsTranslationFactorDlg.Designer.cs
index 4336866..35faddc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/AddAssetsTranslationFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/AddAssetsTranslationFactorDlg.Designer.cs
@@ -91,7 +91,7 @@
layoutControlItem2.Text = "鏉愯川:";
layoutControlItem2.TextSize = new Size(59, 14);
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(350, 12);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/EditAssetsTranslationFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/EditAssetsTranslationFactorDlg.Designer.cs
index 6d6404d..033ca38 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/EditAssetsTranslationFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/EditAssetsTranslationFactorDlg.Designer.cs
@@ -136,7 +136,7 @@
textEditTranslationType.StyleController = layoutControl1;
textEditTranslationType.TabIndex = 7;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(360, 12);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/ViewAssetsTranslationFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/ViewAssetsTranslationFactorDlg.Designer.cs
index 2251158..19fdc72 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/ViewAssetsTranslationFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/ViewAssetsTranslationFactorDlg.Designer.cs
@@ -132,7 +132,7 @@
textEditTranslationType.StyleController = layoutControl1;
textEditTranslationType.TabIndex = 7;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(354, 12);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/AddAssetsExchangerMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/AddAssetsExchangerMainDlg.Designer.cs
index 23b3bfa..ed48a9a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/AddAssetsExchangerMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/AddAssetsExchangerMainDlg.Designer.cs
@@ -159,7 +159,7 @@
txtDiameter.TabIndex = 4;
txtDiameter.EditValueChanged += txtCaliber_EditValueChanged;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/EditAssetsExchangerMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/EditAssetsExchangerMainDlg.Designer.cs
index c2fafda..00d73b1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/EditAssetsExchangerMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/EditAssetsExchangerMainDlg.Designer.cs
@@ -158,7 +158,7 @@
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/ViewAssetsExchangerMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/ViewAssetsExchangerMainDlg.Designer.cs
index 530499f..553331b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/ViewAssetsExchangerMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/ViewAssetsExchangerMainDlg.Designer.cs
@@ -151,7 +151,7 @@
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(76, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/AddAssetsExchangerFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/AddAssetsExchangerFactorDlg.Designer.cs
index 66a1203..6bd4faa 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/AddAssetsExchangerFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/AddAssetsExchangerFactorDlg.Designer.cs
@@ -120,7 +120,7 @@
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(335, 12);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/EditAssetsExchangerFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/EditAssetsExchangerFactorDlg.Designer.cs
index 0d4d85e..6f6cd0c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/EditAssetsExchangerFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/EditAssetsExchangerFactorDlg.Designer.cs
@@ -120,7 +120,7 @@
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(335, 12);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/ViewAssetsExchangerFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/ViewAssetsExchangerFactorDlg.Designer.cs
index 455bb8b..a763dbc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/ViewAssetsExchangerFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/ViewAssetsExchangerFactorDlg.Designer.cs
@@ -108,7 +108,7 @@
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(328, 12);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/AddAssetsCompressorMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/AddAssetsCompressorMainDlg.Designer.cs
index c44e359..a321eda 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/AddAssetsCompressorMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/AddAssetsCompressorMainDlg.Designer.cs
@@ -159,7 +159,7 @@
txtDiameter.TabIndex = 4;
txtDiameter.EditValueChanged += txtCaliber_EditValueChanged;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/EditAssetsCompressorMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/EditAssetsCompressorMainDlg.Designer.cs
index 6104e1b..e90edbd 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/EditAssetsCompressorMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/EditAssetsCompressorMainDlg.Designer.cs
@@ -158,7 +158,7 @@
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/ViewAssetsCompressorMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/ViewAssetsCompressorMainDlg.Designer.cs
index 52f3b76..e32f435 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/ViewAssetsCompressorMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/ViewAssetsCompressorMainDlg.Designer.cs
@@ -151,7 +151,7 @@
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(76, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/AddAssetsCompressorFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/AddAssetsCompressorFactorDlg.Designer.cs
index 7258d82..6e2ee81 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/AddAssetsCompressorFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/AddAssetsCompressorFactorDlg.Designer.cs
@@ -120,7 +120,7 @@
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(335, 12);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/EditAssetsCompressorFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/EditAssetsCompressorFactorDlg.Designer.cs
index 4f44c4c..7540b5c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/EditAssetsCompressorFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/EditAssetsCompressorFactorDlg.Designer.cs
@@ -120,7 +120,7 @@
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(335, 12);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/ViewAssetsCompressorFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/ViewAssetsCompressorFactorDlg.Designer.cs
index 18b3a89..3072d80 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/ViewAssetsCompressorFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/03-factor/ViewAssetsCompressorFactorDlg.Designer.cs
@@ -108,7 +108,7 @@
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(328, 12);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/AddAssetsCoolingMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/AddAssetsCoolingMainDlg.Designer.cs
index 07c67df..169f9b1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/AddAssetsCoolingMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/AddAssetsCoolingMainDlg.Designer.cs
@@ -177,7 +177,7 @@
txtCaliber.TabIndex = 4;
txtCaliber.EditValueChanged += txtCaliber_EditValueChanged;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/EditAssetsCoolingMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/EditAssetsCoolingMainDlg.Designer.cs
index 91d046f..00cac60 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/EditAssetsCoolingMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/EditAssetsCoolingMainDlg.Designer.cs
@@ -176,7 +176,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/ViewAssetsCoolingMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/ViewAssetsCoolingMainDlg.Designer.cs
index 60d35ee..64876c9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/ViewAssetsCoolingMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/02-main/ViewAssetsCoolingMainDlg.Designer.cs
@@ -151,7 +151,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(76, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/AddAssetsCoolingFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/AddAssetsCoolingFactorDlg.Designer.cs
index f0d2ff8..9ccd88a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/AddAssetsCoolingFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/AddAssetsCoolingFactorDlg.Designer.cs
@@ -140,7 +140,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/EditAssetsCoolingFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/EditAssetsCoolingFactorDlg.Designer.cs
index 0c93936..11acd0a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/EditAssetsCoolingFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/EditAssetsCoolingFactorDlg.Designer.cs
@@ -140,7 +140,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(83, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/ViewAssetsCoolingFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/ViewAssetsCoolingFactorDlg.Designer.cs
index 5f8f097..bfeb15e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/ViewAssetsCoolingFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/ViewAssetsCoolingFactorDlg.Designer.cs
@@ -130,7 +130,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtMaterial
+ // txtDN
//
txtMaterial.Location = new Point(76, 36);
txtMaterial.Name = "txtMaterial";
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs
index 25e874e..d50601f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs
@@ -367,6 +367,7 @@
this.MarkPropertyValueChangedEvent?.Invoke(vm.Vmo);
this.GradingPropertyValueChangedEvent?.Invoke(vm.Vmo);
};
+ dlg.SetBindingData(input);
dlg.ShowDialog();
}
break;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.cs
index 22b7dfb..b8448dc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.cs
@@ -84,7 +84,6 @@
_pump_matching_vm.MatchingRatedN = pump_mian.RatedSpeed;
_pump_matching_vm.MatchingRatedP = pump_mian.RatedPower;
_pump_matching_vm.MatchingRatedQ = pump_mian.RatedFlow;
-
this.ReloadDataEvent?.Invoke(_pump_matching_vm);
this.Close();
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/03-valve/AssetsValveSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/03-valve/AssetsValveSingleMatchingCtrl.cs
index 2938fab..4ad704c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/03-valve/AssetsValveSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/03-valve/AssetsValveSingleMatchingCtrl.cs
@@ -43,18 +43,21 @@
public async void SetBindingData(string dbId, string curveDbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsValveMain>.Instance.GetAll();
- _allList = new List<AssetsValveSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsValveSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsValveSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsValveSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ if (long.TryParse(curveDbId, out long curveId))
+ {
+ _curveDbId = curveId;
+ }
+ Search();
}
- if (long.TryParse(curveDbId, out long curveId))
- {
- _curveDbId = curveId;
- }
- Search();
await Task.Delay(300);
if (_selected != null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/04-pipe/AssetsPipeSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/04-pipe/AssetsPipeSingleMatchingCtrl.cs
index c7edc7c..871d27b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/04-pipe/AssetsPipeSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/04-pipe/AssetsPipeSingleMatchingCtrl.cs
@@ -24,14 +24,17 @@
public async void SetBindingData(string dbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsPipeMain>.Instance.GetAll();
- _allList = new List<AssetsPipeSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsPipeSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsPipeSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsPipeSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ Search();
}
- Search();
await Task.Delay(300);
if (_selected != null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/05-elbows/AssetsElbowSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/05-elbows/AssetsElbowSingleMatchingCtrl.cs
index af0d4d7..4d4ef86 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/05-elbows/AssetsElbowSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/05-elbows/AssetsElbowSingleMatchingCtrl.cs
@@ -24,14 +24,17 @@
public async void SetBindingData(string dbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsElbowMain>.Instance.GetAll();
- _allList = new List<AssetsElbowSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsElbowSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsElbowSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsElbowSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ Search();
}
- Search();
await Task.Delay(300);
if (_selected != null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/05-elbows/AssetsElbowSingleMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/05-elbows/AssetsElbowSingleMatchingDlg.cs
index 40ef9e5..88e7c4c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/05-elbows/AssetsElbowSingleMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/05-elbows/AssetsElbowSingleMatchingDlg.cs
@@ -42,7 +42,10 @@
_input.MatchingMaterial = vm.Material;
_input.MatchingCaliber = vm.Caliber;
_input.MatchingBendingAngle = vm.Angle;
- _input.MatchingElbowType = (Yw.WinFrmUI.eElbowType)(int)vm.ElbowType;
+ if (vm.ElbowType != null)
+ {
+ _input.MatchingElbowType = (Yw.WinFrmUI.eElbowType)(int)vm.ElbowType;
+ }
_input.MatchingMinorLoss = vm.MinorLoss;
this.ReloadDataEvent?.Invoke(_input);
this.DialogResult = DialogResult.OK;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/06-threelink/AssetsThreelinkSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/06-threelink/AssetsThreelinkSingleMatchingCtrl.cs
index 792f1e8..9369b86 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/06-threelink/AssetsThreelinkSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/06-threelink/AssetsThreelinkSingleMatchingCtrl.cs
@@ -24,14 +24,17 @@
public async void SetBindingData(string dbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsThreelinkMain>.Instance.GetAll();
- _allList = new List<AssetsThreelinkSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsThreelinkSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsThreelinkSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsThreelinkSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ Search();
}
- Search();
await Task.Delay(300);
if (_selected != null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/07-fourlink/AssetsFourlinkSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/07-fourlink/AssetsFourlinkSingleMatchingCtrl.cs
index f2001d4..34af673 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/07-fourlink/AssetsFourlinkSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/07-fourlink/AssetsFourlinkSingleMatchingCtrl.cs
@@ -24,14 +24,17 @@
public async void SetBindingData(string dbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsFourlinkMain>.Instance.GetAll();
- _allList = new List<AssetsFourlinkSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsFourlinkSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsFourlinkSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsFourlinkSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ Search();
}
- Search();
await Task.Delay(300);
if (_selected != null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs
index 9ffa425..0944a88 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs
@@ -42,18 +42,21 @@
public async void SetBindingData(string dbId, string curveDbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsTankMain>.Instance.GetAll();
- _allList = new List<AssetsTankSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsTankSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsTankSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsTankSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ if (long.TryParse(curveDbId, out long curveId))
+ {
+ _curveDbid = curveId;
+ }
+ Search();
}
- if (long.TryParse(curveDbId, out long curveId))
- {
- _curveDbid = curveId;
- }
- Search();
await Task.Delay(300);
if (_selected != null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/12-Hydrant/AssetsHydrantSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/12-Hydrant/AssetsHydrantSingleMatchingCtrl.cs
index aed8c93..fbe02b9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/12-Hydrant/AssetsHydrantSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/12-Hydrant/AssetsHydrantSingleMatchingCtrl.cs
@@ -24,14 +24,17 @@
public async void SetBindingData(string dbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsHydrantMain>.Instance.GetAll();
- _allList = new List<AssetsHydrantSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsHydrantSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsHydrantSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsHydrantSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ Search();
}
- Search();
await Task.Delay(300);
if (_selected != null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/14-Blunthead/AssetsBluntheadSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/14-Blunthead/AssetsBluntheadSingleMatchingCtrl.cs
index 8afe679..35ef284 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/14-Blunthead/AssetsBluntheadSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/14-Blunthead/AssetsBluntheadSingleMatchingCtrl.cs
@@ -24,14 +24,17 @@
public async void SetBindingData(string dbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsBluntheadMain>.Instance.GetAll();
- _allList = new List<AssetsBluntheadSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsBluntheadSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsBluntheadSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsBluntheadSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ Search();
}
- Search();
await Task.Delay(300);
if (_selected != null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.Designer.cs
index d75ed06..0db861d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.Designer.cs
@@ -48,7 +48,6 @@
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
colStartDiameter = new DevExpress.XtraGrid.Columns.GridColumn();
colEndDiameter = new DevExpress.XtraGrid.Columns.GridColumn();
- coleAlgorithmType = new DevExpress.XtraGrid.Columns.GridColumn();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -163,7 +162,7 @@
//
// gridView1
//
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colMaterial, colCaliber, colCoefficient, colKeyWords, colFlags, colTagName, colDescription, colStartDiameter, colEndDiameter, coleAlgorithmType });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colMaterial, colCaliber, colCoefficient, colKeyWords, colFlags, colTagName, colDescription, colStartDiameter, colEndDiameter });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
//
@@ -204,7 +203,7 @@
colCoefficient.MinWidth = 80;
colCoefficient.Name = "colCoefficient";
colCoefficient.Visible = true;
- colCoefficient.VisibleIndex = 6;
+ colCoefficient.VisibleIndex = 5;
colCoefficient.Width = 80;
//
// colKeyWords
@@ -213,7 +212,7 @@
colKeyWords.MinWidth = 100;
colKeyWords.Name = "colKeyWords";
colKeyWords.Visible = true;
- colKeyWords.VisibleIndex = 7;
+ colKeyWords.VisibleIndex = 6;
colKeyWords.Width = 100;
//
// colFlags
@@ -222,7 +221,7 @@
colFlags.MinWidth = 100;
colFlags.Name = "colFlags";
colFlags.Visible = true;
- colFlags.VisibleIndex = 8;
+ colFlags.VisibleIndex = 7;
colFlags.Width = 100;
//
// colTagName
@@ -232,7 +231,7 @@
colTagName.MinWidth = 100;
colTagName.Name = "colTagName";
colTagName.Visible = true;
- colTagName.VisibleIndex = 9;
+ colTagName.VisibleIndex = 8;
colTagName.Width = 100;
//
// colDescription
@@ -241,7 +240,7 @@
colDescription.MinWidth = 100;
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 10;
+ colDescription.VisibleIndex = 9;
colDescription.Width = 100;
//
// colStartDiameter
@@ -257,13 +256,6 @@
colEndDiameter.Name = "colEndDiameter";
colEndDiameter.Visible = true;
colEndDiameter.VisibleIndex = 4;
- //
- // coleAlgorithmType
- //
- coleAlgorithmType.FieldName = "eAlgorithmType";
- coleAlgorithmType.Name = "coleAlgorithmType";
- coleAlgorithmType.Visible = true;
- coleAlgorithmType.VisibleIndex = 5;
//
// Root
//
@@ -429,6 +421,5 @@
private DevExpress.XtraGrid.Columns.GridColumn colDescription;
private DevExpress.XtraGrid.Columns.GridColumn colStartDiameter;
private DevExpress.XtraGrid.Columns.GridColumn colEndDiameter;
- private DevExpress.XtraGrid.Columns.GridColumn coleAlgorithmType;
}
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.cs
index ef2df57..e5dbd5f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.cs
@@ -24,14 +24,17 @@
public async void SetBindingData(string dbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsTranslationMain>.Instance.GetAll();
- _allList = new List<AssetsTranslationSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsTranslationSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsTranslationSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsTranslationSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ Search();
}
- Search();
await Task.Delay(300);
if (_selected != null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingViewModel.cs
index 844e528..f75ca9c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingViewModel.cs
@@ -53,9 +53,9 @@
public double? Caliber { get; set; }
/// <summary>
- /// 鍠峰皠绯绘暟
+ /// 灞�闃荤郴鏁�
/// </summary>
- [DisplayName("鍠峰皠绯绘暟")]
+ [DisplayName("灞�闃荤郴鏁�")]
public double Coefficient { get; set; }
/// <summary>
@@ -75,12 +75,6 @@
/// </summary>
[DisplayName("绮楃硻绯绘暟")]
public double Roughness { get; set; }
-
- /// <summary>
- /// 绠楁硶绫诲瀷
- /// </summary>
- [DisplayName("绠楁硶绫诲瀷")]
- public HStation.Assets.eTranslationType eAlgorithmType { get; set; }
/// <summary>
/// 鍏抽敭瀛�
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/16-meter/AssetsMeterSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/16-meter/AssetsMeterSingleMatchingCtrl.cs
index 6a59c45..3434d5a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/16-meter/AssetsMeterSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/16-meter/AssetsMeterSingleMatchingCtrl.cs
@@ -24,14 +24,17 @@
public async void SetBindingData(string dbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsMeterMain>.Instance.GetAll();
- _allList = new List<AssetsMeterSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsMeterSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsMeterSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsMeterSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ Search();
}
- Search();
await Task.Delay(300);
if (_selected != null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/16-sprinkler/AssetsSprinklerSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/16-sprinkler/AssetsSprinklerSingleMatchingCtrl.cs
index 0ed5c15..3d173d8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/16-sprinkler/AssetsSprinklerSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/16-sprinkler/AssetsSprinklerSingleMatchingCtrl.cs
@@ -24,14 +24,17 @@
public async void SetBindingData(string dbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsSprinklerMain>.Instance.GetAll();
- _allList = new List<AssetsSprinklerSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsSprinklerSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsSprinklerSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsSprinklerSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ Search();
}
- Search();
await Task.Delay(300);
if (_selected != null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingCtrl.cs
index 80f4bb4..bd24fba 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingCtrl.cs
@@ -41,18 +41,21 @@
public async void SetBindingData(string dbId, string curveDbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsCompressorMain>.Instance.GetAll();
- _allList = new List<AssetsCompressorSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsCompressorSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsCompressorSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsCompressorSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ if (long.TryParse(curveDbId, out long curveid))
+ {
+ _curveDbId = curveid;
+ }
+ Search();
}
- if (long.TryParse(curveDbId, out long curveid))
- {
- _curveDbId = curveid;
- }
- Search();
await Task.Delay(300);
if (_selected != null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-flowmeter/AssetsFlowmeterSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-flowmeter/AssetsFlowmeterSingleMatchingCtrl.cs
index 06363fc..21e4d1a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-flowmeter/AssetsFlowmeterSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-flowmeter/AssetsFlowmeterSingleMatchingCtrl.cs
@@ -24,14 +24,17 @@
public async void SetBindingData(string dbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsFlowmeterMain>.Instance.GetAll();
- _allList = new List<AssetsFlowmeterSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsFlowmeterSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsFlowmeterSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsFlowmeterSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ Search();
}
- Search();
await Task.Delay(300);
if (_selected != null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.cs
index 6ece705..9791f30 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.cs
@@ -41,16 +41,19 @@
public async void SetBindingData(string dbId, string curveDbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsExchangerMain>.Instance.GetAll();
- _allList = new List<AssetsExchangerSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsExchangerSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
- }
- if (long.TryParse(curveDbId, out long curveId))
- {
- _curveDbId = curveId;
+ _allList = new List<AssetsExchangerSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsExchangerSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ if (long.TryParse(curveDbId, out long curveId))
+ {
+ _curveDbId = curveId;
+ }
}
Search();
await Task.Delay(300);
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.resx
index cabe594..7774e8d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.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/03-simulation/07-matching/18-pressmeter/AssetsPressmeterSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-pressmeter/AssetsPressmeterSingleMatchingCtrl.cs
index 86c7097..52675b7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-pressmeter/AssetsPressmeterSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-pressmeter/AssetsPressmeterSingleMatchingCtrl.cs
@@ -25,13 +25,16 @@
{
var allList = await BLLFactory<HStation.BLL.AssetsPressmeterMain>.Instance.GetAll();
_allList = new List<AssetsPressmeterSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsPressmeterSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ allList.ForEach(x => _allList.Add(new AssetsPressmeterSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ Search();
}
- Search();
await Task.Delay(300);
if (_selected != null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/21-cooling/AssetsCoolingSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/21-cooling/AssetsCoolingSingleMatchingCtrl.cs
index 4d34f87..ee5d9e4 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/21-cooling/AssetsCoolingSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/21-cooling/AssetsCoolingSingleMatchingCtrl.cs
@@ -25,11 +25,14 @@
{
var allList = await BLLFactory<HStation.BLL.AssetsCoolingMain>.Instance.GetAll();
_allList = new List<AssetsCoolingSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsCoolingSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ allList.ForEach(x => _allList.Add(new AssetsCoolingSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
}
Search();
await Task.Delay(300);
--
Gitblit v1.9.3