冲突

Shuxia Ning

2024-12-11 f02df8852f3adbebd6c50a6c0077065ca18ccd84

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

@@ -116,12 +116,21 @@
    <Compile Update="10-exchanger\04-chart-edit\ExchangerPerform2dEditDlg.cs" />
    <Compile Update="10-exchanger\05-import\01-excel\ImportExchangerPerform2dByExcelCtrl.cs" />
    <Compile Update="10-exchanger\05-import\01-excel\ImportTankPerform2dByExcelDlg.cs" />
    <Compile Update="10-exchanger\06-prop\EditPackagePartPropDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="11-compressor\04-chart-edit\CompressorMainPhartMinorLossPanel.cs" />
    <Compile Update="11-compressor\04-chart-edit\CompressorPerform2dEditChart.cs" />
    <Compile Update="11-compressor\04-chart-edit\CompressorPerform2dEditCtrl.cs" />
    <Compile Update="11-compressor\04-chart-edit\CompressorPerform2dEditDlg.cs" />
    <Compile Update="11-compressor\05-import\01-excel\ImportCompressorPerform2dByExcelCtrl.cs" />
    <Compile Update="11-compressor\05-import\01-excel\ImportTankPerform2dByExcelDlg.cs" />
    <Compile Update="11-compressor\06-prop\EditPackagePartPropDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="11-compressor\06-prop\ExchangerProductListBox.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="14-tank\04-chart-edit\TankPerform2dEditCtrl.cs" />
    <Compile Update="14-tank\04-chart-edit\TankPerform2dEditDlg.cs" />
    <Compile Update="14-tank\04-chart-edit\TankMainPhartMinorLossPanel.cs" />
