diff --git a/DataBase/版本日志/SGGLDB_V2025-02-13-xiaj.sql b/DataBase/版本日志/SGGLDB_V2025-02-13-xiaj.sql
index 1e606ee..37933ea 100644
--- a/DataBase/版本日志/SGGLDB_V2025-02-13-xiaj.sql
+++ b/DataBase/版本日志/SGGLDB_V2025-02-13-xiaj.sql
@@ -303,240 +303,4 @@ GO
 
 
 
---���˰�ȫ�ж��ƻ�
-
-IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Examine_PersonalSafetyActionPlan') AND type = N'U')
-BEGIN
-
-CREATE TABLE [dbo].[Examine_PersonalSafetyActionPlan](
-	[Id] [nvarchar](50) NOT NULL,
-	[ProjectId] [nvarchar](50) NULL,
-	[Code] [nvarchar](50) NULL,
-	[Name] [nvarchar](200) NULL,
-	[UserId] [nvarchar](50) NULL,
-	[DateTime] [datetime] NULL,
-	[Content] [nvarchar](1000) NULL,
-	[Remark] [nvarchar](1000) NULL,
-	[CompileDate] [datetime] NULL,
-	[CompileMan] [nvarchar](50) NULL,
- CONSTRAINT [PK_Examine_PersonalSafetyActionPlan] PRIMARY KEY CLUSTERED 
-(
-	[Id] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY] 
-ALTER TABLE [dbo].[Examine_PersonalSafetyActionPlan]  WITH CHECK ADD  CONSTRAINT [FK_Examine_PersonalSafetyActionPlan_Base_Project] FOREIGN KEY([ProjectId])
-REFERENCES [dbo].[Base_Project] ([ProjectId])
-ALTER TABLE [dbo].[Examine_PersonalSafetyActionPlan] CHECK CONSTRAINT [FK_Examine_PersonalSafetyActionPlan_Base_Project]
-ALTER TABLE [dbo].[Examine_PersonalSafetyActionPlan]  WITH CHECK ADD  CONSTRAINT [FK_Examine_PersonalSafetyActionPlan_User] FOREIGN KEY([UserId])
-REFERENCES [dbo].[Sys_User] ([UserId])
-ALTER TABLE [dbo].[Examine_PersonalSafetyActionPlan] CHECK CONSTRAINT [FK_Examine_PersonalSafetyActionPlan_User]
-ALTER TABLE [dbo].[Examine_PersonalSafetyActionPlan]  WITH CHECK ADD  CONSTRAINT [FK_Examine_PersonalSafetyActionPlan_Sys_User] FOREIGN KEY([CompileMan])
-REFERENCES [dbo].[Sys_User] ([UserId])
-ALTER TABLE [dbo].[Examine_PersonalSafetyActionPlan] CHECK CONSTRAINT [FK_Examine_PersonalSafetyActionPlan_Sys_User]
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'Id'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Ŀid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'ProjectId'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'Code'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'Name'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'UserId'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'DateTime'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'Content'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'Remark'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'CompileMan'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����ʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan', @level2type=N'COLUMN',@level2name=N'CompileDate'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���˰�ȫ�ж��ƻ�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_PersonalSafetyActionPlan'
-END
-
-GO
-
-
---��ȫ�������
-
-IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Examine_SharingOfSafetyExperience') AND type = N'U')
-BEGIN
-
-CREATE TABLE [dbo].[Examine_SharingOfSafetyExperience](
-	[Id] [nvarchar](50) NOT NULL,
-	[ProjectId] [nvarchar](50) NULL,
-	[Code] [nvarchar](50) NULL,
-	[Name] [nvarchar](200) NULL,
-	[UserId] [nvarchar](50) NULL,
-	[DateTime] [datetime] NULL,
-	[Content] [nvarchar](1000) NULL,
-	[Remark] [nvarchar](1000) NULL,
-	[CompileDate] [datetime] NULL,
-	[CompileMan] [nvarchar](50) NULL,
- CONSTRAINT [PK_Examine_SharingOfSafetyExperience] PRIMARY KEY CLUSTERED 
-(
-	[Id] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY] 
-ALTER TABLE [dbo].[Examine_SharingOfSafetyExperience]  WITH CHECK ADD  CONSTRAINT [FK_Examine_SharingOfSafetyExperience_Base_Project] FOREIGN KEY([ProjectId])
-REFERENCES [dbo].[Base_Project] ([ProjectId])
-ALTER TABLE [dbo].[Examine_SharingOfSafetyExperience] CHECK CONSTRAINT [FK_Examine_SharingOfSafetyExperience_Base_Project]
-ALTER TABLE [dbo].[Examine_SharingOfSafetyExperience]  WITH CHECK ADD  CONSTRAINT [FK_Examine_SharingOfSafetyExperience_User] FOREIGN KEY([UserId])
-REFERENCES [dbo].[Sys_User] ([UserId])
-ALTER TABLE [dbo].[Examine_SharingOfSafetyExperience] CHECK CONSTRAINT [FK_Examine_SharingOfSafetyExperience_User]
-ALTER TABLE [dbo].[Examine_SharingOfSafetyExperience]  WITH CHECK ADD  CONSTRAINT [FK_Examine_SharingOfSafetyExperience_Sys_User] FOREIGN KEY([CompileMan])
-REFERENCES [dbo].[Sys_User] ([UserId])
-ALTER TABLE [dbo].[Examine_SharingOfSafetyExperience] CHECK CONSTRAINT [FK_Examine_SharingOfSafetyExperience_Sys_User]
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'Id'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Ŀid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'ProjectId'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'Code'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'Name'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'UserId'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'DateTime'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'Content'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'Remark'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'CompileMan'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����ʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience', @level2type=N'COLUMN',@level2name=N'CompileDate'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ȫ�������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_SharingOfSafetyExperience'
-END
-
-GO
-
-
-
---�쵼��Ա�μӰ�����ҵ������
-
-IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Examine_LeadershipJoinHomeworkAnalysisMeeting') AND type = N'U')
-BEGIN
-
-CREATE TABLE [dbo].[Examine_LeadershipJoinHomeworkAnalysisMeeting](
-	[Id] [nvarchar](50) NOT NULL,
-	[ProjectId] [nvarchar](50) NULL,
-	[Code] [nvarchar](50) NULL,
-	[Name] [nvarchar](200) NULL,
-	[UserId] [nvarchar](50) NULL,
-	[DateTime] [datetime] NULL,
-	[Content] [nvarchar](1000) NULL,
-	[Remark] [nvarchar](1000) NULL,
-	[CompileDate] [datetime] NULL,
-	[CompileMan] [nvarchar](50) NULL,
- CONSTRAINT [PK_Examine_LeadershipJoinHomeworkAnalysisMeeting] PRIMARY KEY CLUSTERED 
-(
-	[Id] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY] 
-ALTER TABLE [dbo].[Examine_LeadershipJoinHomeworkAnalysisMeeting]  WITH CHECK ADD  CONSTRAINT [FK_Examine_LeadershipJoinHomeworkAnalysisMeeting_Base_Project] FOREIGN KEY([ProjectId])
-REFERENCES [dbo].[Base_Project] ([ProjectId])
-ALTER TABLE [dbo].[Examine_LeadershipJoinHomeworkAnalysisMeeting] CHECK CONSTRAINT [FK_Examine_LeadershipJoinHomeworkAnalysisMeeting_Base_Project]
-ALTER TABLE [dbo].[Examine_LeadershipJoinHomeworkAnalysisMeeting]  WITH CHECK ADD  CONSTRAINT [FK_Examine_LeadershipJoinHomeworkAnalysisMeeting_User] FOREIGN KEY([UserId])
-REFERENCES [dbo].[Sys_User] ([UserId])
-ALTER TABLE [dbo].[Examine_LeadershipJoinHomeworkAnalysisMeeting] CHECK CONSTRAINT [FK_Examine_LeadershipJoinHomeworkAnalysisMeeting_User]
-ALTER TABLE [dbo].[Examine_LeadershipJoinHomeworkAnalysisMeeting]  WITH CHECK ADD  CONSTRAINT [FK_Examine_LeadershipJoinHomeworkAnalysisMeeting_Sys_User] FOREIGN KEY([CompileMan])
-REFERENCES [dbo].[Sys_User] ([UserId])
-ALTER TABLE [dbo].[Examine_LeadershipJoinHomeworkAnalysisMeeting] CHECK CONSTRAINT [FK_Examine_LeadershipJoinHomeworkAnalysisMeeting_Sys_User]
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'Id'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Ŀid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'ProjectId'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'Code'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'Name'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'UserId'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'DateTime'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'Content'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'Remark'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'CompileMan'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����ʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting', @level2type=N'COLUMN',@level2name=N'CompileDate'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�쵼��Ա�μӰ�����ҵ������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_LeadershipJoinHomeworkAnalysisMeeting'
-END
-
-GO
-
-
-
---һ�ߵ�Ա��ϵ���鹲���
-
-IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Examine_CoConstructionActivities') AND type = N'U')
-BEGIN
-
-CREATE TABLE [dbo].[Examine_CoConstructionActivities](
-	[Id] [nvarchar](50) NOT NULL,
-	[ProjectId] [nvarchar](50) NULL,
-	[Code] [nvarchar](50) NULL,
-	[Name] [nvarchar](200) NULL,
-	[UserId] [nvarchar](50) NULL,
-	[DateTime] [datetime] NULL,
-	[Content] [nvarchar](1000) NULL,
-	[Remark] [nvarchar](1000) NULL,
-	[CompileDate] [datetime] NULL,
-	[CompileMan] [nvarchar](50) NULL,
- CONSTRAINT [PK_Examine_CoConstructionActivities] PRIMARY KEY CLUSTERED 
-(
-	[Id] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY] 
-ALTER TABLE [dbo].[Examine_CoConstructionActivities]  WITH CHECK ADD  CONSTRAINT [FK_Examine_CoConstructionActivities_Base_Project] FOREIGN KEY([ProjectId])
-REFERENCES [dbo].[Base_Project] ([ProjectId])
-ALTER TABLE [dbo].[Examine_CoConstructionActivities] CHECK CONSTRAINT [FK_Examine_CoConstructionActivities_Base_Project]
-ALTER TABLE [dbo].[Examine_CoConstructionActivities]  WITH CHECK ADD  CONSTRAINT [FK_Examine_CoConstructionActivities_User] FOREIGN KEY([UserId])
-REFERENCES [dbo].[Sys_User] ([UserId])
-ALTER TABLE [dbo].[Examine_CoConstructionActivities] CHECK CONSTRAINT [FK_Examine_CoConstructionActivities_User]
-ALTER TABLE [dbo].[Examine_CoConstructionActivities]  WITH CHECK ADD  CONSTRAINT [FK_Examine_CoConstructionActivities_Sys_User] FOREIGN KEY([CompileMan])
-REFERENCES [dbo].[Sys_User] ([UserId])
-ALTER TABLE [dbo].[Examine_CoConstructionActivities] CHECK CONSTRAINT [FK_Examine_CoConstructionActivities_Sys_User]
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'Id'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Ŀid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'ProjectId'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'Code'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'Name'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'UserId'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'DateTime'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'Content'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'Remark'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'CompileMan'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����ʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities', @level2type=N'COLUMN',@level2name=N'CompileDate'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'һ�ߵ�Ա��ϵ���鹲���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_CoConstructionActivities'
-END
-
-GO
-
-
-
---��Ϊ��ȫ�۲��빵ͨ
-
-IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Examine_BehavioralSafetyObservation') AND type = N'U')
-BEGIN
-
-CREATE TABLE [dbo].[Examine_BehavioralSafetyObservation](
-	[Id] [nvarchar](50) NOT NULL,
-	[ProjectId] [nvarchar](50) NULL,
-	[Code] [nvarchar](50) NULL,
-	[Name] [nvarchar](200) NULL,
-	[UserId] [nvarchar](50) NULL,
-	[DateTime] [datetime] NULL,
-	[Content] [nvarchar](1000) NULL,
-	[Remark] [nvarchar](1000) NULL,
-	[CompileDate] [datetime] NULL,
-	[CompileMan] [nvarchar](50) NULL,
- CONSTRAINT [PK_Examine_BehavioralSafetyObservation] PRIMARY KEY CLUSTERED 
-(
-	[Id] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY] 
-ALTER TABLE [dbo].[Examine_BehavioralSafetyObservation]  WITH CHECK ADD  CONSTRAINT [FK_Examine_BehavioralSafetyObservation_Base_Project] FOREIGN KEY([ProjectId])
-REFERENCES [dbo].[Base_Project] ([ProjectId])
-ALTER TABLE [dbo].[Examine_BehavioralSafetyObservation] CHECK CONSTRAINT [FK_Examine_BehavioralSafetyObservation_Base_Project]
-ALTER TABLE [dbo].[Examine_BehavioralSafetyObservation]  WITH CHECK ADD  CONSTRAINT [FK_Examine_BehavioralSafetyObservation_User] FOREIGN KEY([UserId])
-REFERENCES [dbo].[Sys_User] ([UserId])
-ALTER TABLE [dbo].[Examine_BehavioralSafetyObservation] CHECK CONSTRAINT [FK_Examine_BehavioralSafetyObservation_User]
-ALTER TABLE [dbo].[Examine_BehavioralSafetyObservation]  WITH CHECK ADD  CONSTRAINT [FK_Examine_BehavioralSafetyObservation_Sys_User] FOREIGN KEY([CompileMan])
-REFERENCES [dbo].[Sys_User] ([UserId])
-ALTER TABLE [dbo].[Examine_BehavioralSafetyObservation] CHECK CONSTRAINT [FK_Examine_BehavioralSafetyObservation_Sys_User]
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'Id'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Ŀid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'ProjectId'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'Code'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'Name'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'UserId'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'DateTime'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'Content'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'Remark'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'CompileMan'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����ʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation', @level2type=N'COLUMN',@level2name=N'CompileDate'
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Ϊ��ȫ�۲��빵ͨ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BehavioralSafetyObservation'
-END
-
-GO
-
-
-
-
-
 
diff --git a/SGGL/BLL/API/APIPersonService.cs b/SGGL/BLL/API/APIPersonService.cs
index 96394be..2df45b9 100644
--- a/SGGL/BLL/API/APIPersonService.cs
+++ b/SGGL/BLL/API/APIPersonService.cs
@@ -71,7 +71,7 @@ namespace BLL
             {
                 var getPerson = from x in db.View_SitePerson_Person
                                 where x.PersonId == personId || x.IdentityCard == personId
-                                where x.BlackList==null || x.BlackList==false
+                                where x.BlackList == null || x.BlackList == false
                                 select new Model.PersonItem
                                 {
                                     PersonId = x.PersonId,
@@ -474,6 +474,7 @@ namespace BLL
         /// <param name="projectId">项目ID</param>
         /// <param name="unitIds">培训单位ID</param>
         /// <param name="workPostIds">培训岗位ID</param>
+        /// <param name="departIds">培训岗位ID</param>
         /// <param name="trainTypeId">培训类型ID</param>
         /// <returns></returns>
         public static List<Model.PersonItem> getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string departIds, string trainTypeId, string InTime, string strParam)
@@ -754,7 +755,7 @@ namespace BLL
                 }
                 else if (!string.IsNullOrEmpty(person.TeamGroupName))
                 {
-                    var group = db.ProjectData_TeamGroup.FirstOrDefault(x =>x.ProjectId == person.ProjectId && x.TeamGroupName == person.TeamGroupName);
+                    var group = db.ProjectData_TeamGroup.FirstOrDefault(x => x.ProjectId == person.ProjectId && x.TeamGroupName == person.TeamGroupName);
                     if (group != null)
                     {
                         newPerson.TeamGroupId = group.TeamGroupId;
@@ -781,7 +782,7 @@ namespace BLL
                     var post = db.Base_WorkPost.FirstOrDefault(x => x.WorkPostName == person.WorkPostName);
                     if (post != null)
                     {
-                        newPerson.WorkPostId = post.WorkPostId; 
+                        newPerson.WorkPostId = post.WorkPostId;
                     }
                 }
                 //if (!string.IsNullOrEmpty(person.IdcardType))
@@ -828,7 +829,7 @@ namespace BLL
                 {
                     newPerson.IsUsed = false;
                 }
-                newPerson.Password =  UserService.getInitialPassword(newPerson.UnitId, newPerson.IdentityCard);
+                newPerson.Password = UserService.getInitialPassword(newPerson.UnitId, newPerson.IdentityCard);
                 string rootUrl = ConfigurationManager.AppSettings["localRoot"];
                 if (!string.IsNullOrEmpty(rootUrl) && !string.IsNullOrEmpty(person.PhotoUrl))
                 {
@@ -1277,11 +1278,11 @@ namespace BLL
         #endregion
 
         #region  获取项目当日在场人员数据
-        public static IEnumerable getPersonPresenceData(string projectId,DateTime dateTime)
+        public static IEnumerable getPersonPresenceData(string projectId, DateTime dateTime)
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
-               string url= ConfigurationManager.AppSettings["CEMS_IMG_URL"];
+                string url = ConfigurationManager.AppSettings["CEMS_IMG_URL"];
 
 
                 DateTime start = Convert.ToDateTime(dateTime.Date.ToString("D").ToString());
@@ -1290,33 +1291,33 @@ namespace BLL
                     && x.ChangeTime >= start && x.ChangeTime <= end); //获取当前全部数据
 
                 getDataList = from x in getDataList
-                    group x by x.PersonId into g
-                    select g.OrderByDescending(t => t.ChangeTime).FirstOrDefault(); //获取每个人最后一条数据 
+                              group x by x.PersonId into g
+                              select g.OrderByDescending(t => t.ChangeTime).FirstOrDefault(); //获取每个人最后一条数据 
 
                 getDataList = getDataList.Where(x => x.IsIn == true); //取类型是进门的数据来获取当前在场人员
                 var data = getDataList.ToList();
-                var attachfile = db.AttachFile.Where(x => data.Select(y => y.PersonId+"#4").Distinct().ToList().Contains(x.ToKeyId)).ToList();
+                var attachfile = db.AttachFile.Where(x => data.Select(y => y.PersonId + "#4").Distinct().ToList().Contains(x.ToKeyId)).ToList();
                 var result = (from x in data
-                              join  y in attachfile on (x.PersonId+"#4") equals y.ToKeyId  into temp
-                    from y in temp.DefaultIfEmpty() 
-                    select new
-                    {
-                        x.PostType,
-                        x.PersonId,
-                        x.IsIn,
-                        IsInName = (x.IsIn == true ? "进门" : "出门"),
-                        x.ChangeTime,
-                        x.UnitName,
-                        x.WorkPostName,
-                        x.WorkAreaName,
-                        x.PersonName,
-                        x.IdentityCard,
-                        x.InOutWay,
-                        x.Address,
-                        x.Remark,
-                        AttachUrl = (y != null) ? y.AttachUrl.Split(',').Select(item => url + item).ToArray() : null
-                    }).ToList();
-                return  result;
+                              join y in attachfile on (x.PersonId + "#4") equals y.ToKeyId into temp
+                              from y in temp.DefaultIfEmpty()
+                              select new
+                              {
+                                  x.PostType,
+                                  x.PersonId,
+                                  x.IsIn,
+                                  IsInName = (x.IsIn == true ? "进门" : "出门"),
+                                  x.ChangeTime,
+                                  x.UnitName,
+                                  x.WorkPostName,
+                                  x.WorkAreaName,
+                                  x.PersonName,
+                                  x.IdentityCard,
+                                  x.InOutWay,
+                                  x.Address,
+                                  x.Remark,
+                                  AttachUrl = (y != null) ? y.AttachUrl.Split(',').Select(item => url + item).ToArray() : null
+                              }).ToList();
+                return result;
             }
         }
         #endregion
@@ -1726,7 +1727,7 @@ namespace BLL
                     if (isOK)
                     {
                         var faceResult = FaceClass.add(person.PersonId, person.IdentityCard, System.Configuration.ConfigurationManager.AppSettings["CEMS_IMG_URL"].ToString() + person.PhotoUrl, AccessToken.getAccessToken());
-                         var face = JsonConvert.DeserializeObject<dynamic>(faceResult);
+                        var face = JsonConvert.DeserializeObject<dynamic>(faceResult);
                         // JsonConvert.DeserializeObject<dynamic>(myPunishItem);
                         if (face.error_code == 0 || face.error_code == 223105)
                         {
@@ -1739,8 +1740,8 @@ namespace BLL
                         else
                         {
                             message = "注册人脸库失败" + face.error_code + face.error_msg;
-                          
-                           
+
+
 
                         }
                     }
@@ -1762,8 +1763,7 @@ namespace BLL
         /// <summary>
         /// 人员出入场
         /// </summary>
-        /// <param name="projectId"></param>w
-        /// <param name="idCard"></param>
+        /// <param name="getPerson"></param>
         /// <param name="isIn"></param>
         /// <param name="changeTime"></param>
         public static void getPersonInOut(Model.SitePerson_Person getPerson, int isIn, DateTime changeTime)
diff --git a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs
index 5cd5b78..f909897 100644
--- a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs
+++ b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs
@@ -12,9 +12,9 @@ namespace BLL
         /// </summary>
         /// <param name="projectId"></param>
         /// <param name="personId"></param>
-        /// <param name="states">1-培训中；2-已完成</param>
+        /// <param name="isRetakeCourse">是否重修：1：重修任务 、0：日常培训任务</param>
         /// <returns></returns>
-        public static List<Model.TrainingTaskItem> getTrainingTaskListByProjectIdPersonId(string projectId, string personId)
+        public static List<Model.TrainingTaskItem> getTrainingTaskListByProjectIdPersonId(string projectId, string personId, string isRetakeCourse)
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
@@ -26,25 +26,29 @@ namespace BLL
                                     select new Model.TrainingTaskItem
                                     {
                                         TaskId = x.TaskId,
-                                        //PlanId = x.PlanId,
+                                        PlanId = x.PlanId,
                                         PlanCode = y.PlanCode,
                                         PlanName = y.PlanName,
                                         TrainStartDate = string.Format("{0:yyyy-MM-dd HH:mm}", y.TrainStartDate),
                                         TeachAddress = y.TeachAddress,
-                                        //PersonId = x.UserId,
+                                        PersonId = x.UserId,
                                         PersonName = db.SitePerson_Person.FirstOrDefault(p => p.PersonId == x.UserId).PersonName,
                                         TaskDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.TaskDate),
                                         TrainTypeName = db.Base_TrainType.FirstOrDefault(b => b.TrainTypeId == y.TrainTypeId).TrainTypeName,
                                         TrainLevelName = db.Base_TrainLevel.FirstOrDefault(b => b.TrainLevelId == y.TrainLevelId).TrainLevelName,
                                         PlanStatesName = y.States == "3" ? "已完成" : "培训中",
-
+                                        IsRetakeCourse = y.IsRetakeCourse == 1 ? 1 : 0,
                                     }).ToList();
+                if (!string.IsNullOrWhiteSpace(isRetakeCourse))
+                {
+                    getDataLists = getDataLists.Where(x => x.IsRetakeCourse == int.Parse(isRetakeCourse)).ToList();
+                }
                 return getDataLists;
             }
         }
         #endregion
 
