From 59f2c4c04e06d77de7f10ab96d1a5c73ccd01262 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 05 十二月 2024 16:23:42 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 254 insertions(+), 11 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user
index c19e8dc..e714b01 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user
@@ -71,6 +71,9 @@
<Compile Update="03-valve\01-series\EditValveSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="03-valve\01-series\ValveTypeTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="03-valve\02-main\AddValveMainDlg.cs">
<SubType>Form</SubType>
</Compile>
@@ -86,6 +89,9 @@
<Compile Update="03-valve\04-chart-edit\ValvePerform2dEditDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="03-valve\04-chart-edit\XhsValveMainPhartMinorLossPanel.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="03-valve\05-import\01-excel\ImportValvePerform2dByExcelCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -96,12 +102,6 @@
<SubType>Form</SubType>
</Compile>
<Compile Update="03-valve\ValveManageMainPage.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-valve\01-series\ValveTypeTreeListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-valve\04-chart-edit\XhsValveMainPhartMinorLossPanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="04-pipe\01-series\AddPipeLineSeriesDlg.cs">
@@ -122,6 +122,9 @@
<Compile Update="04-pipe\02-main\EditPipeMainDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="04-pipe\03-coefficient\SetPipeLineCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="04-pipe\PipeManageMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -138,6 +141,9 @@
<SubType>Form</SubType>
</Compile>
<Compile Update="05-elbow\02-main\EditElbowMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="05-elbow\03-coefficient\SetElbowCoefficientDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="05-elbow\ElbowManageMainPage.cs">
@@ -158,6 +164,9 @@
<Compile Update="06-threeLink\02-main\EditThreeLinkMainDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="06-threeLink\03-coefficient\SetThreelinkCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="06-threeLink\ThreeLinkManageMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -176,6 +185,9 @@
<Compile Update="07-fourLink\02-main\EditFourLinkMainDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="07-fourLink\03-coefficient\SetFourlinkCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="07-fourLink\FourLinkManageMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -192,6 +204,9 @@
<SubType>Form</SubType>
</Compile>
<Compile Update="08-sprinkler\02-main\EditAssetsSprinklerMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="08-sprinkler\03-coefficient\SetSprinklerCoefficientDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="08-sprinkler\SprinklerManageMainPage.cs">
@@ -218,10 +233,10 @@
<Compile Update="10-exchanger\01-series\ExchangerTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="10-exchanger\02-main\01-EditPumpPartProp\EditExchangerPartPropDlg.cs">
+ <Compile Update="10-exchanger\02-main\01-EditExchangePartProp\EditExchangerPartPropDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="10-exchanger\02-main\01-EditPumpPartProp\ExchangerProductListBox.cs">
+ <Compile Update="10-exchanger\02-main\01-EditExchangePartProp\ExchangerProductListBox.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="10-exchanger\02-main\AddExchangerMainDlg.cs">
@@ -230,17 +245,38 @@
<Compile Update="10-exchanger\02-main\EditExchangerMainDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="10-exchanger\03-coefficient\SetExchangerCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="10-exchanger\04-chart-edit\ExchangerMainPhartMinorLossPanel.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="10-exchanger\04-chart-edit\ExchangerPerform2dEditChart.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="10-exchanger\04-chart-edit\ExchangerPerform2dEditCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="10-exchanger\04-chart-edit\ExchangerPerform2dEditDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="10-exchanger\05-import\01-excel\ImportExchangerPerform2dByExcelCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="10-exchanger\05-import\01-excel\ImportTankPerform2dByExcelDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="10-exchanger\ExchangerManageMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="11-compressor\01-series\AddAssetsCompressorSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="11-compressor\01-series\EditAssetsExchangerSeriesDlg.cs">
- <SubType>Form</SubType>
- </Compile>
<Compile Update="11-compressor\01-series\CompressorTreeListCtrl.cs">
<SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="11-compressor\01-series\EditAssetsExchangerSeriesDlg.cs">
+ <SubType>Form</SubType>
</Compile>
<Compile Update="11-compressor\02-main\01-EditPumpPartProp\EditExchangerPartPropDlg.cs">
<SubType>Form</SubType>
@@ -254,11 +290,218 @@
<Compile Update="11-compressor\02-main\EditExchangerMainDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="11-compressor\03-coefficient\SetCompressorCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="11-compressor\04-chart-edit\CompressorMainPhartMinorLossPanel.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="11-compressor\04-chart-edit\CompressorPerform2dEditChart.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="11-compressor\04-chart-edit\CompressorPerform2dEditCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="11-compressor\04-chart-edit\CompressorPerform2dEditDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="11-compressor\05-import\01-excel\ImportCompressorPerform2dByExcelCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="11-compressor\05-import\01-excel\ImportTankPerform2dByExcelDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="11-compressor\ExchangerManageMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="12-package\01-series\AddAssetsPackageSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="12-package\01-series\EditAssetsPackageSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="12-package\01-series\PackageTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="12-package\02-main\AddAssetsPackageMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="12-package\02-main\EditAssetsPackageMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="12-package\EditPackagePartPropDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="12-package\PackageManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="12-package\PackageProductListBox.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="13-blunthead\01-series\AddAssetsBluntheadSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="13-blunthead\01-series\BluntheadTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="13-blunthead\01-series\EditAssetsBluntheadSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="13-blunthead\02-main\AddAssetsSprinklerMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="13-blunthead\02-main\EditAssetsBluntheadMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="13-blunthead\03-coefficient\SetBluntheadCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="13-blunthead\BluntheadManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="14-tank\01-series\AddAssetsTankSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\01-series\EditAssetsTankSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\01-series\TankTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="14-tank\02-main\AddAssetsTankMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\02-main\EditAssetsTankMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\03-coefficient\SetTankCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\04-chart-edit\TankMainPhartMinorLossPanel.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="14-tank\04-chart-edit\TankPerform2dEditChart.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="14-tank\04-chart-edit\TankPerform2dEditCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="14-tank\04-chart-edit\TankPerform2dEditDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\05-import\01-excel\ImportTankPerform2dByExcelCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="14-tank\05-import\01-excel\ImportTankPerform2dByExcelDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\TankManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="15-meter\01-series\AddAssetsBluntheadSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="15-meter\01-series\BluntheadTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="15-meter\01-series\EditAssetsBluntheadSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="15-meter\02-main\AddAssetsSprinklerMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="15-meter\02-main\EditAssetsBluntheadMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="15-meter\03-coefficient\SetBluntheadCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="15-meter\BluntheadManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\01-series\AddAssetsBluntheadSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\01-series\BluntheadTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\01-series\EditAssetsBluntheadSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\02-main\AddAssetsSprinklerMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\02-main\EditAssetsBluntheadMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\03-coefficient\SetBluntheadCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\BluntheadManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="17-hydrant\01-series\AddAssetsBluntheadSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="17-hydrant\01-series\BluntheadTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="17-hydrant\01-series\EditAssetsBluntheadSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="17-hydrant\02-main\AddAssetsSprinklerMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="17-hydrant\02-main\EditAssetsBluntheadMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="17-hydrant\03-coefficient\SetBluntheadCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="17-hydrant\BluntheadManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\01-series\AddAssetsBluntheadSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\01-series\BluntheadTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\01-series\EditAssetsBluntheadSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\02-main\AddAssetsSprinklerMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\02-main\EditAssetsBluntheadMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\03-coefficient\SetBluntheadCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\BluntheadManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="19-translation\01-series\AddAssetsBluntheadSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="19-translation\01-series\BluntheadTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="19-translation\01-series\EditAssetsBluntheadSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="19-translation\02-main\AddAssetsSprinklerMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="19-translation\02-main\EditAssetsBluntheadMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="19-translation\03-coefficient\SetBluntheadCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="19-translation\BluntheadManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.3