--成套设备曲线增加 --用水当量逻辑改变

duheng

2025-04-02 af5eeb8797d88e142410a9e82e84291355e7c336

 WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj

@@ -36,6 +36,7 @@
    <Compile Remove="13-blunthead\03-coefficient\**" />
    <Compile Remove="14-tank\01-series-bak\**" />
    <Compile Remove="14-tank\02-main-bak\**" />
    <Compile Remove="14-tank\03-factor\**" />
    <Compile Remove="14-tank\04-chart-edit\**" />
    <Compile Remove="14-tank\05-import\**" />
    <Compile Remove="17-hydrant\01-series-bak\**" />
@@ -72,6 +73,7 @@
    <EmbeddedResource Remove="13-blunthead\03-coefficient\**" />
    <EmbeddedResource Remove="14-tank\01-series-bak\**" />
    <EmbeddedResource Remove="14-tank\02-main-bak\**" />
    <EmbeddedResource Remove="14-tank\03-factor\**" />
    <EmbeddedResource Remove="14-tank\04-chart-edit\**" />
    <EmbeddedResource Remove="14-tank\05-import\**" />
    <EmbeddedResource Remove="17-hydrant\01-series-bak\**" />
@@ -108,6 +110,7 @@
    <None Remove="13-blunthead\03-coefficient\**" />
    <None Remove="14-tank\01-series-bak\**" />
    <None Remove="14-tank\02-main-bak\**" />
    <None Remove="14-tank\03-factor\**" />
    <None Remove="14-tank\04-chart-edit\**" />
    <None Remove="14-tank\05-import\**" />
    <None Remove="17-hydrant\01-series-bak\**" />
@@ -144,6 +147,7 @@
    <Page Remove="13-blunthead\03-coefficient\**" />
    <Page Remove="14-tank\01-series-bak\**" />
    <Page Remove="14-tank\02-main-bak\**" />
    <Page Remove="14-tank\03-factor\**" />
    <Page Remove="14-tank\04-chart-edit\**" />
    <Page Remove="14-tank\05-import\**" />
    <Page Remove="17-hydrant\01-series-bak\**" />
@@ -215,13 +219,13 @@
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
    <PackageReference Include="Yw.BLL.Assets.Core" Version="3.0.1" />
    <PackageReference Include="Yw.BLL.Phart.Core" Version="3.0.5" />
    <PackageReference Include="Yw.BLL.Phart.Core" Version="3.0.6" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\BLL\HStation.BLL.Assets.Core\HStation.BLL.Assets.Core.csproj" />
    <ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
    <ProjectReference Include="..\..\Dto\HStation.Dto.Assets.Core\HStation.Dto.Assets.Core.csproj" />
    <ProjectReference Include="..\HStation.WinFrmUI.Auth.Core\HStation.WinFrmUI.Auth.Core.csproj" />
    <ProjectReference Include="..\HStation.WinFrmUI.Basic.Core\HStation.WinFrmUI.Basic.Core.csproj" />
    <ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
    <ProjectReference Include="..\HStation.WinFrmUI.Dict.Core\HStation.WinFrmUI.Dict.Core.csproj" />
@@ -234,6 +238,7 @@
    <Compile Update="01-pump\07-PumpChart\02-Eidt\EditAssetsPumpPerform2dDlg.cs" />
    <Compile Update="01-pump\07-PumpChart\02-Eidt\SetImportanceDlg.cs" />
    <Compile Update="01-pump\07-PumpChart\02-Eidt\SetOtherNameDlg.cs" />
    <Compile Update="01-pump\07-PumpChart\03-excelHelper\ImportPumpExcel.cs" />
    <Compile Update="01-pump\07-PumpChart\AssetsPumpCurveQLViewDlg.cs" />
    <Compile Update="02-adapting\EditAdaptingMainDlg.cs" />
    <Compile Update="02-adapting\AddAdaptingMainDlg.cs" />
