From ad4360df5a1245151efc826bee69b63946426891 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 23 十二月 2024 17:50:18 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj | 44 +++++++++++++-------------------------------
1 files changed, 13 insertions(+), 31 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 783940d..6708ab5 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
@@ -11,8 +11,7 @@
<Compile Remove="00-calc-helper\A涓存椂璧勬枡\**" />
<Compile Remove="00-calc-helper\鏂囧瓧\**" />
<Compile Remove="00-calc-helper\绛夋晥绾縗**" />
- <Compile Remove="01-pump\00- - 澶嶅埗\**" />
- <Compile Remove="01-pump\01-single\09-edit\**" />
+ <Compile Remove="01-pump\**" />
<Compile Remove="02-pump\04-special\04-variable-speed\**" />
<Compile Remove="02-valve\**" />
<Compile Remove="bak2\**" />
@@ -23,8 +22,7 @@
<EmbeddedResource Remove="00-calc-helper\A涓存椂璧勬枡\**" />
<EmbeddedResource Remove="00-calc-helper\鏂囧瓧\**" />
<EmbeddedResource Remove="00-calc-helper\绛夋晥绾縗**" />
- <EmbeddedResource Remove="01-pump\00- - 澶嶅埗\**" />
- <EmbeddedResource Remove="01-pump\01-single\09-edit\**" />
+ <EmbeddedResource Remove="01-pump\**" />
<EmbeddedResource Remove="02-pump\04-special\04-variable-speed\**" />
<EmbeddedResource Remove="02-valve\**" />
<EmbeddedResource Remove="bak2\**" />
@@ -35,8 +33,7 @@
<None Remove="00-calc-helper\A涓存椂璧勬枡\**" />
<None Remove="00-calc-helper\鏂囧瓧\**" />
<None Remove="00-calc-helper\绛夋晥绾縗**" />
- <None Remove="01-pump\00- - 澶嶅埗\**" />
- <None Remove="01-pump\01-single\09-edit\**" />
+ <None Remove="01-pump\**" />
<None Remove="02-pump\04-special\04-variable-speed\**" />
<None Remove="02-valve\**" />
<None Remove="bak2\**" />
@@ -47,8 +44,7 @@
<Page Remove="00-calc-helper\A涓存椂璧勬枡\**" />
<Page Remove="00-calc-helper\鏂囧瓧\**" />
<Page Remove="00-calc-helper\绛夋晥绾縗**" />
- <Page Remove="01-pump\00- - 澶嶅埗\**" />
- <Page Remove="01-pump\01-single\09-edit\**" />
+ <Page Remove="01-pump\**" />
<Page Remove="02-pump\04-special\04-variable-speed\**" />
<Page Remove="02-valve\**" />
<Page Remove="bak2\**" />
@@ -62,12 +58,10 @@
<Compile Remove="00-calc-helper\EqualParaCurveEListHelper - 澶嶅埗.cs" />
<Compile Remove="00-calc-helper\ThroughCurve.cs" />
<Compile Remove="00-calc-helper\ThroughParaCurve.cs" />
- <Compile Remove="01-pump\01-single\01-view\PumpViewChart.cs" />
- <Compile Remove="01-pump\01-single\01-view\PumpViewChart.Designer.cs" />
- <Compile Remove="01-pump\05-import\03-one-point\PumpImportByOnePointCtrl.cs" />
- <Compile Remove="01-pump\05-import\03-one-point\PumpImportByOnePointCtrl.designer.cs" />
- <Compile Remove="01-pump\05-import\03-one-point\PumpImportByOnePointDlg.cs" />
- <Compile Remove="01-pump\05-import\03-one-point\PumpImportByOnePointDlg.Designer.cs" />
+ <Compile Remove="02-pump\03-import\02-image\PumpCharImageImportCtrl - 澶嶅埗%282%29.cs" />
+ <Compile Remove="02-pump\03-import\02-image\PumpCharImageImportCtrl - 澶嶅埗%282%29.Designer.cs" />
+ <Compile Remove="02-pump\03-import\02-image\PumpCharImageImportCtrl - 澶嶅埗.cs" />
+ <Compile Remove="02-pump\03-import\02-image\PumpCharImageImportCtrl - 澶嶅埗.Designer.cs" />
<Compile Remove="02-pump\03-import\03-point\PumpChartPointImportCtrl - 澶嶅埗%282%29.cs" />
<Compile Remove="02-pump\03-import\03-point\PumpChartPointImportCtrl - 澶嶅埗%282%29.designer.cs" />
<Compile Remove="02-pump\03-import\03-point\PumpChartPointImportCtrl - 澶嶅埗.cs" />
@@ -80,9 +74,8 @@
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Remove="01-pump\01-single\01-view\PumpViewChart.resx" />
- <EmbeddedResource Remove="01-pump\05-import\03-one-point\PumpImportByOnePointCtrl.resx" />
- <EmbeddedResource Remove="01-pump\05-import\03-one-point\PumpImportByOnePointDlg.resx" />
+ <EmbeddedResource Remove="02-pump\03-import\02-image\PumpCharImageImportCtrl - 澶嶅埗%282%29.resx" />
+ <EmbeddedResource Remove="02-pump\03-import\02-image\PumpCharImageImportCtrl - 澶嶅埗.resx" />
<EmbeddedResource Remove="02-pump\03-import\03-point\PumpChartPointImportCtrl - 澶嶅埗%282%29.resx" />
<EmbeddedResource Remove="02-pump\03-import\03-point\PumpChartPointImportCtrl - 澶嶅埗.resx" />
<EmbeddedResource Remove="02-pump\04-special\03-run-view\PumpRunViewChart - 澶嶅埗.resx" />
@@ -112,6 +105,9 @@
<Compile Update="02-pump\02-edit\PumpChartExcelEditCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="02-pump\03-import\02-image\PickEqupPointDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="02-pump\03-import\03-point\PumpChartPointImportCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -119,18 +115,6 @@
<SubType>UserControl</SubType>
</Compile>
<Compile Update="02-pump\04-special\04-parallel\PumpParallelChart.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="01-pump\05-import\02-picture\PickEqupPointDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="01-pump\05-import\02-picture\PumpImportByPictureCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="01-pump\05-import\02-picture\PumpImportByPictureDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="01-pump\05-import\02-picture\PumpPictureBoxCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="02-universal\01-view\UniversalViewChart.cs">
@@ -154,8 +138,6 @@
</ItemGroup>
<ItemGroup>
- <Folder Include="01-pump\01-single\01-view\" />
- <Folder Include="01-pump\05-import\03-one-point\" />
<Folder Include="02-pump\03-import\01-excel\" />
<Folder Include="02-universal\03-import\01-excel\" />
<Folder Include="02-universal\03-import\02-image\" />
--
Gitblit v1.9.3