水池单独匹配界面修改

duheng

2024-12-05 b26ae60e85d4a03a2426e6607e7afe89e1c10a5f

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

@@ -57,10 +57,30 @@
    <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 复制%284%29.Designer.cs" />
    <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 复制.cs" />
    <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 复制.Designer.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.Designer.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.Designer.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.Designer.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.Designer.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingViewModel.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.Designer.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingViewModel.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.Designer.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingViewModel.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.Designer.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingViewModel.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.Designer.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingViewModel.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.Designer.cs" />
    <Compile Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingViewModel.cs" />
    <Compile Remove="04-pump\PumpFullInfoCtrl.cs" />
    <Compile Remove="04-pump\PumpFullInfoCtrl.designer.cs" />
    <Compile Remove="04-pump\PumpFullInfoViewDlg.cs" />
@@ -77,8 +97,15 @@
    <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 复制%283%29.resx" />
    <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 复制%284%29.resx" />
    <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 复制.resx" />
    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.resx" />
    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.resx" />
    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.resx" />
    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.resx" />
    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.resx" />
    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.resx" />
    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.resx" />
    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.resx" />
    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.resx" />
    <EmbeddedResource Remove="04-pump\PumpFullInfoCtrl.resx" />
    <EmbeddedResource Remove="04-pump\PumpFullInfoViewDlg.resx" />
    <EmbeddedResource Remove="04-pump\SinglePumpInfoViewDLg.resx" />
@@ -118,6 +145,7 @@
  </ItemGroup>

  <ItemGroup>
    <Folder Include="03-simulation\06-simulation\01-matching\00-core\" />
    <Folder Include="map\gaode\css\" />
  </ItemGroup>

@@ -155,27 +183,88 @@
    <Compile Update="03-simulation\04-scheme\02-page\XhsProjectSimulationSchemePage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\09-tank\TankChartShowDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\09-tank\SimulationTankSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\09-tank\TankSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SprinklerSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SimulationSprinklerSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\15-translation\TranslationSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\15-translation\SimulationTranslationSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\13-pressmeter\PressmeterSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\13-pressmeter\SimulationPressmeterSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\12-hydrant\HydrantSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\12-hydrant\SimulationHydrantSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\11-flowmeter\FlowmeterSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\11-flowmeter\SimulationFlowmeterSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\10-meter\MeterSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\10-meter\SimulationMeterSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\14-blunthead\BluntheadSingleMatchingForm.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\14-blunthead\SimulationBluntheadSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs" />
    <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\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingForm.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingForm.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingForm.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreeLinkSingleMatchingForm.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreeLinkSingMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourLinkSingleMatchingForm.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourLinkSingMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\SimulationValveSingleMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\SimulationPipeSing;eMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\SimulationElbowSingleMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourlinkSingleMatchingCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\SimulationFourlinkSingleMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\CompressorChartShowDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\CompressorSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\SimulationCompressorSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\ExchangerChartShowDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\ExchangerSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\SimulationExchangerSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs" />
    <Compile Update="03-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs" />
    <Compile Update="03-simulation\08-working\XhsProjectSimulationWorkingPage.cs">
@@ -199,6 +288,9 @@
    <Compile Update="03-simulation\09-energy\SimulationSingleWorkingEnergyDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\11-pump\03-analy\SimulationMultiWorkingPumpAnalyDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\11-pump\03-analy\SimulationSingleWorkingPumpAnalyDlg.cs">
      <SubType>Form</SubType>
    </Compile>