lpf/xinjiang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

能源报表，代码位置调整

Browse Source
This commit is contained in:
夏菊
2026-08-17 11:05:58 +08:00
parent 11e9ff62b1
commit 10e9cef280
15 changed files with 74 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+33 -33
View File
@@ -666,10 +666,6 @@
<Content Include="Door\InOutManHours.aspx" />
<Content Include="Door\InOutList.aspx" />
<Content Include="Door\InOutRecord.aspx" />
<Content Include="EnergyReport\EnergyStatistics.aspx" />
<Content Include="EnergyReport\EnergyStatisticsEdit.aspx" />
<Content Include="EnergyReport\EnergyWaterConservation.aspx" />
<Content Include="EnergyReport\EnergyWaterConservationEdit.aspx" />
<Content Include="File\Image\label.png" />
<Content Include="File\Image\loc.png" />
<Content Include="File\Image\SEDIN_Code.jpg" />
@@ -2587,6 +2583,10 @@
<Content Include="PZHGL\ProjectData\ProjectMapView.aspx" />
<Content Include="PZHGL\ProjectData\ProjectPageData.aspx" />
<Content Include="PZHGL\ProjectData\ProjectPageDataSave.aspx" />
<Content Include="ReportManage\EnergyReport\EnergyStatistics.aspx" />
<Content Include="ReportManage\EnergyReport\EnergyStatisticsEdit.aspx" />
<Content Include="ReportManage\EnergyReport\EnergyWaterConservation.aspx" />
<Content Include="ReportManage\EnergyReport\EnergyWaterConservationEdit.aspx" />
<Content Include="ReportManage\HazardFactor\HazardFactorOccHealth.aspx" />
<Content Include="ReportManage\HazardFactor\HazardFactorOccHealthEdit.aspx" />
<Content Include="ReportManage\HazardFactor\HazardFactorOccHealthIn.aspx" />
@@ -10399,34 +10399,6 @@
<Compile Include="Door\InOutRecord.aspx.designer.cs">
<DependentUpon>InOutRecord.aspx</DependentUpon>
</Compile>
<Compile Include="EnergyReport\EnergyStatistics.aspx.cs">
<DependentUpon>EnergyStatistics.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="EnergyReport\EnergyStatistics.aspx.designer.cs">
<DependentUpon>EnergyStatistics.aspx</DependentUpon>
</Compile>
<Compile Include="EnergyReport\EnergyStatisticsEdit.aspx.cs">
<DependentUpon>EnergyStatisticsEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="EnergyReport\EnergyStatisticsEdit.aspx.designer.cs">
<DependentUpon>EnergyStatisticsEdit.aspx</DependentUpon>
</Compile>
<Compile Include="EnergyReport\EnergyWaterConservation.aspx.cs">
<DependentUpon>EnergyWaterConservation.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="EnergyReport\EnergyWaterConservation.aspx.designer.cs">
<DependentUpon>EnergyWaterConservation.aspx</DependentUpon>
</Compile>
<Compile Include="EnergyReport\EnergyWaterConservationEdit.aspx.cs">
<DependentUpon>EnergyWaterConservationEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="EnergyReport\EnergyWaterConservationEdit.aspx.designer.cs">
<DependentUpon>EnergyWaterConservationEdit.aspx</DependentUpon>
</Compile>
<Compile Include="HJGL\BaseInfo\Components.aspx.cs">
<DependentUpon>Components.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -17518,6 +17490,34 @@
<Compile Include="PZHGL\ProjectData\ProjectPageDataSave.aspx.designer.cs">
<DependentUpon>ProjectPageDataSave.aspx</DependentUpon>
</Compile>
<Compile Include="ReportManage\EnergyReport\EnergyStatistics.aspx.cs">
<DependentUpon>EnergyStatistics.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ReportManage\EnergyReport\EnergyStatistics.aspx.designer.cs">
<DependentUpon>EnergyStatistics.aspx</DependentUpon>
</Compile>
<Compile Include="ReportManage\EnergyReport\EnergyStatisticsEdit.aspx.cs">
<DependentUpon>EnergyStatisticsEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ReportManage\EnergyReport\EnergyStatisticsEdit.aspx.designer.cs">
<DependentUpon>EnergyStatisticsEdit.aspx</DependentUpon>
</Compile>
<Compile Include="ReportManage\EnergyReport\EnergyWaterConservation.aspx.cs">
<DependentUpon>EnergyWaterConservation.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ReportManage\EnergyReport\EnergyWaterConservation.aspx.designer.cs">
<DependentUpon>EnergyWaterConservation.aspx</DependentUpon>
</Compile>
<Compile Include="ReportManage\EnergyReport\EnergyWaterConservationEdit.aspx.cs">
<DependentUpon>EnergyWaterConservationEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ReportManage\EnergyReport\EnergyWaterConservationEdit.aspx.designer.cs">
<DependentUpon>EnergyWaterConservationEdit.aspx</DependentUpon>
</Compile>
<Compile Include="ReportManage\HazardFactor\HazardFactorOccHealth.aspx.cs">
<DependentUpon>HazardFactorOccHealth.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -20359,7 +20359,7 @@
<WCFMetadata Include="Service References\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
SGGL/FineUIPro.Web/EnergyReport/EnergyStatistics.aspx → SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatistics.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EnergyStatistics.aspx.cs" Inherits="FineUIPro.Web.EnergyReport.EnergyStatistics" %>
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EnergyStatistics.aspx.cs" Inherits="FineUIPro.Web.ReportManage.EnergyReport.EnergyStatistics" %>
<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
<!DOCTYPE html>
SGGL/FineUIPro.Web/EnergyReport/EnergyStatistics.aspx.cs → SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatistics.aspx.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.EnergyReport
namespace FineUIPro.Web.ReportManage.EnergyReport
{
public partial class EnergyStatistics : PageBase
{
SGGL/FineUIPro.Web/EnergyReport/EnergyStatistics.aspx.designer.cs → SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatistics.aspx.designer.cs
Generated
+1 -1
View File
@@ -7,7 +7,7 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.EnergyReport
namespace FineUIPro.Web.ReportManage.EnergyReport
{
SGGL/FineUIPro.Web/EnergyReport/EnergyStatisticsEdit.aspx → SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatisticsEdit.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EnergyStatisticsEdit.aspx.cs" Inherits="FineUIPro.Web.EnergyReport.EnergyStatisticsEdit" %>
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EnergyStatisticsEdit.aspx.cs" Inherits="FineUIPro.Web.ReportManage.EnergyReport.EnergyStatisticsEdit" %>
<!DOCTYPE html>
SGGL/FineUIPro.Web/EnergyReport/EnergyStatisticsEdit.aspx.cs → SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatisticsEdit.aspx.cs
+1 -6
View File
@@ -1,12 +1,7 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.EnergyReport
namespace FineUIPro.Web.ReportManage.EnergyReport
{
public partial class EnergyStatisticsEdit : PageBase
{
SGGL/FineUIPro.Web/EnergyReport/EnergyStatisticsEdit.aspx.designer.cs → SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatisticsEdit.aspx.designer.cs
Generated
+1 -1
View File
@@ -7,7 +7,7 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.EnergyReport
namespace FineUIPro.Web.ReportManage.EnergyReport
{
SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservation.aspx → SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservation.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EnergyWaterConservation.aspx.cs" Inherits="FineUIPro.Web.EnergyReport.EnergyWaterConservation" %>
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EnergyWaterConservation.aspx.cs" Inherits="FineUIPro.Web.ReportManage.EnergyReport.EnergyWaterConservation" %>
<!DOCTYPE html>
SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservation.aspx.cs → SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservation.aspx.cs
+1 -1
View File
@@ -10,7 +10,7 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.EnergyReport
namespace FineUIPro.Web.ReportManage.EnergyReport
{
public partial class EnergyWaterConservation : PageBase
{
SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservation.aspx.designer.cs → SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservation.aspx.designer.cs
Generated
+1 -1
View File
@@ -7,7 +7,7 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.EnergyReport
namespace FineUIPro.Web.ReportManage.EnergyReport
{
SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservationEdit.aspx → SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservationEdit.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EnergyWaterConservationEdit.aspx.cs" Inherits="FineUIPro.Web.EnergyReport.EnergyWaterConservationEdit" %>
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EnergyWaterConservationEdit.aspx.cs" Inherits="FineUIPro.Web.ReportManage.EnergyReport.EnergyWaterConservationEdit" %>
<!DOCTYPE html>
SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservationEdit.aspx.cs → SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservationEdit.aspx.cs
+1 -7
View File
@@ -1,13 +1,7 @@
using BLL;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.EnergyReport
namespace FineUIPro.Web.ReportManage.EnergyReport
{
public partial class EnergyWaterConservationEdit : PageBase
{
SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservationEdit.aspx.designer.cs → SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservationEdit.aspx.designer.cs
Generated
+1 -1
View File
@@ -7,7 +7,7 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.EnergyReport
namespace FineUIPro.Web.ReportManage.EnergyReport
{