冲突

Shuxia Ning

2024-11-27 175472475dadbd80e9c23e043ab6cdce36082d6a

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

@@ -44,6 +44,11 @@
    <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" />
@@ -62,11 +67,14 @@
    <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" />
@@ -75,6 +83,7 @@
    <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>
@@ -147,6 +156,9 @@
    <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" />
@@ -165,8 +177,8 @@
    <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\04-unmatching\00-core\XhsProjectSimulationUnMatchingListCtrl.cs" />
@@ -177,6 +189,15 @@
    <Compile Update="03-simulation\06-simulation\04-unmatching\04-elbow\XhsProjectSimulationElbowUnMatchingListCtrl.cs" />
    <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="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>