-        #region 根据TaskId获取培训任务教材明细列表
+        #region 根据TaskId获取培训任务教材列表
         /// <summary>
         /// 根据TaskId获取培训任务列表
         /// </summary>
@@ -222,12 +226,15 @@ namespace BLL
 
 
 
-        #region 根据TrainingPlanId获取培训任务教材明细列表
+        #region 维护任务学习时长
         /// <summary>
-        /// 根据TrainingPlanId获取培训任务教材明细列表
+        /// 维护任务学习时长
         /// </summary>
-        /// <param name="trainingPlanId"></param>
-        /// <returns>培训计划人员</returns>
+        /// <param name="taskItemId"></param>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <param name="VideoProgress"></param>
+        /// <returns></returns>
         public static Model.Training_TaskItem updateTaskItemLearnTime(string taskItemId, DateTime startTime, DateTime endTime, string VideoProgress)
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 068810f..f25882e 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -7,6 +7,7 @@ namespace BLL
 {
     public static class Const
     {
+        public const string BoardDataMenuId = "";
         /// <summary>
         /// 时间书签（用于筛选数据范围）
         /// </summary>
@@ -777,6 +778,10 @@ namespace BLL
         /// </summary>
         public const string EntryTrainTypeId = "dfb6a37e-4412-4ba9-ad59-3bc505bc21f7";
         /// <summary>
+        /// 培训类型——专项安全培训ID
+        /// </summary>
+        public static string SpecialSafeTrainId = "0e7fdf78-eaa0-4d00-a60b-490040bbea18";
+        /// <summary>
         /// 培训类型——检查重修培训
         /// </summary>
         public const string RetakeCourseTrainTypeId = "2F687916-5E31-4DF3-97A3-E33E108C8070";
@@ -6325,10 +6330,6 @@ namespace BLL
         /// 实业数据
         /// </summary>
         public const string Project_SYHSEData_SYHSEMenuId = "";
-        /// <summary>
-        /// 专项安全培训 id
-        /// </summary>
-        public static string SpecialSafeTrainId = "0e7fdf78-eaa0-4d00-a60b-490040bbea18";
         #endregion
 
         /// <summary>
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 476c613..2f43442 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -305,6 +305,7 @@
     <Content Include="common\mainMenu_SubPackManage.aspx" />
     <Content Include="common\mainMenu_SYHSE.aspx" />
     <Content Include="common\mainMenu_SYHSEN.aspx" />
+    <Content Include="common\mainProjectNew.aspx" />
     <Content Include="common\mainProjectSY.aspx" />
     <Content Include="common\mainProjects.aspx" />
     <Content Include="common\mains.aspx" />
@@ -3424,6 +3425,7 @@
     <Content Include="ZHGL\HSSESystem\HSSEOrganize.aspx" />
     <Content Include="ZHGL\HSSESystem\SafetyInstitution.aspx" />
     <Content Include="ZHGL\HSSESystem\SafetyInstitutionEdit.aspx" />
+    <Content Include="ZHGL\InformationProject\BoardData.aspx" />
     <Content Include="ZHGL\InformationProject\FileCabinetA.aspx" />
     <Content Include="ZHGL\InformationProject\FileCabinetAEdit.aspx" />
     <Content Include="ZHGL\InformationProject\FileCabinetAItemEdit.aspx" />
@@ -8049,6 +8051,13 @@
     <Compile Include="common\mainMenu_SYHSEN.aspx.designer.cs">
       <DependentUpon>mainMenu_SYHSEN.aspx</DependentUpon>
     </Compile>
+    <Compile Include="common\mainProjectNew.aspx.cs">
+      <DependentUpon>mainProjectNew.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="common\mainProjectNew.aspx.designer.cs">
+      <DependentUpon>mainProjectNew.aspx</DependentUpon>
+    </Compile>
     <Compile Include="common\mainProjectSY.aspx.cs">
       <DependentUpon>mainProjectSY.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -19239,6 +19248,13 @@
     <Compile Include="ZHGL\HSSESystem\SafetyInstitutionEdit.aspx.designer.cs">
       <DependentUpon>SafetyInstitutionEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="ZHGL\InformationProject\BoardData.aspx.cs">
+      <DependentUpon>BoardData.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\InformationProject\BoardData.aspx.designer.cs">
+      <DependentUpon>BoardData.aspx</DependentUpon>
+    </Compile>
     <Compile Include="ZHGL\InformationProject\FileCabinetA.aspx.cs">
       <DependentUpon>FileCabinetA.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx
index 2e88d24..ab3d297 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx
@@ -9,100 +9,108 @@
 </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="PlanId" EnableColumnLines="true" DataIDField="PlanId" 
-                AllowSorting="true" SortField="PlanCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" 
-                IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar1" Position="Top" runat="server">
-                        <Items>
-                             <f:DropDownList ID="drpWorkPost" runat="server" Label="岗位" EnableCheckBoxSelect="true"
-                        EnableMultiSelect="true" AutoPostBack="true" OnSelectedIndexChanged="drpWorkPost_SelectedIndexChanged"
+        <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="PlanId" EnableColumnLines="true" DataIDField="PlanId"
+                    AllowSorting="true" SortField="PlanCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server">
+                            <Items>
+                                <f:DropDownList ID="drpUnit" runat="server" Label="单位" EnableCheckBoxSelect="true" AutoSelectFirstItem="false"
+                                    EnableMultiSelect="true" AutoPostBack="true" OnSelectedIndexChanged="drp_SelectedIndexChanged"
                                     LabelAlign="Right" LabelWidth="50px" Width="260px">
                                 </f:DropDownList>
-                            <f:TextBox ID="txtName" runat="server" Label="查询" EmptyText="输入查询条件" AutoPostBack="true"
-                                OnTextChanged="TextBox_TextChanged" Width="350px" LabelWidth="80px" LabelAlign="Right">
-                            </f:TextBox>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>  
-                            
-                             <f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server" OnClick="btnNew_Click"
-                                >
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                        TextAlign="Center" />
-                    <f:RenderField Width="80px" ColumnID="PlanCode" DataField="PlanCode" SortField="PlanCode"
-                        HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="110px" ColumnID="PlanName" DataField="PlanName" FieldType="String"
-                        HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:TemplateField Width="260px" HeaderText="接受培训单位" HeaderTextAlign="Center" TextAlign="Left" ColumnID="tfUnitNames">
-                        <ItemTemplate>
-                            <asp:Label ID="lbUnitNames" runat="server"  Text='<%#ConvertUnitName(Eval("UnitIds")) %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:TemplateField Width="150px" HeaderText="接受培训岗位" HeaderTextAlign="Center" TextAlign="Left" ColumnID="tfWorkPostNames">
-                        <ItemTemplate>
-                            <asp:Label ID="lbtfWorkPostNames" runat="server"  Text='<%#ConvertWorkPostName(Eval("WorkPostId")) %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:RenderField Width="90px" ColumnID="DesignerName" DataField="DesignerName" FieldType="String"
-                        HeaderText="制定人" HeaderTextAlign="Center" TextAlign="Left" >
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="DesignerDate" DataField="DesignerDate" SortField="DesignerDate"
-                        FieldType="Date" Renderer="Date" HeaderText="制定时间" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="TeachAddress" DataField="TeachAddress" 
-                        HeaderText="地点" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                     <f:RenderField Width="100px" ColumnID="TrainStartDate" DataField="TrainStartDate" SortField="TrainStartDate"
-                        FieldType="Date" Renderer="Date" HeaderText="培训时间" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="States" DataField="States" 
-                        FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
-                    </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:Window ID="Window1" Title="编辑培训计划" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true"
-        Width="1000px" Height="450px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuView" OnClick="btnMenuView_Click" EnablePostBack="true"
-            runat="server" Text="查看"  Icon="Find">
-        </f:MenuButton>  
-        <f:MenuButton ID="btnQR" OnClick="btnQR_Click" EnablePostBack="true"
-            runat="server" Text="二维码"  Icon="Shading">
-        </f:MenuButton> 
-        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
-            Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除"
-            Hidden="true">
-        </f:MenuButton>
-    </f:Menu>
+                                <f:DropDownList ID="drpWorkPost" runat="server" Label="岗位" EnableCheckBoxSelect="true" AutoSelectFirstItem="false"
+                                    EnableMultiSelect="true" AutoPostBack="true" OnSelectedIndexChanged="drp_SelectedIndexChanged"
+                                    LabelAlign="Right" LabelWidth="50px" Width="260px">
+                                </f:DropDownList>
+                                <f:TextBox ID="txtName" runat="server" Label="查询" EmptyText="输入计划编号、名称" AutoPostBack="true"
+                                    OnTextChanged="TextBox_TextChanged" Width="350px" LabelWidth="80px" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:DropDownList runat="server" ID="drpTrainType" Label="培训类型" AutoSelectFirstItem="true" AutoPostBack="true" OnSelectedIndexChanged="drp_SelectedIndexChanged" LabelAlign="Right">
+                                </f:DropDownList>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+
+                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server" OnClick="btnNew_Click">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                            TextAlign="Center" />
+                        <f:RenderField Width="80px" ColumnID="PlanCode" DataField="PlanCode" SortField="PlanCode"
+                            HeaderText="编号" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="110px" ColumnID="PlanName" DataField="PlanName" FieldType="String"
+                            HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="TrainTypeName" DataField="TrainTypeName" FieldType="String"
+                            HeaderText="培训类型" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:TemplateField Width="260px" HeaderText="接受培训单位" HeaderTextAlign="Center" TextAlign="Left" ColumnID="tfUnitNames">
+                            <ItemTemplate>
+                                <asp:Label ID="lbUnitNames" runat="server" Text='<%#ConvertUnitName(Eval("UnitIds")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField Width="150px" HeaderText="接受培训岗位" HeaderTextAlign="Center" TextAlign="Left" ColumnID="tfWorkPostNames">
+                            <ItemTemplate>
+                                <asp:Label ID="lbtfWorkPostNames" runat="server" Text='<%#ConvertWorkPostName(Eval("WorkPostId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="90px" ColumnID="DesignerName" DataField="DesignerName" FieldType="String"
+                            HeaderText="制定人" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="DesignerDate" DataField="DesignerDate" SortField="DesignerDate"
+                            FieldType="Date" Renderer="Date" HeaderText="制定时间" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="TeachAddress" DataField="TeachAddress"
+                            HeaderText="地点" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="TrainStartDate" DataField="TrainStartDate" SortField="TrainStartDate"
+                            FieldType="Date" Renderer="Date" HeaderText="培训时间" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="90px" ColumnID="States" DataField="States"
+                            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:Window ID="Window1" Title="编辑培训计划" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true"
+            Width="1000px" Height="450px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuView" OnClick="btnMenuView_Click" EnablePostBack="true"
+                runat="server" Text="查看" Icon="Find">
+            </f:MenuButton>
+            <f:MenuButton ID="btnQR" OnClick="btnQR_Click" EnablePostBack="true"
+                runat="server" Text="二维码" Icon="Shading">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
+                Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除"
+                Hidden="true">
+            </f:MenuButton>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx.cs
index 6653f29..00d731b 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx.cs
@@ -21,14 +21,9 @@ namespace FineUIPro.Web.HSSE.EduTrain
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 this.GetButtonPower();
+                this.InitDropDownList();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
 
-                var data =   APIBaseInfoService.getWorkPost(CurrUser.ProjectId, null);
-                this.drpWorkPost.DataValueField = "BaseInfoId";
-                this.drpWorkPost.DataTextField = "BaseInfoName";
-                this.drpWorkPost.DataSource = data;
-                this.drpWorkPost.DataBind();
-                Funs.FineUIPleaseSelect(drpWorkPost);
                 // 绑定表格
                 BindGrid();
             }
@@ -40,6 +35,22 @@ namespace FineUIPro.Web.HSSE.EduTrain
                 }
             }
         }
