From 1aa330646ad9f88abc580e17d08d727a0ecaae48 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期五, 15 十一月 2024 11:49:08 +0800 Subject: [PATCH] 核心界面优化整理 --- WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj | 178 +++++++++++++++++++++++++++++++--------------------------- 1 files changed, 95 insertions(+), 83 deletions(-) diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj index f9c840a..06e7bb2 100644 --- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj +++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj @@ -10,36 +10,39 @@ <ItemGroup> <Compile Remove="04-viewmodel\07-curve\SetHydroCurveCtrl - 澶嶅埗.cs" /> <Compile Remove="04-viewmodel\07-curve\SetHydroCurveCtrl - 澶嶅埗.Designer.cs" /> - <Compile Remove="06-parter\00-core\HydroParterViewModel.cs" /> - <Compile Remove="06-parter\01-reservoir\HydroReservoirViewModel.cs" /> - <Compile Remove="06-parter\02-tank\HydroTankViewModel.cs" /> - <Compile Remove="06-parter\03-waterbox\HydroWaterboxViewModel.cs" /> - <Compile Remove="06-parter\04-junction\HydroJunctionViewModel.cs" /> - <Compile Remove="06-parter\05-blunthead\HydroBluntheadViewModel.cs" /> - <Compile Remove="06-parter\06-elbow\HydroElbowViewModel.cs" /> - <Compile Remove="06-parter\07-threelink\HydroThreelinkViewModel.cs" /> - <Compile Remove="06-parter\08-fourlink\HydroFourlinkViewModel.cs" /> - <Compile Remove="06-parter\09-hydrant\HydroHydrantViewModel.cs" /> - <Compile Remove="06-parter\10-nozzle\HydroNozzleViewModel.cs" /> - <Compile Remove="06-parter\11-meter\HydroMeterViewModel.cs" /> - <Compile Remove="06-parter\12-flowmeter\HydroFlowmeterViewModel.cs" /> - <Compile Remove="06-parter\13-pressmeter\HydroPressmeterViewModel.cs" /> - <Compile Remove="06-parter\14-pipe\HydroPipeViewModel.cs" /> - <Compile Remove="06-parter\15-translation\HydroTranslationViewModel.cs" /> - <Compile Remove="06-parter\18-exchanger\HydroExchangerViewModel.cs" /> - <Compile Remove="06-parter\19-compressor\HydroCompressorViewModel.cs" /> - <Compile Remove="06-parter\16-pump\HydroPumpViewModel.cs" /> - <Compile Remove="06-parter\17-valve\HydroValveViewModel.cs" /> + <Compile Remove="06-visual\00-core\HydroParterListCtrl.cs" /> + <Compile Remove="06-visual\00-core\HydroParterListCtrl.Designer.cs" /> + <Compile Remove="06-visual\00-core\HydroParterViewModel.cs" /> + <Compile Remove="06-visual\01-reservoir\HydroReservoirViewModel.cs" /> + <Compile Remove="06-visual\02-tank\HydroTankViewModel.cs" /> + <Compile Remove="06-visual\03-waterbox\HydroWaterboxViewModel.cs" /> + <Compile Remove="06-visual\04-junction\HydroJunctionViewModel.cs" /> + <Compile Remove="06-visual\05-blunthead\HydroBluntheadViewModel.cs" /> + <Compile Remove="06-visual\06-elbow\HydroElbowViewModel.cs" /> + <Compile Remove="06-visual\07-threelink\HydroThreelinkViewModel.cs" /> + <Compile Remove="06-visual\08-fourlink\HydroFourlinkViewModel.cs" /> + <Compile Remove="06-visual\09-hydrant\HydroHydrantViewModel.cs" /> + <Compile Remove="06-visual\10-nozzle\HydroNozzleViewModel.cs" /> + <Compile Remove="06-visual\11-meter\HydroMeterViewModel.cs" /> + <Compile Remove="06-visual\12-flowmeter\HydroFlowmeterViewModel.cs" /> + <Compile Remove="06-visual\13-pressmeter\HydroPressmeterViewModel.cs" /> + <Compile Remove="06-visual\14-pipe\HydroPipeViewModel.cs" /> + <Compile Remove="06-visual\15-translation\HydroTranslationViewModel.cs" /> + <Compile Remove="06-visual\18-exchanger\HydroExchangerViewModel.cs" /> + <Compile Remove="06-visual\19-compressor\HydroCompressorViewModel.cs" /> + <Compile Remove="06-visual\16-pump\HydroPumpViewModel.cs" /> + <Compile Remove="06-visual\17-valve\HydroValveViewModel.cs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Remove="04-viewmodel\07-curve\SetHydroCurveCtrl - 澶嶅埗.resx" /> + <EmbeddedResource Remove="06-visual\00-core\HydroParterListCtrl.resx" /> </ItemGroup> <ItemGroup> <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" /> - <PackageReference Include="Yw.BLL.Basic.Core" Version="3.2.9" /> - <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.5.1" /> + <PackageReference Include="Yw.BLL.Basic.Core" Version="3.3.0" /> + <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.5.7" /> </ItemGroup> <ItemGroup> @@ -57,92 +60,101 @@ <Compile Update="02-model\HydroModelMgrPage.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="05-property\HydroParterPropertyCtrl.cs"> + <Compile Update="05-property\HydroVisualPropertyCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\05-blunthead\HydroBluntheadListCtrl.cs"> + <Compile Update="06-visual\01-reservoir\SetHydroReservoirListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\02-tank\SetHydroTankListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\05-blunthead\HydroBluntheadListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\13-pressmeter\HydroPressmeterListCtrl.cs"> + <Compile Update="06-visual\13-pressmeter\HydroPressmeterListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\12-flowmeter\HydroFlowmeterListCtrl.cs"> + <Compile Update="06-visual\12-flowmeter\HydroFlowmeterListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\11-meter\HydroMeterListCtrl.cs"> + <Compile Update="06-visual\11-meter\HydroMeterListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\08-fourlink\HydroFourlinkListCtrl.cs"> + <Compile Update="06-visual\08-fourlink\HydroFourlinkListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\07-threelink\HydroThreelinkListCtrl.cs"> + <Compile Update="06-visual\07-threelink\HydroThreelinkListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\06-elbow\HydroElbowListCtrl.cs"> + <Compile Update="06-visual\06-elbow\HydroElbowListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\09-hydrant\HydroHydrantListCtrl.cs"> + <Compile Update="06-visual\09-hydrant\HydroHydrantListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\03-waterbox\HydroWaterboxListCtrl.cs"> + <Compile Update="06-visual\03-waterbox\HydroWaterboxListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\02-tank\HydroTankListCtrl.cs"> + <Compile Update="06-visual\02-tank\HydroTankListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\01-reservoir\HydroReservoirListCtrl.cs"> + <Compile Update="06-visual\01-reservoir\HydroReservoirListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\18-exchanger\SetHydroExchangerDlg.cs"> + <Compile Update="06-visual\15-translation\SetHydroTranslationListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\15-translation\SetHydroTranslationDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\18-exchanger\SetHydroExchangerDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\18-exchanger\SetHydroExchangerListDlg.cs"> + <Compile Update="06-visual\18-exchanger\SetHydroExchangerListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\18-exchanger\HydroExchangerListCtrl.cs"> + <Compile Update="06-visual\18-exchanger\HydroExchangerListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\17-valve\HydroValveListCtrl.cs"> + <Compile Update="06-visual\17-valve\HydroValveListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\16-pump\HydroPumpListCtrl.cs"> + <Compile Update="06-visual\16-pump\HydroPumpListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\15-translation\HydroTranslationListCtrl.cs"> + <Compile Update="06-visual\15-translation\HydroTranslationListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\14-pipe\HydroPipeListCtrl.cs"> + <Compile Update="06-visual\14-pipe\HydroPipeListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\19-compressor\HydroCompressorListCtrl.cs"> + <Compile Update="06-visual\19-compressor\HydroCompressorListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\19-compressor\SetHydroCompressorDlg.cs"> + <Compile Update="06-visual\19-compressor\SetHydroCompressorDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\19-compressor\SetHydroCompressorListDlg.cs"> + <Compile Update="06-visual\19-compressor\SetHydroCompressorListDlg.cs"> <SubType>Form</SubType> </Compile> <Compile Update="10-working\00-core\SetHydroWorkingInfoDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="10-working\01-waterbox\SetHydroWaterboxWorkingInfoCtrl.cs"> + <Compile Update="10-working\02-waterbox\SetHydroWaterboxWorkingInfoCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="10-working\02-pump\SetHydroPumpWorkingInfoCtrl.cs"> + <Compile Update="10-working\03-pump\SetHydroPumpWorkingInfoCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="10-working\03-valve\SetHydroValveWorkingInfoCtrl.cs"> + <Compile Update="10-working\04-valve\SetHydroValveWorkingInfoCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="10-working\05-pressmeter\SetHydroPressmeterWorkingInfoCtrl.cs"> + <Compile Update="11-search\HydroVisualSearchListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="10-working\04-flowmeter\SetHydroFlowmeterWorkingInfoCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="11-search\HydroParterSearchListCtrl.cs"> - <SubType>UserControl</SubType> + <Compile Update="12-monitor\01-set\SetHydroVisualMonitorDlg.cs"> + <SubType>Form</SubType> </Compile> <Compile Update="14-l2d\HydroL2dViewPage.cs"> <SubType>UserControl</SubType> @@ -165,94 +177,94 @@ <Compile Update="08-grading\06-apply\02-dlg\ApplyHydroGradingDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="10-working\99-failed\HydroCalcuFailedCtrl.cs"> + <Compile Update="13-fail\HydroCalcuFailedCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="06-parter\02-tank\SetHydroTankDlg.cs"> + <Compile Update="06-visual\02-tank\SetHydroTankDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\03-waterbox\SetHydroWaterboxListDlg.cs"> + <Compile Update="06-visual\03-waterbox\SetHydroWaterboxListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\03-waterbox\SetHydroWaterboxDlg.cs"> + <Compile Update="06-visual\03-waterbox\SetHydroWaterboxDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\04-junction\SetHydroJunctionDlg.cs"> + <Compile Update="06-visual\04-junction\SetHydroJunctionDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\04-junction\SetHydroJunctionListDlg.cs"> + <Compile Update="06-visual\04-junction\SetHydroJunctionListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\05-blunthead\SetHydroBluntheadDlg.cs"> + <Compile Update="06-visual\05-blunthead\SetHydroBluntheadDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\05-blunthead\SetHydroBluntheadListDlg.cs"> + <Compile Update="06-visual\05-blunthead\SetHydroBluntheadListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\06-elbow\SetHydroElbowListDlg.cs"> + <Compile Update="06-visual\06-elbow\SetHydroElbowListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\06-elbow\SetHydroElbowDlg.cs"> + <Compile Update="06-visual\06-elbow\SetHydroElbowDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\07-threelink\SetHydroThreelinkListDlg.cs"> + <Compile Update="06-visual\07-threelink\SetHydroThreelinkListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\07-threelink\SetHydroThreelinkDlg.cs"> + <Compile Update="06-visual\07-threelink\SetHydroThreelinkDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\08-fourlink\SetHydroFourlinkDlg.cs"> + <Compile Update="06-visual\08-fourlink\SetHydroFourlinkDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\08-fourlink\SetHydroFourlinkListDlg.cs"> + <Compile Update="06-visual\08-fourlink\SetHydroFourlinkListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\09-hydrant\SetHydroHydrantDlg.cs"> + <Compile Update="06-visual\09-hydrant\SetHydroHydrantDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\09-hydrant\SetHydroHydrantListDlg.cs"> + <Compile Update="06-visual\09-hydrant\SetHydroHydrantListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\10-nozzle\SetHydroNozzleListDlg.cs"> + <Compile Update="06-visual\10-nozzle\SetHydroNozzleListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\10-nozzle\SetHydroNozzleDlg.cs"> + <Compile Update="06-visual\10-nozzle\SetHydroNozzleDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\11-meter\SetHydroMeterListDlg.cs"> + <Compile Update="06-visual\11-meter\SetHydroMeterListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\11-meter\SetHydroMeterDlg.cs"> + <Compile Update="06-visual\11-meter\SetHydroMeterDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\12-flowmeter\SetHydroFlowmeterDlg.cs"> + <Compile Update="06-visual\12-flowmeter\SetHydroFlowmeterDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\12-flowmeter\SetHydroFlowmeterListDlg.cs"> + <Compile Update="06-visual\12-flowmeter\SetHydroFlowmeterListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\13-pressmeter\SetHydroPressmeterListDlg.cs"> + <Compile Update="06-visual\13-pressmeter\SetHydroPressmeterListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\13-pressmeter\SetHydroPressmeterDlg.cs"> + <Compile Update="06-visual\13-pressmeter\SetHydroPressmeterDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\14-pipe\SetHydroPipeDlg.cs"> + <Compile Update="06-visual\14-pipe\SetHydroPipeDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\14-pipe\SetHydroPipeListDlg.cs"> + <Compile Update="06-visual\14-pipe\SetHydroPipeListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\16-pump\SetHydroPumpListDlg.cs"> + <Compile Update="06-visual\16-pump\SetHydroPumpListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\16-pump\SetHydroPumpDlg.cs"> + <Compile Update="06-visual\16-pump\SetHydroPumpDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\17-valve\SetHydroValveListDlg.cs"> + <Compile Update="06-visual\17-valve\SetHydroValveListDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="06-parter\17-valve\SetHydroValveDlg.cs"> + <Compile Update="06-visual\17-valve\SetHydroValveDlg.cs"> <SubType>Form</SubType> </Compile> <Compile Update="Properties\Resources.Designer.cs"> -- Gitblit v1.9.3