From c653f2f6f2de553395b706de3a62fec5e4a6fbf7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 21 十一月 2024 17:52:18 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user | 265 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 233 insertions(+), 32 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 822b50f..8c76598 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
@@ -2,53 +2,254 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
<ItemGroup>
- <Compile Update="00-PumpProductManage\02-ViewPumpInformation\ViewPumpInformationDlg.cs">
+ <Compile Update="00-core\SetDefaultStatusDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="00-PumpProductManage\03-PumpType\AddPumpTypeDlg.cs">
+ <Compile Update="00-core\SetUseStatusDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="00-PumpProductManage\AddPumpProductGroupDlg.cs">
+ <Compile Update="01-pump\01-EditPumpPartProp\AddPumpPropDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="00-PumpProductManage\AddPumpProductMainDlg.cs">
+ <Compile Update="01-pump\01-EditPumpPartProp\EditPumpPartPropDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="00-PumpProductManage\AddPumpProductSeriesDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="00-PumpProductManage\01-EditPumpPartProp\EditPumpPartPropDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="00-PumpProductManage\EditPumpProductGroupDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="00-PumpProductManage\EditPumpProductMainDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="00-PumpProductManage\EditPumpProductSeriesDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="00-PumpProductManage\01-EditPumpPartProp\PumpProductListBox.cs">
+ <Compile Update="01-pump\01-EditPumpPartProp\PumpProductListBox.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="00-PumpProductManage\PumpProductMainPanel.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="00-PumpProductManage\PumpProductSeriesTreeListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="01-ValveManage\ValveManageMainPanel.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="01-ValveManage\AddValveSeriesDlg.cs">
+ <Compile Update="01-pump\02-ViewPumpInformation\ViewPumpInformationDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="02-UICore\00-DocumentPage\DocumentPage.cs">
+ <Compile Update="01-pump\03-PumpType\AddPumpTypeDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\03-PumpType\EditPumpTypeDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\AddPumpProductGroupDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\AddPumpProductMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\AddPumpProductSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\EditPumpProductGroupDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\EditPumpProductMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\EditPumpProductSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\PumpProductMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="02-UICore\00-DocumentPage\MainForm.cs">
+ <Compile Update="01-pump\PumpProductSeriesTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="02-adapting\AdaptingManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="02-adapting\AddAdaptingMainDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="02-adapting\EditAdaptingMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-valve\01-series\AddValveSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-valve\01-series\EditValveSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-valve\02-main\AddValveMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <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\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">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\01-series\EditPipeLineSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\01-series\PipeLineTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="04-pipe\02-main\AddPipeMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\02-main\DescriptionDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\02-main\EditPipeMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\PipeManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="05-elbow\01-series\AddAssetsElbowSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="05-elbow\01-series\EditAssetsElbowSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="05-elbow\01-series\ElbowTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="05-elbow\02-main\AddElbowMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="05-elbow\02-main\EditElbowMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="05-elbow\ElbowManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\01-series\AddAssetsThreelinkSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\01-series\EditAssetsThreelinkSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\01-series\ThreeLinkTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\02-main\AddThreeLinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\02-main\EditThreeLinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\ThreeLinkManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\01-series\AddAssetsFourlinkSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\01-series\EditAssetsFourlinkSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\01-series\FourLinkTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\02-main\AddFourLinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\02-main\EditFourLinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\FourLinkManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="08-sprinkler\01-series\AddAssetsSprinklerSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="08-sprinkler\01-series\EditAssetsSprinklerSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="08-sprinkler\01-series\SprinklerTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="08-sprinkler\02-main\AddAssetsSprinklerMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="08-sprinkler\02-main\EditAssetsSprinklerMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="08-sprinkler\SprinklerManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="09-manufacturer\AddManufacturerDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="09-manufacturer\EditManufacturerDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="09-manufacturer\ManufacturerMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <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\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\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\ExchangerManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.3