From f057f1388eda8aeaea7f3e7a0451b57f32de324c Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 02 九月 2024 09:15:13 +0800
Subject: [PATCH] 界面优化
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj | 92 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 82 insertions(+), 10 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
index 1b03c1c..8cc6da4 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
@@ -8,13 +8,40 @@
</PropertyGroup>
<ItemGroup>
- <None Remove="map\gaode\html\view_project_list.html" />
+ <Compile Remove="02-project\01-import\01-ModelFile\**" />
+ <Compile Remove="03-ViewModel\**" />
+ <Compile Remove="04-HomePageMainPanel\**" />
+ <EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" />
+ <EmbeddedResource Remove="03-ViewModel\**" />
+ <EmbeddedResource Remove="04-HomePageMainPanel\**" />
+ <None Remove="02-project\01-import\01-ModelFile\**" />
+ <None Remove="03-ViewModel\**" />
+ <None Remove="04-HomePageMainPanel\**" />
+ <Page Remove="02-project\01-import\01-ModelFile\**" />
+ <Page Remove="03-ViewModel\**" />
+ <Page Remove="04-HomePageMainPanel\**" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.cs" />
+ <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.Designer.cs" />
+ <Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.cs" />
+ <Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.Designer.cs" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <EmbeddedResource Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.resx" />
+ <EmbeddedResource Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.resx" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <None Remove="map\gaode\html\ViewProjectList.html" />
<None Remove="map\gaode\img\xhs_project.png" />
<None Remove="map\gaode\js\xhs_base64.js" />
</ItemGroup>
<ItemGroup>
- <Content Include="map\gaode\html\view_project_list.html">
+ <Content Include="map\gaode\html\ViewProjectList.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="map\gaode\img\xhs_project.png">
@@ -27,35 +54,80 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
+ <PackageReference Include="Yw.ZipFile.Core" Version="3.0.0" />
</ItemGroup>
<ItemGroup>
+ <Folder Include="04-simulation\02-bimface\" />
+ <Folder Include="04-simulation\03-q3d\" />
+ <Folder Include="04-simulation\04-scheme\" />
<Folder Include="map\gaode\css\" />
+ <Folder Include="Resources\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
+ <ProjectReference Include="..\..\Hydro\HStation.Hydro.Core\HStation.Hydro.Core.csproj" />
+ <ProjectReference Include="..\HStation.WinFrmUI.Assets.Core\HStation.WinFrmUI.Assets.Core.csproj" />
+ <ProjectReference Include="..\HStation.WinFrmUI.Bimface.Core\HStation.WinFrmUI.Bimface.Core.csproj" />
<ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
+ <ProjectReference Include="..\HStation.WinFrmUI.Hydro.Core\HStation.WinFrmUI.Hydro.Core.csproj" />
<ProjectReference Include="..\Yw.WinFrmUI.Map.Core\Yw.WinFrmUI.Map.Core.csproj" />
</ItemGroup>
<ItemGroup>
- <Compile Update="AddXhsProjectDlg.cs">
+ <Compile Update="02-project\04-dlg\00-core\ImportXhsProjectFileDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="MainPanel.cs">
+ <Compile Update="02-project\04-dlg\01-FileChoice\SelectXhsProjectFileModelFileWizardPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="02-project\04-dlg\02-GeneralProject\GenerateXhsProjectFileWizardPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="02-project\04-dlg\03-ImportCompleted\ImportXhsProjectFileCompletedCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="02-project\04-dlg\04-ProjectResultShowPanel\ProjectFileResultShowPanel.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="02-project\04-dlg\EditProjectDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\ChoicePumpMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainChoicePage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainForm.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-scheme\03-hydraulic-simulation\XhsSchemeHydraulicSimulationPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-scheme\02-asset-mgr\XhsSchemeAssetMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-scheme\04-scheme-mgr\02-comparison\SelectSchemeDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-scheme\04-scheme-mgr\02-comparison\XhsSchemeComparisonPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-scheme\XhsSchemeMultiMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-scheme\XhsSchemeMultiMgrPage_Bak2.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-scheme\XhsSchemeMultiMgrPage_Bak.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
- </Compile>
- <Compile Update="XhsProjectTreeList.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="XhsProjectUserControl.cs">
- <SubType>UserControl</SubType>
</Compile>
</ItemGroup>
--
Gitblit v1.9.3