From 0f8ab9b81c5801869a1b620dbc74a95e07c0a566 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 08 十月 2024 17:47:14 +0800
Subject: [PATCH] 增加喷头界面字段

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj |  110 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 98 insertions(+), 12 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 69041c2..f5474a4 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
@@ -8,12 +8,20 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Remove="02-project\01-import\01-ModelFile\**" />
+    <Compile Remove="02-project\01-import\04-completed\**" />
     <Compile Remove="03-ViewModel\**" />
     <Compile Remove="04-HomePageMainPanel\**" />
+    <EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" />
+    <EmbeddedResource Remove="02-project\01-import\04-completed\**" />
     <EmbeddedResource Remove="03-ViewModel\**" />
     <EmbeddedResource Remove="04-HomePageMainPanel\**" />
+    <None Remove="02-project\01-import\01-ModelFile\**" />
+    <None Remove="02-project\01-import\04-completed\**" />
     <None Remove="03-ViewModel\**" />
     <None Remove="04-HomePageMainPanel\**" />
+    <Page Remove="02-project\01-import\01-ModelFile\**" />
+    <Page Remove="02-project\01-import\04-completed\**" />
     <Page Remove="03-ViewModel\**" />
     <Page Remove="04-HomePageMainPanel\**" />
   </ItemGroup>
@@ -21,10 +29,19 @@
   <ItemGroup>
     <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.cs" />
     <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.Designer.cs" />
+    <Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.cs" />
+    <Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.Designer.cs" />
+    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpMainChoicePage.cs" />
+    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpMainChoicePage.Designer.cs" />
+    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpMainForm-bak.cs" />
+    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpMainForm-bak.Designer.cs" />
   </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.resx" />
+    <EmbeddedResource Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.resx" />
+    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpMainChoicePage.resx" />
+    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpMainForm-bak.resx" />
   </ItemGroup>
 
   <ItemGroup>
@@ -52,7 +69,6 @@
 
   <ItemGroup>
     <Folder Include="map\gaode\css\" />
-    <Folder Include="00-core\" />
     <Folder Include="Resources\" />
   </ItemGroup>
 
@@ -64,31 +80,101 @@
     <ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
     <ProjectReference Include="..\HStation.WinFrmUI.Hydro.Core\HStation.WinFrmUI.Hydro.Core.csproj" />
     <ProjectReference Include="..\Yw.WinFrmUI.Map.Core\Yw.WinFrmUI.Map.Core.csproj" />
+    <ProjectReference Include="..\Yw.WinFrmUI.Phart.Core\Yw.WinFrmUI.Phart.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationBimfaceInfoCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationHydroInfoCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationProjectInfoCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="02-project\04-dlg\00-core\ImportXhsProjectFileDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Update="02-project\04-dlg\01-FileChoice\SelectXhsProjectFileModelFileWizardPage.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="02-project\04-dlg\02-GeneralProject\GenerateXhsProjectFileWizardPage.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="02-project\04-dlg\03-ImportCompleted\ImportXhsProjectFileCompletedCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="02-project\04-dlg\04-ProjectResultShowPanel\ProjectFileResultShowPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Update="02-project\04-dlg\EditProjectDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="03-scheme\03-hydraulic-simulation\XhsSchemeHydraulicSimulationPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="03-scheme\02-asset-mgr\XhsSchemeAssetMgrPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="03-scheme\04-scheme-mgr\02-comparison\SelectSchemeDlg.cs">
+    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\XhsProjectSimulationPumpSingleMatchingDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="03-scheme\04-scheme-mgr\02-comparison\XhsSchemeComparisonPage.cs">
+    <Compile Update="03-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="03-scheme\XhsSchemeMultiMgrPage.cs">
+    <Compile Update="03-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="03-scheme\XhsSchemeMultiMgrPage_Bak2.cs">
+    <Compile Update="03-simulation\01-info\XhsProjectSimulationBimfaceInfoCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="03-scheme\XhsSchemeMultiMgrPage_Bak.cs">
+    <Compile Update="03-simulation\01-info\XhsProjectSimulationInfoPage.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\XhsProjectSimulationPumpSingleMatchingDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\XhsProjectSimulationPumpSingleMatchingForm.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\XhsProjectSimulationPumpMatchingListCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-simulation\06-simulation\04-unmatching\00-core\XhsProjectSimulationUnMatchingListCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-simulation\06-simulation\04-unmatching\02-valve\XhsProjectSimulationValveUnMatchingListCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-simulation\06-simulation\04-unmatching\03-pipe\XhsProjectSimulationPipeUnMatchingListCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-simulation\06-simulation\04-unmatching\06-fourlink\XhsProjectSimulationFourlinkUnMatchingListCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-simulation\06-simulation\04-unmatching\05-threelink\XhsProjectSimulationThreelinkUnMatchingListCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-simulation\06-simulation\04-unmatching\04-elbow\XhsProjectSimulationElbowUnMatchingListCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="03-simulation\06-simulation\03-calcu\XhsProjectSimulationHydroCalcuFailedDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Update="03-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Update="Properties\Resources.Designer.cs">

--
Gitblit v1.9.3