修改培训人员添加以及增加培训记录页面

2024-04-03 11:12:45 +08:00 · 2024-04-03 11:12:45 +08:00 · 9235b5e078
parent 0b081ea38f
commit 9235b5e078
23 changed files with 1656 additions and 585 deletions
--- a/CreateModel2017.bat
+++ b/CreateModel2017.bat
@ -27,7 +27,7 @@ REM --------------
@echo.
@call "%VS150%"

-SqlMetal /views  /server:. /database:SGGLDB_CD /code:%Model_ROOT%\Model.cs /namespace:Model
+SqlMetal /views  /server:DESKTOP-1QITK9E\MSSQLSERVER2 /database:SGGLDB_CD /code:%Model_ROOT%\Model.cs /namespace:Model

@ECHO 完成
 pause
--- a/DataBase/版本日志/SGGLDB_CD_V2024-04-02-phf.sql
+++ b/DataBase/版本日志/SGGLDB_CD_V2024-04-02-phf.sql
@ -0,0 +1,6 @@
+update sys_menu set IsUsed=0 where menuid='6C314522-AF62-4476-893E-5F42C09C3077'
+update sys_menu set menuname='培训记录管理' where menuid='1182E353-FAB9-4DB1-A1EC-F41A00892128';
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('ACF2CAB1-CE56-4CED-B252-692558F9E36F','培训记录','HSSE/EduTrain/Trainingrecords.aspx',50,'EE260447-028F-46AF-8864-9A5DC9DAA5BD','Menu_HSSE',0,1,1)
+go
+
--- a/DataBase/版本日志/SGGLDB_CD_V2024-04-03-phf.sql
+++ b/DataBase/版本日志/SGGLDB_CD_V2024-04-03-phf.sql
@ -0,0 +1,495 @@
+--获取当前人待办事项
+ALTER PROCEDURE [dbo].[Sp_APP_GetToDoItems]     
+	@projectId NVARCHAR(50)=NULL,
+	@userId NVARCHAR(200)=NULL
+AS  
+/*获取当前人待办事项*/          
+BEGIN
+
+DECLARE @personid nvarchar(50);--personid
+DECLARE @IdentityCard NVARCHAR(50);--身份证号码
+SELECT IdentityCard=IdentityCard from sys_user where UserId=@userId;
+select @personid = personid from SitePerson_Person where IdentityCard=@IdentityCard and ProjectId=@projectId;
+
+SELECT chec.CheckControlCode AS DataId
+	 ,'B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306' AS MenuId 
+	 ,'质量巡检' AS MenuName
+	 , QuestionDef as Content
+	 ,UserId
+	 ,users.UserName
+	 ,chec.CheckDate AS DataTime
+	 ,CONVERT(varchar(100),chec.CheckDate, 23) AS DataTimeStr
+	 ,'/pagesQ/eq_xunjian/detail' AS UrlStr
+	 from Check_CheckControl as chec 
+	 left join  Check_CheckControlApprove checapprove on chec.CheckControlCode = checapprove.CheckControlCode and checapprove.ApproveDate is null
+	 left join Sys_User AS users ON users.UserId =checapprove.ApproveMan 
+	 where chec.State !='7' and chec.ProjectId = @projectId and      users.UserId =@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
+	,'/pagesHSSE/safe/inspecitonconfirm' AS UrlStr
+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+'%') )) 
+OR (register.states = '2' AND register.CheckManId =@userId))		
+
+UNION ALL
+SELECT PlanId AS DataId
+	,'B782A26B-D85C-4F84-8B45-F7AA47B3159E' AS MenuId
+	,'培训计划' AS MenuName
+	,PlanName AS Content
+	,UserId
+	,users.UserName
+	,DesignerDate AS DataTime
+	,CONVERT(varchar(100),DesignerDate, 23) AS DataTimeStr
+	,'/pagesTest/test/trainindex' AS UrlStr
+FROM Training_Plan AS ePlan
+LEFT JOIN Sys_User AS users ON ePlan.DesignerId= users.UserId 
+WHERE (ePlan.ProjectId=@projectId or (@projectId is null and ePlan.ProjectId is null))
+ AND (States = '0' OR States = '1' ) AND ePlan.DesignerId =@userId
+
+UNION ALL
+SELECT TestPlanId AS DataId
+	,'FAF7F4A4-A4BC-4D94-9E88-0CF5A380DB34' AS MenuId
+	,'考试计划' AS MenuName
+	,PlanName AS Content
+	,UserId
+	,users.UserName
+	,PlanDate AS DataTime
+	,CONVERT(varchar(100),PlanDate, 23) AS DataTimeStr
+	,'/pagesTest/test/testplan' AS UrlStr	
+FROM Training_TestPlan AS TPlan
+LEFT JOIN Sys_User AS users ON users.UserId =TPlan.PlanManId
+WHERE (TPlan.ProjectId=@projectId or (@projectId is null and TPlan.ProjectId is null))
+ AND (States = '0' OR States = '1' ) AND PlanManId =@userId
+
+UNION ALL
+SELECT TaskId AS DataId
+	,'E108F75D-89D0-4DCA-8356-A156C328805C' AS MenuId
+	,'培训任务' AS MenuName
+	,Plans.PlanName AS Content	
+	,users.UserId
+	,users.UserName
+	,TaskDate AS DataTime
+	,CONVERT(varchar(100),TaskDate, 23) AS DataTimeStr
+	,('/pagesTest/test/taskindex') AS UrlStr	
+FROM Training_Task AS Task
+   LEFT JOIN Sys_User AS users ON users.UserId =@userId
+   LEFT JOIN Training_Plan AS Plans ON Plans.PlanId =Task.PlanId
+WHERE (Task.ProjectId=@projectId or (@projectId is null and Task.ProjectId is null))
+	AND (Task.States IS NULL OR Task.States != 2)
+	AND Task.UserId = @userId 
+
+UNION ALL
+SELECT TestRecordId AS DataId
+	,'0EEB138D-84F9-4686-8CBB-CAEAA6CF1B2A' AS MenuId
+	,'扫码考试' AS MenuName
+	,TestPlan.PlanName AS Content	
+	,TestRecord.TestManId
+	,Person.PersonName
+	,TestPlan.TestStartTime AS DataTime
+	,CONVERT(varchar(100),TestPlan.TestStartTime, 23) AS DataTimeStr
+	,('/pages/temp_index/index') AS UrlStr	
+FROM Training_TestRecord AS TestRecord
+left join Training_TestPlan as TestPlan on TestRecord.TestPlanId = TestPlan.TestPlanId
+left join SitePerson_Person as Person on Person.PersonId = TestRecord.TestManId
+left join Sys_User as uses on Person.IdentityCard = uses.IdentityCard
+WHERE (TestRecord.ProjectId=@projectId or (@projectId is null and TestRecord.ProjectId is null))
+AND TestPlan.States ='1'
+AND TestRecord.TestEndTime IS NULL
+AND (TestRecord.TestManId = @userId  or uses.UserId = @userId)
+
+UNION ALL
+SELECT FireWorkId AS DataId
+	,'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' AS MenuId
+	,'动火作业' AS MenuName
+	,LicenseCode AS Content
+	,UserId
+	,users.UserName
+	,ApplyDate AS DataTime
+	,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
+	,(CASE WHEN States = '0' THEN '/pagesWork/dhuo/add' 
+			ELSE '/pagesWork/dhuo/approval' END) AS UrlStr	
+FROM License_FireWork AS License
+   LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
+WHERE License.ProjectId=@projectId 
+	AND (States = '0' OR States = '1' ) 
+	AND License.NextManId LIKE '%'+ @userId+'%'
+UNION ALL
+SELECT FireWorkId AS DataId
+	,'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' AS MenuId
+	,'动火作业' AS MenuName
+	,LicenseCode AS Content
+	,UserId
+	,users.UserName
+	,ApplyDate AS DataTime
+	,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
+	,(CASE WHEN States = '0' THEN '/pagesWork/dhuo/add' 
+			ELSE '/pagesWork/dhuo/approval' END) AS UrlStr	
+FROM License_FireWork AS License
+   LEFT JOIN Sys_User AS users ON users.UserId =License.ApplyManId
+WHERE License.ProjectId=@projectId 
+	AND ( States = '2' ) 
+	AND License.ApplyManId LIKE '%'+ @userId+'%'
+UNION ALL
+SELECT HeightWorkId AS DataId
+	,'DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9' AS MenuId
+	,'高处作业' AS MenuName
+	,LicenseCode AS Content
+	,UserId
+	,users.UserName
+	,ApplyDate AS DataTime
+	,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
+	,(CASE WHEN States = '0' THEN '/pagesWork/gchu/add' 
+			ELSE '/pagesWork/dhuo/approval' END) AS UrlStr	
+FROM License_HeightWork AS License
+   LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
+WHERE License.ProjectId=@projectId 
+	AND (States = '0' OR States = '1' ) 
+	AND License.NextManId LIKE '%'+ @userId+'%'
+UNION ALL
+SELECT HeightWorkId AS DataId
+	,'DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9' AS MenuId
+	,'高处作业' AS MenuName
+	,LicenseCode AS Content
+	,UserId
+	,users.UserName
+	,ApplyDate AS DataTime
+	,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
+	,(CASE WHEN States = '0' THEN '/pagesWork/gchu/add' 
+			ELSE '/pagesWork/dhuo/approval' END) AS UrlStr	
+FROM License_HeightWork AS License
+   LEFT JOIN Sys_User AS users ON users.UserId =License.ApplyManId
+WHERE License.ProjectId=@projectId 
+	AND (States = '2' ) 
+	AND License.ApplyManId LIKE '%'+ @userId+'%'
+UNION ALL
+SELECT LimitedSpaceId AS DataId
+	,'AEC9166D-1C91-45F0-8BFE-D3D0479A28C7' AS MenuId
+	,'受限空间' AS MenuName
+	,LicenseCode AS Content
+	,UserId
+	,users.UserName
+	,ApplyDate AS DataTime
+	,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
+	,(CASE WHEN States = '0' THEN '/pagesWork/sxkj/add' 
+			ELSE '/pagesWork/dhuo/approval' END) AS UrlStr	
+FROM License_LimitedSpace AS License
+   LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
+WHERE License.ProjectId=@projectId 
+	AND (States = '0' OR States = '1' ) 
+	AND License.NextManId LIKE '%'+ @userId+'%'
+UNION ALL
+SELECT LimitedSpaceId AS DataId
+	,'AEC9166D-1C91-45F0-8BFE-D3D0479A28C7' AS MenuId
+	,'受限空间' AS MenuName
+	,LicenseCode AS Content
+	,UserId
+	,users.UserName
+	,ApplyDate AS DataTime
+	,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
+	,(CASE WHEN States = '0' THEN '/pagesWork/sxkj/add' 
+			ELSE '/pagesWork/dhuo/approval' END) AS UrlStr	
+FROM License_LimitedSpace AS License
+   LEFT JOIN Sys_User AS users ON users.UserId =License.ApplyManId
+WHERE License.ProjectId=@projectId 
+	AND (States = '2' ) 
+	AND License.ApplyManId LIKE '%'+ @userId+'%'
+UNION ALL
+SELECT RadialWorkId AS DataId
+	,'F72FF20B-D3EB-46A5-97F7-C99B2473A140' AS MenuId
+	,'射线作业' AS MenuName
+	,LicenseCode AS Content
+	,UserId
+	,users.UserName
+	,ApplyDate AS DataTime
+	,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
+	,(CASE WHEN States = '0' THEN '/pagesWork/sx/add' 
+			ELSE '/pagesWork/dhuo/approval' END) AS UrlStr	
+FROM License_RadialWork AS License
+   LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
+WHERE License.ProjectId=@projectId 
+	AND (States = '0' OR States = '1' ) 
+	AND License.NextManId LIKE '%'+ @userId+'%'
+	UNION ALL
+SELECT RadialWorkId AS DataId
+	,'F72FF20B-D3EB-46A5-97F7-C99B2473A140' AS MenuId
+	,'射线作业' AS MenuName
+	,LicenseCode AS Content
+	,UserId
+	,users.UserName
+	,ApplyDate AS DataTime
+	,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
+	,(CASE WHEN States = '0' THEN '/pagesWork/sx/add' 
+			ELSE '/pagesWork/dhuo/approval' END) AS UrlStr	
+FROM License_RadialWork AS License
+   LEFT JOIN Sys_User AS users ON users.UserId =License.ApplyManId
+WHERE License.ProjectId=@projectId 
+	AND (States = '2' ) 
+	AND License.ApplyManId LIKE '%'+ @userId+'%'
+UNION ALL
+SELECT OpenCircuitId AS DataId
+	,'4E607E83-41FC-4F49-B26F-A21CFE38328F' AS MenuId
+	,'断路(占道)' AS MenuName
+	,LicenseCode AS Content
+	,UserId
+	,users.UserName
+	,ApplyDate AS DataTime
+	,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
+	,(CASE WHEN States = '0' THEN '/pagesWork/dlu/add' 
+			ELSE '/pagesWork/dhuo/approval' END) AS UrlStr	
+FROM License_OpenCircuit AS License
+   LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
+WHERE License.ProjectId=@projectId 
+	AND (States = '0' OR States = '1' ) 
+	AND License.NextManId LIKE '%'+ @userId+'%'
+UNION ALL
+SELECT OpenCircuitId AS DataId
+	,'4E607E83-41FC-4F49-B26F-A21CFE38328F' AS MenuId
+	,'断路(占道)' AS MenuName
+	,LicenseCode AS Content
+	,UserId
+	,users.UserName
+	,ApplyDate AS DataTime
+	,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
+	,(CASE WHEN States = '0' THEN '/pagesWork/dlu/add' 
+			ELSE '/pagesWork/dhuo/approval' END) AS UrlStr	
+FROM License_OpenCircuit AS License
+   LEFT JOIN Sys_User AS users ON users.UserId =License.ApplyManId
+WHERE License.ProjectId=@projectId 
+	AND (States = '0' OR States = '1' ) 
+	AND License.ApplyManId LIKE '%'+ @userId+'%'
+UNION ALL
+SELECT BreakGroundId AS DataId
+	,'755C6AC9-2E38-4D4F-AF33-33CB1744A907' AS MenuId
+	,'动土作业' AS MenuName
+	,LicenseCode AS Content
+	,UserId
+	,users.UserName
+	,ApplyDate AS DataTime
+	,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
+	,(CASE WHEN States = '0' THEN '/pagesWork/dtu/add' 
+			ELSE '/pagesWork/dhuo/approval' END) AS UrlStr	
+FROM License_BreakGround AS License
+   LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
+WHERE License.ProjectId=@projectId 
+	AND (States = '0' OR States = '1' ) 
+	AND License.NextManId LIKE '%'+ @userId+'%'
+UNION ALL
+SELECT BreakGroundId AS DataId
+	,'755C6AC9-2E38-4D4F-AF33-33CB1744A907' AS MenuId
+	,'动土作业' AS MenuName
+	,LicenseCode AS Content
+	,UserId
+	,users.UserName
+	,ApplyDate AS DataTime
+	,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
+	,(CASE WHEN States = '0' THEN '/pagesWork/dtu/add' 
+			ELSE '/pagesWork/dhuo/approval' END) AS UrlStr	
+FROM License_BreakGround AS License
+   LEFT JOIN Sys_User AS users ON users.UserId =License.ApplyManId
+WHERE License.ProjectId=@projectId 
+	AND (States = '0' OR States = '1' ) 
+	AND License.ApplyManId LIKE '%'+ @userId+'%'
+UNION ALL
+SELECT NightWorkId AS DataId
+	,'7BBAE649-7B00-4475-A911-BFE3A37AC55B' AS MenuId
+	,'夜间施工' AS MenuName
+	,LicenseCode AS Content
+	,UserId
+	,users.UserName
+	,ApplyDate AS DataTime
+	,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
+	,(CASE WHEN States = '0' THEN '/pagesWork/yjsg/add' 
+			ELSE '/pagesWork/dhuo/approval' END) AS UrlStr	
+FROM License_NightWork AS License
+   LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
+WHERE License.ProjectId=@projectId 
+	AND (States = '0' OR States = '1' ) 
+	AND License.NextManId LIKE '%'+ @userId+'%'
+UNION ALL
+SELECT NightWorkId AS DataId
+	,'7BBAE649-7B00-4475-A911-BFE3A37AC55B' AS MenuId
+	,'夜间施工' AS MenuName
+	,LicenseCode AS Content
+	,UserId
+	,users.UserName
+	,ApplyDate AS DataTime
+	,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
+	,(CASE WHEN States = '0' THEN '/pagesWork/yjsg/add' 
+			ELSE '/pagesWork/dhuo/approval' END) AS UrlStr	
+FROM License_NightWork AS License
+   LEFT JOIN Sys_User AS users ON users.UserId =License.ApplyManId
+WHERE License.ProjectId=@projectId 
+	AND (States = '2' ) 
+	AND License.ApplyManId LIKE '%'+ @userId+'%'
+UNION ALL
+SELECT LiftingWorkId AS DataId
+	,'A1BE3AB6-9D4A-41E7-8870-E73423165451' AS MenuId
+	,'吊装作业' AS MenuName
+	,LicenseCode AS Content
+	,UserId
+	,users.UserName
+	,ApplyDate AS DataTime
+	,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
+	,(CASE WHEN States = '0' THEN '/pagesWork/dzhuang/add' 
+			ELSE '/pagesWork/dhuo/approval' END) AS UrlStr	
+FROM License_LiftingWork AS License
+   LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId
+WHERE License.ProjectId=@projectId 
+	AND (States = '0' OR States = '1' ) 
+	AND License.NextManId LIKE '%'+ @userId+'%'
+UNION ALL
+SELECT LiftingWorkId AS DataId
+	,'A1BE3AB6-9D4A-41E7-8870-E73423165451' AS MenuId
+	,'吊装作业' AS MenuName
+	,LicenseCode AS Content
+	,UserId
+	,users.UserName
+	,ApplyDate AS DataTime
+	,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr
+	,(CASE WHEN States = '0' THEN '/pagesWork/dzhuang/add' 
+			ELSE '/pagesWork/dhuo/approval' END) AS UrlStr	
+FROM License_LiftingWork AS License
+   LEFT JOIN Sys_User AS users ON users.UserId =License.ApplyManId
+WHERE License.ProjectId=@projectId 
+	AND (States = '2' ) 
+	AND License.ApplyManId LIKE '%'+ @userId+'%'
+UNION ALL
+SELECT RectifyNoticesId AS DataId
+	,'0038D764-D628-46F0-94FF-D0A22C3C45A3' AS MenuId
+	,'隐患整改' AS MenuName
+	,(CASE WHEN Rectify.States =1 THEN '待签发：' 
+		   WHEN Rectify.States =2 THEN '待整改：' 
+		   WHEN Rectify.States =3 THEN '待审核：' 
+		   WHEN Rectify.States =4 THEN '待复查：' 
+		   WHEN Rectify.States =5 THEN '已完成：' 
+		   ELSE '待提交：' END + RectifyNoticesCode) +  ' 内容:' + replace(replace(( select WrongContent from  Check_RectifyNoticesItem as  rni where rni.RectifyNoticesId=Rectify.RectifyNoticesId for xml path ('')),'<WrongContent>',''),'</WrongContent>','') AS Content	
+	,users.UserId
+	,users.UserName
+	,CheckedDate AS DataTime
+	,CONVERT(varchar(100),CheckedDate, 23) AS DataTimeStr
+	,(CASE WHEN ISNULL(Rectify.States,0) =0 THEN '/pagesHSSE/rn/rn_add' --提交
+		   WHEN Rectify.States =1 THEN '/pagesHSSE/rn/rn_approval' --签发
+		   WHEN Rectify.States =2 THEN '/pagesHSSE/rn/rn_rectify' --整改
+		   WHEN Rectify.States =3 THEN '/pagesHSSE/rn/rn_rectifycf' --审核
+		   WHEN Rectify.States =4 THEN '/pagesHSSE/rn/rn_confirm'  --复查
+		ELSE '/pagesHSSE/rn/rn_add' END) AS UrlStr
+FROM Check_RectifyNotices AS Rectify
+	LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Rectify.Projectid=@projectId AND Rectify.States <> 5
+	AND ((ISNULL(Rectify.States,0) =0 AND Rectify.CompleteManId LIKE '%'+ @userId+'%')
+		 OR (Rectify.States =1 AND Rectify.SignPerson LIKE '%'+ @userId+'%')
+		 OR (Rectify.States =2 AND Rectify.DutyPersonId LIKE '%'+ @userId+'%')
+		 OR (Rectify.States =3 AND Rectify.UnitHeadManId LIKE '%'+ @userId+'%')
+		 OR (Rectify.States =4 AND Rectify.CompleteManId LIKE '%'+ @userId+'%') 
+		 OR (Rectify.States =4 AND Rectify.SignPerson LIKE '%'+ @userId+'%')
+		 OR (Rectify.ProfessionalEngineerId LIKE '%'+ @userId+'%' AND (ProfessionalEngineerTime1 IS NULL OR ProfessionalEngineerTime2 IS NULL))
+		 OR (Rectify.ConstructionManagerId LIKE '%'+ @userId+'%' AND (ConstructionManagerTime1 IS NULL OR ConstructionManagerTime2 IS NULL))
+		 OR (Rectify.ProjectManagerId LIKE '%'+ @userId+'%' AND (ProjectManagerTime1 IS NULL OR ProjectManagerTime2 IS NULL)))
+
+UNION ALL
+SELECT PersonId AS DataId
+	,'EE260447-028F-46AF-8864-9A5DC9DAA5BD' AS MenuId
+	,'现场人员' AS MenuName
+	,Person.PersonName AS Content	
+	,users.UserId
+	,users.UserName
+	,Person.InTime AS DataTime
+	,CONVERT(varchar(100),Person.InTime, 23) AS DataTimeStr
+	,('/pagesHSSE/info/peopledetail') AS UrlStr	
+FROM SitePerson_Person AS Person
+   LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Person.ProjectId=@projectId AND (Person.IsUsed IS NULL OR Person.IsUsed= 0)
+	AND Person.AuditorId = @userId AND Person.AuditorDate IS NULL
+
+
+UNION ALL
+SELECT PauseNoticeId AS DataId
+	,'C81DB7ED-165E-4C69-86B0-A3AAE37059FE' AS MenuId
+	,'暂停令' AS MenuName
+	,(CASE WHEN PauseNotice.PauseStates =1 THEN '待签发：' 
+		   WHEN PauseNotice.PauseStates =2 THEN '待批准：' 
+		   WHEN PauseNotice.PauseStates =3 THEN '待接收：' 
+		   ELSE '待提交：' END + PauseNoticeCode) AS Content	
+	,users.UserId
+	,users.UserName
+	,PauseTime AS DataTime
+	,CONVERT(varchar(100),PauseTime, 23) AS DataTimeStr
+	,(CASE WHEN ISNULL(PauseNotice.PauseStates,0) =0 THEN '/pagesHSSE/info/stop_add ' --待提交
+		   WHEN PauseNotice.PauseStates =1 AND PauseNotice.SignManId=@userId THEN '/pagesHSSE/info/stop_approval' --待签发
+		   WHEN PauseNotice.PauseStates =2 AND PauseNotice.ApproveManId=@userId THEN '/pagesHSSE/info/stop_confirm' --待批准
+		   WHEN PauseNotice.PauseStates =3 AND PauseNotice.DutyPersonId=@userId THEN '/pagesHSSE/info/stop_feedback' --待接收
+		ELSE '/pagesHSSE/info/stop_detail' END) AS UrlStr
+FROM Check_PauseNotice AS PauseNotice
+	LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE PauseNotice.ProjectId=@projectId AND PauseNotice.PauseStates <> 4
+	AND ((ISNULL(PauseNotice.PauseStates,0) =0 AND PauseNotice.CompileManId LIKE '%'+ @userId+'%')
+		OR (PauseNotice.PauseStates =1 AND PauseNotice.SignManId LIKE '%'+ @userId+'%')
+		OR (PauseNotice.PauseStates =2 AND PauseNotice.ApproveManId LIKE '%'+ @userId+'%')
+		OR (PauseNotice.PauseStates =3 AND PauseNotice.DutyPersonId LIKE '%'+ @userId+'%')		
+		OR (PauseNotice.ProfessionalEngineerId LIKE '%'+ @userId+'%' AND ProfessionalEngineerTime IS NULL)
+		OR (PauseNotice.ConstructionManagerId LIKE '%'+ @userId+'%' AND ConstructionManagerTime IS NULL)
+		OR (PauseNotice.UnitHeadManId LIKE '%'+ @userId+'%' AND UnitHeadManTime IS NULL)
+		OR (PauseNotice.SupervisorManId LIKE '%'+ @userId+'%' AND SupervisorManTime IS NULL)
+		OR (PauseNotice.OwnerId LIKE '%'+ @userId+'%' AND OwnerTime IS NULL))
+UNION ALL
+SELECT PunishNoticeId AS DataId
+	,'755F1C1D-2178-47D8-9F82-A501B53A2436' AS MenuId
+	,'处罚单' AS MenuName
+	,(CASE WHEN PunishNotice.PunishStates =1 THEN '待签发：' 
+		   WHEN PunishNotice.PunishStates =2 THEN '待批准：' 
+		   WHEN PunishNotice.PunishStates =3 THEN '待回执：' 
+		   ELSE '待提交：' END + PunishNoticeCode) AS Content	
+	,users.UserId
+	,users.UserName
+	,PunishNoticeDate AS DataTime
+	,CONVERT(varchar(100),PunishNoticeDate, 23) AS DataTimeStr
+	,(CASE WHEN ISNULL(PunishNotice.PunishStates,0) =0 THEN '/pagesTest/punish/add ' --待提交
+		   WHEN PunishNotice.PunishStates =1 AND PunishNotice.SignMan=@userId THEN '/pagesTest/punish/approval' --待签发
+		   WHEN PunishNotice.PunishStates =2 AND PunishNotice.ApproveMan=@userId THEN '/pagesTest/punish/rectify' --待批准
+		   WHEN PunishNotice.PunishStates =3 AND PunishNotice.DutyPersonId=@userId THEN '/pagesTest/punish/rectifycf' --待回执
+		ELSE '/pagesTest/punish/detail' END) AS UrlStr
+FROM Check_PunishNotice AS PunishNotice
+	LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE PunishNotice.ProjectId=@projectId AND PunishNotice.PunishStates <> 4
+	AND ((ISNULL(PunishNotice.PunishStates,0) =0 AND PunishNotice.CompileMan LIKE '%'+ @userId+'%')
+		OR (PunishNotice.PunishStates =1 AND PunishNotice.SignMan LIKE '%'+ @userId+'%')
+		OR (PunishNotice.PunishStates =2 AND PunishNotice.ApproveMan LIKE '%'+ @userId+'%')
+		OR (PunishNotice.PunishStates =3 AND PunishNotice.DutyPersonId LIKE '%'+ @userId+'%')		
+		OR (PunishNotice.ProfessionalEngineerId LIKE '%'+ @userId+'%' AND ProfessionalEngineerTime IS NULL)
+		OR (PunishNotice.ConstructionManagerId LIKE '%'+ @userId+'%' AND ConstructionManagerTime IS NULL)
+		OR (PunishNotice.UnitHeadManId LIKE '%'+ @userId+'%' AND UnitHeadManTime IS NULL))
+
+
+UNION ALL
+SELECT TaskId AS DataId
+	,'E108F75D-89D0-4DCA-8356-A156C328805C' AS MenuId
+	,'培训任务' AS MenuName
+	,Plans.PlanName AS Content	
+	,@userId
+	,users.PersonName
+	,TaskDate AS DataTime
+	,CONVERT(varchar(100),TaskDate, 23) AS DataTimeStr
+	,('/pagesTest/test/taskindex') AS UrlStr	
+FROM Training_Task AS Task
+   LEFT JOIN SitePerson_Person AS users ON users.PersonId =@personid and users.ProjectId=@projectId
+   LEFT JOIN Training_Plan AS Plans ON Plans.PlanId =Task.PlanId
+WHERE (Task.ProjectId=@projectId or (@projectId is null and Task.ProjectId is null))
+	AND (Task.States IS NULL OR Task.States != 2)
+	AND Task.UserId = @userId 
+
+ORDER BY DataTime DESC 
+END
+
+
+
+
+
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@ -63,8 +63,9 @@
    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@ -877,6 +877,7 @@
    <Content Include="HSSE\EduTrain\PlanEdit.aspx" />
    <Content Include="HSSE\EduTrain\TaskNotice.aspx" />
    <Content Include="HSSE\EduTrain\TaskNoticeEdit.aspx" />
