From 0ff5ca350625b1e9af061be4abb53f7490330611 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 16 十一月 2024 15:06:50 +0800
Subject: [PATCH] 界面逻辑的修改
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj | 99 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 84 insertions(+), 15 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 3a83c7a..fdedb51 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
@@ -23,11 +23,15 @@
<Compile Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.Designer.cs" />
<Compile Remove="01-pump\PumpProductMainPanel - 澶嶅埗.cs" />
<Compile Remove="01-pump\PumpProductMainPanel - 澶嶅埗.Designer.cs" />
+ <Compile Remove="12-kit\02-main\01-EditPumpPartProp\EquipmentProductListBox.cs" />
+ <Compile Remove="12-kit\02-main\01-EditPumpPartProp\EquipmentProductListBox.Designer.cs" />
+ <Compile Remove="12-kit\02-main\01-EditPumpPartProp\PropGroupChoiceViewModel.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.resx" />
<EmbeddedResource Remove="01-pump\PumpProductMainPanel - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="12-kit\02-main\01-EditPumpPartProp\EquipmentProductListBox.resx" />
</ItemGroup>
<ItemGroup>
@@ -40,7 +44,7 @@
<ProjectReference Include="..\..\BLL\HStation.BLL.Assets.Core\HStation.BLL.Assets.Core.csproj" />
<ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
<ProjectReference Include="..\..\Dto\HStation.Dto.Assets.Core\HStation.Dto.Assets.Core.csproj" />
- <ProjectReference Include="..\HStation.WinFrmUI.Basic\HStation.WinFrmUI.Basic.csproj" />
+ <ProjectReference Include="..\HStation.WinFrmUI.Basic.Core\HStation.WinFrmUI.Basic.Core.csproj" />
<ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
<ProjectReference Include="..\HStation.WinFrmUI.Dict.Core\HStation.WinFrmUI.Dict.Core.csproj" />
<ProjectReference Include="..\HStation.WinFrmUI.PhartRelation.Core\HStation.WinFrmUI.PhartRelation.Core.csproj" />
@@ -63,28 +67,44 @@
<Compile Update="03-valve\01-series\AddAssetsValveSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-valve\ValveTypeTreeListCtrl.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">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="05-elbow\02-main\AddAssetsElbowMainDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="05-elbow\02-main\EditAssetsElbowMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="06-threeLink\01-series\AddPipeLineSeriesDlg.cs" />
- <Compile Update="06-threeLink\01-series\EditPipeLineSeriesDlg.cs" />
- <Compile Update="06-threeLink\01-series\PipeLineTreeListCtrl.cs" />
+ <Compile Update="05-elbow\03-coefficient\SetElbowCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\01-series\AddAssetsThreelinkSeriesDlg.cs" />
+ <Compile Update="06-threeLink\01-series\EditAssetsThreelinkSeriesDlg.cs" />
+ <Compile Update="06-threeLink\01-series\ThreeLinkTreeListCtrl.cs" />
<Compile Update="06-threeLink\02-main\AddAssetsThreelinkMainDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="06-threeLink\02-main\EditAssetsThreelinkMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="06-threeLink\02-main\ThreeLinkManageMainPage.cs" />
- <Compile Update="05-elbow\01-series\AddPipeLineSeriesDlg.cs" />
- <Compile Update="05-elbow\01-series\EditPipeLineSeriesDlg.cs" />
- <Compile Update="05-elbow\01-series\PipeLineTreeListCtrl.cs" />
- <Compile Update="05-elbow\02-main\ElbowManageMainPage.cs" />
+ <Compile Update="06-threeLink\03-coefficient\SetThreelinkCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="06-threeLink\ThreeLinkManageMainPage.cs" />
+ <Compile Update="05-elbow\01-series\AddAssetsElbowSeriesDlg.cs" />
+ <Compile Update="05-elbow\01-series\EditAssetsElbowSeriesDlg.cs" />
+ <Compile Update="05-elbow\01-series\ElbowTreeListCtrl.cs" />
+ <Compile Update="05-elbow\ElbowManageMainPage.cs" />
<Compile Update="04-pipe\01-series\AddPipeLineSeriesDlg.cs" />
<Compile Update="04-pipe\01-series\EditPipeLineSeriesDlg.cs" />
<Compile Update="04-pipe\02-main\EditAssetsPipeMainDlg.cs">
@@ -93,24 +113,69 @@
<Compile Update="04-pipe\02-main\AddAssetsPipeMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="04-pipe\02-main\PipeManageMainPage.cs" />
+ <Compile Update="04-pipe\PipeManageMainPage.cs" />
<Compile Update="04-pipe\01-series\PipeLineTreeListCtrl.cs" />
+ <Compile Update="07-fourLink\03-coefficient\SetFourlinkCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="08-sprinkler\03-coefficient\SetSprinklerCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="10-exchanger\03-coefficient\SetExchangerCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="11-compressor\01-series\AddAssetsCompressorSeriesDlg.cs" />
+ <Compile Update="11-compressor\01-series\EditAssetsExchangerSeriesDlg.cs" />
+ <Compile Update="11-compressor\01-series\CompressorTreeListCtrl.cs" />
+ <Compile Update="11-compressor\02-main\01-EditPumpPartProp\EditExchangerPartPropDlg.cs" />
+ <Compile Update="11-compressor\02-main\01-EditPumpPartProp\ExchangerProductListBox.cs" />
+ <Compile Update="11-compressor\02-main\AddAssetsExchangerMainDlg.cs" />
+ <Compile Update="11-compressor\02-main\EditExchangerMainDlg.cs" />
+ <Compile Update="11-compressor\ExchangerManageMainPage.cs" />
+ <Compile Update="10-exchanger\01-series\AddAssetsExchangerSeriesDlg.cs" />
+ <Compile Update="10-exchanger\01-series\EditAssetsExchangerSeriesDlg.cs" />
+ <Compile Update="10-exchanger\01-series\ExchangerTreeListCtrl.cs" />
+ <Compile Update="10-exchanger\02-main\01-EditPumpPartProp\EditExchangerPartPropDlg.cs" />
+ <Compile Update="10-exchanger\02-main\01-EditPumpPartProp\ExchangerProductListBox.cs" />
+ <Compile Update="10-exchanger\02-main\AddExchangerMainDlg.cs" />
+ <Compile Update="10-exchanger\02-main\EditExchangerMainDlg.cs" />
<Compile Update="07-fourLink\02-main\AddAssetsFourlinkMainDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="07-fourLink\02-main\EditAssetsFourlinkMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="08-nozzle\01-series\AddPipeLineSeriesDlg.cs" />
- <Compile Update="08-nozzle\01-series\EditPipeLineSeriesDlg.cs" />
- <Compile Update="08-nozzle\01-series\NozzleTreeListCtrl.cs" />
+ <Compile Update="08-sprinkler\01-series\AddAssetsSprinklerSeriesDlg.cs" />
+ <Compile Update="08-sprinkler\01-series\EditAssetsSprinklerSeriesDlg.cs" />
+ <Compile Update="08-sprinkler\01-series\SprinklerTreeListCtrl.cs" />
<Compile Update="08-nozzle\02-main\AddAssetsNozzleMainDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="08-nozzle\02-main\EditAssetsNozzleMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="08-nozzle\02-main\NozzleManageMainPage.cs" />
+ <Compile Update="08-sprinkler\SprinklerManageMainPage.cs" />
+ <Compile Update="11-compressor\03-coefficient\SetCompressorCoefficientDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="12-kit\01-series\AddAssetsKitSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="12-kit\01-series\KitTreeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="12-kit\01-series\EditAssetsKitSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="12-kit\02-main\EditAssetsKitMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="12-kit\02-main\AddAssetsKitMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="12-kit\KitManageMainPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
@@ -125,4 +190,8 @@
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="12-kit\02-main\01-EditPumpPartProp\" />
+ </ItemGroup>
+
</Project>
--
Gitblit v1.9.3