diff --git a/DataBase/版本日志/SGGLDB_V2026-08-12-bwj.sql b/DataBase/版本日志/SGGLDB_V2026-08-12-bwj.sql index cb9cf128..de853ecd 100644 --- a/DataBase/版本日志/SGGLDB_V2026-08-12-bwj.sql +++ b/DataBase/版本日志/SGGLDB_V2026-08-12-bwj.sql @@ -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) diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 645dd009..9006e02b 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -666,10 +666,6 @@ - - - - @@ -2587,6 +2583,10 @@ + + + + @@ -10399,34 +10399,6 @@ InOutRecord.aspx - - EnergyStatistics.aspx - ASPXCodeBehind - - - EnergyStatistics.aspx - - - EnergyStatisticsEdit.aspx - ASPXCodeBehind - - - EnergyStatisticsEdit.aspx - - - EnergyWaterConservation.aspx - ASPXCodeBehind - - - EnergyWaterConservation.aspx - - - EnergyWaterConservationEdit.aspx - ASPXCodeBehind - - - EnergyWaterConservationEdit.aspx - Components.aspx ASPXCodeBehind @@ -17518,6 +17490,34 @@ ProjectPageDataSave.aspx + + EnergyStatistics.aspx + ASPXCodeBehind + + + EnergyStatistics.aspx + + + EnergyStatisticsEdit.aspx + ASPXCodeBehind + + + EnergyStatisticsEdit.aspx + + + EnergyWaterConservation.aspx + ASPXCodeBehind + + + EnergyWaterConservation.aspx + + + EnergyWaterConservationEdit.aspx + ASPXCodeBehind + + + EnergyWaterConservationEdit.aspx + HazardFactorOccHealth.aspx ASPXCodeBehind @@ -20359,7 +20359,7 @@ - + diff --git a/SGGL/FineUIPro.Web/EnergyReport/EnergyStatistics.aspx b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatistics.aspx similarity index 99% rename from SGGL/FineUIPro.Web/EnergyReport/EnergyStatistics.aspx rename to SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatistics.aspx index a4932667..1cacaf4a 100644 --- a/SGGL/FineUIPro.Web/EnergyReport/EnergyStatistics.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatistics.aspx @@ -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" %> diff --git a/SGGL/FineUIPro.Web/EnergyReport/EnergyStatistics.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatistics.aspx.cs similarity index 99% rename from SGGL/FineUIPro.Web/EnergyReport/EnergyStatistics.aspx.cs rename to SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatistics.aspx.cs index 32e7f1b2..1f523695 100644 --- a/SGGL/FineUIPro.Web/EnergyReport/EnergyStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatistics.aspx.cs @@ -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 { diff --git a/SGGL/FineUIPro.Web/EnergyReport/EnergyStatistics.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatistics.aspx.designer.cs similarity index 99% rename from SGGL/FineUIPro.Web/EnergyReport/EnergyStatistics.aspx.designer.cs rename to SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatistics.aspx.designer.cs index 05289470..4cca75f3 100644 --- a/SGGL/FineUIPro.Web/EnergyReport/EnergyStatistics.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatistics.aspx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.EnergyReport +namespace FineUIPro.Web.ReportManage.EnergyReport { diff --git a/SGGL/FineUIPro.Web/EnergyReport/EnergyStatisticsEdit.aspx b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatisticsEdit.aspx similarity index 97% rename from SGGL/FineUIPro.Web/EnergyReport/EnergyStatisticsEdit.aspx rename to SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatisticsEdit.aspx index 0eb184cc..b44d9759 100644 --- a/SGGL/FineUIPro.Web/EnergyReport/EnergyStatisticsEdit.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatisticsEdit.aspx @@ -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" %> diff --git a/SGGL/FineUIPro.Web/EnergyReport/EnergyStatisticsEdit.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatisticsEdit.aspx.cs similarity index 98% rename from SGGL/FineUIPro.Web/EnergyReport/EnergyStatisticsEdit.aspx.cs rename to SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatisticsEdit.aspx.cs index 0c87a54d..8ff0b766 100644 --- a/SGGL/FineUIPro.Web/EnergyReport/EnergyStatisticsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatisticsEdit.aspx.cs @@ -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 { diff --git a/SGGL/FineUIPro.Web/EnergyReport/EnergyStatisticsEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatisticsEdit.aspx.designer.cs similarity index 99% rename from SGGL/FineUIPro.Web/EnergyReport/EnergyStatisticsEdit.aspx.designer.cs rename to SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatisticsEdit.aspx.designer.cs index 43807e10..26d7d4f7 100644 --- a/SGGL/FineUIPro.Web/EnergyReport/EnergyStatisticsEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyStatisticsEdit.aspx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.EnergyReport +namespace FineUIPro.Web.ReportManage.EnergyReport { diff --git a/SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservation.aspx b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservation.aspx similarity index 98% rename from SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservation.aspx rename to SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservation.aspx index 3777da3b..4b70aa1c 100644 --- a/SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservation.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservation.aspx @@ -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" %> diff --git a/SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservation.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservation.aspx.cs similarity index 99% rename from SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservation.aspx.cs rename to SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservation.aspx.cs index 35de6be1..dc015089 100644 --- a/SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservation.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservation.aspx.cs @@ -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 { diff --git a/SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservation.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservation.aspx.designer.cs similarity index 99% rename from SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservation.aspx.designer.cs rename to SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservation.aspx.designer.cs index 5c122de5..5803f17c 100644 --- a/SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservation.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservation.aspx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.EnergyReport +namespace FineUIPro.Web.ReportManage.EnergyReport { diff --git a/SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservationEdit.aspx b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservationEdit.aspx similarity index 97% rename from SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservationEdit.aspx rename to SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservationEdit.aspx index 4849fec3..53222941 100644 --- a/SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservationEdit.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservationEdit.aspx @@ -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" %> diff --git a/SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservationEdit.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservationEdit.aspx.cs similarity index 98% rename from SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservationEdit.aspx.cs rename to SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservationEdit.aspx.cs index 58e4a86b..12e99a36 100644 --- a/SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservationEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservationEdit.aspx.cs @@ -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 { diff --git a/SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservationEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservationEdit.aspx.designer.cs similarity index 99% rename from SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservationEdit.aspx.designer.cs rename to SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservationEdit.aspx.designer.cs index 04fe3217..5e96bef4 100644 --- a/SGGL/FineUIPro.Web/EnergyReport/EnergyWaterConservationEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/EnergyReport/EnergyWaterConservationEdit.aspx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.EnergyReport +namespace FineUIPro.Web.ReportManage.EnergyReport { diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 2edacb66..d722e696 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -155980,9 +155980,9 @@ namespace Model private string _ProjectId; - private System.Nullable _EnergySavingIndex; + private System.Nullable _EnergySavingIndex; - private System.Nullable _WaterSavingIndex; + private System.Nullable _WaterSavingIndex; private string _EnergySavingSchemes; @@ -155994,13 +155994,13 @@ namespace Model private string _SupportingDocuments; - private System.Nullable _ActualEnergySaving; + private System.Nullable _ActualEnergySaving; - private System.Nullable _ActualWaterSaving; + private System.Nullable _ActualWaterSaving; - private System.Nullable _EnergySavingCompletionRate; + private System.Nullable _EnergySavingCompletionRate; - private System.Nullable _WaterSavingCompletionRate; + private System.Nullable _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 value); + partial void OnEnergySavingIndexChanging(System.Nullable value); partial void OnEnergySavingIndexChanged(); - partial void OnWaterSavingIndexChanging(System.Nullable value); + partial void OnWaterSavingIndexChanging(System.Nullable 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 value); + partial void OnActualEnergySavingChanging(System.Nullable value); partial void OnActualEnergySavingChanged(); - partial void OnActualWaterSavingChanging(System.Nullable value); + partial void OnActualWaterSavingChanging(System.Nullable value); partial void OnActualWaterSavingChanged(); - partial void OnEnergySavingCompletionRateChanging(System.Nullable value); + partial void OnEnergySavingCompletionRateChanging(System.Nullable value); partial void OnEnergySavingCompletionRateChanged(); - partial void OnWaterSavingCompletionRateChanging(System.Nullable value); + partial void OnWaterSavingCompletionRateChanging(System.Nullable 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 EnergySavingIndex + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnergySavingIndex", DbType="Decimal(18,2)")] + public System.Nullable EnergySavingIndex { get { @@ -156121,8 +156121,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WaterSavingIndex", DbType="Int")] - public System.Nullable WaterSavingIndex + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WaterSavingIndex", DbType="Decimal(18,2)")] + public System.Nullable WaterSavingIndex { get { @@ -156241,8 +156241,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualEnergySaving", DbType="Int")] - public System.Nullable ActualEnergySaving + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualEnergySaving", DbType="Decimal(18,2)")] + public System.Nullable ActualEnergySaving { get { @@ -156261,8 +156261,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualWaterSaving", DbType="Int")] - public System.Nullable ActualWaterSaving + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualWaterSaving", DbType="Decimal(18,2)")] + public System.Nullable ActualWaterSaving { get { @@ -156281,8 +156281,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnergySavingCompletionRate", DbType="Int")] - public System.Nullable EnergySavingCompletionRate + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnergySavingCompletionRate", DbType="Decimal(18,2)")] + public System.Nullable EnergySavingCompletionRate { get { @@ -156301,8 +156301,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WaterSavingCompletionRate", DbType="Int")] - public System.Nullable WaterSavingCompletionRate + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WaterSavingCompletionRate", DbType="Decimal(18,2)")] + public System.Nullable WaterSavingCompletionRate { get {