From ef716332fef142a02843b5a99e8e3e92ab165738 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 24 十二月 2024 11:35:24 +0800
Subject: [PATCH] 修改单独匹配界面线程问题
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj | 141 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 116 insertions(+), 25 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
index 3d0902a..a72fe39 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
@@ -13,33 +13,61 @@
<Compile Remove="03-valve\02-main---bak\**" />
<Compile Remove="03-valve\04-chart-edit\**" />
<Compile Remove="03-valve\05-import\**" />
+ <Compile Remove="05-elbow\01-series\**" />
+ <Compile Remove="05-elbow\02-main\**" />
+ <Compile Remove="05-elbow\03-factor\**" />
<Compile Remove="10-equipment\**" />
<Compile Remove="11-compressor\04-chart-edit\**" />
<Compile Remove="11-compressor\05-import\**" />
+ <Compile Remove="14-tank\01-series-bak\**" />
+ <Compile Remove="14-tank\02-main-bak\**" />
+ <Compile Remove="14-tank\04-chart-edit\**" />
+ <Compile Remove="14-tank\05-import\**" />
<EmbeddedResource Remove="02-UICore\**" />
<EmbeddedResource Remove="03-valve\01-series-----bak\**" />
<EmbeddedResource Remove="03-valve\02-main---bak\**" />
<EmbeddedResource Remove="03-valve\04-chart-edit\**" />
<EmbeddedResource Remove="03-valve\05-import\**" />
+ <EmbeddedResource Remove="05-elbow\01-series\**" />
+ <EmbeddedResource Remove="05-elbow\02-main\**" />
+ <EmbeddedResource Remove="05-elbow\03-factor\**" />
<EmbeddedResource Remove="10-equipment\**" />
<EmbeddedResource Remove="11-compressor\04-chart-edit\**" />
<EmbeddedResource Remove="11-compressor\05-import\**" />
+ <EmbeddedResource Remove="14-tank\01-series-bak\**" />
+ <EmbeddedResource Remove="14-tank\02-main-bak\**" />
+ <EmbeddedResource Remove="14-tank\04-chart-edit\**" />
+ <EmbeddedResource Remove="14-tank\05-import\**" />
<None Remove="02-UICore\**" />
<None Remove="03-valve\01-series-----bak\**" />
<None Remove="03-valve\02-main---bak\**" />
<None Remove="03-valve\04-chart-edit\**" />
<None Remove="03-valve\05-import\**" />
+ <None Remove="05-elbow\01-series\**" />
+ <None Remove="05-elbow\02-main\**" />
+ <None Remove="05-elbow\03-factor\**" />
<None Remove="10-equipment\**" />
<None Remove="11-compressor\04-chart-edit\**" />
<None Remove="11-compressor\05-import\**" />
+ <None Remove="14-tank\01-series-bak\**" />
+ <None Remove="14-tank\02-main-bak\**" />
+ <None Remove="14-tank\04-chart-edit\**" />
+ <None Remove="14-tank\05-import\**" />
<Page Remove="02-UICore\**" />
<Page Remove="03-valve\01-series-----bak\**" />
<Page Remove="03-valve\02-main---bak\**" />
<Page Remove="03-valve\04-chart-edit\**" />
<Page Remove="03-valve\05-import\**" />
+ <Page Remove="05-elbow\01-series\**" />
+ <Page Remove="05-elbow\02-main\**" />
+ <Page Remove="05-elbow\03-factor\**" />
<Page Remove="10-equipment\**" />
<Page Remove="11-compressor\04-chart-edit\**" />
<Page Remove="11-compressor\05-import\**" />
+ <Page Remove="14-tank\01-series-bak\**" />
+ <Page Remove="14-tank\02-main-bak\**" />
+ <Page Remove="14-tank\04-chart-edit\**" />
+ <Page Remove="14-tank\05-import\**" />
</ItemGroup>
<ItemGroup>
@@ -54,6 +82,8 @@
<Compile Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.cs" />
<Compile Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.Designer.cs" />
<Compile Remove="12-package\02-main\01-EditPumpPartProp\PropGroupChoiceViewModel.cs" />
+ <Compile Remove="14-tank\TankManageMainPage.cs" />
+ <Compile Remove="14-tank\TankManageMainPage.Designer.cs" />
<Compile Remove="20-exchanger\ExchangerManageMainPage.cs" />
<Compile Remove="20-exchanger\ExchangerManageMainPage.Designer.cs" />
</ItemGroup>
@@ -64,6 +94,7 @@
<EmbeddedResource Remove="03-valve\SetValveCoefficientDlg.resx" />
<EmbeddedResource Remove="03-valve\ValveManageMainPage.resx" />
<EmbeddedResource Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.resx" />
+ <EmbeddedResource Remove="14-tank\TankManageMainPage.resx" />
<EmbeddedResource Remove="20-exchanger\ExchangerManageMainPage.resx" />
</ItemGroup>
@@ -85,16 +116,22 @@
</ItemGroup>
<ItemGroup>
- <Compile Update="01-pump\07-PumpChart\01-import\01-excel\ImportPumpPerform2dByExcelCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
<Compile Update="01-pump\07-PumpChart\01-import\01-excel\ImportPumpPerform2dByExcelDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="01-pump\07-PumpChart\01-import\02-image\ImportPumpPerform2dByImageDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="01-pump\07-PumpChart\02-Eidt\EditAssetsExchangerCurveQLDlg.cs">
+ <Compile Update="01-pump\07-PumpChart\02-Eidt\EditAssetsPumpPerform2dDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\07-PumpChart\02-Eidt\SetImportanceDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\07-PumpChart\02-Eidt\SetOtherNameDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\07-PumpChart\AssetsPumpCurveQLViewDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="02-adapting\EditAdaptingMainDlg.cs" />
@@ -108,13 +145,22 @@
<Compile Update="01-pump\04-PumpMain\AddPumpProductMainDlg.cs" />
<Compile Update="01-pump\05-PumpSeries\EditPumpProductSeriesDlg.cs" />
<Compile Update="02-adapting\AdaptingManageMainPage.cs" />
+ <Compile Update="03-valve\04-curve\AssetsValveCurveMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-valve\04-curve\AssetsValveCurveViewDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-valve\04-curve\EditAssetsValveCurveDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-valve\04-curve\ImportAssetsValveCurveByExcelDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-valve\04-curve\ImportAssetsValveCurveByPictureDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="04-pipe\03-coefficient\SetPipeLineCoefficientDlg.cs" />
- <Compile Update="05-elbow\02-main\AddAssetsElbowMainDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="05-elbow\02-main\EditAssetsElbowMainDlg.cs">
- <SubType>Form</SubType>
- </Compile>
<Compile Update="05-elbow\03-coefficient\SetElbowCoefficientDlg.cs" />
<Compile Update="06-threeLink\01-series\AddAssetsThreelinkSeriesDlg.cs" />
<Compile Update="06-threeLink\01-series\EditAssetsThreelinkSeriesDlg.cs" />
@@ -127,9 +173,9 @@
</Compile>
<Compile Update="06-threeLink\03-coefficient\SetThreelinkCoefficientDlg.cs" />
<Compile Update="06-threeLink\ThreeLinkManageMainPage.cs" />
- <Compile Update="05-elbow\01-series\AddAssetsElbowSeriesDlg.cs" />
- <Compile Update="05-elbow\01-series\EditAssetsElbowSeriesDlg.cs" />
- <Compile Update="05-elbow\01-series\ElbowTreeListCtrl.cs" />
+ <Compile Update="05-elbow\01-series-bak\AddAssetsElbowSeriesDlg.cs" />
+ <Compile Update="05-elbow\01-series-bak\EditAssetsElbowSeriesDlg.cs" />
+ <Compile Update="05-elbow\01-series-bak\ElbowTreeListCtrl.cs" />
<Compile Update="05-elbow\ElbowManageMainPage.cs" />
<Compile Update="04-pipe\01-series\AddPipeLineSeriesDlg.cs" />
<Compile Update="04-pipe\01-series\EditPipeLineSeriesDlg.cs" />
@@ -157,11 +203,60 @@
<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" />
- <Compile Update="14-tank\05-import\01-excel\ImportTankPerform2dByExcelCtrl.cs" />
- <Compile Update="14-tank\05-import\01-excel\ImportTankPerform2dByExcelDlg.cs" />
+ <Compile Update="14-tank\01-series\AddAssetsTankSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\01-series\AssetsTankSeriesMgrTreeCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="14-tank\01-series\EditAssetsTankSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\01-series\ViewAssetsTankSeriesDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\02-main\AddAssetsTankMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\02-main\AssetsTankMainMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="14-tank\02-main\EditAssetsTankMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\02-main\ViewAssetsTankMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\03-factor\AddAssetsTankFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\03-factor\AssetsTankFactorMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="14-tank\03-factor\EditAssetsTankFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\03-factor\ViewAssetsTankFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\04-curveVol\AssetsTankCurveVOLMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="14-tank\04-curveVol\AssetsTankCurveVOLViewDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\04-curveVol\EditAssetsTankCurveVOLDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\04-curveVol\ImportAssetsTankCurveVOLByExcelDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\04-curveVol\ImportAssetsTankCurveVOLByPictureDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="14-tank\AssetsTankMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="15-meter\01-series\AddAssetsMeterSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
@@ -293,13 +388,6 @@
<Compile Update="17-hydrant\02-main\EditAssetsHydrantMainDlg.cs" />
<Compile Update="17-hydrant\03-coefficient\SetHydrantCoefficientDlg.cs" />
<Compile Update="17-hydrant\HydrantManageMainPage.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" />
- <Compile Update="14-tank\02-main\AddAssetsTankMainDlg.cs" />
- <Compile Update="14-tank\02-main\EditAssetsTankMainDlg.cs" />
- <Compile Update="14-tank\03-coefficient\SetTankCoefficientDlg.cs" />
- <Compile Update="14-tank\TankManageMainPage.cs" />
<Compile Update="13-blunthead\01-series\AddAssetsBluntheadSeriesDlg.cs" />
<Compile Update="13-blunthead\01-series\EditAssetsBluntheadSeriesDlg.cs" />
<Compile Update="13-blunthead\01-series\BluntheadTreeListCtrl.cs" />
@@ -382,6 +470,9 @@
<Compile Update="20-exchanger\03-factor\ViewAssetsCoolingFactorDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="20-exchanger\04-curveql\AssetsExchangerCurveQLViewDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="20-exchanger\04-curveql\ImportAssetsExchangerCurveQLByPictureDlg.cs">
<SubType>Form</SubType>
</Compile>
--
Gitblit v1.9.3