From ca5f300a7cef85d22b5e0f9d59d117c49f9909b3 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 19 十一月 2024 09:42:16 +0800
Subject: [PATCH] 完善资产界面
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
index 9eee921..778f86e 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
@@ -23,6 +23,8 @@
</ItemGroup>
<ItemGroup>
+ <Compile Remove="01-perform\01-pump-chart\01-chart\03-serial-parallel\PumpSerialParallelChart - 澶嶅埗.cs" />
+ <Compile Remove="01-perform\01-pump-chart\01-chart\03-serial-parallel\PumpSerialParallelChart - 澶嶅埗.Designer.cs" />
<Compile Remove="01-perform\01-pump-chart\01-chart\PumpPerform2dMultiChart.cs" />
<Compile Remove="01-perform\01-pump-chart\01-chart\PumpPerform2dMultiChart.Designer.cs" />
<Compile Remove="01-perform\01-pump-chart\01-chart\XtrPerform2dChartUpdate.cs" />
@@ -35,6 +37,7 @@
</ItemGroup>
<ItemGroup>
+ <EmbeddedResource Remove="01-perform\01-pump-chart\01-chart\03-serial-parallel\PumpSerialParallelChart - 澶嶅埗.resx" />
<EmbeddedResource Remove="01-perform\01-pump-chart\01-chart\PumpPerform2dMultiChart.resx" />
<EmbeddedResource Remove="01-perform\01-pump-chart\01-chart\XtrPerform2dChartUpdate.resx" />
<EmbeddedResource Remove="01-perform\01-pump-chart\03-chart-view\XtrPerform2dViewDlg.resx" />
@@ -46,6 +49,14 @@
<Compile Include="01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelCtrl.designer.cs" />
<Compile Include="01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelDlg.cs" />
<Compile Include="01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelDlg.Designer.cs" />
+ <Compile Include="01-perform\01-pump-chart\05-import\02-picture\CurvePictureBoxCtrl.cs" />
+ <Compile Include="01-perform\01-pump-chart\05-import\02-picture\curvePictureBoxCtrl.Designer.cs" />
+ <Compile Include="01-perform\01-pump-chart\05-import\02-picture\ImportPumpPerform2dByPictureCtrl.cs" />
+ <Compile Include="01-perform\01-pump-chart\05-import\02-picture\ImportPumpPerform2dByPictureCtrl.Designer.cs" />
+ <Compile Include="01-perform\01-pump-chart\05-import\02-picture\ImportPumpPerform2dByPictureDlg.cs" />
+ <Compile Include="01-perform\01-pump-chart\05-import\02-picture\ImportPumpPerform2dByPictureDlg.Designer.cs" />
+ <Compile Include="01-perform\01-pump-chart\05-import\02-picture\PickEqupPointDlg.cs" />
+ <Compile Include="01-perform\01-pump-chart\05-import\02-picture\PickEqupPointDlg.designer.cs" />
<Compile Include="01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointCtrl.cs" />
<Compile Include="01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointCtrl.designer.cs" />
<Compile Include="01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointDlg.cs" />
@@ -56,6 +67,10 @@
<EmbeddedResource Include="01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelCtrl.en-US.resx" />
<EmbeddedResource Include="01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelCtrl.resx" />
<EmbeddedResource Include="01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelDlg.resx" />
+ <EmbeddedResource Include="01-perform\01-pump-chart\05-import\02-picture\CurvePictureBoxCtrl.resx" />
+ <EmbeddedResource Include="01-perform\01-pump-chart\05-import\02-picture\ImportPumpPerform2dByPictureCtrl.resx" />
+ <EmbeddedResource Include="01-perform\01-pump-chart\05-import\02-picture\ImportPumpPerform2dByPictureDlg.resx" />
+ <EmbeddedResource Include="01-perform\01-pump-chart\05-import\02-picture\PickEqupPointDlg.resx" />
<EmbeddedResource Include="01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointCtrl.resx" />
<EmbeddedResource Include="01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointDlg.resx" />
</ItemGroup>
@@ -63,7 +78,7 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
<PackageReference Include="NPOI" Version="2.7.1" />
- <PackageReference Include="Yw.Pump.Core" Version="3.1.1" />
+ <PackageReference Include="Yw.Pump.Core" Version="3.1.2" />
</ItemGroup>
<ItemGroup>
@@ -73,7 +88,6 @@
<ItemGroup>
<Folder Include="01-perform\01-pump-chart\03-chart-view\" />
- <Folder Include="01-perform\01-pump-chart\05-import\02-picture%28寰呮仮澶嶏紝闇�寮曠敤鍗曚綅%29\" />
<Folder Include="01-perform\01-pump-chart\99-calculate\" />
<Folder Include="01-perform\02-valve-chart\03-chart-view\" />
</ItemGroup>
@@ -86,6 +100,9 @@
<Compile Update="01-perform\01-pump-chart\01-chart\02-perform-compare\PumpPerformCompareInfoCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="01-perform\01-pump-chart\01-chart\03-serial-parallel\PumpParallelInfoCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="01-perform\01-pump-chart\01-chart\04-variable-speed\PumpVariableSpeedChart.cs">
<SubType>UserControl</SubType>
</Compile>
--
Gitblit v1.9.3