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

Shuxia Ning

2024-10-12 b94da76188b834922d2f13365b22208a4bc4049a

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

@@ -64,6 +64,15 @@
    <Content Include="map\gaode\js\xhs_base64.js">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
    <None Include="Resources\Cancel.svg" />
    <None Include="Resources\Close32.png" />
    <None Include="Resources\Folder.svg" />
    <None Include="Resources\IncomingCall.svg" />
    <None Include="Resources\MapLayers.svg" />
    <None Include="Resources\Remove.svg" />
    <None Include="Resources\Square32.png" />
    <None Include="Resources\SizeNormal32.png" />
    <None Include="Resources\SizeMin32.png" />
  </ItemGroup>

  <ItemGroup>
@@ -114,7 +123,7 @@
    <Compile Update="02-project\04-dlg\EditProjectDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\XhsProjectSimulationPumpSingleMatchingDlg.cs">
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs">
@@ -132,16 +141,16 @@
    <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">
    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\XhsProjectSimulationPumpSingleMatchingForm.cs">
    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingForm.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeLineSingMatchingDlg.cs">
    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeLineSingleMatchingForm.cs">
    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingForm.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs">
@@ -150,7 +159,7 @@
    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\XhsProjectSimulationPumpMatchingListCtrl.cs">
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingForm.cs">