From b825d70578b0ddf6d479569887c194f919795dad Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 14:22:48 +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 | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/PBS.WinFrmUI.Hydro.csproj b/WinFrmUI/PBS.WinFrmUI.Hydro/PBS.WinFrmUI.Hydro.csproj
index c79112a..1d84b79 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/PBS.WinFrmUI.Hydro.csproj
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/PBS.WinFrmUI.Hydro.csproj
@@ -10,15 +10,27 @@
<ItemGroup>
<Compile Remove="03-ViewModel\**" />
<Compile Remove="04-HomePageMainPanel\**" />
+ <Compile Remove="05-system-curve\00-core - 鍓湰\**" />
+ <Compile Remove="06-schedule-simulation\00-core\**" />
+ <Compile Remove="06-schedule-simulation\01-\**" />
<Compile Remove="99-map-view - 澶嶅埗\**" />
<EmbeddedResource Remove="03-ViewModel\**" />
<EmbeddedResource Remove="04-HomePageMainPanel\**" />
+ <EmbeddedResource Remove="05-system-curve\00-core - 鍓湰\**" />
+ <EmbeddedResource Remove="06-schedule-simulation\00-core\**" />
+ <EmbeddedResource Remove="06-schedule-simulation\01-\**" />
<EmbeddedResource Remove="99-map-view - 澶嶅埗\**" />
<None Remove="03-ViewModel\**" />
<None Remove="04-HomePageMainPanel\**" />
+ <None Remove="05-system-curve\00-core - 鍓湰\**" />
+ <None Remove="06-schedule-simulation\00-core\**" />
+ <None Remove="06-schedule-simulation\01-\**" />
<None Remove="99-map-view - 澶嶅埗\**" />
<Page Remove="03-ViewModel\**" />
<Page Remove="04-HomePageMainPanel\**" />
+ <Page Remove="05-system-curve\00-core - 鍓湰\**" />
+ <Page Remove="06-schedule-simulation\00-core\**" />
+ <Page Remove="06-schedule-simulation\01-\**" />
<Page Remove="99-map-view - 澶嶅埗\**" />
</ItemGroup>
@@ -40,8 +52,9 @@
<Compile Remove="05-system-curve\SystemCurvePage - 澶嶅埗.cs" />
<Compile Remove="05-system-curve\SystemCurvePage - 澶嶅埗.Designer.cs" />
<Compile Remove="05-system-curve\WaterDistributionCalculator - 澶嶅埗.cs" />
- <Compile Remove="06-simulation-drill\SimulationDrillPage2.cs" />
- <Compile Remove="06-simulation-drill\SimulationDrillPage2.Designer.cs" />
+ <Compile Remove="06-schedule-simulation\dispatch\Helper\SimuSpeedCalcHelper.cs" />
+ <Compile Remove="06-schedule-simulation\SimulationSchedulePage2.cs" />
+ <Compile Remove="06-schedule-simulation\SimulationSchedulePage2.Designer.cs" />
<Compile Remove="99-map-view\00\Dataset.cs" />
<Compile Remove="99-map-view\00\SelectionSet.cs" />
</ItemGroup>
@@ -53,7 +66,7 @@
<EmbeddedResource Remove="02-quick-modeling\QuickModelingPage - 澶嶅埗.resx" />
<EmbeddedResource Remove="02-quick-modeling\QuickModelingPage1.resx" />
<EmbeddedResource Remove="05-system-curve\SystemCurvePage - 澶嶅埗.resx" />
- <EmbeddedResource Remove="06-simulation-drill\SimulationDrillPage2.resx" />
+ <EmbeddedResource Remove="06-schedule-simulation\SimulationSchedulePage2.resx" />
</ItemGroup>
<ItemGroup>
--
Gitblit v1.9.3