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 |  120 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 69 insertions(+), 51 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 741d8b5..f5474a4 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
@@ -9,15 +9,19 @@
 
   <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>
@@ -27,17 +31,17 @@
     <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-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainChoicePage.cs" />
-    <Compile Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainChoicePage.Designer.cs" />
-    <Compile Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainForm-bak.cs" />
-    <Compile Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainForm-bak.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-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainChoicePage.resx" />
-    <EmbeddedResource Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainForm-bak.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>
@@ -64,7 +68,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="04-simulation\02-bimface\" />
     <Folder Include="map\gaode\css\" />
     <Folder Include="Resources\" />
   </ItemGroup>
@@ -81,6 +84,15 @@
   </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>
@@ -99,64 +111,70 @@
     <Compile Update="02-project\04-dlg\EditProjectDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\ChoicePumpMainDlg.cs">
+    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\XhsProjectSimulationPumpSingleMatchingDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="04-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs">
+    <Compile Update="03-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="04-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs">
+    <Compile Update="03-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="04-simulation\01-info\XhsProjectSimulationBimfaceInfoCtrl.cs">
+    <Compile Update="03-simulation\01-info\XhsProjectSimulationBimfaceInfoCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="04-simulation\01-info\XhsProjectSimulationInfoPage.cs">
+    <Compile Update="03-simulation\01-info\XhsProjectSimulationInfoPage.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="04-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs">
+    <Compile Update="03-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="04-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\01-matching\02-pump\XhsProjectSimulationPumpMatchingListCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\04-unmatching\00-core\XhsProjectSimulationUnMatchingListCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\04-unmatching\02-valve\XhsProjectSimulationValveUnMatchingListCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\04-unmatching\03-pipe\XhsProjectSimulationPipeUnMatchingListCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\04-unmatching\06-fourlink\XhsProjectSimulationFourlinkUnMatchingListCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\04-unmatching\05-threelink\XhsProjectSimulationThreelinkUnMatchingListCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\04-unmatching\04-elbow\XhsProjectSimulationElbowUnMatchingListCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\XhsProjectSimulationCorePage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\03-calcu\XhsProjectSimulationHydroCalcuFailedDlg.cs">
+    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\XhsProjectSimulationPumpSingleMatchingDlg.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="04-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs">
+    <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