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

lixiaojun

10 天以前 3c8e996db701f2744af261e876455754ad182b62

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

@@ -155,6 +155,7 @@

   <ItemGroup>
      <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
      <PackageReference Include="Yw.Epanet.Calcu.Core" Version="1.1.3" />
      <PackageReference Include="Yw.SkiaSharp.Core" Version="3.0.0" />
      <PackageReference Include="Yw.ZipFile.Core" Version="3.0.2" />
   </ItemGroup>
@@ -182,10 +183,12 @@
      <Compile Update="02-project\01-import\04-completed\02-bimface\XhsProjectResultBimfaceCtrl.cs" />
      <Compile Update="02-project\01-import\04-completed\03-hydro\XhsProjectResultHydroCtrl.cs" />
      <Compile Update="02-project\01-import\04-completed\01-info\XhsProjectResultInfoCtrl.cs" />
      <Compile Update="02-project\04-q3d\XhsProjectQ3dViewPage.cs" />
      <Compile Update="02-project\05-add\AddXhsProjectDlg.cs" />
      <Compile Update="02-project\08-view\ViewXhsProjectDlg.cs" />
      <Compile Update="02-project\06-edit\EditXhsProjectDlg.cs" />
      <Compile Update="03-simulation\03-q3d\XhsProjectSimulationL3d2Ctrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\00-core\CreateXhsSchemeBimfaceCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
@@ -370,21 +373,27 @@
      <Compile Update="03-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs" />
      <Compile Update="03-simulation\01-info\XhsProjectSimulationBimfaceInfoCtrl.cs" />
      <Compile Update="03-simulation\01-info\XhsProjectSimulationInfoPage.cs" />
      <Compile Update="03-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs" />
      <Compile Update="03-simulation\11-pump\05-edit\SimulationPumpCurveEditDlg.cs">
        <SubType>Form</SubType>
      </Compile>
      <Compile Update="03-simulation\09-energy-analy\SimulationEnergyAnalyCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\09-energy-analy\SimulationEnergyAnalyDlg.cs">
        <SubType>Form</SubType>
      </Compile>
      <Compile Update="03-simulation\09-energy-analy\SimulationEnergyAnalyWorkingDlg.cs">
        <SubType>Form</SubType>
      </Compile>
      <Compile Update="eMatchingDlg.cs" />
      <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs" />
      <Compile Update="03-simulation\09-energy\SimulationMultiWorkingEnergyDlg.cs" />
      <Compile Update="03-simulation\10-analy\SimulationMultiWorkingAnalyDlg.cs" />
      <Compile Update="03-simulation\10-analy\SimulationSingleWorkingAnalyDlg.cs" />
      <Compile Update="03-simulation\10-multi-analy\SimulationMultiAnalyWorkingDlg.cs" />
      <Compile Update="03-simulation\10-multi-analy\SimulationMultiAnalyDlg.cs" />
      <Compile Update="03-simulation\11-pump\01-parallel\SimulationPumpParallelDlg.cs" />
      <Compile Update="03-simulation\11-pump\02-feat\SimulationSinglePumpFeatDlg.cs" />
      <Compile Update="03-simulation\11-pump\02-feat\SimulationPumpFeatDlg.cs" />
      <Compile Update="03-simulation\09-energy\SimulationSingleWorkingEnergyDlg.cs" />
      <Compile Update="03-simulation\11-pump\03-analy\SimulationMultiWorkingPumpAnalyDlg.cs" />
      <Compile Update="03-simulation\11-pump\03-analy\SimulationSingleWorkingPumpAnalyDlg.cs" />
      <Compile Update="03-simulation\10-pump-analy\SimulationPumpAnalyWorkingDlg.cs" />
      <Compile Update="03-simulation\10-pump-analy\SimulationPumpAnalyDlg.cs" />
      <Compile Update="Properties\Resources.Designer.cs">
         <DesignTime>True</DesignTime>
         <AutoGen>True</AutoGen>
@@ -398,4 +407,8 @@
         <LastGenOutput>Resources.Designer.cs</LastGenOutput>
      </EmbeddedResource>
   </ItemGroup>

   <ItemGroup>
     <Folder Include="03-simulation\11-pump\03-analy\" />
   </ItemGroup>
</Project>