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
DataBase/版本日志/SGGLDB_V2026-08-12-bwj.sql
+5 -5
View File
@@ -1,4 +1,9 @@
update Sys_Menu set Url='ReportManage/EnergyReport/EnergyWaterConservation.aspx' where MenuId='CCA0E136-9AC7-4A14-BC1F-20758A99E88E'
update Sys_Menu set Url='ReportManage/EnergyReport/EnergyWaterConservation.aspx' where MenuId='D4541B37-7876-40D8-A48B-AEF8FCDAEE9F'
update Sys_Menu set Url='ReportManage/EnergyReport/EnergyStatistics.aspx' where MenuId='0BB29D06-E286-45C0-BC6A-3DDF8A21D1B2'
update Sys_Menu set Url='ReportManage/EnergyReport/EnergyStatistics.aspx' where MenuId='C97C6A48-8FF1-4E74-BF9A-E89C0422AB67'
go
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('49DE1534-20FF-44B0-846F-FF057E836DEC','得分扣分记录流水日志','Score/ScoreFlowLog.aspx',30,'416F0A73-FB3D-4AAC-BC76-3820F52382D9','Menu_S_HSSE',1,1,1)
go
@@ -46,11 +51,6 @@ LEFT JOIN Sys_Const AS const ON const.ConstValue = workPost.PostType and const.G
LEFT JOIN Base_Project as project on project.ProjectId = testRecord.ProjectId
GO
update Sys_Menu set Url='EnergyReport/EnergyWaterConservation.aspx' where MenuId='CCA0E136-9AC7-4A14-BC1F-20758A99E88E'
update Sys_Menu set Url='EnergyReport/EnergyWaterConservation.aspx' where MenuId='D4541B37-7876-40D8-A48B-AEF8FCDAEE9F'
update Sys_Menu set Url='EnergyReport/EnergyStatistics.aspx' where MenuId='0BB29D06-E286-45C0-BC6A-3DDF8A21D1B2'
update Sys_Menu set Url='EnergyReport/EnergyStatistics.aspx' where MenuId='C97C6A48-8FF1-4E74-BF9A-E89C0422AB67'
go
insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
values('C6655551-21D8-4E1E-B6C9-27D4A9FF9F71','CCA0E136-9AC7-4A14-BC1F-20758A99E88E','增加',1)
insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
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
{
SGGL/Model/Model.cs
+24 -24
View File
@@ -155980,9 +155980,9 @@ namespace Model
private string _ProjectId;
private System.Nullable<int> _EnergySavingIndex;
private System.Nullable<decimal> _EnergySavingIndex;
private System.Nullable<int> _WaterSavingIndex;
private System.Nullable<decimal> _WaterSavingIndex;
private string _EnergySavingSchemes;
@@ -155994,13 +155994,13 @@ namespace Model
private string _SupportingDocuments;
private System.Nullable<int> _ActualEnergySaving;
private System.Nullable<decimal> _ActualEnergySaving;
private System.Nullable<int> _ActualWaterSaving;
private System.Nullable<decimal> _ActualWaterSaving;
private System.Nullable<int> _EnergySavingCompletionRate;
private System.Nullable<decimal> _EnergySavingCompletionRate;
private System.Nullable<int> _WaterSavingCompletionRate;
private System.Nullable<decimal> _WaterSavingCompletionRate;
private string _CompileMan;
@@ -156020,9 +156020,9 @@ namespace Model
partial void OnEnergyWaterConservationIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnEnergySavingIndexChanging(System.Nullable<int> value);
partial void OnEnergySavingIndexChanging(System.Nullable<decimal> value);
partial void OnEnergySavingIndexChanged();
partial void OnWaterSavingIndexChanging(System.Nullable<int> value);
partial void OnWaterSavingIndexChanging(System.Nullable<decimal> value);
partial void OnWaterSavingIndexChanged();
partial void OnEnergySavingSchemesChanging(string value);
partial void OnEnergySavingSchemesChanged();
@@ -156034,13 +156034,13 @@ namespace Model
partial void OnSummaryChanged();
partial void OnSupportingDocumentsChanging(string value);
partial void OnSupportingDocumentsChanged();
partial void OnActualEnergySavingChanging(System.Nullable<int> value);
partial void OnActualEnergySavingChanging(System.Nullable<decimal> value);
partial void OnActualEnergySavingChanged();
partial void OnActualWaterSavingChanging(System.Nullable<int> value);
partial void OnActualWaterSavingChanging(System.Nullable<decimal> value);
partial void OnActualWaterSavingChanged();
partial void OnEnergySavingCompletionRateChanging(System.Nullable<int> value);
partial void OnEnergySavingCompletionRateChanging(System.Nullable<decimal> value);
partial void OnEnergySavingCompletionRateChanged();
partial void OnWaterSavingCompletionRateChanging(System.Nullable<int> value);
partial void OnWaterSavingCompletionRateChanging(System.Nullable<decimal> value);
partial void OnWaterSavingCompletionRateChanged();
partial void OnCompileManChanging(string value);
partial void OnCompileManChanged();
@@ -156101,8 +156101,8 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnergySavingIndex", DbType="Int")]
public System.Nullable<int> EnergySavingIndex
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnergySavingIndex", DbType="Decimal(18,2)")]
public System.Nullable<decimal> EnergySavingIndex
{
get
{
@@ -156121,8 +156121,8 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WaterSavingIndex", DbType="Int")]
public System.Nullable<int> WaterSavingIndex
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WaterSavingIndex", DbType="Decimal(18,2)")]
public System.Nullable<decimal> WaterSavingIndex
{
get
{
@@ -156241,8 +156241,8 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualEnergySaving", DbType="Int")]
public System.Nullable<int> ActualEnergySaving
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualEnergySaving", DbType="Decimal(18,2)")]
public System.Nullable<decimal> ActualEnergySaving
{
get
{
@@ -156261,8 +156261,8 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualWaterSaving", DbType="Int")]
public System.Nullable<int> ActualWaterSaving
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualWaterSaving", DbType="Decimal(18,2)")]
public System.Nullable<decimal> ActualWaterSaving
{
get
{
@@ -156281,8 +156281,8 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnergySavingCompletionRate", DbType="Int")]
public System.Nullable<int> EnergySavingCompletionRate
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnergySavingCompletionRate", DbType="Decimal(18,2)")]
public System.Nullable<decimal> EnergySavingCompletionRate
{
get
{
@@ -156301,8 +156301,8 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WaterSavingCompletionRate", DbType="Int")]
public System.Nullable<int> WaterSavingCompletionRate
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WaterSavingCompletionRate", DbType="Decimal(18,2)")]
public System.Nullable<decimal> WaterSavingCompletionRate
{
get
{