损失统计报表输入能量统计bug修复

lixiaojun

2025-02-17 92437d69a32c79cebf0708c147c0f3c0a24f2e23

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

@@ -16,8 +16,7 @@
      <Compile Remove="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\**" />
      <Compile Remove="03-ViewModel\**" />
      <Compile Remove="04-HomePageMainPanel\**" />
      <Compile Remove="04-pump\02-analy\**" />
      <Compile Remove="04-pump\03-calc\**" />
      <Compile Remove="map\gaode\css\**" />
      <Compile Remove="Resources\**" />
      <EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" />
      <EmbeddedResource Remove="03-simulation\04-scheme\01-info - 复制\**" />
@@ -27,8 +26,7 @@
      <EmbeddedResource Remove="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\**" />
      <EmbeddedResource Remove="03-ViewModel\**" />
      <EmbeddedResource Remove="04-HomePageMainPanel\**" />
      <EmbeddedResource Remove="04-pump\02-analy\**" />
      <EmbeddedResource Remove="04-pump\03-calc\**" />
      <EmbeddedResource Remove="map\gaode\css\**" />
      <EmbeddedResource Remove="Resources\**" />
      <None Remove="02-project\01-import\01-ModelFile\**" />
      <None Remove="03-simulation\04-scheme\01-info - 复制\**" />
@@ -38,8 +36,7 @@
      <None Remove="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\**" />
      <None Remove="03-ViewModel\**" />
      <None Remove="04-HomePageMainPanel\**" />
      <None Remove="04-pump\02-analy\**" />
      <None Remove="04-pump\03-calc\**" />
      <None Remove="map\gaode\css\**" />
      <None Remove="Resources\**" />
      <Page Remove="02-project\01-import\01-ModelFile\**" />
      <Page Remove="03-simulation\04-scheme\01-info - 复制\**" />
@@ -49,8 +46,7 @@
      <Page Remove="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\**" />
      <Page Remove="03-ViewModel\**" />
      <Page Remove="04-HomePageMainPanel\**" />
      <Page Remove="04-pump\02-analy\**" />
      <Page Remove="04-pump\03-calc\**" />
      <Page Remove="map\gaode\css\**" />
      <Page Remove="Resources\**" />
   </ItemGroup>

@@ -64,8 +60,8 @@
      <Compile Remove="03-simulation\04-scheme\00-core\CreateXhsSchemeDlg - 复制.Designer.cs" />
      <Compile Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage - 复制.cs" />
      <Compile Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage - 复制.Designer.cs" />
      <Compile Remove="03-simulation\04-scheme\02-change\99-change-record\CreateXhsSchemeChangeRecordPage - 复制.cs" />
      <Compile Remove="03-simulation\04-scheme\02-change\99-change-record\CreateXhsSchemeChangeRecordPage - 复制.Designer.cs" />
      <Compile Remove="03-simulation\04-scheme\05-record\CreateXhsSchemeChangeRecordPage - 复制.cs" />
      <Compile Remove="03-simulation\04-scheme\05-record\CreateXhsSchemeChangeRecordPage - 复制.Designer.cs" />
      <Compile Remove="03-simulation\07-matching\00-core\XhsProjectSimulationMatchingListCtrl.cs" />
      <Compile Remove="03-simulation\07-matching\00-core\XhsProjectSimulationMatchingListCtrl.Designer.cs" />
      <Compile Remove="03-simulation\07-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.cs" />
@@ -90,12 +86,6 @@
      <Compile Remove="03-simulation\07-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs" />
      <Compile Remove="03-simulation\07-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.Designer.cs" />
      <Compile Remove="03-simulation\07-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingViewModel.cs" />
      <Compile Remove="04-pump\PumpFullInfoCtrl.cs" />
      <Compile Remove="04-pump\PumpFullInfoCtrl.designer.cs" />
      <Compile Remove="04-pump\PumpFullInfoViewDlg.cs" />
      <Compile Remove="04-pump\PumpFullInfoViewDlg.Designer.cs" />
      <Compile Remove="04-pump\SinglePumpInfoViewDLg.cs" />
      <Compile Remove="04-pump\SinglePumpInfoViewDLg.Designer.cs" />
   </ItemGroup>

   <ItemGroup>
@@ -103,7 +93,7 @@
      <EmbeddedResource Remove="02-project\03-mgr\XhsProjectMgrPage - 复制.resx" />
      <EmbeddedResource Remove="03-simulation\04-scheme\00-core\CreateXhsSchemeDlg - 复制.resx" />
      <EmbeddedResource Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage - 复制.resx" />
      <EmbeddedResource Remove="03-simulation\04-scheme\02-change\99-change-record\CreateXhsSchemeChangeRecordPage - 复制.resx" />
      <EmbeddedResource Remove="03-simulation\04-scheme\05-record\CreateXhsSchemeChangeRecordPage - 复制.resx" />
      <EmbeddedResource Remove="03-simulation\07-matching\00-core\XhsProjectSimulationMatchingListCtrl.resx" />
      <EmbeddedResource Remove="03-simulation\07-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.resx" />
      <EmbeddedResource Remove="03-simulation\07-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.resx" />
