From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 13:59:15 +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 | 47 ++++++++++++++++++++++-------------------------
1 files changed, 22 insertions(+), 25 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 83d8665..139a8f3 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
@@ -9,9 +9,13 @@
<ItemGroup>
<Compile Remove="02-UICore\**" />
+ <Compile Remove="10-equipment\**" />
<EmbeddedResource Remove="02-UICore\**" />
+ <EmbeddedResource Remove="10-equipment\**" />
<None Remove="02-UICore\**" />
+ <None Remove="10-equipment\**" />
<Page Remove="02-UICore\**" />
+ <Page Remove="10-equipment\**" />
</ItemGroup>
<ItemGroup>
@@ -19,14 +23,11 @@
<Compile Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.Designer.cs" />
<Compile Remove="01-pump\PumpProductMainPanel - 澶嶅埗.cs" />
<Compile Remove="01-pump\PumpProductMainPanel - 澶嶅埗.Designer.cs" />
- <Compile Remove="10-equipment\ManufacturerMainPanel.cs" />
- <Compile Remove="10-equipment\ManufacturerMainPanel.designer.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.resx" />
<EmbeddedResource Remove="01-pump\PumpProductMainPanel - 澶嶅埗.resx" />
- <EmbeddedResource Remove="10-equipment\ManufacturerMainPanel.resx" />
</ItemGroup>
<ItemGroup>
@@ -52,7 +53,7 @@
<Compile Update="02-adapting\AddAdaptingMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="01-pump\03-PumpType\EditPumpTypeDlg.cs">
+ <Compile Update="01-pump\03-AssetsPumpType\EditAssetsPumpTypeDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="01-pump\EditPumpProductMainDlg.cs" />
@@ -60,22 +61,22 @@
<Compile Update="01-pump\AddPumpProductGroupDlg.cs" />
<Compile Update="01-pump\AddPumpProductMainDlg.cs" />
<Compile Update="01-pump\EditPumpProductSeriesDlg.cs" />
- <Compile Update="03-valve\01-series\EditValveSeriesDlg.cs">
+ <Compile Update="03-valve\01-series\EditAssetsValveSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-valve\01-series\AddValveSeriesDlg.cs">
+ <Compile Update="03-valve\01-series\AddAssetsValveSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="03-valve\ValveTypeTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="02-adapting\AdaptingManageMainPanel.cs">
+ <Compile Update="02-adapting\AdaptingManageMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="05-elbow\02-main\AddElbowMainDlg.cs">
+ <Compile Update="05-elbow\02-main\AddAssetsElbowMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="05-elbow\02-main\EditElbowMainDlg.cs">
+ <Compile Update="05-elbow\02-main\EditAssetsElbowMainDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="06-threeLink\01-series\AddPipeLineSeriesDlg.cs">
@@ -87,13 +88,13 @@
<Compile Update="06-threeLink\01-series\PipeLineTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="06-threeLink\02-main\AddThreeLinkMainDlg.cs">
+ <Compile Update="06-threeLink\02-main\AddAssetsThreelinkMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="06-threeLink\02-main\EditThreeLinkMainDlg.cs">
+ <Compile Update="06-threeLink\02-main\EditAssetsThreelinkMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="06-threeLink\02-main\ThreeLinkManageMainPanel.cs">
+ <Compile Update="06-threeLink\02-main\ThreeLinkManageMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="05-elbow\01-series\AddPipeLineSeriesDlg.cs">
@@ -105,7 +106,7 @@
<Compile Update="05-elbow\01-series\PipeLineTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="05-elbow\02-main\ElbowManageMainPanel.cs">
+ <Compile Update="05-elbow\02-main\ElbowManageMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="04-pipe\01-series\AddPipeLineSeriesDlg.cs">
@@ -114,22 +115,22 @@
<Compile Update="04-pipe\01-series\EditPipeLineSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="04-pipe\02-main\EditPipeMainDlg.cs">
+ <Compile Update="04-pipe\02-main\EditAssetsPipeMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="04-pipe\02-main\AddPipeMainDlg.cs">
+ <Compile Update="04-pipe\02-main\AddAssetsPipeMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="04-pipe\02-main\PipeManageMainPanel.cs">
+ <Compile Update="04-pipe\02-main\PipeManageMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="04-pipe\01-series\PipeLineTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="07-fourLink\02-main\AddFourLinkMainDlg.cs">
+ <Compile Update="07-fourLink\02-main\AddAssetsFourlinkMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="07-fourLink\02-main\EditFourLinkMainDlg.cs">
+ <Compile Update="07-fourLink\02-main\EditAssetsFourlinkMainDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="08-nozzle\01-series\AddPipeLineSeriesDlg.cs">
@@ -141,13 +142,13 @@
<Compile Update="08-nozzle\01-series\NozzleTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="08-nozzle\02-main\AddNozzleMainDlg.cs">
+ <Compile Update="08-nozzle\02-main\AddAssetsNozzleMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="08-nozzle\02-main\EditNozzleMainDlg.cs">
+ <Compile Update="08-nozzle\02-main\EditAssetsNozzleMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="08-nozzle\02-main\NozzleManageMainPanel.cs">
+ <Compile Update="08-nozzle\02-main\NozzleManageMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="Properties\Resources.Designer.cs">
@@ -162,10 +163,6 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
- </ItemGroup>
-
- <ItemGroup>
- <Folder Include="10-equipment\" />
</ItemGroup>
</Project>
--
Gitblit v1.9.3