From 5685f16cc087d5645b2251ca66a7ac55dd4799ef Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 25 十二月 2024 16:03:55 +0800
Subject: [PATCH] 修改资产--喷头--闷头--消火栓
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj | 73 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 19 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
index c92fb25..e006bd7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
@@ -19,13 +19,22 @@
<Compile Remove="07-fourLink\01-series-bak\**" />
<Compile Remove="07-fourLink\02-main-bak\**" />
<Compile Remove="07-fourLink\03-coefficient\**" />
+ <Compile Remove="08-sprinkler\01-series-bak\**" />
+ <Compile Remove="08-sprinkler\02-main-bak\**" />
+ <Compile Remove="08-sprinkler\03-coefficient\**" />
<Compile Remove="10-equipment\**" />
<Compile Remove="11-compressor\04-chart-edit\**" />
<Compile Remove="11-compressor\05-import\**" />
+ <Compile Remove="13-blunthead\01-series-bak\**" />
+ <Compile Remove="13-blunthead\02-main-bak\**" />
+ <Compile Remove="13-blunthead\03-coefficient\**" />
<Compile Remove="14-tank\01-series-bak\**" />
<Compile Remove="14-tank\02-main-bak\**" />
<Compile Remove="14-tank\04-chart-edit\**" />
<Compile Remove="14-tank\05-import\**" />
+ <Compile Remove="17-hydrant\01-series-bak\**" />
+ <Compile Remove="17-hydrant\02-main-bak\**" />
+ <Compile Remove="17-hydrant\03-coefficient\**" />
<EmbeddedResource Remove="02-UICore\**" />
<EmbeddedResource Remove="03-valve\01-series-----bak\**" />
<EmbeddedResource Remove="03-valve\02-main---bak\**" />
@@ -37,13 +46,22 @@
<EmbeddedResource Remove="07-fourLink\01-series-bak\**" />
<EmbeddedResource Remove="07-fourLink\02-main-bak\**" />
<EmbeddedResource Remove="07-fourLink\03-coefficient\**" />
+ <EmbeddedResource Remove="08-sprinkler\01-series-bak\**" />
+ <EmbeddedResource Remove="08-sprinkler\02-main-bak\**" />
+ <EmbeddedResource Remove="08-sprinkler\03-coefficient\**" />
<EmbeddedResource Remove="10-equipment\**" />
<EmbeddedResource Remove="11-compressor\04-chart-edit\**" />
<EmbeddedResource Remove="11-compressor\05-import\**" />
+ <EmbeddedResource Remove="13-blunthead\01-series-bak\**" />
+ <EmbeddedResource Remove="13-blunthead\02-main-bak\**" />
+ <EmbeddedResource Remove="13-blunthead\03-coefficient\**" />
<EmbeddedResource Remove="14-tank\01-series-bak\**" />
<EmbeddedResource Remove="14-tank\02-main-bak\**" />
<EmbeddedResource Remove="14-tank\04-chart-edit\**" />
<EmbeddedResource Remove="14-tank\05-import\**" />
+ <EmbeddedResource Remove="17-hydrant\01-series-bak\**" />
+ <EmbeddedResource Remove="17-hydrant\02-main-bak\**" />
+ <EmbeddedResource Remove="17-hydrant\03-coefficient\**" />
<None Remove="02-UICore\**" />
<None Remove="03-valve\01-series-----bak\**" />
<None Remove="03-valve\02-main---bak\**" />
@@ -55,13 +73,22 @@
<None Remove="07-fourLink\01-series-bak\**" />
<None Remove="07-fourLink\02-main-bak\**" />
<None Remove="07-fourLink\03-coefficient\**" />
+ <None Remove="08-sprinkler\01-series-bak\**" />
+ <None Remove="08-sprinkler\02-main-bak\**" />
+ <None Remove="08-sprinkler\03-coefficient\**" />
<None Remove="10-equipment\**" />
<None Remove="11-compressor\04-chart-edit\**" />
<None Remove="11-compressor\05-import\**" />
+ <None Remove="13-blunthead\01-series-bak\**" />
+ <None Remove="13-blunthead\02-main-bak\**" />
+ <None Remove="13-blunthead\03-coefficient\**" />
<None Remove="14-tank\01-series-bak\**" />
<None Remove="14-tank\02-main-bak\**" />
<None Remove="14-tank\04-chart-edit\**" />
<None Remove="14-tank\05-import\**" />
+ <None Remove="17-hydrant\01-series-bak\**" />
+ <None Remove="17-hydrant\02-main-bak\**" />
+ <None Remove="17-hydrant\03-coefficient\**" />
<Page Remove="02-UICore\**" />
<Page Remove="03-valve\01-series-----bak\**" />
<Page Remove="03-valve\02-main---bak\**" />
@@ -73,13 +100,22 @@
<Page Remove="07-fourLink\01-series-bak\**" />
<Page Remove="07-fourLink\02-main-bak\**" />
<Page Remove="07-fourLink\03-coefficient\**" />
+ <Page Remove="08-sprinkler\01-series-bak\**" />
+ <Page Remove="08-sprinkler\02-main-bak\**" />
+ <Page Remove="08-sprinkler\03-coefficient\**" />
<Page Remove="10-equipment\**" />
<Page Remove="11-compressor\04-chart-edit\**" />
<Page Remove="11-compressor\05-import\**" />
+ <Page Remove="13-blunthead\01-series-bak\**" />
+ <Page Remove="13-blunthead\02-main-bak\**" />
+ <Page Remove="13-blunthead\03-coefficient\**" />
<Page Remove="14-tank\01-series-bak\**" />
<Page Remove="14-tank\02-main-bak\**" />
<Page Remove="14-tank\04-chart-edit\**" />
<Page Remove="14-tank\05-import\**" />
+ <Page Remove="17-hydrant\01-series-bak\**" />
+ <Page Remove="17-hydrant\02-main-bak\**" />
+ <Page Remove="17-hydrant\03-coefficient\**" />
</ItemGroup>
<ItemGroup>
@@ -95,11 +131,20 @@
<Compile Remove="05-elbow\ElbowManageMainPage.Designer.cs" />
<Compile Remove="07-fourLink\FourLinkManageMainPage.cs" />
<Compile Remove="07-fourLink\FourLinkManageMainPage.Designer.cs" />
+ <Compile Remove="08-sprinkler\SprinklerManageMainPage.cs" />
+ <Compile Remove="08-sprinkler\SprinklerManageMainPage.Designer.cs" />
+ <Compile Remove="08-sprinkler\SprinklerViewModel.cs" />
<Compile Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.cs" />
<Compile Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.Designer.cs" />
<Compile Remove="12-package\02-main\01-EditPumpPartProp\PropGroupChoiceViewModel.cs" />
+ <Compile Remove="13-blunthead\BluntheadManageMainPage.cs" />
+ <Compile Remove="13-blunthead\BluntheadManageMainPage.Designer.cs" />
+ <Compile Remove="13-blunthead\BluntheadViewModel.cs" />
<Compile Remove="14-tank\TankManageMainPage.cs" />
<Compile Remove="14-tank\TankManageMainPage.Designer.cs" />
+ <Compile Remove="17-hydrant\HydrantManageMainPage.cs" />
+ <Compile Remove="17-hydrant\HydrantManageMainPage.Designer.cs" />
+ <Compile Remove="17-hydrant\HydrantViewModel.cs" />
<Compile Remove="20-exchanger\ExchangerManageMainPage.cs" />
<Compile Remove="20-exchanger\ExchangerManageMainPage.Designer.cs" />
</ItemGroup>
@@ -111,8 +156,11 @@
<EmbeddedResource Remove="03-valve\ValveManageMainPage.resx" />
<EmbeddedResource Remove="05-elbow\ElbowManageMainPage.resx" />
<EmbeddedResource Remove="07-fourLink\FourLinkManageMainPage.resx" />
+ <EmbeddedResource Remove="08-sprinkler\SprinklerManageMainPage.resx" />
<EmbeddedResource Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.resx" />
+ <EmbeddedResource Remove="13-blunthead\BluntheadManageMainPage.resx" />
<EmbeddedResource Remove="14-tank\TankManageMainPage.resx" />
+ <EmbeddedResource Remove="17-hydrant\HydrantManageMainPage.resx" />
<EmbeddedResource Remove="20-exchanger\ExchangerManageMainPage.resx" />
</ItemGroup>
@@ -233,6 +281,12 @@
<Compile Update="11-compressor\06-prop\ExchangerProductListBox.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="13-blunthead\02-main\AssetsBluntheadMainMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="13-blunthead\AssetsBluntheadMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="14-tank\01-series\AddAssetsTankSeriesDlg.cs" />
<Compile Update="14-tank\01-series\AssetsTankSeriesMgrTreeCtrl.cs" />
<Compile Update="14-tank\01-series\EditAssetsTankSeriesDlg.cs" />
@@ -297,21 +351,6 @@
<Compile Update="19-translation\02-main\EditAssetsTranslationMainDlg.cs" />
<Compile Update="19-translation\03-coefficient\SetTranslationCoefficientDlg.cs" />
<Compile Update="19-translation\TranslationManageMainPage.cs" />
- <Compile Update="17-hydrant\01-series\AddAssetsHydrantSeriesDlg.cs" />
- <Compile Update="17-hydrant\01-series\HydrantTreeListCtrl.cs" />
- <Compile Update="17-hydrant\01-series\EditAssetsHydrantSeriesDlg.cs" />
- <Compile Update="17-hydrant\02-main\AddAssetsHydrantMainDlg.cs" />
- <Compile Update="17-hydrant\02-main\EditAssetsHydrantMainDlg.cs" />
- <Compile Update="17-hydrant\03-coefficient\SetHydrantCoefficientDlg.cs" />
- <Compile Update="17-hydrant\HydrantManageMainPage.cs" />
- <Compile Update="13-blunthead\01-series\AddAssetsBluntheadSeriesDlg.cs" />
- <Compile Update="13-blunthead\01-series\EditAssetsBluntheadSeriesDlg.cs" />
- <Compile Update="13-blunthead\01-series\BluntheadTreeListCtrl.cs" />
- <Compile Update="13-blunthead\02-main\AddAssetsSprinklerMainDlg.cs" />
- <Compile Update="13-blunthead\02-main\EditAssetsBluntheadMainDlg.cs" />
- <Compile Update="13-blunthead\03-coefficient\SetBluntheadCoefficientDlg.cs" />
- <Compile Update="13-blunthead\BluntheadManageMainPage.cs" />
- <Compile Update="08-sprinkler\03-coefficient\SetSprinklerCoefficientDlg.cs" />
<Compile Update="10-exchanger\03-coefficient\SetExchangerCoefficientDlg.cs" />
<Compile Update="11-compressor\01-series\AddAssetsCompressorSeriesDlg.cs" />
<Compile Update="11-compressor\01-series\EditAssetsExchangerSeriesDlg.cs" />
@@ -331,16 +370,12 @@
<Compile Update="07-fourLink\02-main\EditAssetsFourlinkMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="08-sprinkler\01-series\AddAssetsSprinklerSeriesDlg.cs" />
- <Compile Update="08-sprinkler\01-series\EditAssetsSprinklerSeriesDlg.cs" />
- <Compile Update="08-sprinkler\01-series\SprinklerTreeListCtrl.cs" />
<Compile Update="08-nozzle\02-main\AddAssetsNozzleMainDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="08-nozzle\02-main\EditAssetsNozzleMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="08-sprinkler\SprinklerManageMainPage.cs" />
<Compile Update="11-compressor\03-coefficient\SetCompressorCoefficientDlg.cs" />
<Compile Update="12-package\01-series\AddAssetsPackageSeriesDlg.cs" />
<Compile Update="12-package\01-series\PackageTreeListCtrl.cs" />
--
Gitblit v1.9.3