@@ -134,34 +143,34 @@
    <Compile Update="19-translation\02-main\EditAssetsTranslationMainDlg.cs" />
    <Compile Update="19-translation\03-coefficient\SetTranslationCoefficientDlg.cs" />
    <Compile Update="19-translation\TranslationManageMainPage.cs" />
    <Compile Update="18-pressmeter\01-series\AddAssetsBluntheadSeriesDlg.cs" />
    <Compile Update="18-pressmeter\01-series\BluntheadTreeListCtrl.cs" />
    <Compile Update="18-pressmeter\01-series\EditAssetsBluntheadSeriesDlg.cs" />
    <Compile Update="18-pressmeter\02-main\AddAssetsSprinklerMainDlg.cs" />
    <Compile Update="18-pressmeter\02-main\EditAssetsBluntheadMainDlg.cs" />
    <Compile Update="18-pressmeter\03-coefficient\SetBluntheadCoefficientDlg.cs" />
    <Compile Update="18-pressmeter\BluntheadManageMainPage.cs" />
    <Compile Update="17-hydrant\01-series\AddAssetsBluntheadSeriesDlg.cs" />
    <Compile Update="17-hydrant\01-series\BluntheadTreeListCtrl.cs" />
    <Compile Update="17-hydrant\01-series\EditAssetsBluntheadSeriesDlg.cs" />
    <Compile Update="17-hydrant\02-main\AddAssetsSprinklerMainDlg.cs" />
    <Compile Update="17-hydrant\02-main\EditAssetsBluntheadMainDlg.cs" />
    <Compile Update="17-hydrant\03-coefficient\SetBluntheadCoefficientDlg.cs" />
    <Compile Update="17-hydrant\BluntheadManageMainPage.cs" />
    <Compile Update="16-flowmeter\01-series\AddAssetsBluntheadSeriesDlg.cs" />
    <Compile Update="16-flowmeter\01-series\BluntheadTreeListCtrl.cs" />
    <Compile Update="16-flowmeter\01-series\EditAssetsBluntheadSeriesDlg.cs" />
    <Compile Update="16-flowmeter\02-main\AddAssetsSprinklerMainDlg.cs" />
    <Compile Update="16-flowmeter\02-main\EditAssetsBluntheadMainDlg.cs" />
    <Compile Update="16-flowmeter\03-coefficient\SetBluntheadCoefficientDlg.cs" />
    <Compile Update="16-flowmeter\BluntheadManageMainPage.cs" />
    <Compile Update="15-meter\01-series\AddAssetsBluntheadSeriesDlg.cs" />
    <Compile Update="15-meter\01-series\BluntheadTreeListCtrl.cs" />
    <Compile Update="15-meter\01-series\EditAssetsBluntheadSeriesDlg.cs" />
    <Compile Update="15-meter\02-main\AddAssetsSprinklerMainDlg.cs" />
    <Compile Update="15-meter\02-main\EditAssetsBluntheadMainDlg.cs" />
    <Compile Update="15-meter\03-coefficient\SetBluntheadCoefficientDlg.cs" />
    <Compile Update="15-meter\BluntheadManageMainPage.cs" />
    <Compile Update="18-pressmeter\01-series\AddAssetsPressmeterSeriesDlg.cs" />
    <Compile Update="18-pressmeter\01-series\PressmeterTreeListCtrl.cs" />
    <Compile Update="18-pressmeter\01-series\EditAssetsPressmeterSeriesDlg.cs" />
    <Compile Update="18-pressmeter\02-main\AddAssetsPressmeterMainDlg.cs" />
    <Compile Update="18-pressmeter\02-main\EditAssetsPressmeterMainDlg.cs" />
    <Compile Update="18-pressmeter\03-coefficient\SetPressmeterCoefficientDlg.cs" />
    <Compile Update="18-pressmeter\PressmeterManageMainPage.cs" />
    <Compile Update="17-hydrant\01-series\AddAssetsHydrantSeriesDlg.cs" />
    <Compile Update="17-hydrant\01-series\HydrantTreeListCtrl.cs" />
    <Compile Update="17-hydrant\01-series\EditAssetsHydrantSeriesDlg.cs" />
    <Compile Update="17-hydrant\02-main\AddAssetsHydrantMainDlg.cs" />
    <Compile Update="17-hydrant\02-main\EditAssetsHydrantMainDlg.cs" />
    <Compile Update="17-hydrant\03-coefficient\SetHydrantCoefficientDlg.cs" />
    <Compile Update="17-hydrant\HydrantManageMainPage.cs" />
    <Compile Update="16-flowmeter\01-series\AddAssetsFlowmeterSeriesDlg.cs" />
    <Compile Update="16-flowmeter\01-series\FlowmeterTreeListCtrl.cs" />
    <Compile Update="16-flowmeter\01-series\EditAssetsFlowmeterSeriesDlg.cs" />
    <Compile Update="16-flowmeter\02-main\AddAssetsFlowmeterMainDlg.cs" />
    <Compile Update="16-flowmeter\02-main\EditAssetsFlowmeterMainDlg.cs" />
    <Compile Update="16-flowmeter\03-coefficient\SetFlowmeterCoefficientDlg.cs" />
    <Compile Update="16-flowmeter\FlowmeterManageMainPage.cs" />
    <Compile Update="15-meter\01-series\AddAssetsMeterSeriesDlg.cs" />
    <Compile Update="15-meter\01-series\MeterTreeListCtrl.cs" />
    <Compile Update="15-meter\01-series\EditAssetsMeterSeriesDlg.cs" />
    <Compile Update="15-meter\02-main\AddAssetsMeterMainDlg.cs" />
    <Compile Update="15-meter\02-main\EditAssetsMeterMainDlg.cs" />
    <Compile Update="15-meter\03-coefficient\SetMeterCoefficientDlg.cs" />
    <Compile Update="15-meter\MeterManageMainPage.cs" />
    <Compile Update="14-tank\01-series\AddAssetsTankSeriesDlg.cs" />
    <Compile Update="14-tank\01-series\TankTreeListCtrl.cs" />
    <Compile Update="14-tank\01-series\EditAssetsTankSeriesDlg.cs" />
@@ -181,16 +190,13 @@
    <Compile Update="11-compressor\01-series\AddAssetsCompressorSeriesDlg.cs" />
    <Compile Update="11-compressor\01-series\EditAssetsExchangerSeriesDlg.cs" />
    <Compile Update="11-compressor\01-series\CompressorTreeListCtrl.cs" />
    <Compile Update="11-compressor\02-main\01-EditPumpPartProp\EditExchangerPartPropDlg.cs" />
    <Compile Update="11-compressor\02-main\01-EditPumpPartProp\ExchangerProductListBox.cs" />
    <Compile Update="11-compressor\02-main\AddExchangerMainDlg.cs" />
    <Compile Update="11-compressor\02-main\EditExchangerMainDlg.cs" />
    <Compile Update="11-compressor\ExchangerManageMainPage.cs" />
    <Compile Update="11-compressor\CompressorManageMainPage.cs" />
    <Compile Update="10-exchanger\01-series\AddAssetsExchangerSeriesDlg.cs" />
    <Compile Update="10-exchanger\01-series\EditAssetsExchangerSeriesDlg.cs" />
    <Compile Update="10-exchanger\01-series\ExchangerTreeListCtrl.cs" />
    <Compile Update="10-exchanger\02-main\01-EditExchangePartProp\EditExchangerPartPropDlg.cs" />
    <Compile Update="10-exchanger\02-main\01-EditExchangePartProp\ExchangerProductListBox.cs" />
    <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">