From 423b9511a9ce98fe36a235d5d2ab0d5a8e66238e Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期三, 11 十二月 2024 17:55:44 +0800 Subject: [PATCH] 报告图片导入 --- WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj | 250 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 162 insertions(+), 88 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..0e05759 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,15 @@ <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" /> + <Compile Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.cs" /> + <Compile Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.Designer.cs" /> + <Compile Remove="12-package\02-main\01-EditPumpPartProp\PropGroupChoiceViewModel.cs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.resx" /> <EmbeddedResource Remove="01-pump\PumpProductMainPanel - 澶嶅埗.resx" /> - <EmbeddedResource Remove="10-equipment\ManufacturerMainPanel.resx" /> + <EmbeddedResource Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.resx" /> </ItemGroup> <ItemGroup> @@ -39,20 +44,16 @@ <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" /> </ItemGroup> <ItemGroup> - <Compile Update="02-adapting\EditAdaptingMainDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="02-adapting\AddAdaptingMainDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="01-pump\03-PumpType\EditPumpTypeDlg.cs"> + <Compile Update="02-adapting\EditAdaptingMainDlg.cs" /> + <Compile Update="02-adapting\AddAdaptingMainDlg.cs" /> + <Compile Update="01-pump\03-AssetsPumpType\EditAssetsPumpTypeDlg.cs"> <SubType>Form</SubType> </Compile> <Compile Update="01-pump\EditPumpProductMainDlg.cs" /> @@ -60,96 +61,169 @@ <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"> + <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" /> + <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="05-elbow\03-coefficient\SetElbowCoefficientDlg.cs" /> + <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\03-coefficient\SetThreelinkCoefficientDlg.cs" /> + <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"> + <SubType>Form</SubType> + </Compile> + <Compile Update="04-pipe\02-main\AddAssetsPipeMainDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="04-pipe\PipeManageMainPage.cs" /> + <Compile Update="04-pipe\01-series\PipeLineTreeListCtrl.cs" /> + <Compile Update="07-fourLink\03-coefficient\SetFourlinkCoefficientDlg.cs" /> + <Compile Update="10-exchanger\04-chart-edit\ExchangerMainPhartMinorLossPanel.cs" /> + <Compile Update="10-exchanger\04-chart-edit\ExchangerPerform2dEditChart.cs" /> + <Compile Update="10-exchanger\04-chart-edit\ExchangerPerform2dEditCtrl.cs" /> + <Compile Update="10-exchanger\04-chart-edit\ExchangerPerform2dEditDlg.cs" /> + <Compile Update="10-exchanger\05-import\01-excel\ImportExchangerPerform2dByExcelCtrl.cs" /> + <Compile Update="10-exchanger\05-import\01-excel\ImportTankPerform2dByExcelDlg.cs" /> + <Compile Update="10-exchanger\06-prop\EditPackagePartPropDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="11-compressor\04-chart-edit\CompressorMainPhartMinorLossPanel.cs" /> + <Compile Update="11-compressor\04-chart-edit\CompressorPerform2dEditChart.cs" /> + <Compile Update="11-compressor\04-chart-edit\CompressorPerform2dEditCtrl.cs" /> + <Compile Update="11-compressor\04-chart-edit\CompressorPerform2dEditDlg.cs" /> + <Compile Update="11-compressor\05-import\01-excel\ImportCompressorPerform2dByExcelCtrl.cs" /> + <Compile Update="11-compressor\05-import\01-excel\ImportTankPerform2dByExcelDlg.cs" /> + <Compile Update="11-compressor\06-prop\EditPackagePartPropDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="11-compressor\06-prop\ExchangerProductListBox.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="02-adapting\AdaptingManageMainPanel.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="05-elbow\02-main\AddElbowMainDlg.cs"> + <Compile Update="14-tank\04-chart-edit\TankPerform2dEditCtrl.cs" /> + <Compile Update="14-tank\04-chart-edit\TankPerform2dEditDlg.cs" /> + <Compile Update="14-tank\04-chart-edit\TankMainPhartMinorLossPanel.cs" /> + <Compile Update="14-tank\05-import\01-excel\ImportTankPerform2dByExcelCtrl.cs" /> + <Compile Update="14-tank\05-import\01-excel\ImportTankPerform2dByExcelDlg.cs" /> + <Compile Update="19-translation\01-series\AddAssetsTranslationSeriesDlg.cs" /> + <Compile Update="19-translation\01-series\TranslationTreeListCtrl.cs" /> + <Compile Update="19-translation\01-series\EditAssetsTranslationSeriesDlg.cs" /> + <Compile Update="19-translation\02-main\AddAssetsTranslationMainDlg.cs" /> + <Compile Update="19-translation\02-main\EditAssetsTranslationMainDlg.cs" /> + <Compile Update="19-translation\03-coefficient\SetTranslationCoefficientDlg.cs" /> + <Compile Update="19-translation\TranslationManageMainPage.cs" /> + <Compile Update="18-pressmeter\01-series\AddAssetsPressmeterSeriesDlg.cs" /> + <Compile Update="18-pressmeter\01-series\PressmeterTreeListCtrl.cs" /> + <Compile Update="18-pressmeter\01-series\EditAssetsPressmeterSeriesDlg.cs" /> + <Compile Update="18-pressmeter\02-main\AddAssetsPressmeterMainDlg.cs" /> + <Compile Update="18-pressmeter\02-main\EditAssetsPressmeterMainDlg.cs" /> + <Compile Update="18-pressmeter\03-coefficient\SetPressmeterCoefficientDlg.cs" /> + <Compile Update="18-pressmeter\PressmeterManageMainPage.cs" /> + <Compile Update="17-hydrant\01-series\AddAssetsHydrantSeriesDlg.cs" /> + <Compile Update="17-hydrant\01-series\HydrantTreeListCtrl.cs" /> + <Compile Update="17-hydrant\01-series\EditAssetsHydrantSeriesDlg.cs" /> + <Compile Update="17-hydrant\02-main\AddAssetsHydrantMainDlg.cs" /> + <Compile Update="17-hydrant\02-main\EditAssetsHydrantMainDlg.cs" /> + <Compile Update="17-hydrant\03-coefficient\SetHydrantCoefficientDlg.cs" /> + <Compile Update="17-hydrant\HydrantManageMainPage.cs" /> + <Compile Update="16-flowmeter\01-series\AddAssetsFlowmeterSeriesDlg.cs" /> + <Compile Update="16-flowmeter\01-series\FlowmeterTreeListCtrl.cs" /> + <Compile Update="16-flowmeter\01-series\EditAssetsFlowmeterSeriesDlg.cs" /> + <Compile Update="16-flowmeter\02-main\AddAssetsFlowmeterMainDlg.cs" /> + <Compile Update="16-flowmeter\02-main\EditAssetsFlowmeterMainDlg.cs" /> + <Compile Update="16-flowmeter\03-coefficient\SetFlowmeterCoefficientDlg.cs" /> + <Compile Update="16-flowmeter\FlowmeterManageMainPage.cs" /> + <Compile Update="15-meter\01-series\AddAssetsMeterSeriesDlg.cs" /> + <Compile Update="15-meter\01-series\MeterTreeListCtrl.cs" /> + <Compile Update="15-meter\01-series\EditAssetsMeterSeriesDlg.cs" /> + <Compile Update="15-meter\02-main\AddAssetsMeterMainDlg.cs" /> + <Compile Update="15-meter\02-main\EditAssetsMeterMainDlg.cs" /> + <Compile Update="15-meter\03-coefficient\SetMeterCoefficientDlg.cs" /> + <Compile Update="15-meter\MeterManageMainPage.cs" /> + <Compile Update="14-tank\01-series\AddAssetsTankSeriesDlg.cs" /> + <Compile Update="14-tank\01-series\TankTreeListCtrl.cs" /> + <Compile Update="14-tank\01-series\EditAssetsTankSeriesDlg.cs" /> + <Compile Update="14-tank\02-main\AddAssetsTankMainDlg.cs" /> + <Compile Update="14-tank\02-main\EditAssetsTankMainDlg.cs" /> + <Compile Update="14-tank\03-coefficient\SetTankCoefficientDlg.cs" /> + <Compile Update="14-tank\TankManageMainPage.cs" /> + <Compile Update="13-blunthead\01-series\AddAssetsBluntheadSeriesDlg.cs" /> + <Compile Update="13-blunthead\01-series\EditAssetsBluntheadSeriesDlg.cs" /> + <Compile Update="13-blunthead\01-series\BluntheadTreeListCtrl.cs" /> + <Compile Update="13-blunthead\02-main\AddAssetsSprinklerMainDlg.cs" /> + <Compile Update="13-blunthead\02-main\EditAssetsBluntheadMainDlg.cs" /> + <Compile Update="13-blunthead\03-coefficient\SetBluntheadCoefficientDlg.cs" /> + <Compile Update="13-blunthead\BluntheadManageMainPage.cs" /> + <Compile Update="08-sprinkler\03-coefficient\SetSprinklerCoefficientDlg.cs" /> + <Compile Update="10-exchanger\03-coefficient\SetExchangerCoefficientDlg.cs" /> + <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\AddExchangerMainDlg.cs" /> + <Compile Update="11-compressor\02-main\EditExchangerMainDlg.cs" /> + <Compile Update="11-compressor\CompressorManageMainPage.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\06-prop\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="05-elbow\02-main\EditElbowMainDlg.cs"> + <Compile Update="07-fourLink\02-main\EditAssetsFourlinkMainDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-threeLink\01-series\AddPipeLineSeriesDlg.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="06-threeLink\01-series\EditPipeLineSeriesDlg.cs"> + <Compile Update="08-nozzle\02-main\EditAssetsNozzleMainDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-threeLink\01-series\PipeLineTreeListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="06-threeLink\02-main\AddThreeLinkMainDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="06-threeLink\02-main\EditThreeLinkMainDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="06-threeLink\02-main\ThreeLinkManageMainPanel.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="05-elbow\01-series\AddPipeLineSeriesDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="05-elbow\01-series\EditPipeLineSeriesDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="05-elbow\01-series\PipeLineTreeListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="05-elbow\02-main\ElbowManageMainPanel.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-pipe\01-series\AddPipeLineSeriesDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="04-pipe\01-series\EditPipeLineSeriesDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="04-pipe\02-main\EditPipeMainDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="04-pipe\02-main\AddPipeMainDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="04-pipe\02-main\PipeManageMainPanel.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"> - <SubType>Form</SubType> - </Compile> - <Compile Update="07-fourLink\02-main\EditFourLinkMainDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="08-nozzle\01-series\AddPipeLineSeriesDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="08-nozzle\01-series\EditPipeLineSeriesDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="08-nozzle\01-series\NozzleTreeListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="08-nozzle\02-main\AddNozzleMainDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="08-nozzle\02-main\EditNozzleMainDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="08-nozzle\02-main\NozzleManageMainPanel.cs"> - <SubType>UserControl</SubType> - </Compile> + <Compile Update="08-sprinkler\SprinklerManageMainPage.cs" /> + <Compile Update="11-compressor\03-coefficient\SetCompressorCoefficientDlg.cs" /> + <Compile Update="12-package\01-series\AddAssetsPackageSeriesDlg.cs" /> + <Compile Update="12-package\01-series\PackageTreeListCtrl.cs" /> + <Compile Update="12-package\01-series\EditAssetsPackageSeriesDlg.cs" /> + <Compile Update="12-package\02-main\EditAssetsPackageMainDlg.cs" /> + <Compile Update="12-package\02-main\AddAssetsPackageMainDlg.cs" /> + <Compile Update="12-package\EditPackagePartPropDlg.cs" /> + <Compile Update="12-package\PackageManageMainPage.cs" /> + <Compile Update="12-package\PackageProductListBox.cs" /> <Compile Update="Properties\Resources.Designer.cs"> <DesignTime>True</DesignTime> <AutoGen>True</AutoGen> @@ -165,7 +239,7 @@ </ItemGroup> <ItemGroup> - <Folder Include="10-equipment\" /> + <Folder Include="12-package\02-main\01-EditPumpPartProp\" /> </ItemGroup> </Project> -- Gitblit v1.9.3