+    <Content Include="HSSE\EduTrain\Trainingrecords.aspx" />
    <Content Include="HSSE\EduTrain\TrainTestRecordEdit.aspx" />
    <Content Include="HSSE\EduTrain\CompanyTraining.aspx" />
    <Content Include="HSSE\EduTrain\CompanyTrainingItemSave.aspx" />
@ -10652,6 +10653,13 @@
    <Compile Include="HSSE\EduTrain\TaskNoticeEdit.aspx.designer.cs">
      <DependentUpon>TaskNoticeEdit.aspx</DependentUpon>
    </Compile>
+    <Compile Include="HSSE\EduTrain\Trainingrecords.aspx.cs">
+      <DependentUpon>Trainingrecords.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\EduTrain\Trainingrecords.aspx.designer.cs">
+      <DependentUpon>Trainingrecords.aspx</DependentUpon>
+    </Compile>
    <Compile Include="HSSE\EduTrain\TrainTestRecordEdit.aspx.cs">
      <DependentUpon>TrainTestRecordEdit.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx
@ -41,7 +41,7 @@
            </f:FormRow>
             <f:FormRow>
                <Items>
-                      <f:NumberBox ID="txtLearningTime" Label="时长" runat="server"  DecimalPrecision="0"  NoDecimal="true" NoNegative="true" ></f:NumberBox>
+                      <f:NumberBox ID="txtLearningTime" Label="时长（分钟）" runat="server"  DecimalPrecision="0"  NoDecimal="true" NoNegative="true" ></f:NumberBox>
                </Items>
            </f:FormRow>
        </Rows>
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx.cs
@ -61,7 +61,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
                        hdCompileMan.Text = q.CompileMan;
 						if (q.LearningTime.HasValue)
 						{
-							txtLearningTime.Text = q.LearningTime.Value.ToString();
+							txtLearningTime.Text = (q.LearningTime.Value/60).ToString();
 						}
                        if (q.CompileDate != null)
                        {
@ -99,7 +99,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
            };
 			if (!string.IsNullOrEmpty(txtLearningTime.Text))
 			{
-				newCompanyTrainItem.LearningTime = int.Parse(txtLearningTime.Text);
+				newCompanyTrainItem.LearningTime = int.Parse(txtLearningTime.Text)*60;
 			}
            if (!string.IsNullOrEmpty(txtCompileDate.Text.Trim()))
            {
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx
@ -0,0 +1,137 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Trainingrecords.aspx.cs" Inherits="FineUIPro.Web.HSSE.EduTrain.Trainingrecords" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>培训记录</title>
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="培训记录" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="TaskItemId" EnableColumnLines="true" DataIDField="TaskItemId" AllowSorting="true"
+                    AllowPaging="true" ForceFit="true"
+                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableRowDoubleClickEvent="true" 
+                    EnableTextSelection="True" EnableSummary="true" SummaryPosition="Flow">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                            <Items>
+                               <f:TextBox ID="txtName" runat="server" Label="姓名" LabelAlign="Right" LabelWidth="80px" AutoPostBack="true" OnTextChanged="Text_TextChanged"></f:TextBox>
+
+                                <f:DatePicker ID="txtStartDate" runat="server" Label="培训日期" Width="300px" LabelWidth="100px" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="Text_TextChanged">
+                                </f:DatePicker>
+                                <f:Label ID="lblTo" runat="server" Text="至" Width="20px">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndDate" runat="server" Width="200px" AutoPostBack="true" OnTextChanged="Text_TextChanged">
+                                </f:DatePicker>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                               
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                               
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                      <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                      
+                         <f:RenderField Width="200px" ColumnID="TrainContent" DataField="TrainContent"
+                           FieldType="String" HeaderText="培训内容" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                        </f:RenderField>
+
+                          <f:RenderField Width="100px" ColumnID="TrainStartDate" DataField="TrainStartDate"
+                            SortField="TrainStartDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                            HeaderText="培训时间" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+
+                        <f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName"
+                           FieldType="String" HeaderText="单位" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                        </f:RenderField>
+
+                        <f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName"
+                           FieldType="String" HeaderText="姓名" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                        </f:RenderField>
+
+                        <f:RenderField Width="120px" ColumnID="TrainTypeName" DataField="TrainTypeName"
+                           FieldType="String" HeaderText="培训类型" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                        </f:RenderField>
+
+                        <f:RenderField Width="120px" ColumnID="TrainLevelName" DataField="TrainLevelName"
+                           FieldType="String" HeaderText="培训级别" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                        </f:RenderField>
+
+                        <f:RenderField Width="120px" ColumnID="TrainingItemName" DataField="TrainingItemName"
+                           FieldType="String" HeaderText="培训教材" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                        </f:RenderField>
+
+                        <f:TemplateField ColumnID="tfLearnTime" Width="120px" HeaderText="资源时长(分钟)" HeaderTextAlign="Center" 
+                            TextAlign="left">
+                            <ItemTemplate>
+                                <asp:Label ID="lblLearnTime" runat="server" Text='<%# ConvertTime(Eval("LearnTime")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                      
+                       <f:TemplateField ColumnID="tfVideoProgress" Width="120px" HeaderText="学习时长(分钟)" HeaderTextAlign="Center" 
+                            TextAlign="left">
+                            <ItemTemplate>
+                                <asp:Label ID="lblVideoProgress" runat="server" Text='<%# ConvertTime(Eval("VideoProgress")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    
+                         <f:RenderField Width="80px" ColumnID="TeachHour" DataField="TeachHour"
+                           FieldType="String" HeaderText="学时" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                        </f:RenderField>
+
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Menu ID="Menu1" runat="server">
+            
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+    </script>
+</body>
+</html>
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx.cs
@ -0,0 +1,216 @@
+using BLL;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using AspNet = System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HSSE.EduTrain
+{
+    public partial class Trainingrecords : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+               
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                BindGrid();
+               
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string projectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrEmpty(Request.Params["projectId"]))  ///是否文件柜查看页面传项目值
+            {
+                projectId = Request.Params["projectId"];
+            }
+            if (!string.IsNullOrEmpty(projectId))
+            {
+                string strSql = @"select tp.TrainContent,tp.TrainStartDate,u.UnitName,bt.TrainTypeName,btl.TrainLevelName,tp.TeachHour,tp.ProjectId,
+                                     f.*,p.PersonName From Training_TaskItem f
+                                    left join SitePerson_Person p on f.PersonId = p.PersonId
+                                    left join Training_Plan tp on f.PlanId = tp.PlanId
+                                    left join Base_TrainType bt on tp.TrainTypeId = bt.TrainTypeId
+                                    left join Base_TrainLevel btl on tp.TrainLevelId = btl.TrainLevelId
+                                    left join Base_Unit u on p.UnitId = u.UnitId WHERE 1=1 ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                strSql += " AND tp.ProjectId = @ProjectId";
+                listStr.Add(new SqlParameter("@ProjectId", projectId));
+               
+                if (!string.IsNullOrEmpty(txtName.Text.Trim()))
+                {
+                    strSql += " AND p.PersonName like '%"+ txtName.Text.Trim() + "%'";
+                }
+                if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim()))
+                {
+                    strSql += " AND tp.TrainStartDate >= @StartDate ";
+                    listStr.Add(new SqlParameter("@StartDate", this.txtStartDate.Text.Trim()));
+                }
+                if (!string.IsNullOrEmpty(this.txtEndDate.Text.Trim()))
+                {
+                    strSql += " AND tp.TrainStartDate <= @EndDate ";
+                    listStr.Add(new SqlParameter("@EndDate", this.txtEndDate.Text.Trim()));
+                }
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                Grid1.RecordCount = tb.Rows.Count;
+                //tb = GetFilteredTable(Grid1.FilteredData, tb);
+                var table = this.GetPagedDataTable(Grid1, tb);
+
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+            }
+        }
+
+        #region 查询事件
+        /// <summary>
+        /// 查询事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Text_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 页索引改变事件
+        /// <summary>
+        /// 页索引改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 排序
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 分页选择下拉改变事件
+        /// <summary>
+        /// 分页选择下拉改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("培训记录" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = this.Grid1.Rows.Count();
+            BindGrid();
+            Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+#pragma warning disable CS0108 // “TrainRecord.GetGridTableHtml(Grid)”隐藏继承的成员“PageBase.GetGridTableHtml(Grid)”。如果是有意隐藏，请使用关键字 new。
+        /// <summary>
+        /// 导出方法
+        /// </summary>
+        /// <param name="grid"></param>
+        /// <returns></returns>
+        private string GetGridTableHtml(Grid grid)
+#pragma warning restore CS0108 // “TrainRecord.GetGridTableHtml(Grid)”隐藏继承的成员“PageBase.GetGridTableHtml(Grid)”。如果是有意隐藏，请使用关键字 new。
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
+            sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
+            sb.Append("<tr>");
+            foreach (GridColumn column in grid.Columns)
+            {
+                sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+            }
+            sb.Append("</tr>");
+            foreach (GridRow row in grid.Rows)
+            {
+                sb.Append("<tr>");
+                foreach (GridColumn column in grid.Columns)
+                {
+                    string html = row.Values[column.ColumnIndex].ToString();
+                    if (column.ColumnID == "tfNumber")
+                    {
+                        html = (row.FindControl("lblNumber") as AspNet.Label).Text;
+                    }
+                    if (column.ColumnID == "tfLearnTime")
+                    {
+                        html = (row.FindControl("lblLearnTime") as AspNet.Label).Text;
+                    }
+                    if (column.ColumnID == "tfVideoProgress")
+                    {
+                        html = (row.FindControl("lblVideoProgress") as AspNet.Label).Text;
+                    }
+                   
+                    //sb.AppendFormat("<td>{0}</td>", html);
+                    sb.AppendFormat("<td style='vnd.ms-excel.numberformat:@;width:140px;'>{0}</td>", html);
+                }
+
+                sb.Append("</tr>");
+            }
+
+            sb.Append("</table>");
+
+            return sb.ToString();
+        }
+        #endregion
+
+        #region 格式化字符串
+        /// <summary>
+        /// 获取单位名称
+        /// </summary>
+        /// <param name="unitIds"></param>
+        /// <returns></returns>
+        protected string ConvertTime(object time)
+        {
+            string hours = "0";
+            if (time != null)
+            {
+                if (!string.IsNullOrEmpty(time.ToString()))
+                {
+                    return (Convert.ToInt32(time) * 60).ToString();
+                }
+                else {
+                    return hours;
+                }
+                
+            }
+            return hours;
+        }
+        #endregion
+    }
+}
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx.designer.cs
@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.EduTrain
+{
+
+
+    public partial class Trainingrecords
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtName;
+
+        /// <summary>
+        /// txtStartDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartDate;
+
+        /// <summary>
+        /// lblTo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lblTo;
+
+        /// <summary>
+        /// txtEndDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndDate;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
+        /// <summary>
+        /// lblNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblNumber;
+
+        /// <summary>
+        /// lblLearnTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblLearnTime;
+
+        /// <summary>
+        /// lblVideoProgress 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblVideoProgress;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+    }
+}
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.cs
@ -124,26 +124,39 @@ namespace FineUIPro.Web.HSSE.QualityAudit
 			this.Grid1.DataBind();
 			for (int i = 0; i < Grid1.Rows.Count; i++)
 			{
-				string limitstr = Grid1.Rows[i].Values[8].ToString();
-				if (!string.IsNullOrEmpty(limitstr))
-				{
-					DateTime limitDate = DateTime.Parse(limitstr);
-					if (limitDate.AddMonths(-3) <= DateTime.Now)
-					{
-						Grid1.Rows[i].RowCssClass = "Red";
-					}
-					else
-					{
-						Grid1.Rows[i].RowCssClass = "";
+                //必须是有效期有值并且有附件
+                string limitstr = Grid1.Rows[i].Values[8].ToString();
+                var keyId = Grid1.Rows[i].DataKeys[0].ToString()+ "#4";

-					}
-				}
-				else
-				{
-					Grid1.Rows[i].RowCssClass = "Red";
-				}
+                var sourlist = Funs.DB.AttachFile.Where(p => p.ToKeyId== keyId).ToList();
+                if (!string.IsNullOrEmpty(limitstr) && sourlist.Count > 0)
+                {
+                    Grid1.Rows[i].RowCssClass = "";
+                }
+                else {
+                    Grid1.Rows[i].RowCssClass = "Red";
+                }

-			}
+                //string limitstr = Grid1.Rows[i].Values[8].ToString();
+                //if (!string.IsNullOrEmpty(limitstr))
+                //{
+                //	DateTime limitDate = DateTime.Parse(limitstr);
+                //	if (limitDate.AddMonths(-3) <= DateTime.Now)
+                //	{
+                //		Grid1.Rows[i].RowCssClass = "Red";
+                //	}
+                //	else
+                //	{
+                //		Grid1.Rows[i].RowCssClass = "";
+
+                //	}
+                //}
+                //else
+                //{
+                //	Grid1.Rows[i].RowCssClass = "Red";
+                //}
+
+            }


 			JObject summary = new JObject
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx
@ -34,10 +34,10 @@
            <f:FormRow>
                <Items>
                    <f:DropDownList ID="drpCertificate" runat="server" Label="特岗证书"