+
+        /// <summary>
+        ///  初始化下拉框
+        /// </summary>
+        private void InitDropDownList()
+        {
+            UnitService.InitUnitByProjectIdUnitTypeDropDownList1(drpUnit, this.CurrUser.LoginProjectId, false);
+            TrainTypeService.InitTrainTypeDropDownList(drpTrainType, true);
+            var data = APIBaseInfoService.getWorkPost(CurrUser.ProjectId, null);
+            this.drpWorkPost.DataValueField = "BaseInfoId";
+            this.drpWorkPost.DataTextField = "BaseInfoName";
+            this.drpWorkPost.DataSource = data;
+            this.drpWorkPost.DataBind();
+            //Funs.FineUIPleaseSelect(drpWorkPost);
+        }
+
         #region 编制
         /// <summary>
         /// 编制
@@ -60,10 +71,12 @@ namespace FineUIPro.Web.HSSE.EduTrain
         private void BindGrid()
         {
             string strSql = @"SELECT Plans.PlanId,Plans.PlanCode, Plans.PlanName, Plans.DesignerId, Plans.DesignerDate, Plans.WorkPostId,UnitIds,TrainStartDate,TeachHour,TeachAddress,
-                                     (CASE Plans.States WHEN '0' THEN '计划中' WHEN '1' THEN '待考试' WHEN '2' THEN '考试中' WHEN '3' THEN '已结束' WHEN '-1' THEN '已作废' END ) AS States,
-                                     Users.UserName AS DesignerName,WorkPostNames"
+                                (CASE Plans.States WHEN '0' THEN '计划中' WHEN '1' THEN '待考试' WHEN '2' THEN '考试中' WHEN '3' THEN '已结束' WHEN '-1' THEN '已作废' END ) AS States,
+                                (CASE Plans.IsRetakeCourse WHEN '1' THEN '重修培训' ELSE '日常培训' END ) AS IsRetakeCourseStr,
+                                TrainType.TrainTypeName,Plans.IsRetakeCourse,Users.UserName AS DesignerName,WorkPostNames"
                              + @" FROM dbo.Training_Plan AS Plans "
                              + @" LEFT JOIN Sys_User AS Users ON Users.UserId = Plans.DesignerId "
+                             + @" LEFT JOIN Base_TrainType AS TrainType ON TrainType.TrainTypeId = Plans.TrainTypeId "
                              + @" WHERE Plans.ProjectId='" + this.CurrUser.LoginProjectId + "'";
             List<SqlParameter> listStr = new List<SqlParameter>();
 
@@ -72,10 +85,40 @@ namespace FineUIPro.Web.HSSE.EduTrain
                 strSql += " AND (PlanCode LIKE @name OR PlanName LIKE @name)";
                 listStr.Add(new SqlParameter("@name", "%" + this.txtName.Text.Trim() + "%"));
             }
