From 8eb1a19c55846f70b3b6bf43e32c2e94333d52e7 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 30 十一月 2024 13:07:34 +0800
Subject: [PATCH] epanet 计算完善
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
index 2aeb399..da5ff44 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
@@ -10,29 +10,21 @@
<ItemGroup>
<Compile Remove="02-project\01-import\01-ModelFile\**" />
<Compile Remove="02-project\01-import\04-completed\**" />
- <Compile Remove="03-simulation\06-simulation\03-calcu\00-core\**" />
- <Compile Remove="03-simulation\06-simulation\03-calcu\01-failed\**" />
<Compile Remove="03-ViewModel\**" />
<Compile Remove="04-HomePageMainPanel\**" />
<Compile Remove="Resources\**" />
<EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" />
<EmbeddedResource Remove="02-project\01-import\04-completed\**" />
- <EmbeddedResource Remove="03-simulation\06-simulation\03-calcu\00-core\**" />
- <EmbeddedResource Remove="03-simulation\06-simulation\03-calcu\01-failed\**" />
<EmbeddedResource Remove="03-ViewModel\**" />
<EmbeddedResource Remove="04-HomePageMainPanel\**" />
<EmbeddedResource Remove="Resources\**" />
<None Remove="02-project\01-import\01-ModelFile\**" />
<None Remove="02-project\01-import\04-completed\**" />
- <None Remove="03-simulation\06-simulation\03-calcu\00-core\**" />
- <None Remove="03-simulation\06-simulation\03-calcu\01-failed\**" />
<None Remove="03-ViewModel\**" />
<None Remove="04-HomePageMainPanel\**" />
<None Remove="Resources\**" />
<Page Remove="02-project\01-import\01-ModelFile\**" />
<Page Remove="02-project\01-import\04-completed\**" />
- <Page Remove="03-simulation\06-simulation\03-calcu\00-core\**" />
- <Page Remove="03-simulation\06-simulation\03-calcu\01-failed\**" />
<Page Remove="03-ViewModel\**" />
<Page Remove="04-HomePageMainPanel\**" />
<Page Remove="Resources\**" />
@@ -61,14 +53,15 @@
<Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.Designer.cs" />
<Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.cs" />
<Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.Designer.cs" />
- <Compile Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixCtrl - 澶嶅埗.cs" />
- <Compile Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixCtrl - 澶嶅埗.Designer.cs" />
- <Compile Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixDlg2.cs" />
- <Compile Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixDlg2.Designer.cs" />
- <Compile Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixViewModel.cs" />
<Compile Remove="04-pump\02-analy\SinglePumpSectPointViewModel.cs" />
<Compile Remove="04-pump\03-calc\SinglePumpCalcCtrl - 澶嶅埗.cs" />
<Compile Remove="04-pump\03-calc\SinglePumpCalcCtrl - 澶嶅埗.Designer.cs" />
+ <Compile Remove="04-pump\PumpFullInfoCtrl.cs" />
+ <Compile Remove="04-pump\PumpFullInfoCtrl.designer.cs" />
+ <Compile Remove="04-pump\PumpFullInfoViewDlg.cs" />
+ <Compile Remove="04-pump\PumpFullInfoViewDlg.Designer.cs" />
+ <Compile Remove="04-pump\SinglePumpInfoViewDLg.cs" />
+ <Compile Remove="04-pump\SinglePumpInfoViewDLg.Designer.cs" />
</ItemGroup>
<ItemGroup>
@@ -81,9 +74,10 @@
<EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.resx" />
<EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.resx" />
<EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.resx" />
- <EmbeddedResource Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixCtrl - 澶嶅埗.resx" />
- <EmbeddedResource Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixDlg2.resx" />
<EmbeddedResource Remove="04-pump\03-calc\SinglePumpCalcCtrl - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="04-pump\PumpFullInfoCtrl.resx" />
+ <EmbeddedResource Remove="04-pump\PumpFullInfoViewDlg.resx" />
+ <EmbeddedResource Remove="04-pump\SinglePumpInfoViewDLg.resx" />
</ItemGroup>
<ItemGroup>
@@ -102,6 +96,7 @@
<Content Include="map\gaode\js\xhs_base64.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <None Include="Resources\pump_run_32.png" />
<None Include="Resources\Cancel.svg" />
<None Include="Resources\Close32.png" />
<None Include="Resources\Folder.svg" />
@@ -119,9 +114,6 @@
</ItemGroup>
<ItemGroup>
- <Folder Include="03-simulation\06-simulation\07-bulkset\05-nozzle\" />
- <Folder Include="03-simulation\06-simulation\07-bulkset\03-valve\" />
- <Folder Include="03-simulation\06-simulation\07-bulkset\04-pipe\" />
<Folder Include="map\gaode\css\" />
</ItemGroup>
@@ -180,22 +172,24 @@
<Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourLinkSingleMatchingForm.cs" />
<Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourLinkSingMatchingDlg.cs" />
<Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs" />
- <Compile Update="03-simulation\06-simulation\02-check\XhsProjectSimulationHydroCheckResultCtrl.cs" />
- <Compile Update="03-simulation\06-simulation\04-unmatching\00-core\XhsProjectSimulationUnMatchingListCtrl.cs" />
- <Compile Update="03-simulation\06-simulation\04-unmatching\02-valve\XhsProjectSimulationValveUnMatchingListCtrl.cs" />
- <Compile Update="03-simulation\06-simulation\04-unmatching\03-pipe\XhsProjectSimulationPipeUnMatchingListCtrl.cs" />
- <Compile Update="03-simulation\06-simulation\04-unmatching\06-fourlink\XhsProjectSimulationFourlinkUnMatchingListCtrl.cs" />
- <Compile Update="03-simulation\06-simulation\04-unmatching\05-threelink\XhsProjectSimulationThreelinkUnMatchingListCtrl.cs" />
- <Compile Update="03-simulation\06-simulation\04-unmatching\04-elbow\XhsProjectSimulationElbowUnMatchingListCtrl.cs" />
<Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs" />
<Compile Update="03-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs" />
<Compile Update="03-simulation\08-working\XhsProjectSimulationWorkingPage.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="03-simulation\09-energy\SimulationMultiWorkingEnergyDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\10-analy\SimulationMultiWorkingAnalyDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\10-analy\SimulationSingleWorkingAnalyDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="04-pump\03-calc\SinglePumpCalcCtrl.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\09-energy\01-single\SimulationSingleWorkingEnergyDlg.cs">
+ <Compile Update="03-simulation\09-energy\SimulationSingleWorkingEnergyDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="Properties\Resources.Designer.cs">
--
Gitblit v1.9.3