From 06a1e1eb4ca614efc53d7c3082b861234ae0a479 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期六, 23 十一月 2024 14:03:22 +0800
Subject: [PATCH] 1、管网添加能量统计扩展方法AnalyzeEnergy：（统计类型包括起始总能量、输入能量、势能损失、沿程损失、剩余能量（末端））
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj | 146 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 128 insertions(+), 18 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
index 299a6eb..fc3e156 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
@@ -9,26 +9,31 @@
<ItemGroup>
<Compile Remove="02-UICore\**" />
+ <Compile Remove="10-equipment\**" />
<EmbeddedResource Remove="02-UICore\**" />
+ <EmbeddedResource Remove="10-equipment\**" />
<None Remove="02-UICore\**" />
+ <None Remove="10-equipment\**" />
<Page Remove="02-UICore\**" />
+ <Page Remove="10-equipment\**" />
</ItemGroup>
<ItemGroup>
- <Compile Remove="00-PumpProductManage\AddPumpProductMainDlg - 澶嶅埗.cs" />
- <Compile Remove="00-PumpProductManage\AddPumpProductMainDlg - 澶嶅埗.Designer.cs" />
- <Compile Remove="00-PumpProductManage\PumpProductMainPanel - 澶嶅埗.cs" />
- <Compile Remove="00-PumpProductManage\PumpProductMainPanel - 澶嶅埗.Designer.cs" />
+ <Compile Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.cs" />
+ <Compile Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.Designer.cs" />
+ <Compile Remove="01-pump\PumpProductMainPanel - 澶嶅埗.cs" />
+ <Compile Remove="01-pump\PumpProductMainPanel - 澶嶅埗.Designer.cs" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Remove="00-PumpProductManage\AddPumpProductMainDlg - 澶嶅埗.resx" />
- <EmbeddedResource Remove="00-PumpProductManage\PumpProductMainPanel - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="01-pump\PumpProductMainPanel - 澶嶅埗.resx" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
+ <PackageReference Include="Yw.BLL.Assets.Core" Version="3.0.1" />
</ItemGroup>
<ItemGroup>
@@ -37,36 +42,141 @@
<ProjectReference Include="..\..\Dto\HStation.Dto.Assets.Core\HStation.Dto.Assets.Core.csproj" />
<ProjectReference Include="..\HStation.WinFrmUI.Basic\HStation.WinFrmUI.Basic.csproj" />
<ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
+ <ProjectReference Include="..\HStation.WinFrmUI.Dict.Core\HStation.WinFrmUI.Dict.Core.csproj" />
<ProjectReference Include="..\HStation.WinFrmUI.PhartRelation.Core\HStation.WinFrmUI.PhartRelation.Core.csproj" />
</ItemGroup>
<ItemGroup>
- <Compile Update="00-PumpProductManage\03-PumpType\EditPumpTypeDlg.cs">
+ <Compile Update="02-adapting\EditAdaptingMainDlg.cs" />
+ <Compile Update="02-adapting\AddAdaptingMainDlg.cs" />
+ <Compile Update="01-pump\03-AssetsPumpType\EditAssetsPumpTypeDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="00-PumpProductManage\EditPumpProductMainDlg.cs" />
- <Compile Update="00-PumpProductManage\EditPumpProductGroupDlg.cs" />
- <Compile Update="00-PumpProductManage\AddPumpProductGroupDlg.cs" />
- <Compile Update="00-PumpProductManage\AddPumpProductMainDlg.cs" />
- <Compile Update="00-PumpProductManage\EditPumpProductSeriesDlg.cs" />
- <Compile Update="01-ValveManage\EditValveMainDlg.cs">
+ <Compile Update="01-pump\EditPumpProductMainDlg.cs" />
+ <Compile Update="01-pump\EditPumpProductGroupDlg.cs" />
+ <Compile Update="01-pump\AddPumpProductGroupDlg.cs" />
+ <Compile Update="01-pump\AddPumpProductMainDlg.cs" />
+ <Compile Update="01-pump\EditPumpProductSeriesDlg.cs" />
+ <Compile Update="03-valve\01-series\EditAssetsValveSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="01-ValveManage\AddValveMainDlg.cs">
+ <Compile Update="03-valve\01-series\AddAssetsValveSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="01-ValveManage\ValveTypeTreeListCtrl.cs">
+ <Compile Update="03-valve\04-chart-edit\ValvePerform2dEditChart.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="02-ElbowManage\ElbowManageMainPanel.cs">
+ <Compile Update="03-valve\04-chart-edit\ValvePerform2dEditCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-TeeManage\ElbowManageMainPanel.cs">
+ <Compile Update="03-valve\04-chart-edit\ValvePerform2dEditDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-valve\05-import\01-excel\ImportValvePerform2dByExcelCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="04-CrossManage\CrossManageMainPanel.cs">
+ <Compile Update="03-valve\05-import\01-excel\ImportValvePerform2dByExcelDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-valve\SetValveCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-valve\ValveTypeTreeListCtrl.cs" />
+ <Compile Update="02-adapting\AdaptingManageMainPage.cs" />
+ <Compile Update="03-valve\XhsValveMainPhartMinorLossPanel.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="05-elbow\02-main\AddAssetsElbowMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="05-elbow\02-main\EditAssetsElbowMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\01-series\AddPipeLineSeriesDlg.cs" />
+ <Compile Update="06-threeLink\01-series\EditPipeLineSeriesDlg.cs" />
+ <Compile Update="06-threeLink\01-series\PipeLineTreeListCtrl.cs" />
+ <Compile Update="06-threeLink\02-main\AddAssetsThreelinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\02-main\EditAssetsThreelinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\02-main\ThreeLinkManageMainPage.cs" />
+ <Compile Update="05-elbow\01-series\AddPipeLineSeriesDlg.cs" />
+ <Compile Update="05-elbow\01-series\EditPipeLineSeriesDlg.cs" />
+ <Compile Update="05-elbow\01-series\PipeLineTreeListCtrl.cs" />
+ <Compile Update="05-elbow\02-main\ElbowManageMainPage.cs" />
+ <Compile Update="04-pipe\01-series\AddPipeLineSeriesDlg.cs" />
+ <Compile Update="04-pipe\01-series\EditPipeLineSeriesDlg.cs" />
+ <Compile Update="04-pipe\02-main\EditAssetsPipeMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\02-main\AddAssetsPipeMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\02-main\PipeManageMainPage.cs" />
+ <Compile Update="04-pipe\01-series\PipeLineTreeListCtrl.cs" />
+ <Compile Update="11-compressor\01-series\AddAssetsExchangerSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="11-compressor\01-series\EditAssetsExchangerSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="11-compressor\01-series\ExchangerTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="11-compressor\02-main\01-EditPumpPartProp\EditExchangerPartPropDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="11-compressor\02-main\01-EditPumpPartProp\ExchangerProductListBox.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="11-compressor\02-main\AddAssetsExchangerMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="11-compressor\02-main\EditExchangerMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="11-compressor\02-main\ExchangerManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="10-exchanger\01-series\AddAssetsExchangerSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="10-exchanger\01-series\EditAssetsExchangerSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="10-exchanger\01-series\ExchangerTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="10-exchanger\02-main\01-EditPumpPartProp\EditExchangerPartPropDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="10-exchanger\02-main\01-EditPumpPartProp\ExchangerProductListBox.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="10-exchanger\02-main\AddExchangerMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="10-exchanger\02-main\EditExchangerMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\02-main\AddAssetsFourlinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\02-main\EditAssetsFourlinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="08-nozzle\01-series\AddPipeLineSeriesDlg.cs" />
+ <Compile Update="08-nozzle\01-series\EditPipeLineSeriesDlg.cs" />
+ <Compile Update="08-nozzle\01-series\NozzleTreeListCtrl.cs" />
+ <Compile Update="08-nozzle\02-main\AddAssetsNozzleMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="08-nozzle\02-main\EditAssetsNozzleMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="08-nozzle\02-main\NozzleManageMainPage.cs" />
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
--
Gitblit v1.9.3