@@ -113,9 +103,6 @@
      <EmbeddedResource Remove="03-simulation\07-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.resx" />
      <EmbeddedResource Remove="03-simulation\07-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.resx" />
      <EmbeddedResource Remove="03-simulation\07-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.resx" />
      <EmbeddedResource Remove="04-pump\PumpFullInfoCtrl.resx" />
      <EmbeddedResource Remove="04-pump\PumpFullInfoViewDlg.resx" />
      <EmbeddedResource Remove="04-pump\SinglePumpInfoViewDLg.resx" />
   </ItemGroup>

   <ItemGroup>
@@ -173,10 +160,6 @@
   </ItemGroup>

   <ItemGroup>
      <Folder Include="map\gaode\css\" />
   </ItemGroup>

   <ItemGroup>
      <ProjectReference Include="..\..\BLL\HStation.BLL.TransferFile.Core\HStation.BLL.TransferFile.Core.csproj" />
      <ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
      <ProjectReference Include="..\..\Component\HStation.ReportFile.SDK.Core\HStation.ReportFile.SDK.Core.csproj" />
@@ -203,11 +186,120 @@
      <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\04-scheme\02-change\02-valve\CreateXhsSchemeValveChangePage.cs" />
      <Compile Update="03-simulation\04-scheme\02-change\03-pipe\CreateXhsSchemePipeChangePage.cs" />
      <Compile Update="03-simulation\04-scheme\02-change\99-change-record\CreateXhsSchemeChangeRecordPage.cs" />
      <Compile Update="03-simulation\04-scheme\02-change\00-core\CreateXhsSchemeBimfaceCtrl.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\02-change\01-pump\XhsSchemePumpChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\02-valve\CreateXhsSchemeValveChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\02-valve\XhsSchemeValveChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\18-compressor\CreateXhsSchemeCompressorChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\18-compressor\XhsSchemeCompressorChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\17-exchanger\CreateXhsSchemeExchangerChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\17-exchanger\XhsSchemeExchangerChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\16-translation\CreateXhsSchemeTranslationChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\16-translation\XhsSchemeTranslationChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\03-pipe\CreateXhsSchemePipeChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\03-pipe\XhsSchemePipeChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\04-blunthead\CreateXhsSchemeBluntheadChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\04-blunthead\XhsSchemeBluntheadChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\15-nozzle\CreateXhsSchemeNozzleChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\15-nozzle\XhsSchemeNozzleChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\14-hydrant\CreateXhsSchemeHydrantChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\14-hydrant\XhsSchemeHydrantChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\13-cooling\CreateXhsSchemeCoolingChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\13-cooling\XhsSchemeCoolingChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\12-waterbox\CreateXhsSchemeWaterboxChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\12-waterbox\XhsSchemeWaterboxChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\11-tank\CreateXhsSchemeTankChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\11-tank\XhsSchemeTankChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\10-pressmeter\CreateXhsSchemePressmeterChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\10-pressmeter\XhsSchemePressmeterChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\09-flowmeter\CreateXhsSchemeFlowmeterChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\09-flowmeter\XhsSchemeFlowmeterChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\08-meter\CreateXhsSchemeMeterChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\08-meter\XhsSchemeMeterChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\07-elbow\CreateXhsSchemeElbowChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\07-elbow\XhsSchemeElbowChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\06-fourlink\CreateXhsSchemeFourlinkChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\06-fourlink\XhsSchemeFourlinkChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\05-threelink\CreateXhsSchemeThreelinkChangePage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\02-change\05-threelink\XhsSchemeThreelinkChangeListCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\04-generate\CreateXhsSchemeGeneralWizardPage.cs" />
      <Compile Update="03-simulation\04-scheme\05-record\CreateXhsSchemeChangeRecordPage.cs" />
      <Compile Update="03-simulation\04-scheme\01-info\00-core\XhsSchemeChangeTypeCheckedListHorizCtrl.cs" />
      <Compile Update="03-simulation\04-scheme\02-change\01-pump\CreateXhsSchemePumpChangePage.cs" />
      <Compile Update="03-simulation\07-matching\03-valve\AssetsValveSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\03-valve\AssetsValveSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\04-pipe\AssetsPipeSingleMatchingCtrl.cs">
@@ -279,6 +371,12 @@
      <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\13-print\report\SimulationCommonReportDlg.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" />