From b26ae60e85d4a03a2426e6607e7afe89e1c10a5f Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期四, 05 十二月 2024 11:50:35 +0800 Subject: [PATCH] 水池单独匹配界面修改 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 213 insertions(+), 11 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj index 5247305..121ddda 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj @@ -8,23 +8,107 @@ </PropertyGroup> <ItemGroup> + <Compile Remove="02-project\01-import\01-ModelFile\**" /> + <Compile Remove="02-project\01-import\04-completed\**" /> <Compile Remove="03-ViewModel\**" /> <Compile Remove="04-HomePageMainPanel\**" /> + <Compile Remove="04-pump\02-analy\**" /> + <Compile Remove="04-pump\03-calc\**" /> + <Compile Remove="Resources\**" /> + <EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" /> + <EmbeddedResource Remove="02-project\01-import\04-completed\**" /> <EmbeddedResource Remove="03-ViewModel\**" /> <EmbeddedResource Remove="04-HomePageMainPanel\**" /> + <EmbeddedResource Remove="04-pump\02-analy\**" /> + <EmbeddedResource Remove="04-pump\03-calc\**" /> + <EmbeddedResource Remove="Resources\**" /> + <None Remove="02-project\01-import\01-ModelFile\**" /> + <None Remove="02-project\01-import\04-completed\**" /> <None Remove="03-ViewModel\**" /> <None Remove="04-HomePageMainPanel\**" /> + <None Remove="04-pump\02-analy\**" /> + <None Remove="04-pump\03-calc\**" /> + <None Remove="Resources\**" /> + <Page Remove="02-project\01-import\01-ModelFile\**" /> + <Page Remove="02-project\01-import\04-completed\**" /> <Page Remove="03-ViewModel\**" /> <Page Remove="04-HomePageMainPanel\**" /> + <Page Remove="04-pump\02-analy\**" /> + <Page Remove="04-pump\03-calc\**" /> + <Page Remove="Resources\**" /> </ItemGroup> <ItemGroup> + <Compile Remove="00-core\AssetsMatchingHelper-Bak.cs" /> <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.cs" /> <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.Designer.cs" /> + <Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.cs" /> + <Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.Designer.cs" /> + <Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemePipeViewModel.cs" /> + <Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemePumpViewModel.cs" /> + <Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemeValveViewModel.cs" /> + <Compile Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 澶嶅埗.cs" /> + <Compile Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 澶嶅埗.Designer.cs" /> + <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%282%29.cs" /> + <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%282%29.Designer.cs" /> + <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%283%29.cs" /> + <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%283%29.Designer.cs" /> + <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.cs" /> + <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.Designer.cs" /> + <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.cs" /> + <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.Designer.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.Designer.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.Designer.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.Designer.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.Designer.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingViewModel.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.Designer.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingViewModel.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.Designer.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingViewModel.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.Designer.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingViewModel.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.Designer.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingViewModel.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.Designer.cs" /> + <Compile Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingViewModel.cs" /> + <Compile Remove="04-pump\PumpFullInfoCtrl.cs" /> + <Compile Remove="04-pump\PumpFullInfoCtrl.designer.cs" /> + <Compile Remove="04-pump\PumpFullInfoViewDlg.cs" /> + <Compile Remove="04-pump\PumpFullInfoViewDlg.Designer.cs" /> + <Compile Remove="04-pump\SinglePumpInfoViewDLg.cs" /> + <Compile Remove="04-pump\SinglePumpInfoViewDLg.Designer.cs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.resx" /> + <EmbeddedResource Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.resx" /> + <EmbeddedResource Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 澶嶅埗.resx" /> + <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%282%29.resx" /> + <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%283%29.resx" /> + <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.resx" /> + <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.resx" /> + <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.resx" /> + <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.resx" /> + <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.resx" /> + <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.resx" /> + <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.resx" /> + <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.resx" /> + <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.resx" /> + <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.resx" /> + <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.resx" /> + <EmbeddedResource Remove="04-pump\PumpFullInfoCtrl.resx" /> + <EmbeddedResource Remove="04-pump\PumpFullInfoViewDlg.resx" /> + <EmbeddedResource Remove="04-pump\SinglePumpInfoViewDLg.resx" /> </ItemGroup> <ItemGroup> @@ -43,55 +127,173 @@ <Content Include="map\gaode\js\xhs_base64.js"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <None Include="Resources\pump_run_32.png" /> + <None Include="Resources\Cancel.svg" /> + <None Include="Resources\Close32.png" /> + <None Include="Resources\Folder.svg" /> + <None Include="Resources\IncomingCall.svg" /> + <None Include="Resources\MapLayers.svg" /> + <None Include="Resources\Remove.svg" /> + <None Include="Resources\Square32.png" /> + <None Include="Resources\SizeNormal32.png" /> + <None Include="Resources\SizeMin32.png" /> </ItemGroup> <ItemGroup> <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" /> - <PackageReference Include="Yw.ZipFile.Core" Version="3.0.0" /> + <PackageReference Include="Yw.ZipFile.Core" Version="3.0.2" /> </ItemGroup> <ItemGroup> + <Folder Include="03-simulation\06-simulation\01-matching\00-core\" /> <Folder Include="map\gaode\css\" /> - <Folder Include="00-core\" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="..\..\BLL\HStation.BLL.TransferFile.Core\HStation.BLL.TransferFile.Core.csproj" /> <ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" /> <ProjectReference Include="..\..\Hydro\HStation.Hydro.Core\HStation.Hydro.Core.csproj" /> + <ProjectReference Include="..\HStation.WinFrmUI.Assets.Core\HStation.WinFrmUI.Assets.Core.csproj" /> <ProjectReference Include="..\HStation.WinFrmUI.Bimface.Core\HStation.WinFrmUI.Bimface.Core.csproj" /> <ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" /> <ProjectReference Include="..\HStation.WinFrmUI.Hydro.Core\HStation.WinFrmUI.Hydro.Core.csproj" /> <ProjectReference Include="..\Yw.WinFrmUI.Map.Core\Yw.WinFrmUI.Map.Core.csproj" /> + <ProjectReference Include="..\Yw.WinFrmUI.Phart.Core\Yw.WinFrmUI.Phart.Core.csproj" /> </ItemGroup> <ItemGroup> - <Compile Update="02-project\01-import\00-core\ImportXhsProjectDlg.cs"> + <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationBimfaceInfoCtrl.cs" /> + <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationHydroInfoCtrl.cs" /> + <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationProjectInfoCtrl.cs" /> + <Compile Update="02-project\04-dlg\00-core\ImportXhsProjectFileDlg.cs" /> + <Compile Update="02-project\04-dlg\01-FileChoice\SelectXhsProjectFileModelFileWizardPage.cs" /> + <Compile Update="02-project\04-dlg\02-GeneralProject\GenerateXhsProjectFileWizardPage.cs" /> + <Compile Update="02-project\04-dlg\03-ImportCompleted\ImportXhsProjectFileCompletedCtrl.cs" /> + <Compile Update="02-project\04-dlg\04-ProjectResultShowPanel\ProjectFileResultShowPanel.cs" /> + <Compile Update="02-project\04-dlg\EditProjectDlg.cs" /> + <Compile Update="03-simulation\04-scheme\01-add\01-set\03-pipe\SetSchemePipeListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="03-simulation\04-scheme\01-add\01-set\02-valve\SetSchemeValveListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="03-simulation\04-scheme\02-page\XhsProjectSimulationSchemePage.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="03-simulation\06-simulation\01-matching\09-tank\TankChartShowDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="02-project\04-dlg\EditProjectDlg.cs"> + <Compile Update="03-simulation\06-simulation\01-matching\09-tank\SimulationTankSingleMatchingDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="03-scheme\03-hydraulic-simulation\XhsSchemeHydraulicSimulationPage.cs"> + <Compile Update="03-simulation\06-simulation\01-matching\09-tank\TankSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-scheme\02-asset-mgr\XhsSchemeAssetMgrPage.cs"> + <Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SprinklerSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-scheme\04-scheme-mgr\02-comparison\SelectSchemeDlg.cs"> + <Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SimulationSprinklerSingleMatchingDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="03-scheme\04-scheme-mgr\02-comparison\XhsSchemeComparisonPage.cs"> + <Compile Update="03-simulation\06-simulation\01-matching\15-translation\TranslationSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-scheme\XhsSchemeMultiMgrPage.cs"> + <Compile Update="03-simulation\06-simulation\01-matching\15-translation\SimulationTranslationSingleMatchingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\06-simulation\01-matching\13-pressmeter\PressmeterSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-scheme\XhsSchemeMultiMgrPage_Bak2.cs"> + <Compile Update="03-simulation\06-simulation\01-matching\13-pressmeter\SimulationPressmeterSingleMatchingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\06-simulation\01-matching\12-hydrant\HydrantSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-scheme\XhsSchemeMultiMgrPage_Bak.cs"> + <Compile Update="03-simulation\06-simulation\01-matching\12-hydrant\SimulationHydrantSingleMatchingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\06-simulation\01-matching\11-flowmeter\FlowmeterSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> + <Compile Update="03-simulation\06-simulation\01-matching\11-flowmeter\SimulationFlowmeterSingleMatchingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\06-simulation\01-matching\10-meter\MeterSingleMatchingCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="03-simulation\06-simulation\01-matching\10-meter\SimulationMeterSingleMatchingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\06-simulation\01-matching\14-blunthead\BluntheadSingleMatchingForm.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="03-simulation\06-simulation\01-matching\14-blunthead\SimulationBluntheadSingleMatchingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs" /> + <Compile Update="03-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs" /> + <Compile Update="03-simulation\01-info\XhsProjectSimulationBimfaceInfoCtrl.cs" /> + <Compile Update="03-simulation\01-info\XhsProjectSimulationInfoPage.cs" /> + <Compile Update="03-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs" /> + <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\SimulationValveSingleMatchingDlg.cs" /> + <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingCtrl.cs" /> + <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\SimulationPipeSing;eMatchingDlg.cs" /> + <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingCtrl.cs" /> + <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingCtrl.cs" /> + <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\SimulationElbowSingleMatchingDlg.cs" /> + <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourlinkSingleMatchingCtrl.cs" /> + <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\SimulationFourlinkSingleMatchingDlg.cs" /> + <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\CompressorChartShowDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\CompressorSingleMatchingCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\SimulationCompressorSingleMatchingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\ExchangerChartShowDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\ExchangerSingleMatchingCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\SimulationExchangerSingleMatchingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs" /> + <Compile Update="03-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs" /> + <Compile Update="03-simulation\08-working\XhsProjectSimulationWorkingPage.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="03-simulation\09-energy\SimulationMultiWorkingEnergyDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\10-analy\SimulationMultiWorkingAnalyDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\10-analy\SimulationSingleWorkingAnalyDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\11-pump\01-parallel\SimulationPumpParallelDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\11-pump\02-feat\SimulationPumpFeatDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\09-energy\SimulationSingleWorkingEnergyDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\11-pump\03-analy\SimulationMultiWorkingPumpAnalyDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\11-pump\03-analy\SimulationSingleWorkingPumpAnalyDlg.cs"> + <SubType>Form</SubType> + </Compile> <Compile Update="Properties\Resources.Designer.cs"> <DesignTime>True</DesignTime> <AutoGen>True</AutoGen> -- Gitblit v1.9.3