修复可能报错

lixiaojun

2024-12-10 8d7b513f8546ed1f48fe9f4586cf5b2ea2794a3e

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

@@ -9,28 +9,24 @@

   <ItemGroup>
      <Compile Remove="02-project\01-import\01-ModelFile\**" />
      <Compile Remove="02-project\01-import\04-completed\**" />
      <Compile Remove="03-ViewModel\**" />
      <Compile Remove="04-HomePageMainPanel\**" />
      <Compile Remove="04-pump\02-analy\**" />
      <Compile Remove="04-pump\03-calc\**" />
      <Compile Remove="Resources\**" />
      <EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" />
      <EmbeddedResource Remove="02-project\01-import\04-completed\**" />
      <EmbeddedResource Remove="03-ViewModel\**" />
      <EmbeddedResource Remove="04-HomePageMainPanel\**" />
      <EmbeddedResource Remove="04-pump\02-analy\**" />
      <EmbeddedResource Remove="04-pump\03-calc\**" />
      <EmbeddedResource Remove="Resources\**" />
      <None Remove="02-project\01-import\01-ModelFile\**" />
      <None Remove="02-project\01-import\04-completed\**" />
      <None Remove="03-ViewModel\**" />
      <None Remove="04-HomePageMainPanel\**" />
      <None Remove="04-pump\02-analy\**" />
      <None Remove="04-pump\03-calc\**" />
      <None Remove="Resources\**" />
      <Page Remove="02-project\01-import\01-ModelFile\**" />
      <Page Remove="02-project\01-import\04-completed\**" />
      <Page Remove="03-ViewModel\**" />
      <Page Remove="04-HomePageMainPanel\**" />
      <Page Remove="04-pump\02-analy\**" />
@@ -57,32 +53,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\04-scheme\01-info\CreateXhsSchemeInfoPage.cs" />
      <Compile Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage.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="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" />
      <Compile Remove="03-simulation\07-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.Designer.cs" />
      <Compile Remove="03-simulation\07-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.cs" />
      <Compile Remove="03-simulation\07-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.Designer.cs" />
      <Compile Remove="03-simulation\07-matching\02-pump\XhsPumpMatchingListCtrl.cs" />
      <Compile Remove="03-simulation\07-matching\02-pump\XhsPumpMatchingListCtrl.Designer.cs" />
      <Compile Remove="03-simulation\07-matching\02-pump\XhsPumpMatchingViewModel.cs" />
      <Compile Remove="03-simulation\07-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs" />
      <Compile Remove="03-simulation\07-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.Designer.cs" />
      <Compile Remove="03-simulation\07-matching\03-valve\XhsProjectSimulationValveMatchingViewModel.cs" />
      <Compile Remove="03-simulation\07-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs" />
      <Compile Remove="03-simulation\07-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.Designer.cs" />
      <Compile Remove="03-simulation\07-matching\04-pipe\XhsProjectSimulationPipeMatchingViewModel.cs" />
      <Compile Remove="03-simulation\07-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.cs" />
      <Compile Remove="03-simulation\07-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.Designer.cs" />
      <Compile Remove="03-simulation\07-matching\05-elbows\XhsProjectSimulationElbowsMatchingViewModel.cs" />
      <Compile Remove="03-simulation\07-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs" />
      <Compile Remove="03-simulation\07-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.Designer.cs" />
      <Compile Remove="03-simulation\07-matching\06-threelink\XhsProjectSimulationThreelinkMatchingViewModel.cs" />
      <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" />
@@ -99,16 +93,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\04-scheme\01-info\CreateXhsSchemeInfoPage.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="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" />
      <EmbeddedResource Remove="03-simulation\07-matching\02-pump\XhsPumpMatchingListCtrl.resx" />
      <EmbeddedResource Remove="03-simulation\07-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.resx" />
      <EmbeddedResource Remove="03-simulation\07-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.resx" />
      <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" />
@@ -149,8 +142,7 @@
   </ItemGroup>

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

