From 0cd48df8ccca96a8a0117a508c342a90dc2eacb8 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期五, 08 十一月 2024 13:07:43 +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 | 92 ++++++++++++----------------------------------
1 files changed, 24 insertions(+), 68 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 fc3e156..ffef94e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
@@ -63,29 +63,15 @@
<Compile Update="03-valve\01-series\AddAssetsValveSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-valve\04-chart-edit\ValvePerform2dEditChart.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-valve\04-chart-edit\ValvePerform2dEditCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-valve\04-chart-edit\ValvePerform2dEditDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="03-valve\05-import\01-excel\ImportValvePerform2dByExcelCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-valve\05-import\01-excel\ImportValvePerform2dByExcelDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="03-valve\SetValveCoefficientDlg.cs">
- <SubType>Form</SubType>
- </Compile>
+ <Compile Update="03-valve\04-chart-edit\ValvePerform2dEditChart.cs" />
+ <Compile Update="03-valve\04-chart-edit\ValvePerform2dEditCtrl.cs" />
+ <Compile Update="03-valve\04-chart-edit\ValvePerform2dEditDlg.cs" />
+ <Compile Update="03-valve\05-import\01-excel\ImportValvePerform2dByExcelCtrl.cs" />
+ <Compile Update="03-valve\05-import\01-excel\ImportValvePerform2dByExcelDlg.cs" />
+ <Compile Update="03-valve\SetValveCoefficientDlg.cs" />
<Compile Update="03-valve\ValveTypeTreeListCtrl.cs" />
<Compile Update="02-adapting\AdaptingManageMainPage.cs" />
- <Compile Update="03-valve\XhsValveMainPhartMinorLossPanel.cs">
- <SubType>UserControl</SubType>
- </Compile>
+ <Compile Update="03-valve\XhsValveMainPhartMinorLossPanel.cs" />
<Compile Update="05-elbow\02-main\AddAssetsElbowMainDlg.cs">
<SubType>Form</SubType>
</Compile>
@@ -116,51 +102,21 @@
</Compile>
<Compile Update="04-pipe\02-main\PipeManageMainPage.cs" />
<Compile Update="04-pipe\01-series\PipeLineTreeListCtrl.cs" />
- <Compile Update="11-compressor\01-series\AddAssetsExchangerSeriesDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="11-compressor\01-series\EditAssetsExchangerSeriesDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="11-compressor\01-series\ExchangerTreeListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="11-compressor\02-main\01-EditPumpPartProp\EditExchangerPartPropDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="11-compressor\02-main\01-EditPumpPartProp\ExchangerProductListBox.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="11-compressor\02-main\AddAssetsExchangerMainDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="11-compressor\02-main\EditExchangerMainDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="11-compressor\02-main\ExchangerManageMainPage.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="10-exchanger\01-series\AddAssetsExchangerSeriesDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="10-exchanger\01-series\EditAssetsExchangerSeriesDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="10-exchanger\01-series\ExchangerTreeListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="10-exchanger\02-main\01-EditPumpPartProp\EditExchangerPartPropDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="10-exchanger\02-main\01-EditPumpPartProp\ExchangerProductListBox.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="10-exchanger\02-main\AddExchangerMainDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="10-exchanger\02-main\EditExchangerMainDlg.cs">
- <SubType>Form</SubType>
- </Compile>
+ <Compile Update="11-compressor\01-series\AddAssetsExchangerSeriesDlg.cs" />
+ <Compile Update="11-compressor\01-series\EditAssetsExchangerSeriesDlg.cs" />
+ <Compile Update="11-compressor\01-series\ExchangerTreeListCtrl.cs" />
+ <Compile Update="11-compressor\02-main\01-EditPumpPartProp\EditExchangerPartPropDlg.cs" />
+ <Compile Update="11-compressor\02-main\01-EditPumpPartProp\ExchangerProductListBox.cs" />
+ <Compile Update="11-compressor\02-main\AddAssetsExchangerMainDlg.cs" />
+ <Compile Update="11-compressor\02-main\EditExchangerMainDlg.cs" />
+ <Compile Update="11-compressor\02-main\ExchangerManageMainPage.cs" />
+ <Compile Update="10-exchanger\01-series\AddAssetsExchangerSeriesDlg.cs" />
+ <Compile Update="10-exchanger\01-series\EditAssetsExchangerSeriesDlg.cs" />
+ <Compile Update="10-exchanger\01-series\ExchangerTreeListCtrl.cs" />
+ <Compile Update="10-exchanger\02-main\01-EditPumpPartProp\EditExchangerPartPropDlg.cs" />
+ <Compile Update="10-exchanger\02-main\01-EditPumpPartProp\ExchangerProductListBox.cs" />
+ <Compile Update="10-exchanger\02-main\AddExchangerMainDlg.cs" />
+ <Compile Update="10-exchanger\02-main\EditExchangerMainDlg.cs" />
<Compile Update="07-fourLink\02-main\AddAssetsFourlinkMainDlg.cs">
<SubType>Form</SubType>
</Compile>
@@ -169,14 +125,14 @@
</Compile>
<Compile Update="08-nozzle\01-series\AddPipeLineSeriesDlg.cs" />
<Compile Update="08-nozzle\01-series\EditPipeLineSeriesDlg.cs" />
- <Compile Update="08-nozzle\01-series\NozzleTreeListCtrl.cs" />
+ <Compile Update="08-nozzle\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-nozzle\02-main\NozzleManageMainPage.cs" />
+ <Compile Update="08-nozzle\02-main\SprinklerManageMainPage.cs" />
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
--
Gitblit v1.9.3