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

duheng

2024-10-11 491e01c98198306bd9d70dea34fe0f8b97bb3fc7

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

@@ -9,17 +9,25 @@

  <ItemGroup>
    <Compile Remove="02-project\01-import\01-ModelFile\**" />
    <Compile Remove="02-project\01-import\04-completed\**" />
    <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-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-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-ViewModel\**" />
    <Page Remove="04-HomePageMainPanel\**" />
    <Page Remove="Resources\**" />
  </ItemGroup>

  <ItemGroup>
@@ -65,7 +73,6 @@

  <ItemGroup>
    <Folder Include="map\gaode\css\" />
    <Folder Include="Resources\" />
  </ItemGroup>

  <ItemGroup>
@@ -80,6 +87,15 @@
  </ItemGroup>

  <ItemGroup>
    <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationBimfaceInfoCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationHydroInfoCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationProjectInfoCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\04-dlg\00-core\ImportXhsProjectFileDlg.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -116,6 +132,18 @@
    <Compile Update="03-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\XhsProjectSimulationPumpSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\XhsProjectSimulationPumpSingleMatchingForm.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeLineSingMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeLineSingleMatchingForm.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
@@ -125,12 +153,33 @@
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\XhsProjectSimulationPumpMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingForm.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreeLinkSingleMatchingForm.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreeLinkSingMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-threelinksinglematching\FourLinkSingleMatchingForm.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-threelinksinglematching\FourLinkSingMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\02-check\XhsProjectSimulationHydroCheckResultCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\04-unmatching\00-core\XhsProjectSimulationUnMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>