From ac62dd307492bb3a9c3c33d69f961f35eaa4cd67 Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Mon, 5 Jun 2023 11:18:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E7=AD=96?=
 =?UTF-8?q?=E5=88=92=E3=80=81=E6=80=BB=E5=8C=85=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/ErrLog.txt                 | 44 +++++++++++++++++++
 .../ZHGL/Plan/ActionPlanListEdit.aspx         |  2 +-
 .../ZHGL/Plan/ActionPlanListEdit.aspx.cs      |  2 +-
 .../ZHGL/Plan/ActionPlanListView.aspx.cs      |  2 +-
 .../ZHGL/Plan/MainContractEdit.aspx           |  2 +-
 .../ZHGL/Plan/MainContractEdit.aspx.cs        |  2 +-
 .../ZHGL/Plan/MainContractView.aspx.cs        |  2 +-
 .../ZHGL/Plan/ProjectPlanEdit.aspx            |  2 +-
 .../ZHGL/Plan/ProjectPlanEdit.aspx.cs         |  2 +-
 .../ZHGL/Plan/ProjectPlanView.aspx.cs         |  2 +-
 SGGL/FineUIPro.Web/common/Menu_CQMS.xml       |  3 --
 SGGL/FineUIPro.Web/common/Menu_HSSE.xml       | 10 +----
 SGGL/FineUIPro.Web/common/Menu_ZHGL.xml       | 16 +++----
 13 files changed, 61 insertions(+), 30 deletions(-)

diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index e69de29b..1a1bfb29 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -0,0 +1,44 @@
+
+错误信息开始=====>
+错误类型:NotSupportedException
+错误信息:方法“Boolean IsNullOrEmpty(System.String)”不支持转换为 SQL。
+错误堆栈:
+   在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.TranslateStringStaticMethod(SqlMethodCall mc)
+   在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitMethodCall(SqlMethodCall mc)
+   在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node)
+   在 System.Data.Linq.SqlClient.SqlVisitor.VisitExpression(SqlExpression exp)
+   在 System.Data.Linq.SqlClient.SqlVisitor.VisitUnaryOperator(SqlUnary uo)
+   在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitUnaryOperator(SqlUnary uo)
+   在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node)
+   在 System.Data.Linq.SqlClient.SqlVisitor.VisitExpression(SqlExpression exp)
+   在 System.Data.Linq.SqlClient.SqlVisitor.VisitBinaryOperator(SqlBinary bo)
+   在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitBinaryOperator(SqlBinary bo)
+   在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node)
+   在 System.Data.Linq.SqlClient.SqlVisitor.VisitExpression(SqlExpression exp)
+   在 System.Data.Linq.SqlClient.SqlVisitor.VisitBinaryOperator(SqlBinary bo)
+   在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitBinaryOperator(SqlBinary bo)
+   在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node)
+   在 System.Data.Linq.SqlClient.SqlVisitor.VisitExpression(SqlExpression exp)
+   在 System.Data.Linq.SqlClient.SqlVisitor.VisitSelectCore(SqlSelect select)
+   在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitSelect(SqlSelect select)
+   在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node)
+   在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Convert(SqlNode node, SqlFactory sql, ProviderMode providerMode)
+   在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(ResultShape resultShape, Type resultType, SqlNode node, ReadOnlyCollection`1 parentParameters, SqlNodeAnnotations annotations)
+   在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations)
+   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
+   在 System.Data.Linq.DataQuery`1.System.Collections.Generic.IEnumerable<T>.GetEnumerator()
+   在 System.Collections.Generic.List`1..ctor(IEnumerable`1 collection)
+   在 System.Linq.Enumerable.ToList[TSource](IEnumerable`1 source)
+   在 FineUIPro.Web.ZHGL.Plan.MainContractEdit.Page_Load(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\ZHGL\Plan\MainContractEdit.aspx.cs:行号 72
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/05/2023 11:15:20
+出错文件:http://localhost:14646/ZHGL/Plan/MainContractEdit.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:06/05/2023 11:15:20
+
diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx
index 55bd8bec..849b6e8a 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx
+++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx
@@ -39,7 +39,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="drpCompileMan" runat="server" Label="编制人" LabelAlign="Right"
+                        <f:DropDownList ID="drpCompileMan" runat="server" Label="编制人" LabelAlign="Right" EnableEdit="true"
                             LabelWidth="140px">
                         </f:DropDownList>
                         <f:DatePicker ID="txtCompileDate" runat="server" Label="编制日期" LabelAlign="Right"
diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs
index 138808a0..f3e2f9fd 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs
@@ -68,7 +68,7 @@ namespace FineUIPro.Web.ZHGL.Plan
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 this.ActionPlanListId = Request.Params["ActionPlanListId"];
-                var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole select x).ToList();
+                var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) select x).ToList();
                 Model.ActionPlan_ActionPlanList actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(this.ActionPlanListId);
                 if (actionPlanList != null)
                 {
diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListView.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListView.aspx.cs
index 06e25ddd..3e95deed 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListView.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListView.aspx.cs
@@ -36,7 +36,7 @@ namespace FineUIPro.Web.ZHGL.Plan
             if (!IsPostBack)
             {
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
-                var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole select x).ToList();
+                var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) select x).ToList();
                 this.drpReviewMan.DataTextField = "PersonName";
                 this.drpReviewMan.DataValueField = "PersonId";
                 this.drpReviewMan.DataSource = q;
diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx
index 9a6f9b37..f6ddb464 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx
+++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx
@@ -46,7 +46,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="drpCompileMan" runat="server" Label="编制人" LabelAlign="Right"
+                        <f:DropDownList ID="drpCompileMan" runat="server" Label="编制人" LabelAlign="Right" EnableEdit="true"
                             LabelWidth="140px">
                         </f:DropDownList>
                         <f:DatePicker ID="txtCompileDate" runat="server" Label="编制日期" LabelAlign="Right"
diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs
index 8846aa34..c886f8a4 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractEdit.aspx.cs
@@ -69,7 +69,7 @@ namespace FineUIPro.Web.ZHGL.Plan
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 this.MainContractId = Request.Params["MainContractId"];
                 ProjectService.InitAllProjectDropDownList(this.drpProject, true);
-                var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole select x).ToList();
+                var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) select x).ToList();
                 Model.ActionPlan_MainContract MainContract = BLL.MainContractService.GetMainContractById(this.MainContractId);
                 if (MainContract != null)
                 {
diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs
index 7ebbb33a..4a52abd9 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Plan/MainContractView.aspx.cs
@@ -57,7 +57,7 @@ namespace FineUIPro.Web.ZHGL.Plan
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 this.MainContractId = Request.Params["MainContractId"];
                 ProjectService.InitAllProjectDropDownList(this.drpProject, true);
-                var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole select x).ToList();
+                var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) select x).ToList();
                 Model.ActionPlan_MainContract MainContract = BLL.MainContractService.GetMainContractById(this.MainContractId);
                 if (MainContract != null)
                 {
diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx
index a2113569..9ebbab53 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx
+++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx
@@ -46,7 +46,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="drpCompileMan" runat="server" Label="编制人" LabelAlign="Right"
+                        <f:DropDownList ID="drpCompileMan" runat="server" Label="编制人" LabelAlign="Right" EnableEdit="true"
                             LabelWidth="140px">
                         </f:DropDownList>
                         <f:DatePicker ID="txtCompileDate" runat="server" Label="编制日期" LabelAlign="Right"
diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx.cs
index 6b269bec..ab2dada8 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanEdit.aspx.cs
@@ -69,7 +69,7 @@ namespace FineUIPro.Web.ZHGL.Plan
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 this.ProjectPlanId = Request.Params["ProjectPlanId"];
                 ProjectService.InitAllProjectDropDownList(this.drpProject, true);
-                var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole select x).ToList();
+                var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) select x).ToList();
                 Model.ActionPlan_ProjectPlan ProjectPlan = BLL.ProjectPlanService.GetProjectPlanById(this.ProjectPlanId);
                 if (ProjectPlan != null)
                 {
diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx.cs
index 02b86fae..5aaa5bbb 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ProjectPlanView.aspx.cs
@@ -57,7 +57,7 @@ namespace FineUIPro.Web.ZHGL.Plan
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 this.ProjectPlanId = Request.Params["ProjectPlanId"];
                 ProjectService.InitAllProjectDropDownList(this.drpProject, true);
-                var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole select x).ToList();
+                var q = (from x in Funs.DB.Person_Persons where x.UnitId == Const.UnitId_SEDIN && x.DepartId == Const.Depart_constructionId && x.RoleIds != null && x.RoleIds != Const.NoOfficeRole && x.RoleIds != string.Empty && (!x.IsPost.HasValue || x.IsPost == true) select x).ToList();
                 Model.ActionPlan_ProjectPlan ProjectPlan = BLL.ProjectPlanService.GetProjectPlanById(this.ProjectPlanId);
                 if (ProjectPlan != null)
                 {
diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
index ff89f842..2631bcd6 100644
--- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
@@ -47,9 +47,6 @@
 </TreeNode>
 <TreeNode id="BA383490-BAE3-4E65-B221-8F89D2431135" Text="质量奖惩" NavigateUrl=""><TreeNode id="81053EAB-09C6-4A6B-A952-B756071EE0DA" Text="质量奖励处罚" NavigateUrl="CQMS/RewardAndPunish/RewardAndPunish.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="7ecf0229-8a0b-40ce-8b04-e556f7bd3394" Text="质量报表管理" NavigateUrl=""><TreeNode id="1443C901-A9C3-4CCC-B858-55512DE8C5CA" Text="质量管理工作总结报告" NavigateUrl="CQMS/ManageReport/QualityWorkSummaryReport.aspx"></TreeNode>
-<TreeNode id="267064F1-88F7-4468-998A-49A1A2F25BB8" Text="季度工程项目质量信息表" NavigateUrl="CQMS/ManageReport/QuarterlyProjectQuality.aspx"></TreeNode>
-</TreeNode>
 <TreeNode id="F54EABD2-4242-4A5D-9154-680E02E9F466" Text="质量样板管理" NavigateUrl=""><TreeNode id="B44EC915-7854-4F06-8C87-CD5FF41E3AC0" Text="质量样板" NavigateUrl="CQMS/Models/QualityModel.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="C91C8319-0BFC-4585-BE14-ED41D45A160D" Text="质量月报" NavigateUrl=""><TreeNode id="786864C0-2875-49CD-B55E-0B5C8253295D" Text="质量月报" NavigateUrl="CQMS/Check/CheckMonth.aspx"></TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
index 658c8c3f..69ce59ea 100644
--- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
@@ -96,17 +96,11 @@
 <TreeNode id="03235B30-960D-4FCF-99F7-97773A2EE108" Text="工作报告" NavigateUrl=""><TreeNode id="88AE0EF8-D29E-409F-A154-CCA3999B00AE" Text="安全完工报告" NavigateUrl="HSSE/Manager/CompletionReport.aspx"></TreeNode>
 <TreeNode id="D0EC3002-E1FA-457D-AC3B-4C7B2D71DD82" Text="月报" NavigateUrl="HSSE/Manager/ManagerMonth_SeDin.aspx"></TreeNode>
 <TreeNode id="8E5B4A8E-B06E-4C8A-A2C8-1091A9BCAF72" Text="工程师HSE日志" NavigateUrl="HSSE/Manager/HSEDiary.aspx"></TreeNode>
-<TreeNode id="C554E471-B740-4559-B543-E00F247289FD" Text="集团安全报表" NavigateUrl=""><TreeNode id="6E7DC075-A7AF-4E42-8F8B-0174EFDD54A1" Text="企业安全数据统计月报" NavigateUrl="HSSE/InformationProject/MillionsMonthlyReport.aspx"></TreeNode>
+<TreeNode id="C554E471-B740-4559-B543-E00F247289FD" Text="集团安全报表" NavigateUrl=""><TreeNode id="6E7DC075-A7AF-4E42-8F8B-0174EFDD54A1" Text="百万工时安全统计月报" NavigateUrl="HSSE/InformationProject/MillionsMonthlyReport.aspx"></TreeNode>
 <TreeNode id="38E948BA-E043-4E89-9038-0CE1B508FA19" Text="职工伤亡事故原因分析报" NavigateUrl="HSSE/InformationProject/AccidentCauseReport.aspx"></TreeNode>
+<TreeNode id="8B17DC64-A4B9-4283-B7A1-D2E944205FA5" Text="安全生产数据季报" NavigateUrl="HSSE/InformationProject/SafetyQuarterlyReport.aspx"></TreeNode>
 <TreeNode id="0CDFC1BE-0796-4817-ADB8-7A0B48655E00" Text="应急演练开展情况季报" NavigateUrl="HSSE/InformationProject/DrillConductedQuarterlyReport.aspx"></TreeNode>
 <TreeNode id="0973EE1C-CD2A-4116-BD67-1ABAD71D6C7C" Text="应急演练工作计划半年报" NavigateUrl="HSSE/InformationProject/DrillPlanHalfYearReport.aspx"></TreeNode>
-<TreeNode id="86F71934-7149-470E-BEAB-FFDC5BF3C0F2" Text="实业安全简报" NavigateUrl="SHIYE/InformationProject/SafetyBriefing.aspx"></TreeNode>
-<TreeNode id="FB174DD6-CBAE-43AF-9356-B098A17B719D" Text="安全管理工作总结报告" NavigateUrl="HSSE/InformationProject/WorkSummaryReport.aspx"></TreeNode>
-<TreeNode id="FD572EFA-8E87-43D1-B514-25A39768106F" Text="生态环保工作总结报告" NavigateUrl="HSSE/InformationProject/EPSummaryReport.aspx"></TreeNode>
-<TreeNode id="25CE6894-2840-4DC4-AD2E-D72292849CEE" Text="建筑行业能源节约与生态环境保护汇总表" NavigateUrl="ZHGL/Environmental/ProjectArchitectureReport.aspx"></TreeNode>
-<TreeNode id="A44E98F6-E9FE-43F8-8349-C166263BF608" Text="化工行业能源节约与生态环境保护汇总表" NavigateUrl="ZHGL/Environmental/ProjectChemicalReport.aspx"></TreeNode>
-<TreeNode id="EFA6E45F-1267-4804-BEE7-41E0C5461204" Text="中央企业节能环保产业企业基本情况和经营情况报表" NavigateUrl="ZHGL/Environmental/ProjectOperationReport.aspx"></TreeNode>
-<TreeNode id="9DE996D9-A2CF-40C8-86D3-6A472AB30E5D" Text="中央企业节能环保产业企业生产和服务业务情况报表" NavigateUrl="ZHGL/Environmental/ProjectEnergyReport.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="C483220C-0FEE-4E45-9B78-BBBA857EFFB3" Text="安全数据" NavigateUrl="ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx"></TreeNode>
 </TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
index 9a07f5bf..7eb273d9 100644
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@@ -15,21 +15,17 @@
 <TreeNode id="C619988F-307B-4A39-B518-7F45CA7326F5" Text="检查记录" NavigateUrl=""></TreeNode>
 <TreeNode id="DEE90726-E00D-462B-A4BF-7E36180DD5B8" Text="项目绩效评价" NavigateUrl="OfficeCheck/ProjectEvaluation/ProjectEvaluation.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="ERDXV53M-09B1-6UIO-3EFM-5DVZDF329001" Text="安全信息上报" NavigateUrl=""><TreeNode id="3156A9F0-276D-4AD4-BF84-45CF6DFC215C" Text="企业安全数据统计月报" NavigateUrl="ZHGL/Information/MillionsMonthlyReport.aspx"></TreeNode>
+<TreeNode id="ERDXV53M-09B1-6UIO-3EFM-5DVZDF329001" Text="安全信息上报" NavigateUrl=""><TreeNode id="3156A9F0-276D-4AD4-BF84-45CF6DFC215C" Text="百万工时安全统计月报" NavigateUrl="ZHGL/Information/MillionsMonthlyReport.aspx"></TreeNode>
 <TreeNode id="4BC71D2E-7D94-48C1-A61A-139637825AA5" Text="职工伤亡事故原因分析报" NavigateUrl="ZHGL/Information/AccidentCauseReport.aspx"></TreeNode>
+<TreeNode id="A3894BAD-3F4A-4BB4-98CF-A76C588AE53F" Text="安全生产数据季报" NavigateUrl="ZHGL/Information/SafetyQuarterlyReport.aspx"></TreeNode>
 <TreeNode id="7985C759-8EB9-4B7D-AC65-00541280B46C" Text="应急演练开展情况季报" NavigateUrl="ZHGL/Information/DrillConductedQuarterlyReport.aspx"></TreeNode>
 <TreeNode id="70DEB27A-D6FF-4D57-879B-0270F2967FA0" Text="应急演练工作计划半年报" NavigateUrl="ZHGL/Information/DrillPlanHalfYearReport.aspx"></TreeNode>
-<TreeNode id="AAC7C263-6E25-49DC-985B-DC3FA7AAF3A1" Text="实业安全简报" NavigateUrl="ZHGL/Information/SafetyBriefing.aspx"></TreeNode>
-<TreeNode id="07FEEC9D-09C1-4C19-9269-62F69532086C" Text="安全管理工作总结报告" NavigateUrl="ZHGL/Information/WorkSummaryReport.aspx"></TreeNode>
-<TreeNode id="CF9C1F00-34B8-42E5-B2D1-704094169CA3" Text="季度工程项目质量信息表" NavigateUrl="ZHGL/Information/QuarterlyProjectQuality.aspx"></TreeNode>
-<TreeNode id="12941594-2171-411A-8CC8-32E3BD9FCDDF" Text="质量管理工作总结报告" NavigateUrl="ZHGL/Information/QualityWorkSummaryReport.aspx"></TreeNode>
-<TreeNode id="5B344750-79DD-40AA-8AA7-34B04E41FA72" Text="生态环保工作总结报告" NavigateUrl="ZHGL/Information/EPSummaryReport.aspx"></TreeNode>
-<TreeNode id="7C47F078-D4C9-40D9-BEEF-E657EAFEC650" Text="建筑行业能源节约与生态环境保护汇总表" NavigateUrl="ZHGL/Environmental/ArchitectureReport.aspx"></TreeNode>
-<TreeNode id="ECDD89AC-1E16-4D82-B3BE-5D62F31B7A14" Text="化工行业能源节约与生态环境保护汇总表" NavigateUrl="ZHGL/Environmental/ChemicalReport.aspx"></TreeNode>
-<TreeNode id="7652D239-1897-4886-8DF2-B71E3B060D21" Text="中央企业节能环保产业企业基本情况和经营情况报表" NavigateUrl="ZHGL/Environmental/OperationReport.aspx"></TreeNode>
-<TreeNode id="30579BFE-AB4B-49A7-A73D-B7CE902A8B69" Text="中央企业节能环保产业企业生产和服务业务情况报表" NavigateUrl="ZHGL/Environmental/EnergyReport.aspx"></TreeNode>
 </TreeNode>
+<TreeNode id="76E236DA-DDFC-4CE8-8CB8-02F8A27A8535" Text="专业技术方案评审" NavigateUrl=""><TreeNode id="B6A2B6EB-6B90-4953-B544-83FFF4F0EC19" Text="安全实施计划" NavigateUrl="ZHGL/Plan/ActionPlanList.aspx"></TreeNode>
 <TreeNode id="B9ADD006-BA46-4191-BCD1-CCB56767C82B" Text="总包施工质量计划" NavigateUrl="ZHGL/Plan/MainPlan.aspx"></TreeNode>
+<TreeNode id="6F9F1B71-67D8-4297-8F9B-360F3695E84B" Text="项目策划" NavigateUrl="ZHGL/Plan/ProjectPlan.aspx"></TreeNode>
+<TreeNode id="D36E568B-54A3-4E86-919E-407C605B7BFC" Text="总包合同" NavigateUrl="ZHGL/Plan/MainContract.aspx"></TreeNode>
+</TreeNode>
 <TreeNode id="ABB667AF-2C50-40A6-9FC9-FC34A96582E3" Text="文件柜" NavigateUrl=""></TreeNode>
 <TreeNode id="BFFBE172-7473-486E-9833-49F13B359C6C" Text="安全会议" NavigateUrl=""><TreeNode id="B911B4F8-DDFD-4F37-9EAC-EB104F753432" Text="企业安委会" NavigateUrl="ZHGL/Meeting/CompanySafetyMeeting.aspx"></TreeNode>
 <TreeNode id="2497EF13-C052-4228-B388-EBC5C18963BC" Text="企业专题会" NavigateUrl="ZHGL/Meeting/CompanySpecialMeeting.aspx"></TreeNode>