From d1807075581920a8c94a409b11a9c88dd869be1e Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期四, 20 三月 2025 16:57:33 +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 | 146 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 115 insertions(+), 31 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 bb4065f..81a1317 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,18 +2,6 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
<ItemGroup>
- <Compile Update="00-core\SelectFlagsCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="00-core\SelectFlagsPopupCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="00-core\SetDefaultStatusDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="00-core\SetUseStatusDlg.cs">
- <SubType>Form</SubType>
- </Compile>
<Compile Update="01-pump\01-EditPumpPartProp\AddPumpPropDlg.cs">
<SubType>Form</SubType>
</Compile>
@@ -66,6 +54,9 @@
<SubType>Form</SubType>
</Compile>
<Compile Update="01-pump\07-PumpChart\02-Eidt\SetOtherNameDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\07-PumpChart\03-excelHelper\ImportPumpExcel.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="01-pump\07-PumpChart\AssetsPumpCurveQLViewDlg.cs">
@@ -167,6 +158,9 @@
<Compile Update="03-valve\04-curve\ImportAssetsValveCurveByPictureDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="03-valve\05-excelHelper\ImportValveExcel.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="03-valve\05-import\01-excel\ImportValvePerform2dByExcelCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -185,6 +179,18 @@
<Compile Update="04-pipe\01-series-bak\PipeLineTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="04-pipe\01-series\AddAssetsPipeSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\01-series\AssetsPipeSeriesMgrTreeCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="04-pipe\01-series\EditAssetsPipeSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\01-series\ViewAssetsPipeSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="04-pipe\02-main-bak\AddPipeMainDlg.cs">
<SubType>Form</SubType>
</Compile>
@@ -194,8 +200,35 @@
<Compile Update="04-pipe\02-main-bak\EditPipeMainDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="04-pipe\02-main\AddAssetsPipeMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\02-main\AssetsPipeMainMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="04-pipe\02-main\EditAssetsPipeMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\02-main\ViewAssetsPipeMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="04-pipe\03-coefficient\SetPipeLineCoefficientDlg.cs">
<SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\03-factor\AddAssetsPipeFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\03-factor\AssetsPipeFactorMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="04-pipe\03-factor\EditAssetsPipeFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\03-factor\ViewAssetsPipeFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\AssetsPipeMgrPage.cs">
+ <SubType>UserControl</SubType>
</Compile>
<Compile Update="05-elbow\01-series-bak\AddAssetsElbowSeriesDlg.cs">
<SubType>Form</SubType>
@@ -246,6 +279,9 @@
<SubType>Form</SubType>
</Compile>
<Compile Update="05-elbow\03-factor\ViewAssetsElbowFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="05-elbow\04-excelHelper\ImportElbowExcel.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="05-elbow\AssetsElbowMgrPage.cs">
@@ -302,11 +338,50 @@
<Compile Update="07-fourLink\01-series-bak\FourLinkTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="07-fourLink\01-series\AddAssetsFourlinkSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\01-series\AssetsFourlinkSeriesMgrTreeCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\01-series\EditAssetsFourlinkSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\01-series\ViewAssetsFourlinkSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="07-fourLink\02-main-bak\EditFourLinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\02-main\AddAssetsFourlinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\02-main\AssetsFourlinkMainMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\02-main\EditAssetsFourlinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\02-main\ViewAssetsFourlinkMainDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="07-fourLink\03-coefficient\SetFourlinkCoefficientDlg.cs">
<SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\03-factor\AddAssetsFourlinkFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\03-factor\AssetsFourlinkFactorMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\03-factor\EditAssetsFourlinkFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\03-factor\ViewAssetsFourlinkFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourLink\AssetsFourlinkMgrPage.cs">
+ <SubType>UserControl</SubType>
</Compile>
<Compile Update="08-sprinkler\01-series\AddAssetsSprinklerSeriesDlg.cs">
<SubType>Form</SubType>
@@ -350,13 +425,13 @@
<Compile Update="08-sprinkler\AssetsSprinklerMgrPage.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="09-manufacturer\AddManufacturerDlg.cs">
+ <Compile Update="09-Manufacturer\AddManufacturerDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="09-manufacturer\EditManufacturerDlg.cs">
+ <Compile Update="09-Manufacturer\EditManufacturerDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="09-manufacturer\ManufacturerMainPage.cs">
+ <Compile Update="09-Manufacturer\ManufacturerMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="10-equipment\ManufacturerMainPanel.cs">
@@ -401,6 +476,9 @@
<Compile Update="13-blunthead\02-main\AddAssetsBluntheadMainDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="13-blunthead\02-main\AssetsBluntheadMainMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="13-blunthead\02-main\EditAssetsBluntheadMainDlg.cs">
<SubType>Form</SubType>
</Compile>
@@ -418,6 +496,9 @@
</Compile>
<Compile Update="13-blunthead\03-factor\ViewAssetsBluntheadFactorDlg.cs">
<SubType>Form</SubType>
+ </Compile>
+ <Compile Update="13-blunthead\AssetsBluntheadMgrPage.cs">
+ <SubType>UserControl</SubType>
</Compile>
<Compile Update="14-tank\01-series-bak\AddAssetsTankSeriesDlg.cs">
<SubType>Form</SubType>
@@ -458,6 +539,21 @@
<Compile Update="14-tank\02-main\ViewAssetsTankMainDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="14-tank\03-curveVol\AssetsTankCurveVOLMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="14-tank\03-curveVol\AssetsTankCurveVOLViewDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\03-curveVol\EditAssetsTankCurveVOLDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\03-curveVol\ImportAssetsTankCurveVOLByExcelDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\03-curveVol\ImportAssetsTankCurveVOLByPictureDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="14-tank\03-factor\AddAssetsTankFactorDlg.cs">
<SubType>Form</SubType>
</Compile>
@@ -480,21 +576,6 @@
<SubType>UserControl</SubType>
</Compile>
<Compile Update="14-tank\04-chart-edit\TankPerform2dEditDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="14-tank\04-curveVol\AssetsTankCurveVOLMgrPage.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="14-tank\04-curveVol\AssetsTankCurveVOLViewDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="14-tank\04-curveVol\EditAssetsTankCurveVOLDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="14-tank\04-curveVol\ImportAssetsTankCurveVOLByExcelDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="14-tank\04-curveVol\ImportAssetsTankCurveVOLByPictureDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="14-tank\05-import\01-excel\ImportTankPerform2dByExcelCtrl.cs">
@@ -623,7 +704,7 @@
<Compile Update="17-hydrant\03-factor\ViewAssetsHydrantFactorDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="17-hydrant\AssetsBluntheadMgrPage.cs">
+ <Compile Update="17-hydrant\AssetsHydrantMgrPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="18-pressmeter\01-series\AddAssetsPressmeterSeriesDlg.cs">
@@ -704,6 +785,9 @@
<Compile Update="19-translation\03-factor\ViewAssetsTranslationFactorDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="19-translation\04-excelHelper\ImportTranslationExcel.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="19-translation\AssetsTranslationMgrPage.cs">
<SubType>UserControl</SubType>
</Compile>
--
Gitblit v1.9.3