@@ -251,91 +256,36 @@
    <Compile Update="03-valve\04-curve\EditAssetsValveCurveDlg.cs" />
    <Compile Update="03-valve\04-curve\ImportAssetsValveCurveByExcelDlg.cs" />
    <Compile Update="03-valve\04-curve\ImportAssetsValveCurveByPictureDlg.cs" />
    <Compile Update="04-pipe\01-series\AddAssetsPipeSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-pipe\01-series\AssetsPipeSeriesMgrTreeCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-pipe\01-series\EditAssetsPipeSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-pipe\01-series\ViewAssetsPipeSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-pipe\02-main\AddAssetsPipeMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-pipe\02-main\AssetsPipeMainMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-pipe\02-main\EditAssetsPipeMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-pipe\02-main\ViewAssetsPipeMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-pipe\03-factor\AddAssetsPipeFactorDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-pipe\03-factor\AssetsPipeFactorMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-pipe\03-factor\EditAssetsPipeFactorDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-pipe\03-factor\ViewAssetsPipeFactorDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-pipe\AssetsPipeMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-valve\05-excelHelper\ImportValveExcel.cs" />
    <Compile Update="04-pipe\01-series\AddAssetsPipeSeriesDlg.cs" />
    <Compile Update="04-pipe\01-series\AssetsPipeSeriesMgrTreeCtrl.cs" />
    <Compile Update="04-pipe\01-series\EditAssetsPipeSeriesDlg.cs" />
    <Compile Update="04-pipe\01-series\ViewAssetsPipeSeriesDlg.cs" />
    <Compile Update="04-pipe\02-main\AddAssetsPipeMainDlg.cs" />
    <Compile Update="04-pipe\02-main\AssetsPipeMainMgrPage.cs" />
    <Compile Update="04-pipe\02-main\EditAssetsPipeMainDlg.cs" />
    <Compile Update="04-pipe\02-main\ViewAssetsPipeMainDlg.cs" />
    <Compile Update="04-pipe\03-factor\AddAssetsPipeFactorDlg.cs" />
    <Compile Update="04-pipe\03-factor\AssetsPipeFactorMgrPage.cs" />
    <Compile Update="04-pipe\03-factor\EditAssetsPipeFactorDlg.cs" />
    <Compile Update="04-pipe\03-factor\ViewAssetsPipeFactorDlg.cs" />
    <Compile Update="04-pipe\AssetsPipeMgrPage.cs" />
    <Compile Update="05-elbow\AssetsElbowMgrPage.cs" />
    <Compile Update="04-pipe\02-main\EditAssetsPipeMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-pipe\02-main\AddAssetsPipeMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourlink\01-series\AddAssetsFourlinkSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourlink\01-series\AssetsFourlinkSeriesMgrTreeCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="07-fourlink\01-series\EditAssetsFourlinkSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourlink\01-series\ViewAssetsFourlinkSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourlink\02-main\AddAssetsFourlinkMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourlink\02-main\AssetsFourlinkMainMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="07-fourlink\02-main\EditAssetsFourlinkMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourlink\02-main\ViewAssetsFourlinkMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourlink\03-factor\AddAssetsFourlinkFactorDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourlink\03-factor\AssetsFourlinkFactorMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="07-fourlink\03-factor\EditAssetsFourlinkFactorDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourlink\03-factor\ViewAssetsFourlinkFactorDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourlink\AssetsFourlinkMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-pipe\02-main\EditAssetsPipeMainDlg.cs" />
    <Compile Update="04-pipe\02-main\AddAssetsPipeMainDlg.cs" />
    <Compile Update="07-fourlink\01-series\AddAssetsFourlinkSeriesDlg.cs" />
    <Compile Update="07-fourlink\01-series\AssetsFourlinkSeriesMgrTreeCtrl.cs" />
    <Compile Update="07-fourlink\01-series\EditAssetsFourlinkSeriesDlg.cs" />
    <Compile Update="07-fourlink\01-series\ViewAssetsFourlinkSeriesDlg.cs" />
    <Compile Update="07-fourlink\02-main\AddAssetsFourlinkMainDlg.cs" />
    <Compile Update="07-fourlink\02-main\AssetsFourlinkMainMgrPage.cs" />
    <Compile Update="07-fourlink\02-main\EditAssetsFourlinkMainDlg.cs" />
    <Compile Update="07-fourlink\02-main\ViewAssetsFourlinkMainDlg.cs" />
    <Compile Update="07-fourlink\03-factor\AddAssetsFourlinkFactorDlg.cs" />
    <Compile Update="07-fourlink\03-factor\AssetsFourlinkFactorMgrPage.cs" />
    <Compile Update="07-fourlink\03-factor\EditAssetsFourlinkFactorDlg.cs" />
    <Compile Update="07-fourlink\03-factor\ViewAssetsFourlinkFactorDlg.cs" />
    <Compile Update="07-fourlink\AssetsFourlinkMgrPage.cs" />
    <Compile Update="10-exchanger\04-chart-edit\ExchangerMainPhartMinorLossPanel.cs" />
    <Compile Update="10-exchanger\04-chart-edit\ExchangerPerform2dEditChart.cs" />
    <Compile Update="10-exchanger\04-chart-edit\ExchangerPerform2dEditCtrl.cs" />
