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

duheng

2024-12-20 ab65b0ac21e7fabfd8548538142d9a1b66a2ad3d

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

@@ -13,6 +13,9 @@
    <Compile Update="01-home\03-property\HomeXhsProjectPropertyCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-home\04-title\XhsProjectHomeTitleCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\01-import\00-core\ImportXhsProjectDlg.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -94,23 +97,38 @@
    <Compile Update="03-simulation\04-scheme\00-core\CreateXhsSchemeDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl.cs">
    <Compile Update="03-simulation\04-scheme\01-info - 复制\00-core\XhsSchemeChangeTypeCheckedListHorizCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\04-scheme\01-add\01-set\02-valve\SetSchemeValveListCtrl.cs">
    <Compile Update="03-simulation\04-scheme\01-info - 复制\CreateXhsSchemeInfoPage - 复制.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\04-scheme\01-add\01-set\03-pipe\SetSchemePipeListCtrl.cs">
    <Compile Update="03-simulation\04-scheme\01-info - 复制\CreateXhsSchemeInfoPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\04-scheme\01-add\AddXhsSchemeDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\04-scheme\02-change\01-pump\CreateXhsSchemePumpChangePage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\04-scheme\99-bak\01-set\01-pump\SetSchemePumpListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\04-scheme\99-bak\01-set\02-valve\SetSchemeValveListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\04-scheme\99-bak\01-set\03-pipe\SetSchemePipeListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\04-scheme\99-bak\AddXhsSchemeDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\05-function\SimulationFunctionCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\EditXhsSchemeDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
@@ -160,28 +178,10 @@
    <Compile Update="03-simulation\07-matching\09-Tank\TankSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\10-Meter\MeterSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\10-Meter\SimulationMeterSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\11-Flowmeter\FlowmeterSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\11-Flowmeter\SimulationFlowmeterSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\12-Hydrant\HydrantSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\12-Hydrant\SimulationHydrantSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\13-Pressmeter\PressmeterSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\13-Pressmeter\SimulationPressmeterSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\14-Blunthead\BluntheadSingleMatchingForm.cs">
@@ -196,32 +196,29 @@
    <Compile Update="03-simulation\07-matching\15-Translation\TranslationSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\16-meter\AssetsMeterSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\16-sprinkler\SimulationSprinklerSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\16-sprinkler\SprinklerSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\17-compressor\CompressorChartShowDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\17-compressor\CompressorSingleMatchingCtrl.cs">
    <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\17-compressor\SimulationCompressorSingleMatchingDlg.cs">
    <Compile Update="03-simulation\07-matching\17-compressor\CompressorChartShowDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\18-exchanger\ExchangerChartShowDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\18-exchanger\ExchangerSingleMatchingCtrl.cs">
    <Compile Update="03-simulation\07-matching\21-cooling\AssetsCoolingSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\18-exchanger\SimulationExchangerSingleMatchingDlg.cs">
    <Compile Update="03-simulation\07-matching\21-cooling\AssetsCoolingSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\08-working\XhsProjectSimulationWorkingPage.cs">
      <SubType>UserControl</SubType>
@@ -277,6 +274,18 @@
    <Compile Update="03-simulation\11-pump\03-analy\SimulationSingleWorkingPumpAnalyDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\11-pump\04-working\SimulationPumpSingleWorkingChartCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\12-report\00-core\SimulationProjectTitleCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\12-report\02-helper\SimulationWorkingReportCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\12-report\02-helper\SimulationWorkingReportDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\12-report\test.cs">
      <SubType>UserControl</SubType>
    </Compile>