From ce9752fd657c6689ea64929eb962146e2730624e Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期五, 28 三月 2025 14:07:54 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI/PBS.WinFrmUI.csproj | 142 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 139 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI/PBS.WinFrmUI.csproj b/WinFrmUI/PBS.WinFrmUI/PBS.WinFrmUI.csproj
index 0bf25e8..1d01171 100644
--- a/WinFrmUI/PBS.WinFrmUI/PBS.WinFrmUI.csproj
+++ b/WinFrmUI/PBS.WinFrmUI/PBS.WinFrmUI.csproj
@@ -5,19 +5,23 @@
<Nullable>disable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>
- <RootNamespace>HStation.WinFrmUI.PBS</RootNamespace>
+ <RootNamespace></RootNamespace>
</PropertyGroup>
<ItemGroup>
+ <Compile Remove="01-home\01-project\**" />
<Compile Remove="03-ViewModel\**" />
<Compile Remove="04-HomePageMainPanel\**" />
<Compile Remove="Resources\**" />
+ <EmbeddedResource Remove="01-home\01-project\**" />
<EmbeddedResource Remove="03-ViewModel\**" />
<EmbeddedResource Remove="04-HomePageMainPanel\**" />
<EmbeddedResource Remove="Resources\**" />
+ <None Remove="01-home\01-project\**" />
<None Remove="03-ViewModel\**" />
<None Remove="04-HomePageMainPanel\**" />
<None Remove="Resources\**" />
+ <Page Remove="01-home\01-project\**" />
<Page Remove="03-ViewModel\**" />
<Page Remove="04-HomePageMainPanel\**" />
<Page Remove="Resources\**" />
@@ -37,9 +41,27 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
+ <PackageReference Include="Yw.BLL.Map.Core" Version="3.0.9" />
+ <PackageReference Include="Yw.WebBrower.Core" Version="3.0.2" />
+ <PackageReference Include="Yw.WebView2.WinFrmUI.Core" Version="3.0.1" />
</ItemGroup>
<ItemGroup>
+ <Compile Update="01-place\EditPlaceDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="02-facility\EditFacilityDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="02-facility\AddFacilityDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="02-facility\FacilityMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-elecPrice\ElecPriceMgr.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
@@ -55,13 +77,127 @@
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\BLL\HStation.BLL.Assets.Core\HStation.BLL.Assets.Core.csproj" />
<ProjectReference Include="..\..\BLL\PBS.BLL\PBS.BLL.csproj" />
- <ProjectReference Include="..\..\Vmo\PBS.Vmo\PBS.Vmo.csproj" />
+ <ProjectReference Include="..\..\BLL\Yw.BLL.Division.Core\Yw.BLL.Division.Core.csproj" />
+ <ProjectReference Include="..\HStation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
+ <ProjectReference Include="..\PBS.WinFrmUI.WE\PBS.WinFrmUI.WE.csproj" />
<ProjectReference Include="..\Yw.WinFrmUI.Core\Yw.WinFrmUI.Core.csproj" />
+ <ProjectReference Include="..\Yw.WinFrmUI.Map.Core\Yw.WinFrmUI.Map.Core.csproj" />
</ItemGroup>
<ItemGroup>
- <Folder Include="02-facility\" />
+ <None Update="map\gaode\css\display_menu.css">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\css\honey_switch.css">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\css\public.css">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\firehydrant_import.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\firehydrant_test.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\fixed_set.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\fixed_view.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\getPointLnglat.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\HTMLPage1.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\marker_multi_set.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\polygon_intake_set.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\polygon_intake_view.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\polygon_set.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\polygon_view.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\SetMarker.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\SetPlaceMarker.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\SetSimpleMarker.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\sketch_create.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\sketch_set.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\sketch_view.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\ViewMarker.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\html\ViewProjectList.html">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\img\current.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\img\locate.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\img\mark_b.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\img\point_red.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\img\search.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\img\touming.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\img\weizhi.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\img\xhs_project.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\js\base64.js">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\js\display_menu.js">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\js\honey_switch.js">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\js\jquery-2.1.1.min.js">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\js\public.js">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\js\tools.js">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <None Update="map\gaode\js\xhs_base64.js">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
</ItemGroup>
</Project>
--
Gitblit v1.9.3