@@ -351,12 +301,8 @@
    <Compile Update="11-compressor\06-prop\ExchangerProductListBox.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="13-blunthead\02-main\AssetsBluntheadMainMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="13-blunthead\AssetsBluntheadMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="13-blunthead\02-main\AssetsBluntheadMainMgrPage.cs" />
    <Compile Update="13-blunthead\AssetsBluntheadMgrPage.cs" />
    <Compile Update="14-tank\01-series\AddAssetsTankSeriesDlg.cs" />
    <Compile Update="14-tank\01-series\AssetsTankSeriesMgrTreeCtrl.cs" />
    <Compile Update="14-tank\01-series\EditAssetsTankSeriesDlg.cs" />
@@ -365,15 +311,11 @@
    <Compile Update="14-tank\02-main\AssetsTankMainMgrPage.cs" />
    <Compile Update="14-tank\02-main\EditAssetsTankMainDlg.cs" />
    <Compile Update="14-tank\02-main\ViewAssetsTankMainDlg.cs" />
    <Compile Update="14-tank\03-factor\AddAssetsTankFactorDlg.cs" />
    <Compile Update="14-tank\03-factor\AssetsTankFactorMgrPage.cs" />
    <Compile Update="14-tank\03-factor\EditAssetsTankFactorDlg.cs" />
    <Compile Update="14-tank\03-factor\ViewAssetsTankFactorDlg.cs" />
    <Compile Update="14-tank\04-curveVol\AssetsTankCurveVOLMgrPage.cs" />
    <Compile Update="14-tank\04-curveVol\AssetsTankCurveVOLViewDlg.cs" />
    <Compile Update="14-tank\04-curveVol\EditAssetsTankCurveVOLDlg.cs" />
    <Compile Update="14-tank\04-curveVol\ImportAssetsTankCurveVOLByExcelDlg.cs" />
    <Compile Update="14-tank\04-curveVol\ImportAssetsTankCurveVOLByPictureDlg.cs" />
    <Compile Update="14-tank\03-curveVol\AssetsTankCurveVOLMgrPage.cs" />
    <Compile Update="14-tank\03-curveVol\AssetsTankCurveVOLViewDlg.cs" />
    <Compile Update="14-tank\03-curveVol\EditAssetsTankCurveVOLDlg.cs" />
    <Compile Update="14-tank\03-curveVol\ImportAssetsTankCurveVOLByExcelDlg.cs" />
    <Compile Update="14-tank\03-curveVol\ImportAssetsTankCurveVOLByPictureDlg.cs" />
    <Compile Update="14-tank\AssetsTankMgrPage.cs" />
    <Compile Update="15-meter\01-series\AddAssetsMeterSeriesDlg.cs" />
    <Compile Update="15-meter\01-series\AssetsMeterSeriesMgrTreeCtrl.cs" />
@@ -427,12 +369,8 @@
    <Compile Update="10-exchanger\06-prop\ExchangerProductListBox.cs" />
    <Compile Update="10-exchanger\02-main\AddExchangerMainDlg.cs" />
    <Compile Update="10-exchanger\02-main\EditExchangerMainDlg.cs" />
    <Compile Update="07-fourlink\02-main\AddAssetsFourlinkMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourlink\02-main\EditAssetsFourlinkMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourlink\02-main\AddAssetsFourlinkMainDlg.cs" />
    <Compile Update="07-fourlink\02-main\EditAssetsFourlinkMainDlg.cs" />
    <Compile Update="08-nozzle\02-main\AddAssetsNozzleMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -448,6 +386,7 @@
    <Compile Update="12-package\EditPackagePartPropDlg.cs" />
    <Compile Update="12-package\PackageManageMainPage.cs" />
    <Compile Update="12-package\PackageProductListBox.cs" />
    <Compile Update="19-translation\04-excelHelper\ImportTranslationExcel.cs" />
    <Compile Update="20-exchanger\01-series\AddAssetsExchangerSeriesDlg.cs" />
    <Compile Update="20-exchanger\01-series\AssetsExchangerSeriesMgrTreeCtrl.cs" />
    <Compile Update="20-exchanger\01-series\EditAssetsExchangerSeriesDlg.cs" />