冲突缺少文件补充

duheng

2024-09-23 651d1f87d2e0e26021c20f3667e1db7b1349b478

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

@@ -27,11 +27,18 @@
    <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-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainChoicePage.cs" />
    <Compile Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainChoicePage.Designer.cs" />
    <Compile Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainForm-bak.cs" />
    <Compile Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainForm-bak.Designer.cs" />
    <Compile Remove="04-simulation\06-simulation\01-autoMatching\01-ViewModel\AdaptingViewModel.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-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainChoicePage.resx" />
    <EmbeddedResource Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainForm-bak.resx" />
  </ItemGroup>

  <ItemGroup>
@@ -58,6 +65,7 @@
  </ItemGroup>

  <ItemGroup>
    <Folder Include="04-simulation\02-bimface\" />
    <Folder Include="map\gaode\css\" />
    <Folder Include="Resources\" />
  </ItemGroup>
@@ -70,6 +78,7 @@
    <ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
    <ProjectReference Include="..\HStation.WinFrmUI.Hydro.Core\HStation.WinFrmUI.Hydro.Core.csproj" />
    <ProjectReference Include="..\Yw.WinFrmUI.Map.Core\Yw.WinFrmUI.Map.Core.csproj" />
    <ProjectReference Include="..\Yw.WinFrmUI.Phart.Core\Yw.WinFrmUI.Phart.Core.csproj" />
  </ItemGroup>

  <ItemGroup>
@@ -94,12 +103,6 @@
    <Compile Update="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\ChoicePumpMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainChoicePage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainForm.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-scheme\03-hydraulic-simulation\XhsSchemeHydraulicSimulationPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
@@ -121,6 +124,63 @@
    <Compile Update="03-scheme\XhsSchemeMultiMgrPage_Bak.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\01-info\XhsProjectSimulationBimfaceInfoCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\01-info\XhsProjectSimulationInfoPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\01-autoMatching\02-AsstesFormCtrl\PipeLineMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\01-autoMatching\02-AsstesFormCtrl\ValveMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\01-autoMatching\02-AsstesFormCtrl\PumpMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\01-autoMatching\02-AsstesFormCtrl\ThreeLinkMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\01-autoMatching\02-AsstesFormCtrl\FourLinkMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\04-unmatching\00-core\XhsProjectSimulationUnMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\04-unmatching\02-valve\XhsProjectSimulationValveUnMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\04-unmatching\03-pipe\XhsProjectSimulationPipeUnMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\04-unmatching\06-fourlink\XhsProjectSimulationFourlinkUnMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\04-unmatching\05-threelink\XhsProjectSimulationThreelinkUnMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\04-unmatching\04-elbow\XhsProjectSimulationElbowUnMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\XhsProjectSimulationCorePage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\03-calcu\XhsProjectSimulationHydroCalcuFailedDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="Properties\Resources.Designer.cs">
      <DesignTime>True</DesignTime>
      <AutoGen>True</AutoGen>