From 3af811d30c93995e2500bdd2f3795be77cc1a519 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 19 十二月 2024 18:06:02 +0800
Subject: [PATCH] 水泵曲线修改
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj | 148 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 113 insertions(+), 35 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 b1a799a..19870fc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
@@ -9,21 +9,21 @@
<ItemGroup>
<Compile Remove="02-UICore\**" />
+ <Compile Remove="03-valve\01-series-----bak\**" />
+ <Compile Remove="03-valve\02-main---bak\**" />
<Compile Remove="10-equipment\**" />
- <Compile Remove="20-exchanger\04-curve\**" />
- <Compile Remove="20-exchanger\05-import\**" />
<EmbeddedResource Remove="02-UICore\**" />
+ <EmbeddedResource Remove="03-valve\01-series-----bak\**" />
+ <EmbeddedResource Remove="03-valve\02-main---bak\**" />
<EmbeddedResource Remove="10-equipment\**" />
- <EmbeddedResource Remove="20-exchanger\04-curve\**" />
- <EmbeddedResource Remove="20-exchanger\05-import\**" />
<None Remove="02-UICore\**" />
+ <None Remove="03-valve\01-series-----bak\**" />
+ <None Remove="03-valve\02-main---bak\**" />
<None Remove="10-equipment\**" />
- <None Remove="20-exchanger\04-curve\**" />
- <None Remove="20-exchanger\05-import\**" />
<Page Remove="02-UICore\**" />
+ <Page Remove="03-valve\01-series-----bak\**" />
+ <Page Remove="03-valve\02-main---bak\**" />
<Page Remove="10-equipment\**" />
- <Page Remove="20-exchanger\04-curve\**" />
- <Page Remove="20-exchanger\05-import\**" />
</ItemGroup>
<ItemGroup>
@@ -31,6 +31,10 @@
<Compile Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.Designer.cs" />
<Compile Remove="01-pump\PumpProductMainPanel - 澶嶅埗.cs" />
<Compile Remove="01-pump\PumpProductMainPanel - 澶嶅埗.Designer.cs" />
+ <Compile Remove="03-valve\SetValveCoefficientDlg.cs" />
+ <Compile Remove="03-valve\SetValveCoefficientDlg.Designer.cs" />
+ <Compile Remove="03-valve\ValveManageMainPage.cs" />
+ <Compile Remove="03-valve\ValveManageMainPage.Designer.cs" />
<Compile Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.cs" />
<Compile Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.Designer.cs" />
<Compile Remove="12-package\02-main\01-EditPumpPartProp\PropGroupChoiceViewModel.cs" />
@@ -41,6 +45,8 @@
<ItemGroup>
<EmbeddedResource Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.resx" />
<EmbeddedResource Remove="01-pump\PumpProductMainPanel - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="03-valve\SetValveCoefficientDlg.resx" />
+ <EmbeddedResource Remove="03-valve\ValveManageMainPage.resx" />
<EmbeddedResource Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.resx" />
<EmbeddedResource Remove="20-exchanger\ExchangerManageMainPage.resx" />
</ItemGroup>
@@ -49,6 +55,7 @@
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
<PackageReference Include="Yw.BLL.Assets.Core" Version="3.0.1" />
+ <PackageReference Include="Yw.BLL.Phart.Core" Version="3.0.5" />
</ItemGroup>
<ItemGroup>
@@ -62,29 +69,33 @@
</ItemGroup>
<ItemGroup>
+ <Compile Update="01-pump\07-PumpChart\01-import\01-excel\ImportPumpPerform2dByExcelCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="01-pump\07-PumpChart\01-import\01-excel\ImportPumpPerform2dByExcelDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\07-PumpChart\01-import\02-image\ImportAssetsExchangerCurveQLByPictureDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\07-PumpChart\02-Eidt\EditAssetsExchangerCurveQLDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="02-adapting\EditAdaptingMainDlg.cs" />
<Compile Update="02-adapting\AddAdaptingMainDlg.cs" />
<Compile Update="01-pump\03-AssetsPumpType\EditAssetsPumpTypeDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="01-pump\EditPumpProductMainDlg.cs" />
- <Compile Update="01-pump\EditPumpProductGroupDlg.cs" />
- <Compile Update="01-pump\AddPumpProductGroupDlg.cs" />
- <Compile Update="01-pump\AddPumpProductMainDlg.cs" />
- <Compile Update="01-pump\EditPumpProductSeriesDlg.cs" />
- <Compile Update="03-valve\01-series\EditAssetsValveSeriesDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="03-valve\01-series\AddAssetsValveSeriesDlg.cs">
- <SubType>Form</SubType>
- </Compile>
+ <Compile Update="01-pump\04-PumpMain\EditPumpProductMainDlg.cs" />
+ <Compile Update="01-pump\06-PumpGroup\EditPumpProductGroupDlg.cs" />
+ <Compile Update="01-pump\06-PumpGroup\AddPumpProductGroupDlg.cs" />
+ <Compile Update="01-pump\04-PumpMain\AddPumpProductMainDlg.cs" />
+ <Compile Update="01-pump\05-PumpSeries\EditPumpProductSeriesDlg.cs" />
<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\01-series\ValveTypeTreeListCtrl.cs" />
<Compile Update="02-adapting\AdaptingManageMainPage.cs" />
<Compile Update="03-valve\04-chart-edit\XhsValveMainPhartMinorLossPanel.cs" />
<Compile Update="04-pipe\03-coefficient\SetPipeLineCoefficientDlg.cs" />
@@ -186,6 +197,84 @@
<Compile Update="15-meter\AssetsMeterMgrPage.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="16-flowmeter\01-series\AddAssetsFlowmeterSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\01-series\AssetsFlowmeterSeriesMgrTreeCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\01-series\EditAssetsFlowmeterSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\01-series\ViewAssetsFlowmeterSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\02-main\AddAssetsFlowmeterMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\02-main\AssetsFlowmeterMainMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\02-main\EditAssetsFlowmeterMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\02-main\ViewAssetsFlowmeterMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\03-factor\AddAssetsFlowmeterFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\03-factor\AssetsFlowmeterFactorMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\03-factor\EditAssetsFlowmeterFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\03-factor\ViewAssetsFlowmeterFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="16-flowmeter\AssetsFlowmeterMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\01-series\AddAssetsPressmeterSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\01-series\AssetsPressmeterSeriesMgrTreeCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\01-series\EditAssetsPressmeterSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\01-series\ViewAssetsPressmeterSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\02-main\AddAssetsPressmeterMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\02-main\AssetsPressmeterMainMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\02-main\EditAssetsPressmeterMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\02-main\ViewAssetsPressmeterMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\03-factor\AddAssetsPressmeterFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\03-factor\AssetsPressmeterFactorMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\03-factor\EditAssetsPressmeterFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\03-factor\ViewAssetsPressmeterFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="18-pressmeter\AssetsPressmeterMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="19-translation\01-series\AddAssetsTranslationSeriesDlg.cs" />
<Compile Update="19-translation\01-series\TranslationTreeListCtrl.cs" />
<Compile Update="19-translation\01-series\EditAssetsTranslationSeriesDlg.cs" />
@@ -193,13 +282,6 @@
<Compile Update="19-translation\02-main\EditAssetsTranslationMainDlg.cs" />
<Compile Update="19-translation\03-coefficient\SetTranslationCoefficientDlg.cs" />
<Compile Update="19-translation\TranslationManageMainPage.cs" />
- <Compile Update="18-pressmeter\01-series\AddAssetsPressmeterSeriesDlg.cs" />
- <Compile Update="18-pressmeter\01-series\PressmeterTreeListCtrl.cs" />
- <Compile Update="18-pressmeter\01-series\EditAssetsPressmeterSeriesDlg.cs" />
- <Compile Update="18-pressmeter\02-main\AddAssetsPressmeterMainDlg.cs" />
- <Compile Update="18-pressmeter\02-main\EditAssetsPressmeterMainDlg.cs" />
- <Compile Update="18-pressmeter\03-coefficient\SetPressmeterCoefficientDlg.cs" />
- <Compile Update="18-pressmeter\PressmeterManageMainPage.cs" />
<Compile Update="17-hydrant\01-series\AddAssetsHydrantSeriesDlg.cs" />
<Compile Update="17-hydrant\01-series\HydrantTreeListCtrl.cs" />
<Compile Update="17-hydrant\01-series\EditAssetsHydrantSeriesDlg.cs" />
@@ -207,13 +289,6 @@
<Compile Update="17-hydrant\02-main\EditAssetsHydrantMainDlg.cs" />
<Compile Update="17-hydrant\03-coefficient\SetHydrantCoefficientDlg.cs" />
<Compile Update="17-hydrant\HydrantManageMainPage.cs" />
- <Compile Update="16-flowmeter\01-series\AddAssetsFlowmeterSeriesDlg.cs" />
- <Compile Update="16-flowmeter\01-series\FlowmeterTreeListCtrl.cs" />
- <Compile Update="16-flowmeter\01-series\EditAssetsFlowmeterSeriesDlg.cs" />
- <Compile Update="16-flowmeter\02-main\AddAssetsFlowmeterMainDlg.cs" />
- <Compile Update="16-flowmeter\02-main\EditAssetsFlowmeterMainDlg.cs" />
- <Compile Update="16-flowmeter\03-coefficient\SetFlowmeterCoefficientDlg.cs" />
- <Compile Update="16-flowmeter\FlowmeterManageMainPage.cs" />
<Compile Update="14-tank\01-series\AddAssetsTankSeriesDlg.cs" />
<Compile Update="14-tank\01-series\TankTreeListCtrl.cs" />
<Compile Update="14-tank\01-series\EditAssetsTankSeriesDlg.cs" />
@@ -303,6 +378,9 @@
<Compile Update="20-exchanger\03-factor\ViewAssetsCoolingFactorDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="20-exchanger\04-curveql\ImportAssetsExchangerCurveQLByPictureDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="20-exchanger\AssetsExchangerMgrPage.cs">
<SubType>UserControl</SubType>
</Compile>
--
Gitblit v1.9.3