-            if (!string.IsNullOrEmpty(this.drpWorkPost.SelectedValue) && this.drpWorkPost.SelectedValue != "null")
+            if (this.drpUnit.SelectedItemArray.Count() > 1 || (this.drpUnit.SelectedValue != BLL.Const._Null && this.drpUnit.SelectedItemArray.Count() == 1))
             {
-                strSql += " AND  Plans.WorkPostId = '@workPost' ";
-                listStr.Add(new SqlParameter("@workPost", "%" + this.drpWorkPost.SelectedValue + "%"));
+                strSql += " AND (1=2 ";
+                int i = 0;
+                foreach (var item in this.drpUnit.SelectedValueArray)
+                {
+                    if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
+                    {
+                        strSql += " OR  Plans.UnitIds LIKE @UnitId" + i.ToString();
+                        listStr.Add(new SqlParameter("@UnitId" + i.ToString(), "%" + item + "%"));
+                    }
+                    i++;
+                }
+                strSql += ")";
+            }
+            if (this.drpWorkPost.SelectedItemArray.Count() > 1 || (this.drpWorkPost.SelectedValue != BLL.Const._Null && this.drpWorkPost.SelectedItemArray.Count() == 1))
+            {
+                strSql += " AND (1=2 ";
+                int i = 0;
+                foreach (var item in this.drpWorkPost.SelectedValueArray)
+                {
+                    if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
+                    {
+                        strSql += " OR  Plans.WorkPostId LIKE @WorkPostId" + i.ToString();
+                        listStr.Add(new SqlParameter("@WorkPostId" + i.ToString(), "%" + item + "%"));
+                    }
+                    i++;
+                }
+                strSql += ")";
+            }
+            if (!string.IsNullOrEmpty(this.drpTrainType.SelectedValue) && this.drpTrainType.SelectedValue != Const._Null)
+            {
+                strSql += " AND  Plans.TrainTypeId = @TrainTypeId ";
+                listStr.Add(new SqlParameter("@TrainTypeId", this.drpTrainType.SelectedValue));
             }
 
             SqlParameter[] parameter = listStr.ToArray();
@@ -265,6 +308,12 @@ namespace FineUIPro.Web.HSSE.EduTrain
         {
             this.BindGrid();
         }
+
+        protected void drp_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+
         #endregion
 
         #region 获取权限按钮
@@ -312,10 +361,6 @@ namespace FineUIPro.Web.HSSE.EduTrain
         #endregion
 
 
-       protected void drpWorkPost_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            BindGrid();
-        }
 
         /// <summary>
         /// 查看二维码
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx.designer.cs
index c5289b5..2f63c0e 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx.designer.cs
@@ -59,6 +59,15 @@ namespace FineUIPro.Web.HSSE.EduTrain
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
 
+        /// <summary>
+        /// drpUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnit;
+
         /// <summary>
         /// drpWorkPost 控件。
         /// </summary>
@@ -77,6 +86,15 @@ namespace FineUIPro.Web.HSSE.EduTrain
         /// </remarks>
         protected global::FineUIPro.TextBox txtName;
 
