Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

cloudflight

2024-12-24 97a43bf839f59cdda1641d61706e6e71a0c5e172

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj

@@ -10,6 +10,7 @@
   <ItemGroup>
      <Compile Remove="02-project\01-import\01-ModelFile\**" />
      <Compile Remove="03-simulation\04-scheme\01-info - 复制\**" />
      <Compile Remove="03-simulation\07-matching\05-elbows\01-elbowsinglematching\**" />
      <Compile Remove="03-ViewModel\**" />
      <Compile Remove="04-HomePageMainPanel\**" />
      <Compile Remove="04-pump\02-analy\**" />
@@ -17,6 +18,7 @@
      <Compile Remove="Resources\**" />
      <EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" />
      <EmbeddedResource Remove="03-simulation\04-scheme\01-info - 复制\**" />
      <EmbeddedResource Remove="03-simulation\07-matching\05-elbows\01-elbowsinglematching\**" />
      <EmbeddedResource Remove="03-ViewModel\**" />
      <EmbeddedResource Remove="04-HomePageMainPanel\**" />
      <EmbeddedResource Remove="04-pump\02-analy\**" />
@@ -24,6 +26,7 @@
      <EmbeddedResource Remove="Resources\**" />
      <None Remove="02-project\01-import\01-ModelFile\**" />
      <None Remove="03-simulation\04-scheme\01-info - 复制\**" />
      <None Remove="03-simulation\07-matching\05-elbows\01-elbowsinglematching\**" />
      <None Remove="03-ViewModel\**" />
      <None Remove="04-HomePageMainPanel\**" />
      <None Remove="04-pump\02-analy\**" />
@@ -31,6 +34,7 @@
      <None Remove="Resources\**" />
      <Page Remove="02-project\01-import\01-ModelFile\**" />
      <Page Remove="03-simulation\04-scheme\01-info - 复制\**" />
      <Page Remove="03-simulation\07-matching\05-elbows\01-elbowsinglematching\**" />
      <Page Remove="03-ViewModel\**" />
      <Page Remove="04-HomePageMainPanel\**" />
      <Page Remove="04-pump\02-analy\**" />
@@ -44,8 +48,12 @@
      <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\00-core\CreateXhsSchemeDlg - 复制.cs" />
      <Compile Remove="03-simulation\04-scheme\00-core\CreateXhsSchemeDlg - 复制.Designer.cs" />
      <Compile Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage - 复制.cs" />
      <Compile Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage - 复制.Designer.cs" />
      <Compile Remove="03-simulation\04-scheme\02-change\99-change-record\CreateXhsSchemeChangeRecordPage - 复制.cs" />
      <Compile Remove="03-simulation\04-scheme\02-change\99-change-record\CreateXhsSchemeChangeRecordPage - 复制.Designer.cs" />
      <Compile Remove="03-simulation\04-scheme\99-bak\00-viewmodel\SetSchemePipeViewModel.cs" />
      <Compile Remove="03-simulation\04-scheme\99-bak\00-viewmodel\SetSchemePumpViewModel.cs" />
      <Compile Remove="03-simulation\04-scheme\99-bak\00-viewmodel\SetSchemeValveViewModel.cs" />
@@ -94,7 +102,9 @@
   <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\00-core\CreateXhsSchemeDlg - 复制.resx" />
      <EmbeddedResource Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage - 复制.resx" />
      <EmbeddedResource Remove="03-simulation\04-scheme\02-change\99-change-record\CreateXhsSchemeChangeRecordPage - 复制.resx" />
      <EmbeddedResource Remove="03-simulation\04-scheme\99-bak\01-set\01-pump\SetSchemePumpListCtrl - 复制.resx" />
      <EmbeddedResource Remove="03-simulation\04-scheme\99-bak\AddXhsSchemeDlg - 复制%282%29.resx" />
      <EmbeddedResource Remove="03-simulation\04-scheme\99-bak\AddXhsSchemeDlg - 复制%283%29.resx" />
@@ -132,6 +142,9 @@
      </Content>
      <None Include="Resources\apply_32x32.png" />
      <None Include="Resources\clear_32x32.png" />
      <None Include="Resources\home.svg" />
      <None Include="Resources\map.svg" />
      <None Include="Resources\project.svg" />
      <None Include="Resources\pump128.png" />
      <None Include="Resources\omit.svg" />
      <None Include="Resources\pipe.svg" />
@@ -166,13 +179,13 @@
   </ItemGroup>

   <ItemGroup>
      <Folder Include="03-simulation\07-matching\00-core\" />
      <Folder Include="map\gaode\css\" />
   </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="..\..\Component\HStation.ReportFile.SDK.Core\HStation.ReportFile.SDK.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" />
