diff --git a/DataBase/版本日志/SUBQHSE_V2025-03-18-bwj.sql b/DataBase/版本日志/SUBQHSE_V2025-03-18-bwj.sql
new file mode 100644
index 00000000..13dede19
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2025-03-18-bwj.sql
@@ -0,0 +1,329 @@
+alter table BS_Welder alter column WED_WorkCode nvarchar(100)
+go
+
+--��ȡ��ǰ�˴�������
+ALTER  PROCEDURE [dbo].[Sp_Project_GetToDoItems]
+	@projectId NVARCHAR(50)=NULL,
+	@userId NVARCHAR(200)=NULL
+AS
+/*��ȡ��ǰ�˴�������*/
+BEGIN
+SELECT HazardRegisterId AS DataId
+	,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
+	,'��ȫѲ�������' AS MenuName
+	,register.RegisterDef AS Content
+	,UserId
+	,users.UserName
+	,register.RegisterDate AS DataTime
+	,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr
+	,'../HSSE/HiddenInspection/HiddenRectificationRectify.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl
+FROM HSSE_Hazard_HazardRegister AS register
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE register.ProjectId=@projectId AND
+((register.states = '1' AND (register.ResponsibleMan =@userId OR register.CCManIds LIKE ('%'+@userId+'%') ))
+)
+UNION ALL
+
+SELECT HazardRegisterId AS DataId
+	,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
+	,'��ȫѲ���ȷ��' AS MenuName
+	,register.RegisterDef AS Content
+	,UserId
+	,users.UserName
+	,register.RegisterDate AS DataTime
+	,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr
+	,'../HSSE/HiddenInspection/HiddenRectificationConfirm.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl
+FROM HSSE_Hazard_HazardRegister AS register
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE register.ProjectId=@projectId AND
+register.states = '2' AND register.CheckManId =@userId
+
+UNION ALL
+SELECT CheckControlCode AS DataId
+	,'B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306' AS MenuId
+	,'����Ѳ�������' AS MenuName
+	,checkControl.QuestionDef AS Content
+	,UserId
+	,users.UserName
+	,checkControl.CheckDate AS DataTime
+	,CONVERT(varchar(100),checkControl.CheckDate, 23) AS DataTimeStr
+	,'../CQMS/Check/ChecklistEdit.aspx?ToDo=ToDo&CheckControlCode='+checkControl.CheckControlCode AS PCUrl
+FROM Check_CheckControl AS checkControl
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE checkControl.ProjectId=@projectId AND
+checkControl.State != '7' AND checkControl.CheckControlCode in (select CheckControlCode from Check_CheckControlApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
+
+UNION ALL
+SELECT GJSXID AS DataId
+	,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId
+	,'�ؼ����������' AS MenuName
+	,GJSX.Detail AS Content
+	,users.UserId
+	,users.UserName
+	,GJSX.CreateDate AS DataTime
+	,CONVERT(varchar(100),GJSX.CreateDate, 23) AS DataTimeStr
+	,'../PZHGL/GJSX/GJSXListEdit.aspx?ToDo=ToDo&EditType=Edit&ID='+GJSXID AS PCUrl
+FROM GJSX
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE GJSX.ProjectId=@projectId AND
+GJSX.State != 0 AND (((select count(*) from GJSX_detail detail where detail.Progress_user=@userId and detail.GJSXID=GJSX.GJSXID)=0
+and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0)
+or (GJSX.User_Acceptance like '%'+@userId+'%' and (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID))
+)
+
+--UNION ALL
+--SELECT InspectionEquipmentId AS DataId
+--	,'6c2c1e5e-1812-4e1c-a683-7125518e28c7' AS MenuId
+--	,'�豸���ϱ����ȷ��' AS MenuName
+--	,Equipment.InspectionName AS Content
+--	,UserId
+--	,users.UserName
+--	,Equipment.InspectionDate AS DataTime
+--	,CONVERT(varchar(100),Equipment.InspectionDate, 23) AS DataTimeStr
+--	,'../CQMS/Comprehensive/InspectionEquipmentEdit.aspx?ToDo=ToDo&InspectionEquipmentId='+Equipment.InspectionEquipmentId AS PCUrl
+--FROM Comprehensive_InspectionEquipment AS Equipment
+--LEFT JOIN Sys_User AS users ON users.UserId =@userId
+--WHERE Equipment.ProjectId=@projectId and
+--Equipment.Status!='3' AND Equipment.InspectionEquipmentId in (select InspectionEquipmentId from Comprehensive_InspectionEquipmentApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
+--UNION ALL
+--SELECT InspectionPersonId AS DataId
+--	,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
+--	,'��Ա�����ȷ��' AS MenuName
+--	,Person.PersonName AS Content
+--	,UserId
+--	,users.UserName
+--	,Person.CompileDate AS DataTime
+--	,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
+--	,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
+--FROM Comprehensive_InspectionPerson AS Person
+--LEFT JOIN Sys_User AS users ON users.UserId =@userId
+--WHERE Person.ProjectId=@projectId and
+--Person.Status!='3' AND Person.InspectionPersonId in (select InspectionPersonId from Comprehensive_InspectionPersonApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
+--UNION ALL
+--SELECT InspectionMachineId AS DataId
+--	,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
+--	,'���߱����ȷ��' AS MenuName
+--	,Machine.InspectionMachineName AS Content
+--	,UserId
+--	,users.UserName
+--	,Machine.CompileDate AS DataTime
+--	,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
+--	,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
+--FROM Comprehensive_InspectionMachine AS Machine
+--LEFT JOIN Sys_User AS users ON users.UserId =@userId
+--WHERE Machine.ProjectId=@projectId and
+--Machine.Status!='3' AND Machine.InspectionMachineId in (select InspectionMachineId from Comprehensive_InspectionMachineApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
+UNION ALL
+SELECT ConstructSolutionId AS DataId
+	,'91C4BFDB-0A51-4992-99CC-EB4EC185593D' AS MenuId
+	,'ʩ������������' AS MenuName
+	,Solution.SolutionName AS Content
+	,UserId
+	,users.UserName
+	,Solution.CompileDate AS DataTime
+	,CONVERT(varchar(100),Solution.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Solution/EditConstructSolution.aspx?ToDo=ToDo&ConstructSolutionId='+Solution.ConstructSolutionId AS PCUrl
+FROM Solution_CQMSConstructSolution AS Solution
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Solution.ProjectId=@projectId and
+Solution.State!='3'
+AND Solution.ConstructSolutionId in
+(select top 1 ConstructSolutionId from (
+SELECT Solution_CQMSConstructSolutionApprove.*
+FROM Solution_CQMSConstructSolutionApprove,
+(SELECT MIN([order]) AS [order],ConstructSolutionId FROM Solution_CQMSConstructSolutionApprove where ApproveType!='S' and  ApproveDate is null GROUP BY ConstructSolutionId )b
+WHERE Solution_CQMSConstructSolutionApprove.[order] = b.[order] and Solution_CQMSConstructSolutionApprove.ConstructSolutionId = b.ConstructSolutionId
+ ) approve
+where approve.ApproveMan=@userId )
+
+UNION ALL
+SELECT InspectionId AS DataId
+	,'4781f467-35bf-4cf2-aaa4-7960a175eb61' AS MenuId
+	,'����֪ͨ��������' AS MenuName
+	,InspectionManagement.AcceptanceSite AS Content
+	,UserId
+	,users.UserName
+	,InspectionManagement.CompileDate AS DataTime
+	,CONVERT(varchar(100),InspectionManagement.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/ProcessControl/InspectionNoticeEdit.aspx?View=View&InspectionId='+InspectionManagement.InspectionId AS PCUrl
+FROM ProcessControl_InspectionManagement AS InspectionManagement
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE InspectionManagement.ProjectId=@projectId and
+dateadd(day,3,InspectionManagement.CompileDate)>getdate() and InspectionManagement.AcceptanceCheckMan like '%'+@userId+'%'
+UNION ALL
+SELECT CheckSpecialId AS DataId
+	,'1B08048F-93ED-4E84-AE65-DB7917EA2DFB' AS MenuId
+	,'ר����' AS MenuName
+	,CheckItemSet.CheckItemName AS Content
+	,UserId
+	,users.UserName
+	,CheckSpecial.CheckTime AS DataTime
+	,CONVERT(varchar(100),CheckSpecial.CheckTime, 23) AS DataTimeStr
+	,'../HSSE/Check/CheckSpecialView.aspx?CheckSpecialId='+CheckSpecial.CheckSpecialId AS PCUrl
+FROM Check_CheckSpecial AS CheckSpecial
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN Technique_CheckItemSet AS CheckItemSet ON CheckItemSet.CheckItemSetId =CheckSpecial.CheckItemSetId
+WHERE CheckSpecial.ProjectId=@projectId and
+dateadd(day,3,CheckSpecial.CheckTime)>getdate() and CheckSpecial.PartInPersonIds like '%'+@userId+'%'
+UNION ALL
+SELECT CheckColligationId AS DataId
+	,'C198EBA8-9E23-4654-92E1-09C61105C522' AS MenuId
+	,'�ۺϼ�������' AS MenuName
+	,case CheckType when '0' then '�ܼ�' when '1' then '�¼�' else '����' end AS Content
+	,users.UserId
+	,users.UserName
+	,CheckColligation.CheckTime AS DataTime
+	,CONVERT(varchar(100),CheckColligation.CheckTime, 23) AS DataTimeStr
+	,'../HSSE/Check/CheckColligationEdit.aspx?CheckColligationId='+CheckColligation.CheckColligationId AS PCUrl
+FROM Check_CheckColligation AS CheckColligation
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN Sys_FlowOperate AS FlowOperate ON CheckColligation.CheckColligationId=FlowOperate.DataId
+LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId
+WHERE CheckColligation.ProjectId=@projectId and FlowOperate.IsClosed <> 1 and FlowOperate.OperaterId=@userId
+UNION ALL
+SELECT PatrolPlanId AS DataId
+	,'D256E5C8-DC76-4F4D-BABE-A253418823F4' AS MenuId
+	,'����Ѳ�������' AS MenuName
+	,HazardListItem.HazardItems AS Content
+	,UserId
+	,users.UserName
+	,PatrolPlan.LimitCheckDate AS DataTime
+	,CONVERT(varchar(100),PatrolPlan.LimitCheckDate, 23) AS DataTimeStr
+	,'../HSSE/Hazard/RoutingInspectionEdit.aspx?PatrolPlanId='+PatrolPlan.PatrolPlanId AS PCUrl
+FROM Hazard_PatrolPlan AS PatrolPlan
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN Hazard_HazardSelectedItem AS HazardListItem on HazardListItem.HazardSelectedItemId=PatrolPlan.HazardSelectedItemId
+WHERE HazardListItem.ProjectId=@projectId and
+dateadd(day,-3,PatrolPlan.LimitCheckDate)<getdate() and PatrolPlan.DutyPerson=@userId
+and (select COUNT(*) from Hazard_RoutingInspection ri where ri.PatrolPlanId=PatrolPlan.PatrolPlanId)=0
+UNION ALL
+SELECT PersonQuality.PersonId AS DataId
+	,'EBEA762D-1F46-47C5-9EAD-759E13D9B41C' AS MenuId
+	,'������ҵ��Ա���ʻ���'+convert(nvarchar(6),DATEDIFF(day,getdate(),PersonQuality.LimitDate))+'�����' AS MenuName
+	,Person.PersonName AS Content
+	,users.UserId
+	,users.UserName
+	,PersonQuality.LimitDate AS DataTime
+	,CONVERT(varchar(100),PersonQuality.LimitDate, 23) AS DataTimeStr
+	,'../HSSE/QualityAudit/PersonQualityEdit.aspx?PersonId='+PersonQuality.PersonId AS PCUrl
+FROM QualityAudit_PersonQuality AS PersonQuality
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN SitePerson_Person AS Person on Person.PersonId=PersonQuality.PersonId
+WHERE Person.ProjectId=@projectId and Person.IsUsed=1 and  Person.InTime<getdate() and (Person.OutTime is null or Person.OutTime  >getdate() ) and
+dateadd(day,-15,PersonQuality.LimitDate)<getdate() and getdate()<PersonQuality.LimitDate
+UNION ALL
+SELECT PersonQuality.PersonId AS DataId
+	,'EBEA762D-1F46-47C5-9EAD-759E13D9B41C' AS MenuId
+	,'������ҵ��Ա�����ѹ���'+convert(nvarchar(6),DATEDIFF(day,PersonQuality.LimitDate,getdate()))+'��' AS MenuName
+	,Person.PersonName AS Content
+	,users.UserId
+	,users.UserName
+	,PersonQuality.LimitDate AS DataTime
+	,CONVERT(varchar(100),PersonQuality.LimitDate, 23) AS DataTimeStr
+	,'../HSSE/QualityAudit/PersonQualityEdit.aspx?PersonId='+PersonQuality.PersonId AS PCUrl
+FROM QualityAudit_PersonQuality AS PersonQuality
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN SitePerson_Person AS Person on Person.PersonId=PersonQuality.PersonId
+WHERE Person.ProjectId=@projectId and Person.IsUsed=1 and  Person.InTime<getdate() and (Person.OutTime is null or Person.OutTime  >getdate() ) and
+PersonQuality.LimitDate<getdate()
+UNION ALL
+SELECT InspectionPersonId AS DataId
+	,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
+	,'��Ա���黹��'+convert(nvarchar(6),DATEDIFF(day,getdate(),Person.ValidityDate))+'�����' AS MenuName
+	,Person.PersonName AS Content
+	,UserId
+	,users.UserName
+	,Person.ValidityDate AS DataTime
+	,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
+FROM Comprehensive_InspectionPerson AS Person
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Person.ProjectId=@projectId and (Person.IsOnSite=1 or Person.DepartureTime is not null) and
+dateadd(day,-15,Person.ValidityDate)<getdate() and getdate()<Person.ValidityDate
+UNION ALL
+SELECT InspectionPersonId AS DataId
+	,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
+	,'��Ա�����ѹ���'+convert(nvarchar(6),DATEDIFF(day,Person.ValidityDate,getdate()))+'��' AS MenuName
+	,Person.PersonName AS Content
+	,UserId
+	,users.UserName
+	,Person.ValidityDate AS DataTime
+	,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
+FROM Comprehensive_InspectionPerson AS Person
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Person.ProjectId=@projectId and (Person.IsOnSite=1 or Person.DepartureTime is not null) and
+Person.ValidityDate<getdate()
+UNION ALL
+SELECT InspectionMachineId AS DataId
+	,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
+	,'���߱��黹��'+convert(nvarchar(6),DATEDIFF(day,getdate(),Machine.NextTestDate))+'�����' AS MenuName
+	,Machine.InspectionMachineName AS Content
+	,UserId
+	,users.UserName
+	,Machine.NextTestDate AS DataTime
+	,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
+FROM Comprehensive_InspectionMachine AS Machine
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Machine.ProjectId=@projectId and (Machine.IsOnSite=1 or Machine.LeaveDate is not null) and
+dateadd(day,-15,Machine.NextTestDate)<getdate() and getdate()<Machine.NextTestDate
+UNION ALL
+SELECT InspectionMachineId AS DataId
+	,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
+	,'���߱����ѹ���'+convert(nvarchar(6),DATEDIFF(day,Machine.NextTestDate,getdate()))+'��' AS MenuName
+	,Machine.InspectionMachineName AS Content
+	,UserId
+	,users.UserName
+	,Machine.NextTestDate AS DataTime
+	,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
+FROM Comprehensive_InspectionMachine AS Machine
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Machine.ProjectId=@projectId and (Machine.IsOnSite=1 or Machine.LeaveDate is not null) and
+Machine.NextTestDate<getdate()
+UNION ALL
+SELECT distinct Project.ProjectId AS DataId
+	,'2AE9D982-A499-497F-8F54-ADDA5856887E' AS MenuId
+	,'���¹�������������δ�' AS MenuName
+	,'' AS Content
+	,users.UserId
+	,users.UserName
+	,GETDATE() AS DataTime
+	,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
+	,'../JDGL/Check/QuantityCompletion.aspx?ToDo=ToDo' AS PCUrl
+FROM Base_Project AS Project
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
+WHERE Project.ProjectId=@projectId
+and (pu.RoleId like '%22F78A47-F59C-4FE8-9C43-2DD304CB2108%' or pu.RoleId like '%GCB64EF3-AB0A-40BC-824D-CC314598D5DC%') and ((DATENAME(DAY,GETDATE())>=22 and (select COUNT(*) from JDGL_QuantityCompletion WHERE ProjectId=@projectId and DATENAME(year,GETDATE())=DATENAME(year,EndDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,EndDate))=0)
+--or (DATEADD(day,60,(select top 1 EndDate from JDGL_QuantityCompletion WHERE ProjectId=@projectId order by EndDate desc))<GETDATE())
+)
+UNION ALL
+SELECT MonthPlan.MonthPlanId AS DataId
+	,'94287B92-7E96-4B90-BC6F-DAF30AE3B314' AS MenuId
+	,'�¶ȼƻ���δ���' AS MenuName
+	,'' AS Content
+	,users.UserId
+	,users.UserName
+	,GETDATE() AS DataTime
+	,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
+	,'../JDGL/Check/MonthPlanEdit.aspx?ToDo=ToDo' AS PCUrl
+FROM JDGL_MonthPlan AS MonthPlan
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
+WHERE MonthPlan.ProjectId=@projectId
+and MonthPlan.DutyPerson=@userId and MonthPlan.RealDate is null and DATENAME(DAY,GETDATE())>=22 and 
+DATENAME(year,GETDATE())=DATENAME(year,MonthPlan.PlanDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,MonthPlan.PlanDate)
+
+
+ORDER BY DataTime DESC
+END
+
+
+
+
+
+GO
+
+
diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs
index 192cd837..a44ad576 100644
--- a/SGGL/BLL/ProjectData/ProjectService.cs
+++ b/SGGL/BLL/ProjectData/ProjectService.cs
@@ -1,11 +1,10 @@
 namespace BLL
 {
+    using Model;
+    using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Linq;
-    using Model;
-    using System;
-    using Newtonsoft.Json;
-    using Microsoft.SqlServer.Dts.Runtime;
     using System.Runtime.Caching;
 
     public static class ProjectService
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx
index f14cd232..77beae4b 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx
@@ -310,7 +310,7 @@
     <comment>重大风险</comment>
   </data>
   <data name="managersCount" xml:space="preserve">
-    <value>Total number of managers</value>
+    <value>Total managers</value>
     <comment>管理人员总数</comment>
   </data>
   <data name="MechanicalCompletion" xml:space="preserve">
@@ -382,7 +382,7 @@
     <comment>风险管控</comment>
   </data>
   <data name="SafeLaborHours" xml:space="preserve">
-    <value>Safe labor hours</value>
+    <value>safe man-hours</value>
     <comment>安全人工时</comment>
   </data>
   <data name="SafetyStatistics" xml:space="preserve">
@@ -480,7 +480,7 @@
     <comment>安全问题统计</comment>
   </data>
   <data name="SafetyLaborHours" xml:space="preserve">
-    <value>Cumulative safety labor hours</value>
+    <value>Cumulative safe man-hours</value>
     <comment>累计安全人工时</comment>
   </data>
   <data name="BeCompleted" xml:space="preserve">
@@ -645,10 +645,10 @@
     <value>Safe Work Hours This Month</value>
   </data>
   <data name="mainProject2_TotalSafeTrainingPersonnel" xml:space="preserve">
-    <value>Total Safe Training Personnel</value>
+    <value>Total safety training personnel</value>
   </data>
   <data name="mainProject2_SafeManagementPersonnel" xml:space="preserve">
-    <value>Safe Management Personnel</value>
+    <value>safety management personnel</value>
   </data>
   <data name="mainProject2_NearMissIncidents" xml:space="preserve">
     <value>Near Miss Incidents</value>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx
index 71938b0b..9e06427f 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx
@@ -28,7 +28,7 @@
                 <f:FormRow ColumnWidths="50% 25% 25%">
                     <Items>
                         <f:TextBox ID="txtInspectionName" runat="server" Label="名称" MaxLength="300" LabelAlign="Right" LabelWidth="120px"></f:TextBox>
-                        <f:TextBox ID="txtSpecifications" runat="server" Label="规格"   LabelAlign="Right" LabelWidth="120px"></f:TextBox>
+                        <f:TextBox ID="txtSpecifications" runat="server" Label="规格" LabelAlign="Right" LabelWidth="120px"></f:TextBox>
                         <f:DropDownList ID="drpEquipmentOrMatail" runat="server" Label="设备/材料" LabelAlign="Right" ShowRedStar="true" LabelWidth="120px">
                             <f:ListItem Value="设备" Text="设备" />
                             <f:ListItem Value="材料" Text="材料" />
@@ -38,7 +38,7 @@
                 <f:FormRow ColumnWidths="50% 25% 25%">
                     <Items>
                         <f:TextBox ID="txtSupplier" runat="server" Label="供货厂商" MaxLength="300" LabelAlign="Right" LabelWidth="120px"></f:TextBox>
-                        <f:NumberBox ID="txtCounts" Label="本次数量"  runat="server" NoDecimal="false" DecimalPrecision="3" NoNegative="true" LabelAlign="Right" LabelWidth="120px">
+                        <f:NumberBox ID="txtCounts" Label="本次数量" runat="server" NoDecimal="false" DecimalPrecision="3" NoNegative="true" LabelAlign="Right" LabelWidth="120px">
                         </f:NumberBox>
                         <f:TextBox ID="txtUnit" runat="server" Label="单位" MaxLength="50" LabelAlign="Right" LabelWidth="70px"></f:TextBox>
                     </Items>
@@ -74,7 +74,7 @@
                         <f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
                             <Items>
                                 <f:Label ID="Label1" runat="server" Label="上传附件"
-                                    LabelWidth="120px" LabelAlign="Right">
+                                    LabelWidth="150px" LabelAlign="Right">
                                 </f:Label>
                                 <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
                                 </f:Button>
@@ -109,9 +109,7 @@
 
                     </Items>
                 </f:FormRow>
-                    --%>
-
-
+                --%>
             </Rows>
             <Toolbars>
                 <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
@@ -121,7 +119,7 @@
                         <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click" Hidden="true">
                         </f:Button>
 
-                         <%--<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ToolTip="提交" OnClick="btnSubmit_Click" ValidateForms="SimpleForm1">
+                        <%--<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ToolTip="提交" OnClick="btnSubmit_Click" ValidateForms="SimpleForm1">
                         </f:Button>--%>
                     </Items>
                 </f:Toolbar>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs
index d0112b53..ceed9497 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs
@@ -1,5 +1,6 @@
 using BLL;
 using BLL.CQMS.Comprehensive;
+using FineUIPro.Web.Comprehensive;
 using System;
 using System.Linq;
 
@@ -46,7 +47,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 var inspectionEquipment = BLL.InspectionEquipmentService.GetInspectionEquipmentById(this.InspectionEquipmentId);
                 if (inspectionEquipment != null)
                 {
-                    this.InspectionEquipmentId = inspectionEquipment.InspectionEquipmentId;
+                    this.InspectionEquipmentId = inspectionEquipment.InspectionEquipmentId; 
+                    this.hdAttachUrl.Text = this.InspectionEquipmentId;
                     if (!string.IsNullOrEmpty(inspectionEquipment.UnitId))
                     {
                         this.drpUnitId.SelectedValue = inspectionEquipment.UnitId;
@@ -287,7 +289,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             }
 
             if (string.IsNullOrEmpty(this.InspectionEquipmentId))
-            {   newInspectionEquipment.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson));
+            {
+                if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
+                {
+                    newInspectionEquipment.InspectionEquipmentId = this.hdAttachUrl.Text;
+                }
+                else
+                {
+                    newInspectionEquipment.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson));
+                    this.hdAttachUrl.Text = newInspectionEquipment.InspectionEquipmentId;
+                }               
                 newInspectionEquipment.CompileMan = this.CurrUser.UserId;
                 newInspectionEquipment.CompileDate = DateTime.Now;
                 newInspectionEquipment.Status = BLL.Const.Comprehensive_Compile;
@@ -502,18 +513,18 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// <param name="e"></param>
         protected void btnAttach_Click(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(this.InspectionEquipmentId))   //新增记录
+            if (string.IsNullOrEmpty(this.hdAttachUrl.Text))   //新增记录
             {
-                this.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionEquipment));
+                this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionEquipment));
             }
-            //var oldInspectionEquipment = Funs.DB.Comprehensive_InspectionEquipment.Where(u => u.InspectionEquipmentId == this.InspectionEquipmentId).FirstOrDefault();
-            //if (oldInspectionEquipment.Status == BLL.Const.Comprehensive_Complete)
+            //Model.Comprehensive_InspectionPerson inspectionPerson = BLL.InspectionPersonService.GetInspectionPersonById(this.InspectionPersonId);
+            //if (inspectionPerson.Status == BLL.Const.Comprehensive_Complete)
             //{
-            //    PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/InspectionEquipment&menuId={1}", this.InspectionEquipmentId, BLL.Const.InspectionEquipmentMenuId)));
+            //    PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/inspectionPerson&menuId={1}", this.hdAttachUrl.Text, BLL.Const.InspectionPersonMenuId)));
             //}
             //else
             //{
-                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/InspectionEquipment&menuId={1}", this.InspectionEquipmentId, BLL.Const.InspectionEquipmentMenuId)));
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/InspectionEquipment&menuId={1}", this.hdAttachUrl.Text, BLL.Const.InspectionEquipmentMenuId)));
             //}
         }
         #endregion
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
index f66409a9..9be113a7 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
@@ -22,7 +22,7 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="sdrpUnitId" runat="server" Label="报验单位" LabelAlign="Right">
+                                <f:DropDownList ID="sdrpUnitId" runat="server" Label="接收单位" LabelAlign="Right">
                                 </f:DropDownList>
                                 <f:DropDownList ID="drpProfessionalId" runat="server" Label="专业" LabelAlign="Right" LabelWidth="60px"></f:DropDownList>
                                 <f:TextBox runat="server" ID="txtNCRCode" Label="NCR单号" LabelAlign="Right"></f:TextBox>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
index 12c49d5a..4f7aca93 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
@@ -41,8 +41,8 @@ namespace FineUIPro.Web.Comprehensive
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             if (sdrpUnitId.SelectedValue != BLL.Const._Null)
             {
-                strSql += " AND C.SendUnit=@UnitId";
-                listStr.Add(new SqlParameter("@UnitId", sdrpUnitId.SelectedValue));
+                strSql += " AND C.ReceiveUnit like @UnitId";
+                listStr.Add(new SqlParameter("@UnitId", "%" + sdrpUnitId.SelectedValue + "%"));
             }
             if (this.drpProfessionalId.SelectedValue != BLL.Const._Null)
             {
@@ -348,7 +348,7 @@ namespace FineUIPro.Web.Comprehensive
                          select x);
             if (sdrpUnitId.SelectedValue != BLL.Const._Null)
             {
-                lists = lists.Where(x => x.SendUnit == sdrpUnitId.SelectedValue);
+                lists = lists.Where(x => x.ReceiveUnit.Contains(sdrpUnitId.SelectedValue));
             }
             if (this.drpProfessionalId.SelectedValue != BLL.Const._Null)
             {
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs
index abb39d36..8f0fcaf5 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs
@@ -49,6 +49,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 if (specialEquipment != null)
                 {
                     this.SpecialEquipmentId = specialEquipment.SpecialEquipmentId;
+                    this.hdAttachUrl.Text = this.SpecialEquipmentId;
                     if (!string.IsNullOrEmpty(specialEquipment.UnitId))
                     {
                         this.drpUnit.SelectedValue = specialEquipment.UnitId;
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
index 917d1479..6da8ad1a 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
@@ -2212,7 +2212,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 var query = from c in db.Comprehensive_NCRManagement
                             join u in db.Base_Unit on c.SendUnit equals u.UnitId into unitJoin
                             from u in unitJoin.DefaultIfEmpty()
-                            where c.ProjectId == this.CurrUser.LoginProjectId && c.ReceiveUnit == item.UnitId
+                            where c.ProjectId == this.CurrUser.LoginProjectId && c.ReceiveUnit.Contains(item.UnitId)
                             select new
                             {
                                 c.NCRManagementId,
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
index 31034041..b3854711 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
@@ -2167,7 +2167,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 var query = from c in db.Comprehensive_NCRManagement
                             join u in db.Base_Unit on c.SendUnit equals u.UnitId into unitJoin
                             from u in unitJoin.DefaultIfEmpty()
-                            where c.ProjectId == this.CurrUser.LoginProjectId && c.ReceiveUnit == item.UnitId
+                            where c.ProjectId == this.CurrUser.LoginProjectId && c.ReceiveUnit.Contains(item.UnitId)
                             select new
                             {
                                 c.NCRManagementId,
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx
index 28c9bcbe..aae40e42 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx
+++ b/SGGL/FineUIPro.Web/indexProject.aspx
@@ -239,8 +239,8 @@
                                     <div class="c_lang">
                                         <f:DropDownList runat="server" ID="drpSelectLan" AutoPostBack="true" EmptyText="<%$ Resources:Lan,SelectLanguage %>"
                                             CssClass="icontopaction themes" Width="80px" OnSelectedIndexChanged="drpSelectLan_SelectedIndexChanged">
-                                            <f:ListItem Text="<%$ Resources:Lan,Chinese %>" Value="zh-CN" />
-                                            <f:ListItem Text="<%$ Resources:Lan,English %>" Value="en-US" />
+                                            <f:ListItem Text="中文" Value="zh-CN" />
+                                            <f:ListItem Text="English" Value="en-US" />
                                         </f:DropDownList>
                                     </div>
                                     <div class="projectSelect">
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs b/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs
index a13b715c..0447df07 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web {
-    
-    
-    public partial class indexProject {
-        
+namespace FineUIPro.Web
+{
+
+
+    public partial class indexProject
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// topPanel 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel topPanel;
-        
+
         /// <summary>
         /// ContentPanel1 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel1;
-        
+
         /// <summary>
         /// drpSelectLan 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpSelectLan;
-        
+
         /// <summary>
         /// drpProject 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProject;
-        
+
         /// <summary>
         /// Button21 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button Button21;
-        
+
         /// <summary>
         /// btnCall 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnCall;
-        
+
         /// <summary>
         /// btnTodo 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnTodo;
-        
+
         /// <summary>
         /// lblName 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lblName;
-        
+
         /// <summary>
         /// btnPersonal 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnPersonal;
-        
+
         /// <summary>
         /// btnProjectSet 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnProjectSet;
-        
+
         /// <summary>
         /// btnHelp 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnHelp;
-        
+
         /// <summary>
         /// Button18 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button Button18;
-        
+
         /// <summary>
         /// leftPanel 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel leftPanel;
-        
+
         /// <summary>
         /// leftPanelToolCollapse 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tool leftPanelToolCollapse;
-        
+
         /// <summary>
         /// leftPanelToolGear 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tool leftPanelToolGear;
-        
+
         /// <summary>
         /// btnExpandAll 控件。
         /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnExpandAll;
-        
+
         /// <summary>
         /// btnCollapseAll 控件。
         /// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnCollapseAll;
-        
+
         /// <summary>
         /// MenuMode 控件。
         /// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton MenuMode;
-        
+
         /// <summary>
         /// MenuModeNormal 控件。
         /// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuModeNormal;
-        
+
         /// <summary>
         /// MenuModeCompact 控件。
         /// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuModeCompact;
-        
+
         /// <summary>
         /// MenuModeLarge 控件。
         /// </summary>
@@ -227,7 +229,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuModeLarge;
-        
+
         /// <summary>
         /// MenuStyle 控件。
         /// </summary>
@@ -236,7 +238,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton MenuStyle;
-        
+
         /// <summary>
         /// MenuStyleTree 控件。
         /// </summary>
@@ -245,7 +247,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuStyleTree;
-        
+
         /// <summary>
         /// MenuStyleMiniModeTree 控件。
         /// </summary>
@@ -254,7 +256,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuStyleMiniModeTree;
-        
+
         /// <summary>
         /// MenuStylePlainTree 控件。
         /// </summary>
@@ -263,7 +265,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuStylePlainTree;
-        
+
         /// <summary>
         /// MenuLang 控件。
         /// </summary>
@@ -272,7 +274,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton MenuLang;
-        
+
         /// <summary>
         /// MenuLangZHCN 控件。
         /// </summary>
@@ -281,7 +283,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuLangZHCN;
-        
+
         /// <summary>
         /// mainTabStrip 控件。
         /// </summary>
@@ -290,7 +292,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TabStrip mainTabStrip;
-        
+
         /// <summary>
         /// Tab1 控件。
         /// </summary>
@@ -299,7 +301,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tab Tab1;
-        
+
         /// <summary>
         /// toolRefresh 控件。
         /// </summary>
@@ -308,7 +310,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tool toolRefresh;
-        
+
         /// <summary>
         /// toolNewWindow 控件。
         /// </summary>
@@ -317,7 +319,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tool toolNewWindow;
-        
+
         /// <summary>
         /// toolMaximize 控件。
         /// </summary>
@@ -326,7 +328,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tool toolMaximize;
-        
+
         /// <summary>
         /// toolSignOut 控件。
         /// </summary>
@@ -335,7 +337,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tool toolSignOut;
-        
+
         /// <summary>
         /// windowCustomQuery 控件。
         /// </summary>
@@ -344,7 +346,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window windowCustomQuery;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -353,7 +355,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -362,7 +364,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -371,7 +373,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// XmlDataSource1 控件。
         /// </summary>
@@ -380,7 +382,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.XmlDataSource XmlDataSource1;
-        
+
         /// <summary>
         /// ProjectZJ 控件。
         /// </summary>
@@ -389,7 +391,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button ProjectZJ;
-        
+
         /// <summary>
         /// ProjectTG 控件。
         /// </summary>
@@ -398,7 +400,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button ProjectTG;
-        
+
         /// <summary>
         /// ProjectJG 控件。
         /// </summary>
@@ -407,7 +409,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button ProjectJG;
-        
+
         /// <summary>
         /// btnCQMS 控件。
         /// </summary>
@@ -416,7 +418,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnCQMS;
-        
+
         /// <summary>
         /// btnHSSE 控件。
         /// </summary>
@@ -425,7 +427,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnHSSE;
-        
+
         /// <summary>
         /// btnJDGL 控件。
         /// </summary>
@@ -434,7 +436,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnJDGL;
-        
+
         /// <summary>
         /// btnHJGL 控件。
         /// </summary>
@@ -443,7 +445,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnHJGL;
-        
+
         /// <summary>
         /// btnCLGL 控件。
         /// </summary>
@@ -452,7 +454,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnCLGL;
-        
+
         /// <summary>
         /// btnTestRun 控件。
         /// </summary>
@@ -461,7 +463,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnTestRun;
-        
+
         /// <summary>
         /// btnTransfer 控件。
         /// </summary>
@@ -470,7 +472,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnTransfer;
-        
+
         /// <summary>
         /// btnPGJSX 控件。
         /// </summary>
@@ -479,7 +481,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnPGJSX;
-        
+
         /// <summary>
         /// btnDigitalSite 控件。
         /// </summary>
@@ -488,7 +490,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnDigitalSite;
-        
+
         /// <summary>
         /// btnPDigData 控件。
         /// </summary>
@@ -497,7 +499,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnPDigData;
-        
+
         /// <summary>
         /// btnOpinion 控件。
         /// </summary>
@@ -506,7 +508,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOpinion;
-        
+
         /// <summary>
         /// btnDoc 控件。
         /// </summary>
@@ -515,7 +517,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnDoc;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -524,7 +526,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.SimpleForm SimpleForm1;
-        
+
         /// <summary>
         /// hfProjectCode 控件。
         /// </summary>
@@ -533,7 +535,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hfProjectCode;
-        
+
         /// <summary>
         /// hfMonitorPW 控件。
         /// </summary>