+        /// <summary>
+        /// drpTrainType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpTrainType;
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx.cs
index 8536e9a..f7d8f07 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx.cs
@@ -470,8 +470,8 @@ namespace FineUIPro.Web.HSSE.EduTrain
             if (dpUnit.SelectedValueArray != null && dpWorkPost.SelectedValueArray != null)
             {
                 dpSysUser.Items.Clear();
-                string unitIds = string.Join(",", dpUnit.SelectedValue);
-                string workPostIds = string.Join(",", dpWorkPost.SelectedValue);
+                string unitIds = string.Join(",", dpUnit.SelectedValueArray);
+                string workPostIds = string.Join(",", dpWorkPost.SelectedValueArray);
                 var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(this.CurrUser.LoginProjectId, unitIds, workPostIds, "", drpTrainType.SelectedValue, "", "").OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
                 dpSysUser.DataTextField = "PersonName";
                 dpSysUser.DataValueField = "PersonId";
diff --git a/SGGL/FineUIPro.Web/common/mainNew.aspx b/SGGL/FineUIPro.Web/common/mainNew.aspx
deleted file mode 100644
index 7153bbc..0000000
--- a/SGGL/FineUIPro.Web/common/mainNew.aspx
+++ /dev/null
@@ -1,549 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="mainNew.aspx.cs" Inherits="FineUIPro.Web.common.mainNew" %>
-
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>Document</title>
-    <script src="./lib/flex.js"></script>
-    <link rel="stylesheet" href="css/swiper-bundle.min.css"/>
-    <link rel="stylesheet" href="css/index.css"/>
-</head>
-<body>
-    <form id="form1" runat="server">
-       <div class="z-page">
-        <div class="z-main">
-            <div class="z-side">
-                <div class="z-s">
-                    <div class="z-w">
-                        <div class="z-lab">百万工时</div>
-                        <div class="z-val" id="NumberBox1" runat="server">657.32</div>
-                    </div>
-                </div>
-                <div class="z-s">
-                    <div class="z-w">
-                        <div class="z-lab">承包商数量</div>
-                        <div class="z-val"><span id="NumberBox2" runat="server">0</span><span class="z-unit">个</span></div>
-                    </div>
-                </div>
-                <div class="z-s">
-                    <div class="z-w">
-                        <div class="z-lab">作业人员</div>
-                        <div class="z-val"><span id="NumberBox3" runat="server">0</span><span class="z-unit">人</span></div>
-                    </div>
-                </div>
-                <div class="z-s">
-                    <div class="z-w">
-                        <div class="z-lab">培训课时</div>
-                        <div class="z-val"><span id="NumberBox4" runat="server">0</span><span class="z-unit">小时</span></div>
-                    </div>
-                </div>
-               <%-- <div class="z-s">
-                    <div class="z-w">
-                        <div class="z-lab">特种作业（工作票）</div>
-                        <div class="z-val"><span id="NumberBox5" runat="server">0</span><span class="z-unit">项</span></div>
-                    </div>
-                </div>--%>
-               <div class="z-s">
-                    <div class="z-w">
-                        <div class="z-lab">高危作业</div>
-                        <div class="z-val"><span id="NumberBox6" runat="server">0</span><span class="z-unit">项</span></div>
-                    </div>
-                </div>
-                <div class="z-s1">
-                    <div class="z-w1">
-                        <div class="z-lab">项目停工</div>
-                        <div class="z-val"><span id="NumberBox7" runat="server">0</span><span class="z-unit">次</span></div>
-                    </div>
-                    <div class="z-s-box">
-                        <div class="z_box">
-                            <div class="z-b-lab">天气原因</div>
-                            <div class="z-b-val"><span id="NumberBox8" runat="server">0</span> <span class="z-unit">次</span> </div>
-                        </div>
-                        <div class="z_box">
-                            <div class="z-b-lab">天气原因</div>
-                            <div class="z-b-val"><span id="NumberBox9" runat="server">0</span> <span class="z-unit">次</span> </div>
-                        </div>
-                        <div class="z_box">
-                            <div class="z-b-lab">天气原因</div>
-                            <div class="z-b-val"><span id="NumberBox10" runat="server">0</span> <span class="z-unit">次</span> </div>
-                        </div>
-                    </div>
-                </div>
-                <%--<div class="z-s1">
-                    <div class="z-w1">
-                        <div class="z-lab">项目总数</div>
-                        <div class="z-val"><span id="NumberBox11" runat="server">0</span><span class="z-unit">个</span></div>
-                    </div>
-                    <div class="z-s-box">
-                        <div class="z_box">
-                            <div class="z-b-lab">A级</div>
-                            <div class="z-b-val"><span id="NumberBox12" runat="server">0</span> <span class="z-unit">个</span> </div>
-                        </div>
-                        <div class="z_box">
-                            <div class="z-b-lab">B级</div>
-                            <div class="z-b-val"><span id="NumberBox13" runat="server">0</span> <span class="z-unit">个</span> </div>
-                        </div>
-                        <div class="z_box">
-                            <div class="z-b-lab">C级</div>
-                            <div class="z-b-val"><span id="NumberBox14" runat="server">0</span> <span class="z-unit">个</span> </div>
-                        </div>
-                    </div>
-                </div>--%>
-                <div class="z-s1">
-                    <div class="z-w1">
-                        <div class="z-lab">安全费用</div>
-                        <div class="z-val"><span id="NumberBox15" runat="server">0</span><span class="z-unit">万元</span></div>
-                    </div>
-                    <div class="z-s-box">
-                        <div class="z_box">
-                            <div class="z-b-lab">已使用</div>
-                            <div class="z-b-val"><span id="NumberBox16" runat="server">0</span> <span class="z-unit">万元</span> </div>
-                        </div>
-                        <div class="z_box">
-                            <div class="z-b-lab">未归集</div>
-                            <div class="z-b-val"><span id="NumberBox17" runat="server">0</span> <span class="z-unit">万元</span> </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="z-s2">
-                    <div class="z-w1">
-                        <div class="z-lab">应急演练</div>
-                        <div class="z-val"><span id="NumberBox18" runat="server">0</span><span class="z-unit">次</span></div>
-                    </div>
-                    <div class="z-w1">
-                        <div class="z-lab">应急物品</div>
-                        <div class="z-val"><span id="NumberBox19" runat="server">0</span><span class="z-unit">项</span></div>
-                    </div>
-                    <div class="z-w1">
-                        <div class="z-lab">应急药品</div>
-                        <div class="z-val"><span id="NumberBox20" runat="server">0</span><span class="z-unit">项</span></div>
-                    </div>
-                </div>
-
-                 <div class="z-s4" style="margin-top:20px">
-                    <div class="z-w1">
-                        <div class="z-lab">领导个人行动计划</div>
-                        <div class="z-val"><span id="NumberBox39" runat="server">0</span><span class="z-unit">次</span></div>
-                    </div>
-                    <div class="z-w1">
-                        <div class="z-lab">安全行为观察与沟通</div>
-                        <div class="z-val"><span id="NumberBox40" runat="server">0</span><span class="z-unit">次</span></div>
-                    </div>
-                </div>
-            </div>
-            <div class="z-center">
-                <div class="z-p">
-                    <div class="z-p-b">
-                        <div class="z-pb-val"><span id="divProjectNum" runat="server">0</span> <span class="z-unit">个</span> </div>
-                        <div class="z-pb-lab">在建项目</div>
-                    </div>
-                    <div class="z-p-b">
-                        <div class="z-pb-val"><span id="divJoinConstructionPersonNum" runat="server">0</span> <span class="z-unit">个</span> </div>
-                        <div class="z-pb-lab">参建人数</div>
-                    </div>
-                </div>
-                <div class="z-map">
-                    <div id="cMap"></div>
-                </div>
-                <div id="zhuimap"></div>
-            </div>
-            <div class="z-side">
-                <div class="z-s1">
-                    <div class="z-w1">
-                        <div class="z-lab">危害因素</div>
-                        <div class="z-val"><span id="NumberBox21" runat="server">0</span><span class="z-unit">项</span></div>
-                    </div>
-                    <div class="z-s-box">
-                          <div class="z_box">
-                                <div class="z-b-lab">低风险</div>
-                                <div class="z-b-val"><span id="NumberBox41" runat="server">0</span> <span class="z-unit">项</span> </div>
-                            </div>
-                            <div class="z_box">
-                                <div class="z-b-lab">一般风险</div>
-                                <div class="z-b-val"><span id="NumberBox23" runat="server">0</span> <span class="z-unit">项</span> </div>
-                            </div>
-                            <div class="z_box">
-                                <div class="z-b-lab">较大风险</div>
-                                <div class="z-b-val"><span id="NumberBox42" runat="server">0</span> <span class="z-unit">项</span> </div>
-                            </div>
-                            <div class="z_box">
-                                <div class="z-b-lab">重大风险</div>
-                                <div class="z-b-val"><span id="NumberBox22" runat="server">0</span> <span class="z-unit">项</span> </div>
-                            </div>
-                    </div>
-                </div>
-                <div class="z-s3">
-                    <div class="z-c">
-                        <div class="z-w3">
-                            <div class="z-w3_lab">质量问题</div>
-                            <div class="z-w3_val"><span id="NumberBox24" runat="server">0</span><span class="z-unit">项</span></div>
-                        </div>
-                        <div class="z-l"></div>
-                        <div class="z-w3">
-                            <div class="z-w3_lab">已整改</div>
-                            <div class="z-w3_val"><span id="NumberBox25" runat="server">0</span><span class="z-unit">项</span></div>
-                        </div>
-                    </div>
-                    <div class="z-c">
-                        <div class="z-w3">
-                            <div class="z-w3_lab">安全问题</div>
-                            <div class="z-w3_val"><span id="NumberBox26" runat="server">0</span><span class="z-unit">项</span></div>
-                        </div>
-                        <div class="z-l"></div>
-                        <div class="z-w3">
-                            <div class="z-w3_lab">已整改</div>
-                            <div class="z-w3_val"><span id="NumberBox27" runat="server">0</span><span class="z-unit">项</span></div>
-                        </div>
-                    </div>
-                    <div class="z-w1">
-                        <div class="z-lab">项目停工</div>
-                        <div class="z-val"><span id="NumberBox28" runat="server">0</span><span class="z-unit">个</span></div>
-                    </div>
-                    <div class="z-s-box">
-                        <div class="z_box">
-                            <div class="z-b-lab">管控红线问题</div>
-                            <div class="z-b-val"><span id="NumberBox29" runat="server">0</span> <span class="z-unit">项</span> </div>
-                        </div>
-                        <div class="z_box">
-                            <div class="z-b-lab">较大隐患及停工项问题</div>
-                            <div class="z-b-val"><span id="NumberBox30" runat="server">0</span> <span class="z-unit">项</span> </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="z-s2" style="    margin-bottom: .325rem;">
-                    <div class="z-w1">
-                        <div class="z-lab">特种设备/日检查</div>
-                        <div class="z-val"><span id="NumberBox31" runat="server">0</span><span class="z-unit">次</span></div>
-                    </div>
-                    <div class="z-w1">
-                        <div class="z-lab">特种设备/周排查</div>
-                        <div class="z-val"><span id="NumberBox32" runat="server">0</span><span class="z-unit">项</span></div>
-                    </div>
-                    <div class="z-w1">
-                        <div class="z-lab">特种设备/月调度情况</div>
-                        <div class="z-val"><span id="NumberBox33" runat="server">0</span><span class="z-unit">项</span></div>
-                    </div>
-                </div>
-                <div class="z-s1">
-                    <div class="z-w1">
-                        <div class="z-lab">参与五星计划</div>
-                        <div class="z-val"><span id="NumberBox34" runat="server">0</span><span class="z-unit">人次</span></div>
-                    </div>
-                    <div class="z-s-box">
-                        <div class="z_box">
-                            <div class="z-b-lab">五星</div>
-                            <div class="z-b-val"><span id="NumberBox35" runat="server">0</span> <span class="z-unit">人</span> </div>
-                        </div>
-                        <div class="z_box">
-                            <div class="z-b-lab">四星</div>
-                            <div class="z-b-val"><span id="NumberBox36" runat="server">0</span> <span class="z-unit">人</span> </div>
-                        </div>
-                        <div class="z_box">
-                            <div class="z-b-lab">三星</div>
-                            <div class="z-b-val"><span id="NumberBox37" runat="server">0</span> <span class="z-unit">人</span> </div>
-                        </div>
-                        <div class="z_box">
-                            <div class="z-b-lab">二星</div>
-                            <div class="z-b-val"><span id="NumberBox38" runat="server">0</span> <span class="z-unit">人</span> </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="z-s4">
-                    <div class="z-w1">
-                        <div class="z-lab">一般隐患</div>
-                        <div class="z-val"><span id="NumberBox43" runat="server">0</span><span class="z-unit">次</span></div>
-                    </div>
-                    <div class="z-w1">
-                        <div class="z-lab">较大隐患</div>
-                        <div class="z-val"><span id="NumberBox44" runat="server">0</span><span class="z-unit">次</span></div>
-                    </div>
-                </div>
-
-                <div class="z-b">
-                    <div class="z-tit">HSE监管片区责任和网格化管理情况</div>
-                    <div class="z-imgb">
-                        <div class="swiper">
-                            <div class="swiper-wrapper" id="swiper_div" runat="server">
-                               <%-- <div class="swiper-slide">
-                                    <img src="images/m06.png"/>
-                                </div>--%>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    </form>
-</body>
-</html>
-<script src="lib/swiper-bundle.min.js"></script>
-<script src="lib/china1.js"></script>
-<script src="lib/echarts.min.js"></script>
-<script>
-    var mySwiper = new Swiper('.swiper', {
-        autoplay: true,//可选选项，自动滑动
-    })
-
-    createChinaMap()
-    function createChinaMap() {
-        // 地图 点
-        var chinaData = JSON.parse('<%=ProjectInfo %>')
-        // 中国地图 配置
-        let chinaOption = {
-            tooltip: { show: false },
-            geo: [
-                {
-                    // 地理坐标系组件
-                    map: "china",
-                    roam: false, // 可以缩放和平移
-                    aspectScale: 0.75, // 比例
-                    top: 140,
-                    zlevel: 2,
-                    zoom: 1.4,
-                    tooltip: {
-                        show: true,
-                        backgroundColor: "#4CB0DD",
-                        borderColor: 'rgba(0, 0, 0, 0.2)',
-                        formatter: function (h) {
-                            console.log(h)
-                            let html = `<div style="z-index:99999999;color: #ffffff;">
-                                <p>`+ h.name.split("@")[0] + `</p>
-                            </div>`
-                            return html
-                        },
-                    },
-                    label: {
-                        show: false
-                    },
-                    regions: [
-                        {
-                            name: "南海诸岛",
-                            itemStyle: {
-                                // 隐藏地图
-                                normal: {
-                                    opacity: 0, // 为 0 时不绘制该图形
-                                }
-                            },
-                            label: {
-                                show: false // 隐藏文字
-                            }
-                        }
-                    ],
-                    itemStyle: {
-                        // 图形上的地图区域
-                        normal: {
-                            areaColor: "#062539",
-                            borderColor: "#07121B",
-                        }
-                    },
-
-                    emphasis: {
-                        disabled: true,
-                    }
-
-                },
-                {
-                    // 地理坐标系组件
-                    map: "china",
-                    roam: false, // 可以缩放和平移
-                    aspectScale: 0.75, // 比例
-                    top: 130,
-                    zlevel: 9,
-                    zoom: 1.4,
-                    regions: [
-                        {
-                            name: "南海诸岛",
-                            itemStyle: {
-                                // 隐藏地图
-                                normal: {
-                                    opacity: 0, // 为 0 时不绘制该图形
-                                }
-                            },
-                            label: {
-                                show: false // 隐藏文字
-                            }
-                        }
-                    ],
-                    itemStyle: {
-                        // 图形上的地图区域
-                        normal: {
-                            areaColor: "#0576B3",
-                            borderColor: "#076393",
-                        }
-                    },
-
-                    emphasis: {
-                        disabled: true,
-                    }
-
-                },
-
-                {
-                    // 地理坐标系组件
-                    map: "china",
-                    roam: false, // 可以缩放和平移
-                    aspectScale: 0.75, // 比例
-                    top: 120,
-                    zlevel: 12,
-                    zoom: 1.4,
-                    label: {
-                        color: "#ffffff",
-                        show: true
-                    },
-                    regions: [
-                        {
-                            name: "南海诸岛",
-                            label: {
-                                show: false // 隐藏文字
-                            }
-                        }
-                    ],
-                    itemStyle: {
-                        // 图形上的地图区域
-                        normal: {
-                            borderWidth: 1,
-                            areaColor: "#0E6492",
-                            borderColor: "#45A8DB",
-                        }
-                    },
-                    emphasis: {
-                        disabled: true,
-                    }
-
-                },
-            ],
-            series: [
-                {
-                    id: 'isSkip',
-                    type: 'effectScatter',
-                    coordinateSystem: 'geo',
-                    symbolSize: 10,
-                    zlevel: 100,
-                    selectedMode: true,
-                    select: {
-                        disabled: true,
-                        label: true,
-                    },
-                    itemStyle: {
-                        color: "#FDFF04"
-                    },
-                    rippleEffect: {
-
-                    },
-                    tooltip: {
-                        show: true
-                    },
-                    data: chinaData,
-                }],
-
-        }
-        echarts.registerMap('china', chinaJson);
-        let chinaChart = echarts.init(document.getElementById('cMap'));
-        chinaChart.setOption(chinaOption);
-
-        window.addEventListener("resize", function () {
-            chinaChart.resize();   //myChart指自己定义的echartsDom对象
-        });
-
-        chinaChart.on('click', function (params) {
-            // 控制台打印点击的地区名称
-            //if (params.seriesType == 'effectScatter') {
-            //    alert('点击了' + params.name);
-            //}
-            if (params.seriesType == "effectScatter") {
-                var gotoUrl = params.name.split("@")[1] || 'indexProject.aspx'
-                top.window.location.href = '../' + gotoUrl
-            }
-            // 你可以在这里添加你的逻辑代码
-        });
-
-        //chinaChart.on('click', function (params) {
-        //    // 控制台打印点击的地区名称
-        //    if (params.seriesType == 'effectScatter') {
-        //        /*alert('点击了' + params.name);*/
-        //    }
-        //    // 你可以在这里添加你的逻辑代码
-        //});
-
-    }
-    // 重置大小
-    function resetSize(size, initWidth = 1920) {
-        let clientWidth = document.body.clientWidth
-        return size * (clientWidth / initWidth)
-    }
-
-    createZHUIMap()
-    function createZHUIMap() {
-
-        let data = [
-            { val: 1, value: 1, name: '重大故障' }, // value 控制漏斗图的占比 不动
-            { val: 29, value: 2, name: '故障' },
-            { val: 300, value: 3, name: '(Trouble)' },
-        ]
-
-        var chartDom = document.getElementById('zhuimap');
-        var myChart = echarts.init(chartDom);
-        var option;
-
-        option = {
-            title: {
-                bottom: '10%',
-                left: 'center',
-                text: `(${data[2].val}:${data[1].val}:${data[0].val})`,
-                textStyle: {
-                    fontSize: resetSize(14),
-                    color: '#ffffff'
-                }
-            },
-            series: [
-                {
-                    name: 'Funnel',
-                    type: 'funnel',
-                    left: '10%',
-                    top: '15%',
-                    width: '80%',
-                    height: '60%',
-                    minSize: '0%',
-                    maxSize: '100%',
-                    sort: 'ascending',
-                    gap: 0,
-                    label: {
-                        show: true,
-                        position: 'inside',
-                        fontSize: resetSize(10),
-                        color: '#ffffff',
-                        formatter: (h) => {
-                            let data = h.data
-                            return `${data.val}次\n${data.name}`
-
-                        }
-                    },
-                    labelLine: {
-                        length: 10,
-                        lineStyle: {
-                            width: 1,
-                            type: 'solid'
-                        }
-                    },
-                    itemStyle: {
-                        borderColor: '#fff',
-                        borderWidth: 0,
-
-                    },
-                    emphasis: {
-                        label: {
-                            fontSize: resetSize(10)
-                        }
-                    },
-                    data
-                }
-            ]
-        };
-
-        option && myChart.setOption(option);
-    }
-</script>
diff --git a/SGGL/FineUIPro.Web/common/mainNew.aspx.cs b/SGGL/FineUIPro.Web/common/mainNew.aspx.cs
deleted file mode 100644
index fb1a2e2..0000000
--- a/SGGL/FineUIPro.Web/common/mainNew.aspx.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-using BLL;
-using FineUIPro.Web.DataShow;
-using Newtonsoft.Json;
-using NPOI.SS.Util;
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.IO;
-using System.Linq;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace FineUIPro.Web.common
-{
-    public partial class mainNew : PageBase
-    {
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            if (!IsPostBack) {
-                Model.SGGLDB db = Funs.DB;
-
-                ////项目信息
-                getProjectInfo(db);
-
-                //加载看板数据
-                loadData();
-            }
-        }
-
-        #region 项目信息
-        protected string ProjectInfo;
-        /// <summary>
-        /// 项目信息
-        /// </summary>
-        private List<Model.Base_Project> getProjectInfo(Model.SGGLDB db)
-        {
-            ProjectInfo = "[]";
-            var getProjects = db.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && (x.IsDelete == null || x.IsDelete == false));
-
-
-            string picHtml = "";
-
-
-            var getP = from x in db.InformationProject_Picture
-                       join y in db.AttachFile on x.PictureId equals y.ToKeyId
-                       where y.AttachFileId != null && y.AttachUrl != null
-                       orderby x.UploadDate descending
-                       select new { x.PictureId, x.Title, x.UploadDate, y.AttachUrl };
-
-
-            if (getP.Count() > 0)
-            {
-                foreach (var item in getP)
-                {
-                    var geturl = Funs.GetStrListByStr(item.AttachUrl, ',');
-                    foreach (var itemurl in geturl)
-                    {
-                        if (!string.IsNullOrEmpty(itemurl))
-                        {
-
-                            picHtml += @"<div class=""swiper-slide""><img src=""../" + itemurl + @""" /></div> ";
-                        }
-                    }
-                }
-            }
-
-
-            //foreach (var p in getProjects)
-            //{
-            //    try
-            //    {
-            //        string res = AttachFileService.getFileUrl(p.ProjectId, BLL.Const.SeverProjectSetMenuId);
-            //        string[] urls = res.Split(',');
-            //        foreach (string u in urls)
-            //        {
-            //            if (!string.IsNullOrEmpty(u))
-            //            {
-            //                picHtml += @"<div class=""swiper-slide""><img src=""../" + u + @""" /></div> ";
-            //            }
-            //        }
-            //    }
-            //    catch (Exception ex) { }
-
-            //}
-            //divProjectPic.InnerHtml = picHtml;
-            var array = new DecimalFormat(",###").Format(getProjects.Count()).ToArray();
-            string projectNum = "";
-
-            foreach (var s in array)
-            {
-                if (s != ',')
-                {
-                    projectNum += "<span class=\"num-box\">" + s + "</span>";
-                }
-                else
-                {
-                    projectNum += "<span >" + s + "</span>";
-                }
-
-            }
-            this.divProjectNum.InnerHtml = projectNum;
-            var persons = from x in db.SitePerson_Person
-                          where x.IsUsed == true
-                          select x;
-            var array2 = new DecimalFormat(",###").Format(persons.Count()).ToArray();
-            string personsNum = "";
-
-            foreach (var s in array2)
-            {
-                if (s != ',')
-                {
-                    personsNum += "<span class=\"num-box\">" + s + "</span>";
-                }
-                else
-                {
-                    personsNum += "<span >" + s + "</span>";
-                }
-
-            }
-            this.divJoinConstructionPersonNum.InnerHtml = personsNum;
-            var getProjectMap = getProjects.Where(x => x.MapCoordinates.Length > 0);
-            if (getProjectMap.Count() > 0)
-            {
-                List<Model.SingleSerie> list = new List<Model.SingleSerie>();
-                foreach (var item in getProjectMap)
-                {
-                    Model.SingleSerie newS = new Model.SingleSerie
-                    {
-                        name = "【项目名称】：" + item.ProjectName
-                        //+ "</br> 【项目状态】：" + GetProjectState(item.ProjectId)
-                        + "</br>【开工时间】：" + string.Format("{0:yyyy-MM-dd}", item.StartDate)
-                        + "</br>【竣工时间】：" + string.Format("{0:yyyy-MM-dd}", item.EndDate)
-                        + "</br>【项目地址】：" + item.ProjectAddress + "@" + "indexProject.aspx?projectId=" + item.ProjectId,
-                        //url = "indexProject.aspx?projectId=" + item.ProjectId,
-                        cityname = "中国"
-                    };
-                    var strMap = Funs.GetStrListByStr(item.MapCoordinates, ',');
-                    if (strMap.Count > 1)
-                    {
-                        newS.value = new[] { Funs.GetNewDecimalOrZero(strMap[0]), Funs.GetNewDecimalOrZero(strMap[1]) };
-                        list.Add(newS);
-                    }
-                }
-                ProjectInfo = JsonConvert.SerializeObject(list);
-            }
-
-            return getProjects.ToList();
-        }
-        #endregion
-
-        protected void loadData() {
-            var data = Funs.DB.Sys_Const.Where(x => x.GroupId == "BoardData").ToList();
-            if (data.Count > 0) {
-                #region 加载数据
-                NumberBox1.InnerHtml = data.Where(x => x.ConstText == "NumberBox1").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString();
-
-                NumberBox2.InnerHtml = data.Where(x => x.ConstText == "NumberBox2").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox3.InnerHtml = data.Where(x => x.ConstText == "NumberBox3").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox4.InnerHtml = data.Where(x => x.ConstText == "NumberBox4").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString();
-                //NumberBox5.InnerHtml = data.Where(x => x.ConstText == "NumberBox5").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox6.InnerHtml = data.Where(x => x.ConstText == "NumberBox6").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox7.InnerHtml = data.Where(x => x.ConstText == "NumberBox7").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox8.InnerHtml = data.Where(x => x.ConstText == "NumberBox8").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox9.InnerHtml = data.Where(x => x.ConstText == "NumberBox9").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox10.InnerHtml = data.Where(x => x.ConstText == "NumberBox10").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                //NumberBox11.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox11").ConstValue;
-                //NumberBox12.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox12").ConstValue;
-                //NumberBox13.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox13").ConstValue;
-                //NumberBox14.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox14").ConstValue;
-                NumberBox15.InnerHtml = data.Where(x => x.ConstText == "NumberBox15").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox16.InnerHtml = data.Where(x => x.ConstText == "NumberBox16").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox17.InnerHtml = data.Where(x => x.ConstText == "NumberBox17").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox18.InnerHtml = data.Where(x => x.ConstText == "NumberBox18").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox19.InnerHtml = data.Where(x => x.ConstText == "NumberBox19").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox20.InnerHtml = data.Where(x => x.ConstText == "NumberBox20").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-
-                NumberBox21.InnerHtml = data.Where(x => x.ConstText == "NumberBox21").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox22.InnerHtml = data.Where(x => x.ConstText == "NumberBox22").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox23.InnerHtml = data.Where(x => x.ConstText == "NumberBox23").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox24.InnerHtml = data.Where(x => x.ConstText == "NumberBox24").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox25.InnerHtml = data.Where(x => x.ConstText == "NumberBox25").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox26.InnerHtml = data.Where(x => x.ConstText == "NumberBox26").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox27.InnerHtml = data.Where(x => x.ConstText == "NumberBox27").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox28.InnerHtml = data.Where(x => x.ConstText == "NumberBox28").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox29.InnerHtml = data.Where(x => x.ConstText == "NumberBox29").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox30.InnerHtml = data.Where(x => x.ConstText == "NumberBox30").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox31.InnerHtml = data.Where(x => x.ConstText == "NumberBox31").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox32.InnerHtml = data.Where(x => x.ConstText == "NumberBox32").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox33.InnerHtml = data.Where(x => x.ConstText == "NumberBox33").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox34.InnerHtml = data.Where(x => x.ConstText == "NumberBox34").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox35.InnerHtml = data.Where(x => x.ConstText == "NumberBox35").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox36.InnerHtml = data.Where(x => x.ConstText == "NumberBox36").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox37.InnerHtml = data.Where(x => x.ConstText == "NumberBox37").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox38.InnerHtml = data.Where(x => x.ConstText == "NumberBox38").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox39.InnerHtml = data.Where(x => x.ConstText == "NumberBox39").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox40.InnerHtml = data.Where(x => x.ConstText == "NumberBox40").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox41.InnerHtml = data.Where(x => x.ConstText == "NumberBox41").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox42.InnerHtml = data.Where(x => x.ConstText == "NumberBox42").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox43.InnerHtml = data.Where(x => x.ConstText == "NumberBox43").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                NumberBox44.InnerHtml = data.Where(x => x.ConstText == "NumberBox44").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
-                #endregion
-            }
-
-            //加载附件图片
-            var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.MenuId == "087F4FAF-3B00-462A-9040-4CB3556F8177");
-            var swpiperHtml = "";
-            if (sour!=null)
-            {
-                string url = sour.AttachUrl.Replace('\\', '/');
-                List<string> list = Funs.GetStrListByStr(url, ',');
-                if (list.Count() > 0)
-                {
-                    int i = 0;
-                    foreach (var item in list)
-                    {
-                        string atturl = Funs.RootPath + item.Replace(';', ' ').Trim();
-                        if (File.Exists(atturl))
-                        {
-                            swpiperHtml += "<div class=\"swiper-slide\">";
-                            swpiperHtml += "<img src = \"../"+ item + "\"/>";
-                            swpiperHtml += "</div>";
-                        }
-                    }
-                    swiper_div.InnerHtml = swpiperHtml;
-
-
-                }
-            }
-            
-        }
-    }
-}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/mainNew.aspx.designer.cs b/SGGL/FineUIPro.Web/common/mainNew.aspx.designer.cs
deleted file mode 100644
index e21dcca..0000000
--- a/SGGL/FineUIPro.Web/common/mainNew.aspx.designer.cs
+++ /dev/null
@@ -1,404 +0,0 @@
-//------------------------------------------------------------------------------
-// <自动生成>
-//     此代码由工具生成。
-//
-//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，则所做更改将丢失。
-// </自动生成>
-//------------------------------------------------------------------------------
-
-namespace FineUIPro.Web.common
-{
-
-
-    public partial class mainNew
-    {
-
-        /// <summary>
-        /// form1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
-        /// <summary>
-        /// NumberBox1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox1;
-
-        /// <summary>
-        /// NumberBox2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox2;
-
-        /// <summary>
-        /// NumberBox3 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox3;
-
-        /// <summary>
-        /// NumberBox4 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox4;
-
-        /// <summary>
-        /// NumberBox6 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox6;
-
-        /// <summary>
-        /// NumberBox7 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox7;
-
-        /// <summary>
-        /// NumberBox8 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox8;
-
-        /// <summary>
-        /// NumberBox9 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox9;
-
-        /// <summary>
-        /// NumberBox10 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox10;
-
-        /// <summary>
-        /// NumberBox15 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox15;
-
-        /// <summary>
-        /// NumberBox16 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox16;
-
-        /// <summary>
-        /// NumberBox17 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox17;
-
-        /// <summary>
-        /// NumberBox18 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox18;
-
-        /// <summary>
-        /// NumberBox19 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox19;
-
-        /// <summary>
-        /// NumberBox20 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox20;
-
-        /// <summary>
-        /// NumberBox39 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox39;
-
-        /// <summary>
-        /// NumberBox40 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox40;
-
-        /// <summary>
-        /// divProjectNum 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divProjectNum;
-
-        /// <summary>
-        /// divJoinConstructionPersonNum 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divJoinConstructionPersonNum;
-
-        /// <summary>
-        /// NumberBox21 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox21;
-
-        /// <summary>
-        /// NumberBox41 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox41;
-
-        /// <summary>
-        /// NumberBox23 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox23;
-
-        /// <summary>
-        /// NumberBox42 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox42;
-
-        /// <summary>
-        /// NumberBox22 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox22;
-
-        /// <summary>
-        /// NumberBox24 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox24;
-
-        /// <summary>
-        /// NumberBox25 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox25;
-
-        /// <summary>
-        /// NumberBox26 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox26;
-
-        /// <summary>
-        /// NumberBox27 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox27;
-
-        /// <summary>
-        /// NumberBox28 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox28;
-
-        /// <summary>
-        /// NumberBox29 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox29;
-
-        /// <summary>
-        /// NumberBox30 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox30;
-
-        /// <summary>
-        /// NumberBox31 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox31;
-
-        /// <summary>
-        /// NumberBox32 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox32;
-
-        /// <summary>
-        /// NumberBox33 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox33;
-
-        /// <summary>
-        /// NumberBox34 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox34;
-
-        /// <summary>
-        /// NumberBox35 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox35;
-
-        /// <summary>
-        /// NumberBox36 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox36;
-
-        /// <summary>
-        /// NumberBox37 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox37;
-
-        /// <summary>
-        /// NumberBox38 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox38;
-
-        /// <summary>
-        /// NumberBox43 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox43;
-
-        /// <summary>
-        /// NumberBox44 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox44;
-
-        /// <summary>
-        /// swiper_div 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl swiper_div;
-    }
-}
diff --git a/SGGL/Model/APIItem/HSSE/PersonInfoItem.cs b/SGGL/Model/APIItem/HSSE/PersonInfoItem.cs
new file mode 100644
index 0000000..ca34e2a
--- /dev/null
+++ b/SGGL/Model/APIItem/HSSE/PersonInfoItem.cs
@@ -0,0 +1,62 @@
+
+namespace Model
+{
+    public class PersonInfoItem
+    {
+        /// <summary>
+        /// 人员主键ID
+        /// </summary>
+        public string PersonId { get; set; }
+        ///// <summary>
+        ///// 卡号
+        ///// </summary>
+        //public string CardNo { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string PersonName { get; set; }
+
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public string SexName { get; set; }
+        /// <summary>
+        /// 身份证号码
+        /// </summary>
+        public string IdentityCard { get; set; }
+        /// <summary>
+        /// 电话
+        /// </summary>
+        public string Telephone { get; set; }
+        /// <summary>
+        /// 单位名称
+        /// </summary>
+        public string UnitName { get; set; }
+        /// <summary>
+        /// 班组名称
+        /// </summary>
+        public string TeamGroupName { get; set; }
+        /// <summary>
+        /// 岗位名称
+        /// </summary>
+        public string WorkPostName { get; set; }
+        /// <summary>
+        /// 入场时间
+        /// </summary>
+        public string InTime { get; set; }
+        /// <summary>
+        /// 照片路径
+        /// </summary>
+        public string PhotoUrl { get; set; }
+
+        /// <summary>
+        /// HSE分值（本年）
+        /// </summary>
+        public int HSEScore { get; set; }
+        /// <summary>
+        /// HSE学时（本年）
+        /// </summary>
+        public double LearnHour { get; set; }
+
+    }
+}
diff --git a/SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs b/SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs
index 1a8b852..ca14e47 100644
--- a/SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs
+++ b/SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs
@@ -111,5 +111,15 @@ namespace Model
             get;
             set;
         }
+        /// <summary>
+        /// 是否是重修任务
+        /// </summary>
+        public int IsRetakeCourse
+        {
+            get;
+            set;
+        }
+
+        
     }
 }
diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj
index c99cbaf..55bf0a4 100644
--- a/SGGL/Model/Model.csproj
+++ b/SGGL/Model/Model.csproj
@@ -125,6 +125,7 @@
     <Compile Include="APIItem\HSSE\NoticeItem.cs" />
     <Compile Include="APIItem\HSSE\PauseNoticeItem.cs" />
     <Compile Include="APIItem\HSSE\PersonInOutItem.cs" />
+    <Compile Include="APIItem\HSSE\PersonInfoItem.cs" />
     <Compile Include="APIItem\HSSE\PersonItem.cs" />
     <Compile Include="APIItem\HSSE\PersonQualityItem.cs" />
     <Compile Include="APIItem\HSSE\PictureItem.cs" />
diff --git a/SGGL/WebAPI/Controllers/HSSE/TrainingTaskController.cs b/SGGL/WebAPI/Controllers/HSSE/TrainingTaskController.cs
index d16eb50..1273959 100644
--- a/SGGL/WebAPI/Controllers/HSSE/TrainingTaskController.cs
+++ b/SGGL/WebAPI/Controllers/HSSE/TrainingTaskController.cs
@@ -13,20 +13,21 @@ namespace WebAPI.Controllers
     /// </summary>
     public class TrainingTaskController : ApiController
     {
-        #region 根据ProjectId、PersonId获取培训任务教材明细列表
+        #region 根据ProjectId、PersonId获取培训任务列表
         /// <summary>
         /// 根据ProjectId、PersonId获取培训任务教材明细列表
         /// </summary>
         /// <param name="projectId"></param>
         /// <param name="personId"></param>
-        /// <param name="pageIndex">1-培训中；2-已完成</param>
+        /// <param name="isRetakeCourse">是否重修：1：重修任务</param>
+        /// <param name="pageIndex">页码</param>
         /// <returns></returns>
-        public Model.ResponeData getTrainingTaskListByProjectIdPersonId(string projectId, string personId, int pageIndex)
+        public Model.ResponeData getTrainingTaskListByProjectIdPersonId(string projectId, string personId, string isRetakeCourse, int pageIndex)
         {
             var responeData = new Model.ResponeData();
             try
             {
-                var getQualityLists = APITrainingTaskService.getTrainingTaskListByProjectIdPersonId(projectId, personId);
+                var getQualityLists = APITrainingTaskService.getTrainingTaskListByProjectIdPersonId(projectId, personId, isRetakeCourse);
                 int pageCount = getQualityLists.Count;
                 if (pageCount > 0 && pageIndex > 0)
                 {
@@ -128,6 +129,14 @@ namespace WebAPI.Controllers
         }
 		#endregion
 
+        /// <summary>
+        /// 维护任务学习时长
+        /// </summary>
+        /// <param name="taskItemId"></param>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <param name="VideoProgress"></param>
+        /// <returns></returns>
 		[HttpGet]
 		public Model.ResponeData updateTaskItemLearnTime(string taskItemId, DateTime startTime, DateTime endTime, string VideoProgress)
 		{
diff --git a/SGGL/WebAPI/Controllers/PersonController.cs b/SGGL/WebAPI/Controllers/Person/PersonController.cs
similarity index 96%
rename from SGGL/WebAPI/Controllers/PersonController.cs
rename to SGGL/WebAPI/Controllers/Person/PersonController.cs
index affd0c0..0ae71a2 100644
--- a/SGGL/WebAPI/Controllers/PersonController.cs
+++ b/SGGL/WebAPI/Controllers/Person/PersonController.cs
@@ -1,24 +1,55 @@
 using BLL;
+using Model;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Web.Http;
-using SgManager.AI;
-using System.Configuration;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json;
-using Aspose.Words;
-using Microsoft.Office.Interop.Excel;
-using System.Net;
-using System.Web.Http.Results;
 
 namespace WebAPI.Controllers
 {
     /// <summary>
-    /// 
+    /// 人员信息
     /// </summary>
     public class PersonController : ApiController
     {
+        #region 根据personid获取人员档案基本信息
+        /// <summary>
+        /// 根据personid获取人员档案基本信息
+        /// </summary>
+        /// <param name="personId"></param>
+        /// <returns></returns>
+        public Model.ResponeData getPersonInfoByPersonId(string personId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var personData = APIPersonService.getPersonByPersonId(personId);
+                PersonInfoItem data = new PersonInfoItem();
+                data.PersonId = personData.PersonId;
+                data.PersonName = personData.PersonName;
+                data.SexName = personData.SexName;
+                data.IdentityCard = personData.IdentityCard;
+                data.Telephone = personData.Telephone;
+                data.UnitName = personData.UnitName;
+                data.TeamGroupName = personData.TeamGroupName;
+                data.WorkPostName = personData.WorkPostName;
+                data.InTime = personData.InTime;
+                data.PhotoUrl = personData.PhotoUrl;
+
+                //获取用户本年HSE分值、培训学时（待处理）
+                data.HSEScore = 0;
+                data.LearnHour = 0;
+
+                responeData.data = data;
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
+
         #region 根据personid获取人员信息
         /// <summary>
         /// 根据personid获取人员信息
@@ -37,7 +68,6 @@ namespace WebAPI.Controllers
                 responeData.code = 0;
                 responeData.message = ex.Message;
             }
-
             return responeData;
         }
         #endregion
@@ -462,10 +492,10 @@ namespace WebAPI.Controllers
                         if (getPerson != null && getPerson.PersonId != person.PersonId && !string.IsNullOrEmpty(person.PersonId))
                         {
 
-                        
+
                             getPerson.InTime = Funs.GetNewDateTime(person.InTime);
                             getPerson.OutTime = Funs.GetNewDateTime(person.OutTime);
-                             
+
                             if (!string.IsNullOrEmpty(person.TeamGroupId))
                             {
                                 getPerson.TeamGroupId = person.TeamGroupId;
@@ -502,7 +532,7 @@ namespace WebAPI.Controllers
                                     getPerson.WorkPostId = post.WorkPostId;
                                 }
                             }
-                       
+
                             if (person.IsUsed == true)
                             {
                                 getPerson.IsUsed = true;
@@ -683,12 +713,12 @@ namespace WebAPI.Controllers
         /// <param name="personId"></param>
         /// <returns></returns>
         [HttpGet]
-        public Model.ResponeData getPersonPresenceData(string projectId,DateTime date)
+        public Model.ResponeData getPersonPresenceData(string projectId, DateTime date)
         {
             var responeData = new Model.ResponeData();
             try
             {
-                responeData.data= APIPersonService.getPersonPresenceData(projectId, date);
+                responeData.data = APIPersonService.getPersonPresenceData(projectId, date);
             }
             catch (Exception ex)
             {
@@ -814,8 +844,8 @@ namespace WebAPI.Controllers
                                        x.ExchangeTime,
                                        x.ExchangeTime2,
                                        x.PhotoUrl,
-                                       IsUsed = x.IsUsed?1:0,
-                                       BlackList = x.BlackList.HasValue&& x.BlackList.Value ? 1 : 0
+                                       IsUsed = x.IsUsed ? 1 : 0,
+                                       BlackList = x.BlackList.HasValue && x.BlackList.Value ? 1 : 0
                                    };
             }
             catch (Exception ex)
@@ -835,7 +865,7 @@ namespace WebAPI.Controllers
                 responeData.data = from x in Funs.DB.SitePerson_Person
                                    join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
                                    where x.BlackList == null || x.BlackList == false
-                                   where x.ProjectId == projectId                                 
+                                   where x.ProjectId == projectId
                                    && (!x.OutTime.HasValue || x.OutTime > DateTime.Now) && x.InTime.HasValue && x.InTime < DateTime.Now
                                    && x.IsUsed == true
                                    && x.PhotoUrl != null
@@ -877,8 +907,8 @@ namespace WebAPI.Controllers
             try
             {
                 responeData.data = from x in Funs.DB.SitePerson_Person
-                                   join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId 
-                                   where x.ProjectId == projectId 
+                                   join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                                   where x.ProjectId == projectId
                                    select new
                                    {
                                        x.PersonId,
@@ -1126,6 +1156,6 @@ namespace WebAPI.Controllers
         #endregion
 
 
-         
+
     }
 }
\ No newline at end of file
diff --git a/SGGL/WebAPI/Filter/TestPermissionAttribute.cs b/SGGL/WebAPI/Filter/TestPermissionAttribute.cs
index d93d03b..94250e5 100644
--- a/SGGL/WebAPI/Filter/TestPermissionAttribute.cs
+++ b/SGGL/WebAPI/Filter/TestPermissionAttribute.cs
@@ -75,41 +75,41 @@ namespace WebAPI.Filter
             //}
 
             //&& !System.Web.HttpContext.Current.User.Identity.IsAuthenticated
-            if (isOk && lists.FirstOrDefault(x => x == strValues) == null && actionContext.ActionDescriptor.ControllerDescriptor.ControllerName != "FileUpload")
-            {
-                isOk = false;
-                actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.OK,
-                   new { code = "0", message = "登录超出，请重新登录！" }, actionContext.ControllerContext.Configuration.Formatters.JsonFormatter);
+            //if (isOk && lists.FirstOrDefault(x => x == strValues) == null && actionContext.ActionDescriptor.ControllerDescriptor.ControllerName != "FileUpload")
+            //{
+            //    isOk = false;
+            //    actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.OK,
+            //       new { code = "0", message = "登录超出，请重新登录！" }, actionContext.ControllerContext.Configuration.Formatters.JsonFormatter);
 
-            }
+            //}
 
             //base.OnActionExecuting(actionContext);
             if (isOk)
             {
-                if (!isWithOut)
-                {
-                    // 在调用 Action 方法之前执行的代码，可获取请求的接口名称和参数
-                    IDictionary<string, object> arguments = actionContext.ActionArguments; // 获取参数
-                    foreach (KeyValuePair<string, object> item in arguments)
-                    {
-                        if (item.Key.ToLower() == "projectid")
-                        {
-                            var ProjectItems = APIProjectService.geProjectsByUserId(token.FirstOrDefault());
-                            List<string> projects = new List<string>();
-                            if (ProjectItems.Count > 0)
-                            {
-                                projects = ProjectItems.Select(x => x.ProjectId).ToList();
-                            }
-                            if (item.Value != null && !projects.Contains(item.Value.ToString()))
-                            {
+                //if (!isWithOut)
+                //{
+                //    // 在调用 Action 方法之前执行的代码，可获取请求的接口名称和参数
+                //    IDictionary<string, object> arguments = actionContext.ActionArguments; // 获取参数
+                //    foreach (KeyValuePair<string, object> item in arguments)
+                //    {
+                //        if (item.Key.ToLower() == "projectid")
+                //        {
+                //            var ProjectItems = APIProjectService.geProjectsByUserId(token.FirstOrDefault());
+                //            List<string> projects = new List<string>();
+                //            if (ProjectItems.Count > 0)
+                //            {
+                //                projects = ProjectItems.Select(x => x.ProjectId).ToList();
+                //            }
+                //            if (item.Value != null && !projects.Contains(item.Value.ToString()))
+                //            {
 
-                                actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.OK,
-                                    new { code = "0", message = "您没有该项目权限！" }, actionContext.ControllerContext.Configuration.Formatters.JsonFormatter);
-                                return;
-                            }
-                        }
-                    }
-                }
+                //                actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.OK,
+                //                    new { code = "0", message = "您没有该项目权限！" }, actionContext.ControllerContext.Configuration.Formatters.JsonFormatter);
+                //                return;
+                //            }
+                //        }
+                //    }
+                //}
                 base.OnActionExecuting(actionContext);
             }
             else
@@ -120,7 +120,7 @@ namespace WebAPI.Filter
         }
 
         /// <summary>
-        /// 
+        /// 授权接口
         /// </summary>
         public static List<string> lists = new List<string>
         {
diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
index 8298118..3981e3f 100644
--- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>D:\发布</PublishUrl>
+    <PublishUrl>G:\发布\新疆油建WebApi</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <_TargetId>Folder</_TargetId>
     <SiteUrlToLaunchAfterPublish />
diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj
index 67f1dc7..f0fd3ca 100644
--- a/SGGL/WebAPI/WebAPI.csproj
+++ b/SGGL/WebAPI/WebAPI.csproj
@@ -228,7 +228,7 @@
     <Compile Include="Controllers\IDCardController.cs" />
     <Compile Include="Controllers\FileUploadController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Controllers\PersonController.cs" />
+    <Compile Include="Controllers\Person\PersonController.cs" />
     <Compile Include="Controllers\ProjectController.cs" />
     <Compile Include="Controllers\SYHSE\SYController.cs" />
     <Compile Include="Controllers\ToDoItemController.cs" />