From 3314fa6d962c399d93b87e45a90ed94050a771da Mon Sep 17 00:00:00 2001 From: duheng <2286773002@qq.com> Date: 星期四, 20 三月 2025 12:12:27 +0800 Subject: [PATCH] 增加场所信息Vmo层 --- WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj | 275 +++++++++++++++++++++++++++++++----------------------- 1 files changed, 156 insertions(+), 119 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 c92fb25..47327bd 100644 --- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj +++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj @@ -13,73 +13,149 @@ <Compile Remove="03-valve\02-main---bak\**" /> <Compile Remove="03-valve\04-chart-edit\**" /> <Compile Remove="03-valve\05-import\**" /> + <Compile Remove="04-pipe\01-series-bak\**" /> + <Compile Remove="04-pipe\02-main-bak\**" /> + <Compile Remove="04-pipe\03-coefficient\**" /> <Compile Remove="05-elbow\01-series-bak\**" /> <Compile Remove="05-elbow\02-main-bak\**" /> <Compile Remove="05-elbow\03-coefficient\**" /> - <Compile Remove="07-fourLink\01-series-bak\**" /> - <Compile Remove="07-fourLink\02-main-bak\**" /> - <Compile Remove="07-fourLink\03-coefficient\**" /> + <Compile Remove="06-threeLink\01-series-bak\**" /> + <Compile Remove="06-threeLink\02-main-bak\**" /> + <Compile Remove="06-threeLink\03-coefficient\**" /> + <Compile Remove="07-fourlink\01-series-bak\**" /> + <Compile Remove="07-fourlink\02-main-bak\**" /> + <Compile Remove="07-fourlink\03-coefficient\**" /> + <Compile Remove="08-sprinkler\01-series-bak\**" /> + <Compile Remove="08-sprinkler\02-main-bak\**" /> + <Compile Remove="08-sprinkler\03-coefficient\**" /> <Compile Remove="10-equipment\**" /> <Compile Remove="11-compressor\04-chart-edit\**" /> <Compile Remove="11-compressor\05-import\**" /> + <Compile Remove="13-blunthead\01-series-bak\**" /> + <Compile Remove="13-blunthead\02-main-bak\**" /> + <Compile Remove="13-blunthead\03-coefficient\**" /> <Compile Remove="14-tank\01-series-bak\**" /> <Compile Remove="14-tank\02-main-bak\**" /> + <Compile Remove="14-tank\03-factor\**" /> <Compile Remove="14-tank\04-chart-edit\**" /> <Compile Remove="14-tank\05-import\**" /> + <Compile Remove="17-hydrant\01-series-bak\**" /> + <Compile Remove="17-hydrant\02-main-bak\**" /> + <Compile Remove="17-hydrant\03-coefficient\**" /> + <Compile Remove="19-translation\01-series-bak\**" /> + <Compile Remove="19-translation\02-main-bak\**" /> + <Compile Remove="19-translation\03-coefficient\**" /> <EmbeddedResource Remove="02-UICore\**" /> <EmbeddedResource Remove="03-valve\01-series-----bak\**" /> <EmbeddedResource Remove="03-valve\02-main---bak\**" /> <EmbeddedResource Remove="03-valve\04-chart-edit\**" /> <EmbeddedResource Remove="03-valve\05-import\**" /> + <EmbeddedResource Remove="04-pipe\01-series-bak\**" /> + <EmbeddedResource Remove="04-pipe\02-main-bak\**" /> + <EmbeddedResource Remove="04-pipe\03-coefficient\**" /> <EmbeddedResource Remove="05-elbow\01-series-bak\**" /> <EmbeddedResource Remove="05-elbow\02-main-bak\**" /> <EmbeddedResource Remove="05-elbow\03-coefficient\**" /> - <EmbeddedResource Remove="07-fourLink\01-series-bak\**" /> - <EmbeddedResource Remove="07-fourLink\02-main-bak\**" /> - <EmbeddedResource Remove="07-fourLink\03-coefficient\**" /> + <EmbeddedResource Remove="06-threeLink\01-series-bak\**" /> + <EmbeddedResource Remove="06-threeLink\02-main-bak\**" /> + <EmbeddedResource Remove="06-threeLink\03-coefficient\**" /> + <EmbeddedResource Remove="07-fourlink\01-series-bak\**" /> + <EmbeddedResource Remove="07-fourlink\02-main-bak\**" /> + <EmbeddedResource Remove="07-fourlink\03-coefficient\**" /> + <EmbeddedResource Remove="08-sprinkler\01-series-bak\**" /> + <EmbeddedResource Remove="08-sprinkler\02-main-bak\**" /> + <EmbeddedResource Remove="08-sprinkler\03-coefficient\**" /> <EmbeddedResource Remove="10-equipment\**" /> <EmbeddedResource Remove="11-compressor\04-chart-edit\**" /> <EmbeddedResource Remove="11-compressor\05-import\**" /> + <EmbeddedResource Remove="13-blunthead\01-series-bak\**" /> + <EmbeddedResource Remove="13-blunthead\02-main-bak\**" /> + <EmbeddedResource Remove="13-blunthead\03-coefficient\**" /> <EmbeddedResource Remove="14-tank\01-series-bak\**" /> <EmbeddedResource Remove="14-tank\02-main-bak\**" /> + <EmbeddedResource Remove="14-tank\03-factor\**" /> <EmbeddedResource Remove="14-tank\04-chart-edit\**" /> <EmbeddedResource Remove="14-tank\05-import\**" /> + <EmbeddedResource Remove="17-hydrant\01-series-bak\**" /> + <EmbeddedResource Remove="17-hydrant\02-main-bak\**" /> + <EmbeddedResource Remove="17-hydrant\03-coefficient\**" /> + <EmbeddedResource Remove="19-translation\01-series-bak\**" /> + <EmbeddedResource Remove="19-translation\02-main-bak\**" /> + <EmbeddedResource Remove="19-translation\03-coefficient\**" /> <None Remove="02-UICore\**" /> <None Remove="03-valve\01-series-----bak\**" /> <None Remove="03-valve\02-main---bak\**" /> <None Remove="03-valve\04-chart-edit\**" /> <None Remove="03-valve\05-import\**" /> + <None Remove="04-pipe\01-series-bak\**" /> + <None Remove="04-pipe\02-main-bak\**" /> + <None Remove="04-pipe\03-coefficient\**" /> <None Remove="05-elbow\01-series-bak\**" /> <None Remove="05-elbow\02-main-bak\**" /> <None Remove="05-elbow\03-coefficient\**" /> - <None Remove="07-fourLink\01-series-bak\**" /> - <None Remove="07-fourLink\02-main-bak\**" /> - <None Remove="07-fourLink\03-coefficient\**" /> + <None Remove="06-threeLink\01-series-bak\**" /> + <None Remove="06-threeLink\02-main-bak\**" /> + <None Remove="06-threeLink\03-coefficient\**" /> + <None Remove="07-fourlink\01-series-bak\**" /> + <None Remove="07-fourlink\02-main-bak\**" /> + <None Remove="07-fourlink\03-coefficient\**" /> + <None Remove="08-sprinkler\01-series-bak\**" /> + <None Remove="08-sprinkler\02-main-bak\**" /> + <None Remove="08-sprinkler\03-coefficient\**" /> <None Remove="10-equipment\**" /> <None Remove="11-compressor\04-chart-edit\**" /> <None Remove="11-compressor\05-import\**" /> + <None Remove="13-blunthead\01-series-bak\**" /> + <None Remove="13-blunthead\02-main-bak\**" /> + <None Remove="13-blunthead\03-coefficient\**" /> <None Remove="14-tank\01-series-bak\**" /> <None Remove="14-tank\02-main-bak\**" /> + <None Remove="14-tank\03-factor\**" /> <None Remove="14-tank\04-chart-edit\**" /> <None Remove="14-tank\05-import\**" /> + <None Remove="17-hydrant\01-series-bak\**" /> + <None Remove="17-hydrant\02-main-bak\**" /> + <None Remove="17-hydrant\03-coefficient\**" /> + <None Remove="19-translation\01-series-bak\**" /> + <None Remove="19-translation\02-main-bak\**" /> + <None Remove="19-translation\03-coefficient\**" /> <Page Remove="02-UICore\**" /> <Page Remove="03-valve\01-series-----bak\**" /> <Page Remove="03-valve\02-main---bak\**" /> <Page Remove="03-valve\04-chart-edit\**" /> <Page Remove="03-valve\05-import\**" /> + <Page Remove="04-pipe\01-series-bak\**" /> + <Page Remove="04-pipe\02-main-bak\**" /> + <Page Remove="04-pipe\03-coefficient\**" /> <Page Remove="05-elbow\01-series-bak\**" /> <Page Remove="05-elbow\02-main-bak\**" /> <Page Remove="05-elbow\03-coefficient\**" /> - <Page Remove="07-fourLink\01-series-bak\**" /> - <Page Remove="07-fourLink\02-main-bak\**" /> - <Page Remove="07-fourLink\03-coefficient\**" /> + <Page Remove="06-threeLink\01-series-bak\**" /> + <Page Remove="06-threeLink\02-main-bak\**" /> + <Page Remove="06-threeLink\03-coefficient\**" /> + <Page Remove="07-fourlink\01-series-bak\**" /> + <Page Remove="07-fourlink\02-main-bak\**" /> + <Page Remove="07-fourlink\03-coefficient\**" /> + <Page Remove="08-sprinkler\01-series-bak\**" /> + <Page Remove="08-sprinkler\02-main-bak\**" /> + <Page Remove="08-sprinkler\03-coefficient\**" /> <Page Remove="10-equipment\**" /> <Page Remove="11-compressor\04-chart-edit\**" /> <Page Remove="11-compressor\05-import\**" /> + <Page Remove="13-blunthead\01-series-bak\**" /> + <Page Remove="13-blunthead\02-main-bak\**" /> + <Page Remove="13-blunthead\03-coefficient\**" /> <Page Remove="14-tank\01-series-bak\**" /> <Page Remove="14-tank\02-main-bak\**" /> + <Page Remove="14-tank\03-factor\**" /> <Page Remove="14-tank\04-chart-edit\**" /> <Page Remove="14-tank\05-import\**" /> + <Page Remove="17-hydrant\01-series-bak\**" /> + <Page Remove="17-hydrant\02-main-bak\**" /> + <Page Remove="17-hydrant\03-coefficient\**" /> + <Page Remove="19-translation\01-series-bak\**" /> + <Page Remove="19-translation\02-main-bak\**" /> + <Page Remove="19-translation\03-coefficient\**" /> </ItemGroup> <ItemGroup> @@ -91,15 +167,32 @@ <Compile Remove="03-valve\SetValveCoefficientDlg.Designer.cs" /> <Compile Remove="03-valve\ValveManageMainPage.cs" /> <Compile Remove="03-valve\ValveManageMainPage.Designer.cs" /> + <Compile Remove="04-pipe\PipeManageMainPage.cs" /> + <Compile Remove="04-pipe\PipeManageMainPage.Designer.cs" /> <Compile Remove="05-elbow\ElbowManageMainPage.cs" /> <Compile Remove="05-elbow\ElbowManageMainPage.Designer.cs" /> - <Compile Remove="07-fourLink\FourLinkManageMainPage.cs" /> - <Compile Remove="07-fourLink\FourLinkManageMainPage.Designer.cs" /> + <Compile Remove="06-threeLink\ThreeLinkManageMainPage.cs" /> + <Compile Remove="06-threeLink\ThreeLinkManageMainPage.Designer.cs" /> + <Compile Remove="06-threeLink\ThreeLinkViewModel.cs" /> + <Compile Remove="07-fourlink\FourLinkManageMainPage.cs" /> + <Compile Remove="07-fourlink\FourLinkManageMainPage.Designer.cs" /> + <Compile Remove="08-sprinkler\SprinklerManageMainPage.cs" /> + <Compile Remove="08-sprinkler\SprinklerManageMainPage.Designer.cs" /> + <Compile Remove="08-sprinkler\SprinklerViewModel.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" /> + <Compile Remove="13-blunthead\BluntheadManageMainPage.cs" /> + <Compile Remove="13-blunthead\BluntheadManageMainPage.Designer.cs" /> + <Compile Remove="13-blunthead\BluntheadViewModel.cs" /> <Compile Remove="14-tank\TankManageMainPage.cs" /> <Compile Remove="14-tank\TankManageMainPage.Designer.cs" /> + <Compile Remove="17-hydrant\HydrantManageMainPage.cs" /> + <Compile Remove="17-hydrant\HydrantManageMainPage.Designer.cs" /> + <Compile Remove="17-hydrant\HydrantViewModel.cs" /> + <Compile Remove="19-translation\TranslationManageMainPage.cs" /> + <Compile Remove="19-translation\TranslationManageMainPage.Designer.cs" /> + <Compile Remove="19-translation\TranslationViewModel.cs" /> <Compile Remove="20-exchanger\ExchangerManageMainPage.cs" /> <Compile Remove="20-exchanger\ExchangerManageMainPage.Designer.cs" /> </ItemGroup> @@ -109,10 +202,16 @@ <EmbeddedResource Remove="01-pump\PumpProductMainPanel - 澶嶅埗.resx" /> <EmbeddedResource Remove="03-valve\SetValveCoefficientDlg.resx" /> <EmbeddedResource Remove="03-valve\ValveManageMainPage.resx" /> + <EmbeddedResource Remove="04-pipe\PipeManageMainPage.resx" /> <EmbeddedResource Remove="05-elbow\ElbowManageMainPage.resx" /> - <EmbeddedResource Remove="07-fourLink\FourLinkManageMainPage.resx" /> + <EmbeddedResource Remove="06-threeLink\ThreeLinkManageMainPage.resx" /> + <EmbeddedResource Remove="07-fourlink\FourLinkManageMainPage.resx" /> + <EmbeddedResource Remove="08-sprinkler\SprinklerManageMainPage.resx" /> <EmbeddedResource Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.resx" /> + <EmbeddedResource Remove="13-blunthead\BluntheadManageMainPage.resx" /> <EmbeddedResource Remove="14-tank\TankManageMainPage.resx" /> + <EmbeddedResource Remove="17-hydrant\HydrantManageMainPage.resx" /> + <EmbeddedResource Remove="19-translation\TranslationManageMainPage.resx" /> <EmbeddedResource Remove="20-exchanger\ExchangerManageMainPage.resx" /> </ItemGroup> @@ -120,13 +219,13 @@ <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" /> <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" /> <PackageReference Include="Yw.BLL.Assets.Core" Version="3.0.1" /> - <PackageReference Include="Yw.BLL.Phart.Core" Version="3.0.5" /> + <PackageReference Include="Yw.BLL.Phart.Core" Version="3.0.6" /> </ItemGroup> <ItemGroup> <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.Auth.Core\HStation.WinFrmUI.Auth.Core.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" /> @@ -139,6 +238,7 @@ <Compile Update="01-pump\07-PumpChart\02-Eidt\EditAssetsPumpPerform2dDlg.cs" /> <Compile Update="01-pump\07-PumpChart\02-Eidt\SetImportanceDlg.cs" /> <Compile Update="01-pump\07-PumpChart\02-Eidt\SetOtherNameDlg.cs" /> + <Compile Update="01-pump\07-PumpChart\03-excelHelper\ImportPumpExcel.cs" /> <Compile Update="01-pump\07-PumpChart\AssetsPumpCurveQLViewDlg.cs" /> <Compile Update="02-adapting\EditAdaptingMainDlg.cs" /> <Compile Update="02-adapting\AddAdaptingMainDlg.cs" /> @@ -156,68 +256,36 @@ <Compile Update="03-valve\04-curve\EditAssetsValveCurveDlg.cs" /> <Compile Update="03-valve\04-curve\ImportAssetsValveCurveByExcelDlg.cs" /> <Compile Update="03-valve\04-curve\ImportAssetsValveCurveByPictureDlg.cs" /> - <Compile Update="04-pipe\03-coefficient\SetPipeLineCoefficientDlg.cs" /> + <Compile Update="03-valve\05-excelHelper\ImportValveExcel.cs" /> + <Compile Update="04-pipe\01-series\AddAssetsPipeSeriesDlg.cs" /> + <Compile Update="04-pipe\01-series\AssetsPipeSeriesMgrTreeCtrl.cs" /> + <Compile Update="04-pipe\01-series\EditAssetsPipeSeriesDlg.cs" /> + <Compile Update="04-pipe\01-series\ViewAssetsPipeSeriesDlg.cs" /> + <Compile Update="04-pipe\02-main\AddAssetsPipeMainDlg.cs" /> + <Compile Update="04-pipe\02-main\AssetsPipeMainMgrPage.cs" /> + <Compile Update="04-pipe\02-main\EditAssetsPipeMainDlg.cs" /> + <Compile Update="04-pipe\02-main\ViewAssetsPipeMainDlg.cs" /> + <Compile Update="04-pipe\03-factor\AddAssetsPipeFactorDlg.cs" /> + <Compile Update="04-pipe\03-factor\AssetsPipeFactorMgrPage.cs" /> + <Compile Update="04-pipe\03-factor\EditAssetsPipeFactorDlg.cs" /> + <Compile Update="04-pipe\03-factor\ViewAssetsPipeFactorDlg.cs" /> + <Compile Update="04-pipe\AssetsPipeMgrPage.cs" /> <Compile Update="05-elbow\AssetsElbowMgrPage.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="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\01-series\AddAssetsFourlinkSeriesDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="07-fourLink\01-series\AssetsFourlinkSeriesMgrTreeCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="07-fourLink\01-series\EditAssetsFourlinkSeriesDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="07-fourLink\01-series\ViewAssetsFourlinkSeriesDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="07-fourLink\02-main\AddAssetsFourlinkMainDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="07-fourLink\02-main\AssetsFourlinkMainMgrPage.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="07-fourLink\02-main\EditAssetsFourlinkMainDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="07-fourLink\02-main\ViewAssetsFourlinkMainDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="07-fourLink\03-factor\AddAssetsFourlinkFactorDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="07-fourLink\03-factor\AssetsFourlinkFactorMgrPage.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="07-fourLink\03-factor\EditAssetsFourlinkFactorDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="07-fourLink\03-factor\ViewAssetsFourlinkFactorDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="07-fourLink\AssetsFourlinkMgrPage.cs"> - <SubType>UserControl</SubType> - </Compile> + <Compile Update="04-pipe\02-main\EditAssetsPipeMainDlg.cs" /> + <Compile Update="04-pipe\02-main\AddAssetsPipeMainDlg.cs" /> + <Compile Update="07-fourlink\01-series\AddAssetsFourlinkSeriesDlg.cs" /> + <Compile Update="07-fourlink\01-series\AssetsFourlinkSeriesMgrTreeCtrl.cs" /> + <Compile Update="07-fourlink\01-series\EditAssetsFourlinkSeriesDlg.cs" /> + <Compile Update="07-fourlink\01-series\ViewAssetsFourlinkSeriesDlg.cs" /> + <Compile Update="07-fourlink\02-main\AddAssetsFourlinkMainDlg.cs" /> + <Compile Update="07-fourlink\02-main\AssetsFourlinkMainMgrPage.cs" /> + <Compile Update="07-fourlink\02-main\EditAssetsFourlinkMainDlg.cs" /> + <Compile Update="07-fourlink\02-main\ViewAssetsFourlinkMainDlg.cs" /> + <Compile Update="07-fourlink\03-factor\AddAssetsFourlinkFactorDlg.cs" /> + <Compile Update="07-fourlink\03-factor\AssetsFourlinkFactorMgrPage.cs" /> + <Compile Update="07-fourlink\03-factor\EditAssetsFourlinkFactorDlg.cs" /> + <Compile Update="07-fourlink\03-factor\ViewAssetsFourlinkFactorDlg.cs" /> + <Compile Update="07-fourlink\AssetsFourlinkMgrPage.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" /> @@ -233,6 +301,8 @@ <Compile Update="11-compressor\06-prop\ExchangerProductListBox.cs"> <SubType>UserControl</SubType> </Compile> + <Compile Update="13-blunthead\02-main\AssetsBluntheadMainMgrPage.cs" /> + <Compile Update="13-blunthead\AssetsBluntheadMgrPage.cs" /> <Compile Update="14-tank\01-series\AddAssetsTankSeriesDlg.cs" /> <Compile Update="14-tank\01-series\AssetsTankSeriesMgrTreeCtrl.cs" /> <Compile Update="14-tank\01-series\EditAssetsTankSeriesDlg.cs" /> @@ -241,15 +311,11 @@ <Compile Update="14-tank\02-main\AssetsTankMainMgrPage.cs" /> <Compile Update="14-tank\02-main\EditAssetsTankMainDlg.cs" /> <Compile Update="14-tank\02-main\ViewAssetsTankMainDlg.cs" /> - <Compile Update="14-tank\03-factor\AddAssetsTankFactorDlg.cs" /> - <Compile Update="14-tank\03-factor\AssetsTankFactorMgrPage.cs" /> - <Compile Update="14-tank\03-factor\EditAssetsTankFactorDlg.cs" /> - <Compile Update="14-tank\03-factor\ViewAssetsTankFactorDlg.cs" /> - <Compile Update="14-tank\04-curveVol\AssetsTankCurveVOLMgrPage.cs" /> - <Compile Update="14-tank\04-curveVol\AssetsTankCurveVOLViewDlg.cs" /> - <Compile Update="14-tank\04-curveVol\EditAssetsTankCurveVOLDlg.cs" /> - <Compile Update="14-tank\04-curveVol\ImportAssetsTankCurveVOLByExcelDlg.cs" /> - <Compile Update="14-tank\04-curveVol\ImportAssetsTankCurveVOLByPictureDlg.cs" /> + <Compile Update="14-tank\03-curveVol\AssetsTankCurveVOLMgrPage.cs" /> + <Compile Update="14-tank\03-curveVol\AssetsTankCurveVOLViewDlg.cs" /> + <Compile Update="14-tank\03-curveVol\EditAssetsTankCurveVOLDlg.cs" /> + <Compile Update="14-tank\03-curveVol\ImportAssetsTankCurveVOLByExcelDlg.cs" /> + <Compile Update="14-tank\03-curveVol\ImportAssetsTankCurveVOLByPictureDlg.cs" /> <Compile Update="14-tank\AssetsTankMgrPage.cs" /> <Compile Update="15-meter\01-series\AddAssetsMeterSeriesDlg.cs" /> <Compile Update="15-meter\01-series\AssetsMeterSeriesMgrTreeCtrl.cs" /> @@ -290,28 +356,6 @@ <Compile Update="18-pressmeter\03-factor\EditAssetsPressmeterFactorDlg.cs" /> <Compile Update="18-pressmeter\03-factor\ViewAssetsPressmeterFactorDlg.cs" /> <Compile Update="18-pressmeter\AssetsPressmeterMgrPage.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="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="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" /> @@ -325,22 +369,14 @@ <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="07-fourLink\02-main\EditAssetsFourlinkMainDlg.cs"> - <SubType>Form</SubType> - </Compile> - <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="07-fourlink\02-main\AddAssetsFourlinkMainDlg.cs" /> + <Compile Update="07-fourlink\02-main\EditAssetsFourlinkMainDlg.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-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" /> @@ -350,6 +386,7 @@ <Compile Update="12-package\EditPackagePartPropDlg.cs" /> <Compile Update="12-package\PackageManageMainPage.cs" /> <Compile Update="12-package\PackageProductListBox.cs" /> + <Compile Update="19-translation\04-excelHelper\ImportTranslationExcel.cs" /> <Compile Update="20-exchanger\01-series\AddAssetsExchangerSeriesDlg.cs" /> <Compile Update="20-exchanger\01-series\AssetsExchangerSeriesMgrTreeCtrl.cs" /> <Compile Update="20-exchanger\01-series\EditAssetsExchangerSeriesDlg.cs" /> -- Gitblit v1.9.3