@@ -168,14 +160,14 @@

   <ItemGroup>
     <Reference Include="Aspose.Words">
       <HintPath>..\..\Desktop\HStation.Desktop.Xhs.Core\bin\Debug\net6.0-windows\Aspose.Words.dll</HintPath>
       <HintPath>00-core\Aspose.Words.dll</HintPath>
     </Reference>
   </ItemGroup>

   <ItemGroup>
      <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationBimfaceInfoCtrl.cs" />
      <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationHydroInfoCtrl.cs" />
      <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationProjectInfoCtrl.cs" />
      <Compile Update="02-project\01-import\04-completed\XhsProjectSimulationBimfaceInfoCtrl.cs" />
      <Compile Update="02-project\01-import\04-completed\XhsProjectSimulationHydroInfoCtrl.cs" />
      <Compile Update="02-project\01-import\04-completed\01-info\XhsProjectSimulationProjectInfoCtrl.cs" />
      <Compile Update="02-project\04-dlg\00-core\ImportXhsProjectFileDlg.cs" />
      <Compile Update="02-project\04-dlg\01-FileChoice\SelectXhsProjectFileModelFileWizardPage.cs" />
      <Compile Update="02-project\04-dlg\02-GeneralProject\GenerateXhsProjectFileWizardPage.cs" />
@@ -185,44 +177,46 @@
      <Compile Update="03-simulation\04-scheme\01-add\01-set\03-pipe\SetSchemePipeListCtrl.cs" />
      <Compile Update="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl.cs" />
      <Compile Update="03-simulation\04-scheme\01-add\01-set\02-valve\SetSchemeValveListCtrl.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\09-tank\TankChartShowDlg.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\09-tank\SimulationTankSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\09-tank\TankSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SprinklerSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SimulationSprinklerSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\15-translation\TranslationSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\15-translation\SimulationTranslationSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\13-pressmeter\PressmeterSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\13-pressmeter\SimulationPressmeterSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\12-hydrant\HydrantSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\12-hydrant\SimulationHydrantSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\11-flowmeter\FlowmeterSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\11-flowmeter\SimulationFlowmeterSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\10-meter\MeterSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\10-meter\SimulationMeterSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\14-blunthead\BluntheadSingleMatchingForm.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\14-blunthead\SimulationBluntheadSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\04-scheme\01-info\00-core\XhsSchemeChangeTypeCheckedListHorizCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\07-matching\09-Tank\TankChartShowDlg.cs" />
      <Compile Update="03-simulation\07-matching\09-Tank\SimulationTankSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\09-Tank\TankSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\16-sprinkler\SprinklerSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\16-sprinkler\SimulationSprinklerSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\15-Translation\TranslationSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\15-Translation\SimulationTranslationSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\13-Pressmeter\PressmeterSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\13-Pressmeter\SimulationPressmeterSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\12-Hydrant\HydrantSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\12-Hydrant\SimulationHydrantSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\11-Flowmeter\FlowmeterSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\11-Flowmeter\SimulationFlowmeterSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\10-Meter\MeterSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\10-Meter\SimulationMeterSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\14-Blunthead\BluntheadSingleMatchingForm.cs" />
      <Compile Update="03-simulation\07-matching\14-Blunthead\SimulationBluntheadSingleMatchingDlg.cs" />
      <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\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\SimulationCompressorSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\CompressorChartShowDlg.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\CompressorSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\ExchangerChartShowDlg.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\ExchangerSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\SimulationExchangerSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\03-valve\01-valvesinglematching\SimulationValveSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\03-valve\01-valvesinglematching\ValveSingleMatchingCtrl.cs" />
      <Compile Update="eMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\05-elbows\01-elbowsinglematching\SimulationElbowSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\FourlinkSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\SimulationFourlinkSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\17-compressor\SimulationCompressorSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\17-compressor\CompressorChartShowDlg.cs" />
      <Compile Update="03-simulation\07-matching\17-compressor\CompressorSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\18-exchanger\ExchangerChartShowDlg.cs" />
      <Compile Update="03-simulation\07-matching\18-exchanger\ExchangerSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\18-exchanger\SimulationExchangerSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs" />
      <Compile Update="03-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs" />
      <Compile Update="03-simulation\08-working\XhsProjectSimulationWorkingPage.cs" />
      <Compile Update="03-simulation\09-energy\SimulationMultiWorkingEnergyDlg.cs" />
      <Compile Update="03-simulation\10-analy\SimulationMultiWorkingAnalyDlg.cs" />