-                     LabelAlign="Right" LabelWidth="120px" EnableEdit="true" Required="true" ShowRedStar="true" >
+                     LabelAlign="Right" LabelWidth="120px" EnableEdit="true">
                     </f:DropDownList>
                    <f:TextBox ID="txtCertificateNo" runat="server" Label="证书编号" LabelAlign="Right"
-                        MaxLength="50" Required="true" ShowRedStar="true" LabelWidth="120px">
+                        MaxLength="50" LabelWidth="120px">
                    </f:TextBox>
                </Items>
            </f:FormRow>
@ -57,7 +57,7 @@
                          LabelWidth="120px">
                    </f:DatePicker>
                    <f:DatePicker ID="txtLimitDate" Label="有效期至" runat="server" LabelAlign="Right" EnableEdit="true"
-                        Required="true" ShowRedStar="true" LabelWidth="120px">
+                         LabelWidth="120px">
                    </f:DatePicker>
                </Items>
            </f:FormRow>
@ -91,12 +91,12 @@
        <Toolbars>
            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
                <Items>
-                    <f:Button ID="btnAttachUrl" Text="证书扫描件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
+                    <f:Button ID="btnAttachUrl" Text="证书扫描件" ToolTip="附件上传及查看" Icon="TableCell" runat="server" Hidden="true"
                        OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1" MarginLeft="5px">
                    </f:Button>
                    <f:ToolbarFill ID="ToolbarFill1" runat="server">
                    </f:ToolbarFill>
