From d1807075581920a8c94a409b11a9c88dd869be1e Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期四, 20 三月 2025 16:57:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI.Hydro/PBS.WinFrmUI.Hydro.csproj | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/PBS.WinFrmUI.Hydro.csproj b/WinFrmUI/PBS.WinFrmUI.Hydro/PBS.WinFrmUI.Hydro.csproj
index 565d0b0..e1d4412 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/PBS.WinFrmUI.Hydro.csproj
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/PBS.WinFrmUI.Hydro.csproj
@@ -19,27 +19,70 @@
</ItemGroup>
<ItemGroup>
- <Compile Remove="01-system-curve\SystemCurveCalcHelper - 澶嶅埗.cs" />
- <Compile Remove="01-system-curve\SystemCurvePage - 澶嶅埗.cs" />
- <Compile Remove="01-system-curve\SystemCurvePage - 澶嶅埗.Designer.cs" />
- <Compile Remove="01-system-curve\WaterDistributionCalculator - 澶嶅埗.cs" />
+ <Compile Remove="01-model-template\00-core\ModelTemplatePage - 澶嶅埗.cs" />
+ <Compile Remove="01-model-template\00-core\ModelTemplatePage - 澶嶅埗.Designer.cs" />
+ <Compile Remove="02-quick-modeling\NetWorkModelHelper.cs" />
+ <Compile Remove="02-quick-modeling\QuickModelingPage - 澶嶅埗.cs" />
+ <Compile Remove="02-quick-modeling\QuickModelingPage - 澶嶅埗.Designer.cs" />
+ <Compile Remove="02-quick-modeling\QuickModelingPage1.cs" />
+ <Compile Remove="02-quick-modeling\QuickModelingPage1.Designer.cs" />
+ <Compile Remove="03-system-curve\SystemCurveCalcHelper - 澶嶅埗.cs" />
+ <Compile Remove="03-system-curve\SystemCurvePage - 澶嶅埗.cs" />
+ <Compile Remove="03-system-curve\SystemCurvePage - 澶嶅埗.Designer.cs" />
+ <Compile Remove="03-system-curve\WaterDistributionCalculator - 澶嶅埗.cs" />
+ <Compile Remove="template\TemplateMgr - 澶嶅埗.cs" />
+ <Compile Remove="template\TemplateMgr - 澶嶅埗.Designer.cs" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Remove="01-system-curve\SystemCurvePage - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="01-model-template\00-core\ModelTemplatePage - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="02-quick-modeling\QuickModelingPage - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="02-quick-modeling\QuickModelingPage1.resx" />
+ <EmbeddedResource Remove="03-system-curve\SystemCurvePage - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="template\TemplateMgr - 澶嶅埗.resx" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
<PackageReference Include="Yw.Ahart.Core" Version="3.0.5" />
+ <PackageReference Include="Yw.BLL.Map.Core" Version="3.0.9" />
<PackageReference Include="Yw.Epanet.Calcu.Core" Version="1.0.3" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\BLL\PBS.BLL\PBS.BLL.csproj" />
+ <ProjectReference Include="..\HStation.WinFrmUI.Basic.Core\HStation.WinFrmUI.Basic.Core.csproj" />
<ProjectReference Include="..\Yw.WinFrmUI.Core\Yw.WinFrmUI.Core.csproj" />
+ <ProjectReference Include="..\Yw.WinFrmUI.Map.Core\Yw.WinFrmUI.Map.Core.csproj" />
+ <ProjectReference Include="..\Yw.WinFrmUI.Unit.Core\Yw.WinFrmUI.Unit.Core.csproj" />
</ItemGroup>
<ItemGroup>
+ <Compile Update="01-model-template\00-core\SetMapBaseMapDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-model-template\00-core\ModelTemplatePage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="01-model-template\01-model-template\EditModelTemplateDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="02-quick-modeling\03-facility\QuickModelingFacilityWizardPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="04-model-edit\ModelEditPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="99-map-view\Class1.cs" />
+ <Compile Update="99-map-view\DMap.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Update="99-map-view\Form_Magnifier.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="99-map-view\MapViewer.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
--
Gitblit v1.9.3