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.user | 74 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 insertions(+), 4 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 3851970..4a2f9d9 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,10 +71,31 @@
<Compile Update="03-valve\02-main\EditValveMainDlg.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\ValveManageMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="03-valve\ValveTypeTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-valve\XhsValveMainPhartMinorLossPanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="04-pipe\01-series\AddPipeLineSeriesDlg.cs">
@@ -158,16 +179,16 @@
<Compile Update="08-nozzle\01-series\EditPipeLineSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="08-nozzle\01-series\NozzleTreeListCtrl.cs">
+ <Compile Update="08-nozzle\01-series\SprinklerTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="08-nozzle\02-main\AddNozzleMainDlg.cs">
+ <Compile Update="08-nozzle\02-main\AddAssetsSprinklerMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="08-nozzle\02-main\EditNozzleMainDlg.cs">
+ <Compile Update="08-nozzle\02-main\EditAssetsSprinklerMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="08-nozzle\02-main\NozzleManageMainPage.cs">
+ <Compile Update="08-nozzle\02-main\SprinklerManageMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="09-manufacturer\AddManufacturerDlg.cs">
@@ -182,8 +203,53 @@
<Compile Update="10-equipment\ManufacturerMainPanel.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="10-exchanger\02-main\ExchangerManageMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
+ <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>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.3