-                    <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1"
+                    <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1" Hidden="true"
                        OnClick="btnSave_Click">
                    </f:Button>
                    <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs
@ -130,20 +130,21 @@ namespace FineUIPro.Web.HSSE.QualityAudit
        /// <param name="sender"></param>
        /// <param name="e"></param>
        protected void btnAttachUrl_Click(object sender, EventArgs e)
-        {           
-            if (this.btnSave.Hidden)
-            {
-                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PersonQualityAttachUrl&menuId={1}&type=-1", PersonQualityId, BLL.Const.PersonQualityMenuId)));
-            }
-            else
-            {
-                if (string.IsNullOrEmpty(this.PersonQualityId))
-                {
-                    SaveData(false);
-                }
+        {
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PersonQualityAttachUrl&menuId={1}&type=-1", PersonQualityId, BLL.Const.PersonQualityMenuId)));
+            //if (this.btnSave.Hidden)
+            //{
+            //    PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PersonQualityAttachUrl&menuId={1}&type=-1", PersonQualityId, BLL.Const.PersonQualityMenuId)));
+            //}
+            //else
+            //{
+            //    if (string.IsNullOrEmpty(this.PersonQualityId))
+            //    {
+            //        SaveData(false);
+            //    }

-                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PersonQualityAttachUrl&menuId={1}", PersonQualityId, BLL.Const.PersonQualityMenuId)));
-            }            
+            //    PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PersonQualityAttachUrl&menuId={1}", PersonQualityId, BLL.Const.PersonQualityMenuId)));
+            //}            
        }
        #endregion

--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.designer.cs
@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------

-namespace FineUIPro.Web.HSSE.QualityAudit {
-    
-    
-    public partial class PersonQualityEdit {
-        
+namespace FineUIPro.Web.HSSE.QualityAudit
+{
+
+
+    public partial class PersonQualityEdit
+    {
+
        /// <summary>
        /// form1 控件。
        /// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
        /// <summary>
        /// PageManager1 控件。
        /// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.PageManager PageManager1;
-        
+
        /// <summary>
        /// SimpleForm1 控件。
        /// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Form SimpleForm1;
-        
+
        /// <summary>
        /// txtUnitCode 控件。
        /// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextBox txtUnitCode;
-        
+
        /// <summary>
        /// txtUnitName 控件。
        /// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextBox txtUnitName;
-        
+
        /// <summary>
        /// txtPersonName 控件。
        /// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextBox txtPersonName;
-        
+
        /// <summary>
        /// txtWorkPostName 控件。
        /// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextBox txtWorkPostName;
-        
+
        /// <summary>
        /// drpCertificate 控件。
        /// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DropDownList drpCertificate;
-        
+
        /// <summary>
        /// txtCertificateNo 控件。
        /// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextBox txtCertificateNo;
-        
+
        /// <summary>
        /// txtGrade 控件。
        /// </summary>
@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextBox txtGrade;
-        
+
        /// <summary>
        /// txtSendUnit 控件。
        /// </summary>
@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextBox txtSendUnit;
-        
+
        /// <summary>
        /// txtSendDate 控件。
        /// </summary>
@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DatePicker txtSendDate;
-        
+
        /// <summary>
        /// txtLimitDate 控件。
        /// </summary>
@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DatePicker txtLimitDate;
-        
+
        /// <summary>
        /// drpAuditor 控件。
        /// </summary>
@ -137,7 +139,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DropDownList drpAuditor;
-        
+
        /// <summary>
        /// txtAuditDate 控件。
        /// </summary>
@ -146,7 +148,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DatePicker txtAuditDate;
-        
+
        /// <summary>
        /// txtLateCheckDate 控件。
        /// </summary>
@ -155,7 +157,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.DatePicker txtLateCheckDate;
-        
+
        /// <summary>
        /// Label1 控件。
        /// </summary>
@ -164,7 +166,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Label Label1;
-        
+
        /// <summary>
        /// txtRemark 控件。
        /// </summary>
@ -173,7 +175,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.TextArea txtRemark;
-        
+
        /// <summary>
        /// Toolbar1 控件。
        /// </summary>
@ -182,7 +184,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Toolbar Toolbar1;
-        
+
        /// <summary>
        /// btnAttachUrl 控件。
        /// </summary>
@ -191,7 +193,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnAttachUrl;
-        
+
        /// <summary>
        /// ToolbarFill1 控件。
        /// </summary>
@ -200,7 +202,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
        /// <summary>
        /// btnSave 控件。
        /// </summary>
@ -209,7 +211,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnSave;
-        
+
        /// <summary>
        /// btnClose 控件。
        /// </summary>
@ -218,7 +220,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnClose;
-        
+
        /// <summary>
        /// WindowAtt 控件。
        /// </summary>
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
@ -165,7 +165,7 @@
        </f:Panel>
        <f:Window ID="Window1" Title="编辑人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
            Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
-            Width="1000px" Height="700px">
+            Width="1000px" Height="800px">
        </f:Window>
        <f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
            Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="true"
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx
@ -57,7 +57,7 @@
                </f:Toolbar>
            </Toolbars>
            <Items>
-                <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="580px" ShowBorder="true"
+                <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="650px" ShowBorder="true"
                    TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server"
                    ActiveTabIndex="0">
                    <Tabs>
@ -99,6 +99,13 @@
                                                </f:RadioButtonList>
                                                 <f:DatePicker ID="txtIdcardEndDate" runat="server" Label="安全/特种作业证书有效日期" LabelAlign="Right"  LabelWidth="110px">
                                                </f:DatePicker>
+
+                                                  <%--新增--%>
+                                                  <f:DatePicker ID="txtCertificateLimitTime" runat="server" Label="特岗证书有效期" LabelAlign="Right" >
+                                                </f:DatePicker>
+
+                                                  <f:DatePicker ID="txtOutTime" runat="server" Label="出场时间" LabelAlign="Right">
+                                                </f:DatePicker>
                                            </Items>
                                        </f:Panel>
                                        <f:Panel ID="Panel4" runat="server" BoxFlex="3" ShowBorder="false" ShowHeader="false"
@ -108,7 +115,7 @@
                                                    LabelAlign="Right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                                                </f:TextBox>
                                                <f:Button runat="server" ID="btnReadIdentityCard" Icon="Vcard" OnClick="btnReadIdentityCard_Click"
-                                                    Text="读取证件" MarginLeft="90px" Hidden="true">
+                                                    Text="读取证件" MarginLeft="90px" Hidden="true" >
                                                </f:Button>
                                                <f:RadioButtonList ID="rblSex" runat="server" Label="性别" LabelAlign="Right" Required="True" ShowRedStar="True">
                                                    <f:RadioItem Value="1" Text="男" Selected="true" />
@ -128,9 +135,24 @@
                                                
                                                <f:DatePicker ID="txtAuditorDate" runat="server" Label="审核时间" LabelAlign="Right" >
                                                </f:DatePicker>
-                                                <f:CheckBox runat="server" ID="ckIsOutside" Label="外聘" LabelAlign="Right"></f:CheckBox>
+                                                <f:CheckBox runat="server" ID="ckIsOutside" Label="外聘" LabelAlign="Right" CssStyle="margin-bottom:15px"></f:CheckBox>
                                                
+
+                                                <%--新增--%>
+                                                 <f:DropDownList ID="drpCertificate" runat="server" Label="特岗证书" LabelAlign="Right"  EnableEdit="true" CssStyle="margin-bottom:15px">
+                                                </f:DropDownList>
+
+                                                <f:TextBox ID="txtCertificateCode" runat="server" Label="证书编号" LabelAlign="Right" MaxLength="20"  CssStyle="margin-bottom:20px">
+                                                </f:TextBox>
                                               
+                                                 <f:RadioButtonList ID="rblIsCardUsed" runat="server" Label="考勤卡启用"   CssStyle="margin-bottom:15px"
+                                                    LabelAlign="Right" Required="True">
+                                                    <f:RadioItem Value="True" Text="是" />
+                                                    <f:RadioItem Value="False" Text="否" />
+                                                </f:RadioButtonList>
+
+                                                  <f:TextBox ID="txtOutResult" runat="server" Label="出场原因" LabelAlign="Right" MaxLength="50">
+                                                </f:TextBox>
                                            </Items>
                                        </f:Panel>
                                        <f:Panel ID="Panel5" Title="面板1" BoxFlex="2" runat="server" ShowBorder="false" ShowHeader="false"
@ -149,8 +171,10 @@
                                </f:Panel>
                            </Items>

+                         
+
                        </f:Tab>
-                        <f:Tab ID="Tab2" Title="详细信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
+                        <f:Tab ID="Tab2" Title="详细信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server" Hidden="true">
                            <Items>
                                <f:Form ID="Form7" ShowBorder="false" ShowHeader="false" runat="server" LabelWidth="100px">
                                    <Rows>
@ -188,35 +212,25 @@
                                        </f:FormRow>
                                        <f:FormRow>
                                            <Items>
-                                                <f:DropDownList ID="drpCertificate" runat="server" Label="特岗证书" LabelAlign="Right"  EnableEdit="true">
-                                                </f:DropDownList>
-                                                <f:TextBox ID="txtCertificateCode" runat="server" Label="证书编号" LabelAlign="Right" MaxLength="20">
-                                                </f:TextBox>
+                                               
                                            </Items>
                                        </f:FormRow>
                                        <f:FormRow>
                                            <Items>
-                                                <f:DatePicker ID="txtCertificateLimitTime" runat="server" Label="证书有效期" LabelAlign="Right" >
-                                                </f:DatePicker>
-                                                <f:RadioButtonList ID="rblIsCardUsed" runat="server" Label="考勤卡启用" 
-                                                    LabelAlign="Right" Required="True">
-                                                    <f:RadioItem Value="True" Text="是" />
-                                                    <f:RadioItem Value="False" Text="否" />
-                                                </f:RadioButtonList>
+                                                
+                                               
                                            </Items>
                                        </f:FormRow>
                                        <f:FormRow>
                                            <Items>
                                                <f:TextBox ID="txtAddress" runat="server" Label="家庭地址" MaxLength="500" LabelAlign="Right" >
                                                </f:TextBox>
-                                                 <f:DatePicker ID="txtOutTime" runat="server" Label="出场时间" LabelAlign="Right">
-                                                </f:DatePicker>
+                                               
                                                </Items>
                                        </f:FormRow>
                                        <f:FormRow ColumnWidths="100%">
                                            <Items>
-                                                <f:TextBox ID="txtOutResult" runat="server" Label="出场原因" LabelAlign="Right" MaxLength="50">
-                                                </f:TextBox>
+                                              
                                            </Items>
                                        </f:FormRow>
                                    </Rows>
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs
--- a/SGGL/FineUIPro.Web/SysManage/HttpLog.aspx
+++ b/SGGL/FineUIPro.Web/SysManage/HttpLog.aspx
@ -33,7 +33,7 @@
            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="HTTP请求日志表" EnableCollapse="true"  ForceFit="true" 
                runat="server" BoxFlex="1" DataKeyNames="HttpLogId" AllowCellEditing="true"  EnableTextSelection="true"
                ClicksToEdit="2" DataIDField="HttpLogId" AllowSorting="true" SortField="HttpLogId"
-                SortDirection="DESC" OnSort="Grid1_Sort"  EnableColumnLines="true"  FixedRowHeight="true" RowHeight="72px" OnRowDoubleClick="Grid1_RowDoubleClick"
+                SortDirection="DESC" OnSort="Grid1_Sort"  EnableColumnLines="true"  OnRowDoubleClick="Grid1_RowDoubleClick"
                AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                EnableRowDoubleClickEvent="true" >
                <Toolbars>
@ -74,7 +74,7 @@
                          <f:RenderField Width="450px" ColumnID="LogTxt" DataField="LogTxt" SortField="LogTxt"
                             FieldType="String" HeaderText="日志信息" TextAlign="Left" HeaderTextAlign="Center" >
                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="MeThod" DataField="MeThod" SortField="MeThod" ShowToolTip="True"
+                          <f:RenderField Width="150px" ColumnID="MeThod" DataField="MeThod" SortField="MeThod" 
                             FieldType="String" HeaderText="方法" TextAlign="Left" HeaderTextAlign="Center" >
                           </f:RenderField>
                     
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@ -12,7 +12,7 @@
  <appSettings>
    <!--连接字符串-->
    <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_CD;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
-    <add key="ConnectionString" value="Server=.;Database=SGGLDB_CD;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true; Connect Timeout=1200;Pooling=true; MAX Pool Size=512;Min Pool Size=50;Connection Lifetime=30" />
+    <add key="ConnectionString" value="Server=DESKTOP-1QITK9E\MSSQLSERVER2;Database=SGGLDB_CD;Integrated Security=False;User ID=sa;Password=123;MultipleActiveResultSets=true; Connect Timeout=1200;Pooling=true; MAX Pool Size=512;Min Pool Size=50;Connection Lifetime=30" />
    <!--系统名称-->
    <add key="SystemName" value="数字化施工管理信息平台V1.0" />
    <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;" />
--- a/SGGL/FineUIPro.Web/common/Menu_Attendance.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Attendance.xml
@ -13,5 +13,4 @@
 <TreeNode id="E6B5DAD1-8B9A-47AC-B7A8-33AB3B0B630C" Text="单位考勤" NavigateUrl="Door/InOutManHours.aspx"></TreeNode>
 <TreeNode id="984AB874-D5CB-4077-8ADB-6E154F5B636C" Text="缺勤人员" NavigateUrl="Door/AbsenceDuty.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="51B5435D-7762-4D23-9E63-CBB2DE5BC5B3" Text="人员动态看板" NavigateUrl="HSSE/KqShowScreen/KqShowScreen.aspx"></TreeNode>
 </Tree>
--- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="68A54450-557C-4C33-9121-797C15AF1047" Text="开复工报告" NavigateUrl="PZHGL/StartWorkReport.aspx">
+  <TreeNode id="68A54450-557C-4C33-9121-797C15AF1047" Text="开工报告" NavigateUrl="PZHGL/StartWorkReport.aspx">
  </TreeNode>
 <TreeNode id="F8E57293-0BD8-435E-AA08-3B1DC2858CB6" Text="质量策划" NavigateUrl=""><TreeNode id="063601B5-EF75-418B-90E8-4255C0DB06D7" Text="公司/部门质量管理规定" NavigateUrl="CQMS/ZLCH/Zlgltx.aspx"></TreeNode>
 <TreeNode id="AC145EE1-4E5C-4CEF-A85A-AAC331A041DB" Text="质量管理实施计划" NavigateUrl="CQMS/ZLCH/Zlssjh.aspx"></TreeNode>
--- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
@ -17,11 +17,11 @@
 <TreeNode id="874B4232-E0AD-41CD-8C66-8A7FF2D79358" Text="项目安全协议清单" NavigateUrl="HSSE/QualityAudit/ProjectRecord.aspx"></TreeNode>
 </TreeNode>
 </TreeNode>
-<TreeNode id="EE260447-028F-46AF-8864-9A5DC9DAA5BD" Text="人员培训" NavigateUrl=""><TreeNode id="1182E353-FAB9-4DB1-A1EC-F41A00892128" Text="培训记录" NavigateUrl="HSSE/EduTrain/TrainRecord.aspx"></TreeNode>
+<TreeNode id="EE260447-028F-46AF-8864-9A5DC9DAA5BD" Text="人员培训" NavigateUrl=""><TreeNode id="1182E353-FAB9-4DB1-A1EC-F41A00892128" Text="培训记录管理" NavigateUrl="HSSE/EduTrain/TrainRecord.aspx"></TreeNode>
 <TreeNode id="F81E3F54-B3A9-4DDB-9C8C-1574317E040F" Text="人员培训查询" NavigateUrl="HSSE/EduTrain/TrainFind.aspx"></TreeNode>
 <TreeNode id="B782A26B-D85C-4F84-8B45-F7AA47B3159E" Text="培训计划" NavigateUrl="HSSE/EduTrain/Plan.aspx"></TreeNode>
 <TreeNode id="E108F75D-89D0-4DCA-8356-A156C328805C" Text="培训任务" NavigateUrl="HSSE/EduTrain/Task.aspx"></TreeNode>
-<TreeNode id="6C314522-AF62-4476-893E-5F42C09C3077" Text="培训试题" NavigateUrl="HSSE/EduTrain/TestTrainRecord.aspx"></TreeNode>
+<TreeNode id="ACF2CAB1-CE56-4CED-B252-692558F9E36F" Text="培训记录" NavigateUrl="HSSE/EduTrain/Trainingrecords.aspx"></TreeNode>
 <TreeNode id="FAF7F4A4-A4BC-4D94-9E88-0CF5A380DB34" Text="考试计划" NavigateUrl="HSSE/EduTrain/TestPlan.aspx"></TreeNode>
 <TreeNode id="0EEB138D-84F9-4686-8CBB-CAEAA6CF1B2A" Text="考试记录" NavigateUrl="HSSE/EduTrain/TestRecord.aspx"></TreeNode>
 <TreeNode id="6FF941C1-8A00-4A74-8111-C892FC30A8DA" Text="考试统计" NavigateUrl="HSSE/EduTrain/TestStatistics.aspx"></TreeNode>
@ -37,7 +37,6 @@
 <TreeNode id="750F5074-45B9-470E-AE1E-6204957421E6" Text="安管人员资质" NavigateUrl="HSSE/QualityAudit/SafePersonQuality.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="467A0CB9-737D-4451-965E-869EBC3A4BD6" Text="HSE检查" NavigateUrl=""><TreeNode id="2FC8AA2A-F421-4174-A05E-2711167AF141" Text="安全巡检" NavigateUrl="HSSE/HiddenInspection/HiddenRectificationList.aspx"></TreeNode>
-<TreeNode id="1B08048F-93ED-4E84-AE65-DB7917EA2DFB" Text="专项检查" NavigateUrl="HSSE/Check/CheckSpecial.aspx"></TreeNode>
 <TreeNode id="C7481FEE-EA92-44B8-99F6-C5CA6BBDCFF5" Text="专项检查记录" NavigateUrl="HSSE/Check/CheckSpecialRecord.aspx"></TreeNode>
 <TreeNode id="C198EBA8-9E23-4654-92E1-09C61105C522" Text="综合检查" NavigateUrl="HSSE/Check/CheckColligation.aspx"></TreeNode>
 <TreeNode id="355265DE-901A-4110-B934-B4DA067C4334" Text="领导带班检查" NavigateUrl="HSSE/Check/ProjectLeaderCheck.aspx"></TreeNode>
--- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml
+++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml
@ -4,14 +4,15 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
  <PropertyGroup>
-    <DeleteExistingFiles>false</DeleteExistingFiles>
-    <ExcludeApp_Data>false</ExcludeApp_Data>
-    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>bin\app.publish\</PublishUrl>
+    <PublishUrl>E:\发布\辰达</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <_TargetId>Folder</_TargetId>
+    <SiteUrlToLaunchAfterPublish />
  </PropertyGroup>
 </Project>