冲突

Shuxia Ning

2024-11-27 175472475dadbd80e9c23e043ab6cdce36082d6a

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

@@ -10,43 +10,80 @@
  <ItemGroup>
    <Compile Remove="02-project\01-import\01-ModelFile\**" />
    <Compile Remove="02-project\01-import\04-completed\**" />
    <Compile Remove="03-simulation\06-simulation\03-calcu\00-core\**" />
    <Compile Remove="03-simulation\06-simulation\03-calcu\01-failed\**" />
    <Compile Remove="03-ViewModel\**" />
    <Compile Remove="04-HomePageMainPanel\**" />
    <Compile Remove="Resources\**" />
    <EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" />
    <EmbeddedResource Remove="02-project\01-import\04-completed\**" />
    <EmbeddedResource Remove="03-simulation\06-simulation\03-calcu\00-core\**" />
    <EmbeddedResource Remove="03-simulation\06-simulation\03-calcu\01-failed\**" />
    <EmbeddedResource Remove="03-ViewModel\**" />
    <EmbeddedResource Remove="04-HomePageMainPanel\**" />
    <EmbeddedResource Remove="Resources\**" />
    <None Remove="02-project\01-import\01-ModelFile\**" />
    <None Remove="02-project\01-import\04-completed\**" />
    <None Remove="03-simulation\06-simulation\03-calcu\00-core\**" />
    <None Remove="03-simulation\06-simulation\03-calcu\01-failed\**" />
    <None Remove="03-ViewModel\**" />
    <None Remove="04-HomePageMainPanel\**" />
    <None Remove="Resources\**" />
    <Page Remove="02-project\01-import\01-ModelFile\**" />
    <Page Remove="02-project\01-import\04-completed\**" />
    <Page Remove="03-simulation\06-simulation\03-calcu\00-core\**" />
    <Page Remove="03-simulation\06-simulation\03-calcu\01-failed\**" />
    <Page Remove="03-ViewModel\**" />
    <Page Remove="04-HomePageMainPanel\**" />
    <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\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\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixCtrl - 复制.cs" />
    <Compile Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixCtrl - 复制.Designer.cs" />
    <Compile Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixDlg2.cs" />
    <Compile Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixDlg2.Designer.cs" />
    <Compile Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixViewModel.cs" />
    <Compile Remove="04-pump\02-analy\SinglePumpSectPointViewModel.cs" />
    <Compile Remove="04-pump\03-calc\SinglePumpCalcCtrl - 复制.cs" />
    <Compile Remove="04-pump\03-calc\SinglePumpCalcCtrl - 复制.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\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\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixCtrl - 复制.resx" />
    <EmbeddedResource Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixDlg2.resx" />
    <EmbeddedResource Remove="04-pump\03-calc\SinglePumpCalcCtrl - 复制.resx" />
  </ItemGroup>

  <ItemGroup>
@@ -89,6 +126,7 @@
  </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" />
@@ -109,6 +147,18 @@
    <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\XhsProjectSimulationSchemeMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingDlg.cs" />
    <Compile Update="03-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs" />
    <Compile Update="03-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs" />
@@ -127,11 +177,10 @@
    <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreeLinkSingleMatchingForm.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreeLinkSingMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-threelinksinglematching\FourLinkSingleMatchingForm.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-threelinksinglematching\FourLinkSingMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourLinkSingleMatchingForm.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourLinkSingMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\02-check\XhsProjectSimulationHydroCheckResultCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\03-calcu\02-prefix\02-valve\XhsProjectSimulationValveCalcuPrefixCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\04-unmatching\00-core\XhsProjectSimulationUnMatchingListCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\04-unmatching\02-valve\XhsProjectSimulationValveUnMatchingListCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\04-unmatching\03-pipe\XhsProjectSimulationPipeUnMatchingListCtrl.cs" />
@@ -139,8 +188,16 @@
    <Compile Update="03-simulation\06-simulation\04-unmatching\05-threelink\XhsProjectSimulationThreelinkUnMatchingListCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\04-unmatching\04-elbow\XhsProjectSimulationElbowUnMatchingListCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs" />
    <Compile Update="03-simulation\06-simulation\03-calcu\01-failed\XhsProjectSimulationCalcuFailedDlg.cs" />
    <Compile Update="03-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs" />
    <Compile Update="03-simulation\08-working\XhsProjectSimulationWorkingPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-pump\03-calc\SinglePumpCalcCtrl.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\09-energy\01-single\SimulationSingleWorkingEnergyDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="Properties\Resources.Designer.cs">
      <DesignTime>True</DesignTime>
      <AutoGen>True</AutoGen>