From ad8f523428e7f319700c226707e3cdfe389d6539 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 17 二月 2025 17:48:39 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj | 71 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 29 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj
index 8e69497..0c52c9a 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj
@@ -7,45 +7,41 @@
</PropertyGroup>
<ItemGroup>
+ <Compile Remove="00-core\01-helper\**" />
+ <Compile Remove="00-core\绛夋晥绾縗**" />
<Compile Remove="01-pump-main\**" />
<Compile Remove="01-viewmodel - 澶嶅埗\**" />
- <Compile Remove="01-viewmodel\01-pump\01-feat\**" />
<Compile Remove="02-valve-main\**" />
<Compile Remove="03-variable-speed\**" />
+ <Compile Remove="99-common\**" />
+ <EmbeddedResource Remove="00-core\01-helper\**" />
+ <EmbeddedResource Remove="00-core\绛夋晥绾縗**" />
<EmbeddedResource Remove="01-pump-main\**" />
<EmbeddedResource Remove="01-viewmodel - 澶嶅埗\**" />
- <EmbeddedResource Remove="01-viewmodel\01-pump\01-feat\**" />
<EmbeddedResource Remove="02-valve-main\**" />
<EmbeddedResource Remove="03-variable-speed\**" />
+ <EmbeddedResource Remove="99-common\**" />
+ <None Remove="00-core\01-helper\**" />
+ <None Remove="00-core\绛夋晥绾縗**" />
<None Remove="01-pump-main\**" />
<None Remove="01-viewmodel - 澶嶅埗\**" />
- <None Remove="01-viewmodel\01-pump\01-feat\**" />
<None Remove="02-valve-main\**" />
<None Remove="03-variable-speed\**" />
+ <None Remove="99-common\**" />
+ <Page Remove="00-core\01-helper\**" />
+ <Page Remove="00-core\绛夋晥绾縗**" />
<Page Remove="01-pump-main\**" />
<Page Remove="01-viewmodel - 澶嶅埗\**" />
- <Page Remove="01-viewmodel\01-pump\01-feat\**" />
<Page Remove="02-valve-main\**" />
<Page Remove="03-variable-speed\**" />
+ <Page Remove="99-common\**" />
</ItemGroup>
<ItemGroup>
- <Compile Remove="99-common\PumpParallelChartDlg.cs" />
- <Compile Remove="99-common\PumpParallelChartDlg.Designer.cs" />
- <Compile Remove="99-common\PumpPerform2dMultiViewDlg - 澶嶅埗.cs" />
- <Compile Remove="99-common\PumpPerform2dMultiViewDlg - 澶嶅埗.Designer.cs" />
- <Compile Remove="99-common\PumpSerialParallelChartDlg.cs" />
- <Compile Remove="99-common\PumpSerialParallelChartDlg.Designer.cs" />
- <Compile Remove="99-common\PumpVariableSpeedChartDlg.cs" />
- <Compile Remove="99-common\PumpVariableSpeedChartDlg.Designer.cs" />
- <Compile Remove="99-common\PumpWorkChartDlg.cs" />
- <Compile Remove="99-common\PumpWorkChartDlg.Designer.cs" />
- <Compile Remove="99-common\PumpWorkComparisonChartDlg.cs" />
- <Compile Remove="99-common\PumpWorkComparisonChartDlg.Designer.cs" />
- <Compile Remove="99-common\SelXhsPumpMainPhartDlg.cs" />
- <Compile Remove="99-common\SelXhsPumpMainPhartDlg.Designer.cs" />
- <Compile Remove="99-common\SelXhsValveMainPhartDlg.cs" />
- <Compile Remove="99-common\SelXhsValveMainPhartDlg.Designer.cs" />
+ <Compile Remove="01-pump\01-view\PumpChartViewCtrl - 澶嶅埗.cs" />
+ <Compile Remove="01-pump\01-view\PumpChartViewCtrl - 澶嶅埗.Designer.cs" />
+ <Compile Remove="01-pump\01-view\SingleMappingMatrixDlg.cs" />
+ <Compile Remove="01-pump\01-view\SingleMappingMatrixDlg.Designer.cs" />
<Compile Remove="PumpCurveExpandDlg.cs" />
<Compile Remove="PumpCurveExpandDlg.Designer.cs" />
<Compile Remove="PumpParallelAnalyDlg - 澶嶅埗.cs" />
@@ -55,23 +51,21 @@
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Remove="99-common\PumpParallelChartDlg.resx" />
- <EmbeddedResource Remove="99-common\PumpPerform2dMultiViewDlg - 澶嶅埗.resx" />
- <EmbeddedResource Remove="99-common\PumpSerialParallelChartDlg.resx" />
- <EmbeddedResource Remove="99-common\PumpVariableSpeedChartDlg.resx" />
- <EmbeddedResource Remove="99-common\PumpWorkChartDlg.resx" />
- <EmbeddedResource Remove="99-common\PumpWorkComparisonChartDlg.resx" />
- <EmbeddedResource Remove="99-common\SelXhsPumpMainPhartDlg.resx" />
- <EmbeddedResource Remove="99-common\SelXhsValveMainPhartDlg.resx" />
+ <EmbeddedResource Remove="01-pump\01-view\PumpChartViewCtrl - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="01-pump\01-view\SingleMappingMatrixDlg.resx" />
<EmbeddedResource Remove="PumpCurveExpandDlg.resx" />
<EmbeddedResource Remove="PumpParallelAnalyDlg - 澶嶅埗.resx" />
<EmbeddedResource Remove="PumpParallelAnalyDlg.resx" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="00-core\绛夋晥绾縗EqualParaCurveEListHelper.cs" />
+ </ItemGroup>
+
+ <ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
<PackageReference Include="NPOI" Version="2.7.1" />
- <PackageReference Include="Yw.BLL.Phart.Core" Version="3.0.5" />
+ <PackageReference Include="Yw.BLL.Phart.Core" Version="3.0.6" />
</ItemGroup>
<ItemGroup>
@@ -82,6 +76,12 @@
</ItemGroup>
<ItemGroup>
+ <Compile Update="01-pump\01-view\DeleteEqualEDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\01-view\DeleteVariableSpeedDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="01-pump\02-edit\PumpChartEditCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -103,6 +103,13 @@
<Compile Update="02-universal\03-import\02-image\UniversalChartImageImportCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="03-valve\01-view\ValveChartViewCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-valve\02-edit\ValveChartEditCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-valve\03-import\01-excel\ValveChartExcelImportCtrl.cs" />
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
@@ -111,6 +118,12 @@
<Compile Update="relation\01-list\PhartDiagramRelationListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="relation\03-grid\01-valve\ValvePhartDiagramRelationGridViewCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="relation\04-view\ValvePhartDiagramRelationCurveViewDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="SinglePumpAnalyDlg.cs">
<SubType>Form</SubType>
</Compile>
--
Gitblit v1.9.3