@@ -189,45 +202,42 @@
   </ItemGroup>

   <ItemGroup>
      <Compile Update="02-project\01-import\04-completed\XhsProjectSimulationBimfaceInfoCtrl.cs" />
      <Compile Update="02-project\01-import\04-completed\XhsProjectSimulationHydroInfoCtrl.cs" />
      <Compile Update="02-project\01-import\04-completed\01-info\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\02-change\02-valve\CreateXhsSchemeValveChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\03-pipe\CreateXhsSchemePipeChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="02-project\01-import\04-completed\02-bimface\XhsProjectResultBimfaceCtrl.cs" />
      <Compile Update="02-project\01-import\04-completed\03-hydro\XhsProjectResultHydroCtrl.cs" />
      <Compile Update="02-project\01-import\04-completed\01-info\XhsProjectResultInfoCtrl.cs" />
      <Compile Update="02-project\04-q3d\XhsProjectQ3dViewPage.cs" />
      <Compile Update="02-project\05-add\AddXhsProjectDlg.cs" />
      <Compile Update="02-project\08-view\ViewXhsProjectDlg.cs" />
      <Compile Update="02-project\06-edit\EditXhsProjectDlg.cs" />
      <Compile Update="03-simulation\04-scheme\02-change\02-valve\CreateXhsSchemeValveChangePage.cs" />
      <Compile Update="03-simulation\04-scheme\02-change\03-pipe\CreateXhsSchemePipeChangePage.cs" />
      <Compile Update="03-simulation\04-scheme\02-change\99-change-record\CreateXhsSchemeChangeRecordPage.cs" />
      <Compile Update="03-simulation\04-scheme\99-bak\01-set\03-pipe\SetSchemePipeListCtrl.cs" />
      <Compile Update="03-simulation\04-scheme\99-bak\01-set\01-pump\SetSchemePumpListCtrl.cs" />
      <Compile Update="03-simulation\04-scheme\99-bak\01-set\02-valve\SetSchemeValveListCtrl.cs" />
      <Compile Update="03-simulation\04-scheme\01-info\00-core\XhsSchemeChangeTypeCheckedListHorizCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\01-pump\CreateXhsSchemePumpChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\07-matching\09-Tank\TankChartShowDlg.cs" />
      <Compile Update="03-simulation\07-matching\09-Tank\SimulationTankSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\09-Tank\TankSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\04-scheme\01-info\00-core\XhsSchemeChangeTypeCheckedListHorizCtrl.cs" />
      <Compile Update="03-simulation\04-scheme\02-change\01-pump\CreateXhsSchemePumpChangePage.cs" />
      <Compile Update="03-simulation\07-matching\03-valve\AssetsValveSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\03-valve\AssetsValveSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\05-elbows\AssetsElbowSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\05-elbows\AssetsElbowSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\09-Tank\AssetsTankSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\09-Tank\AssetsTankSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\17-compressor\AssetsCompressorSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\17-compressor\AssetsCompressorSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\18-exchanger\AssetsExchangerSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\18-exchanger\AssetsExchangerSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\18-pressmeter\AssetsPressmeterSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\18-pressmeter\AssetsPressmeterSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\17-flowmeter\AssetsFlowmeterSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\17-flowmeter\AssetsFlowmeterSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\16-meter\AssetsMeterSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\16-sprinkler\SprinklerSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\16-sprinkler\SimulationSprinklerSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\15-Translation\TranslationSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\15-Translation\SimulationTranslationSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\13-Pressmeter\PressmeterSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\13-Pressmeter\SimulationPressmeterSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\12-Hydrant\HydrantSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\12-Hydrant\SimulationHydrantSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\11-Flowmeter\FlowmeterSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\11-Flowmeter\SimulationFlowmeterSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\10-Meter\MeterSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\10-Meter\SimulationMeterSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\14-Blunthead\BluntheadSingleMatchingForm.cs" />
      <Compile Update="03-simulation\07-matching\14-Blunthead\SimulationBluntheadSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs" />
@@ -235,20 +245,10 @@
      <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\07-matching\03-valve\01-valvesinglematching\SimulationValveSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\03-valve\01-valvesinglematching\ValveSingleMatchingCtrl.cs" />
      <Compile Update="eMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\05-elbows\01-elbowsinglematching\SimulationElbowSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\FourlinkSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\SimulationFourlinkSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\17-compressor\SimulationCompressorSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\17-compressor\CompressorChartShowDlg.cs" />
      <Compile Update="03-simulation\07-matching\17-compressor\CompressorSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\18-exchanger\ExchangerChartShowDlg.cs" />
      <Compile Update="03-simulation\07-matching\18-exchanger\ExchangerSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\18-exchanger\SimulationExchangerSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs" />
      <Compile Update="03-simulation\08-working\XhsProjectSimulationWorkingPage.cs" />
      <Compile Update="03-simulation\09-energy\SimulationMultiWorkingEnergyDlg.cs" />