diff --git a/DataBase/版本日志/SGGLDB_CD_V2023-03-29-001.sql b/DataBase/版本日志/SGGLDB_CD_V2023-03-29-001.sql
new file mode 100644
index 00000000..8bff6a80
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_CD_V2023-03-29-001.sql
@@ -0,0 +1,663 @@
+ALTER TABLE Base_WorkPost ADD IsCQMS BIT NULL
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_WorkPost', @level2type=N'COLUMN',@level2name=N'IsCQMS'
+GO
+
+ALTER TABLE Solution_LargerHazard ADD IsSuperLargerHazard BIT NULL
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�Ƿ�Σ�󹤳�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Solution_LargerHazard', @level2type=N'COLUMN',@level2name=N'IsSuperLargerHazard'
+GO
+ALTER TABLE Solution_LargerHazard ADD TrainPersonNum INT NULL
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ѵ����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Solution_LargerHazard', @level2type=N'COLUMN',@level2name=N'TrainPersonNum'
+GO
+
+CREATE TABLE [dbo].[Check_ProjectLeaderCheck](
+	[ProjectLeaderCheckId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[UnitIds] [nvarchar](500) NULL,
+	[CheckCode] [nvarchar](50) NULL,
+	[LeaderIds] [nvarchar](500) NULL,
+	[CheckDate] [datetime] NULL,
+	[QuestionDef] [nvarchar](2000) NULL,
+	[IsHoldMeet] [bit] NULL,
+	[Requirement] [nvarchar](2000) NULL,
+	[LeaderNames] [nvarchar](500) NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompileDate] [datetime] NULL,
+ CONSTRAINT [PK_Check_ProjectLeaderCheck] PRIMARY KEY CLUSTERED 
+(
+	[ProjectLeaderCheckId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[Check_ProjectLeaderCheck]  WITH CHECK ADD  CONSTRAINT [FK_Check_ProjectLeaderCheck_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[Check_ProjectLeaderCheck] CHECK CONSTRAINT [FK_Check_ProjectLeaderCheck_Base_Project]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_ProjectLeaderCheck', @level2type=N'COLUMN',@level2name=N'ProjectLeaderCheckId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_ProjectLeaderCheck', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���ε�λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_ProjectLeaderCheck', @level2type=N'COLUMN',@level2name=N'UnitIds'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_ProjectLeaderCheck', @level2type=N'COLUMN',@level2name=N'CheckCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����쵼id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_ProjectLeaderCheck', @level2type=N'COLUMN',@level2name=N'LeaderIds'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_ProjectLeaderCheck', @level2type=N'COLUMN',@level2name=N'CheckDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_ProjectLeaderCheck', @level2type=N'COLUMN',@level2name=N'QuestionDef'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�Ƿ��ٿ�ר�⽲����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_ProjectLeaderCheck', @level2type=N'COLUMN',@level2name=N'IsHoldMeet'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����Ҫ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_ProjectLeaderCheck', @level2type=N'COLUMN',@level2name=N'Requirement'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����쵼����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_ProjectLeaderCheck', @level2type=N'COLUMN',@level2name=N'LeaderNames'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Ŀ�����˴������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_ProjectLeaderCheck'
+GO
+
+ALTER TABLE Base_TrainType ADD TrainType char(1) null
+go
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���ͣ�1��������ȫ��ѵ2��ר����ѵ3��������ҵ��ѵ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_TrainType', @level2type=N'COLUMN',@level2name=N'TrainType'
+GO
+
+
+CREATE TABLE [dbo].[Emergency_DrillRecordList_Unit](
+	[DrillRecordListId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[DrillRecordCode] [nvarchar](50) NULL,
+	[DrillRecordName] [nvarchar](500) NULL,
+	[UnitIds] [nvarchar](4000) NULL,
+	[UnitNames] [nvarchar](4000) NULL,
+	[UserIds] [nvarchar](4000) NULL,
+	[UserNames] [nvarchar](4000) NULL,
+	[DrillRecordDate] [datetime] NULL,
+	[DrillRecordContents] [nvarchar](max) NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompileDate] [datetime] NULL,
+	[States] [char](1) NULL,
+	[AttachUrl] [nvarchar](2000) NULL,
+	[DrillRecordType] [char](1) NULL,
+	[JointPersonNum] [int] NULL,
+	[DrillCost] [decimal](9, 2) NULL,
+ CONSTRAINT [PK_DrillRecordList_Unit_DrillRecordListId] PRIMARY KEY CLUSTERED 
+(
+	[DrillRecordListId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+
+
+CREATE TABLE [dbo].[Emergency_EmergencyList_Unit](
+	[EmergencyListId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[EmergencyCode] [nvarchar](50) NULL,
+	[EmergencyName] [nvarchar](500) NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[EmergencyTypeId] [nvarchar](50) NULL,
+	[VersionCode] [nvarchar](50) NULL,
+	[EmergencyContents] [nvarchar](max) NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompileDate] [datetime] NULL,
+	[States] [char](1) NULL,
+	[AttachUrl] [nvarchar](2000) NULL,
+	[AuditMan] [nvarchar](50) NULL,
+	[ApproveMan] [nvarchar](50) NULL,
+ CONSTRAINT [PK_EmergencyList_Unit_EmergencyListId] PRIMARY KEY CLUSTERED 
+(
+	[EmergencyListId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+CREATE TABLE [dbo].[Environmental_ArchitectureReport](
+	[ArchitectureReportId] [nvarchar](50) NOT NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[Year] [int] NULL,
+	[Quarters] [int] NULL,
+	[FillingMan] [nvarchar](50) NULL,
+	[FillingDate] [datetime] NULL,
+	[DutyPerson] [nvarchar](50) NULL,
+	[UpState] [char](1) NULL,
+ CONSTRAINT [PK_Environmental_ArchitectureReport] PRIMARY KEY CLUSTERED 
+(
+	[ArchitectureReportId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[Environmental_ArchitectureReport]  WITH CHECK ADD  CONSTRAINT [FK_Environmental_ArchitectureReport_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[Environmental_ArchitectureReport] CHECK CONSTRAINT [FK_Environmental_ArchitectureReport_Base_Unit]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ArchitectureReport', @level2type=N'COLUMN',@level2name=N'ArchitectureReportId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ArchitectureReport', @level2type=N'COLUMN',@level2name=N'UnitId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ArchitectureReport', @level2type=N'COLUMN',@level2name=N'Year'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�·�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ArchitectureReport', @level2type=N'COLUMN',@level2name=N'Quarters'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ArchitectureReport', @level2type=N'COLUMN',@level2name=N'FillingMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ArchitectureReport', @level2type=N'COLUMN',@level2name=N'FillingDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ArchitectureReport', @level2type=N'COLUMN',@level2name=N'DutyPerson'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������ҵ��Դ��Լ����̬�����������ܱ�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ArchitectureReport'
+GO
+
+
+
+CREATE TABLE [dbo].[Environmental_ArchitectureReportItem](
+	[ArchitectureReportItemId] [nvarchar](50) NOT NULL,
+	[ArchitectureReportId] [nvarchar](50) NULL,
+	[SortIndex] [nvarchar](50) NULL,
+	[LastYearValue] [nvarchar](50) NULL,
+	[ThisYearValue] [nvarchar](50) NULL,
+	[Rate] [nvarchar](50) NULL,
+ CONSTRAINT [PK_Environmental_ArchitectureReportItem] PRIMARY KEY CLUSTERED 
+(
+	[ArchitectureReportItemId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[Environmental_ArchitectureReportItem]  WITH CHECK ADD  CONSTRAINT [FK_Environmental_ArchitectureReportItem_Environmental_ArchitectureReport] FOREIGN KEY([ArchitectureReportId])
+REFERENCES [dbo].[Environmental_ArchitectureReport] ([ArchitectureReportId])
+GO
+
+ALTER TABLE [dbo].[Environmental_ArchitectureReportItem] CHECK CONSTRAINT [FK_Environmental_ArchitectureReportItem_Environmental_ArchitectureReport]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ArchitectureReportItem', @level2type=N'COLUMN',@level2name=N'ArchitectureReportItemId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ArchitectureReportItem', @level2type=N'COLUMN',@level2name=N'ArchitectureReportId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����ۼ����ֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ArchitectureReportItem', @level2type=N'COLUMN',@level2name=N'LastYearValue'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����ۼ����ֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ArchitectureReportItem', @level2type=N'COLUMN',@level2name=N'ThisYearValue'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������ͬ�ڱȽ�����(%)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ArchitectureReportItem', @level2type=N'COLUMN',@level2name=N'Rate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������ҵ��Դ��Լ����̬��������������ϸ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ArchitectureReportItem'
+GO
+
+CREATE TABLE [dbo].[Environmental_ChemicalReport](
+	[ChemicalReportId] [nvarchar](50) NOT NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[Year] [int] NULL,
+	[Month] [int] NULL,
+	[FillingMan] [nvarchar](50) NULL,
+	[FillingDate] [datetime] NULL,
+	[DutyPerson] [nvarchar](50) NULL,
+	[UpState] [char](1) NULL,
+ CONSTRAINT [PK_Environmental_ChemicalReport] PRIMARY KEY CLUSTERED 
+(
+	[ChemicalReportId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[Environmental_ChemicalReport]  WITH CHECK ADD  CONSTRAINT [FK_Environmental_ChemicalReport_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[Environmental_ChemicalReport] CHECK CONSTRAINT [FK_Environmental_ChemicalReport_Base_Unit]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ChemicalReport', @level2type=N'COLUMN',@level2name=N'ChemicalReportId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ChemicalReport', @level2type=N'COLUMN',@level2name=N'UnitId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ChemicalReport', @level2type=N'COLUMN',@level2name=N'Year'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�·�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ChemicalReport', @level2type=N'COLUMN',@level2name=N'Month'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ChemicalReport', @level2type=N'COLUMN',@level2name=N'FillingMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ChemicalReport', @level2type=N'COLUMN',@level2name=N'FillingDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ChemicalReport', @level2type=N'COLUMN',@level2name=N'DutyPerson'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������ҵ��Դ��Լ����̬�����������ܱ�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ChemicalReport'
+GO
+
+
+
+CREATE TABLE [dbo].[Environmental_ChemicalReportItem](
+	[ChemicalReportItemId] [nvarchar](50) NOT NULL,
+	[ChemicalReportId] [nvarchar](50) NULL,
+	[SortIndex] [nvarchar](50) NULL,
+	[LastYearValue] [nvarchar](50) NULL,
+	[ThisYearValue] [nvarchar](50) NULL,
+	[Rate] [nvarchar](50) NULL,
+ CONSTRAINT [PK_Environmental_ChemicalReportItem] PRIMARY KEY CLUSTERED 
+(
+	[ChemicalReportItemId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[Environmental_ChemicalReportItem]  WITH CHECK ADD  CONSTRAINT [FK_Environmental_ChemicalReportItem_Environmental_ChemicalReport] FOREIGN KEY([ChemicalReportId])
+REFERENCES [dbo].[Environmental_ChemicalReport] ([ChemicalReportId])
+GO
+
+ALTER TABLE [dbo].[Environmental_ChemicalReportItem] CHECK CONSTRAINT [FK_Environmental_ChemicalReportItem_Environmental_ChemicalReport]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ChemicalReportItem', @level2type=N'COLUMN',@level2name=N'ChemicalReportItemId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ChemicalReportItem', @level2type=N'COLUMN',@level2name=N'ChemicalReportId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����ۼ����ֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ChemicalReportItem', @level2type=N'COLUMN',@level2name=N'LastYearValue'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����ۼ����ֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ChemicalReportItem', @level2type=N'COLUMN',@level2name=N'ThisYearValue'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������ͬ�ڱȽ�����(%)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ChemicalReportItem', @level2type=N'COLUMN',@level2name=N'Rate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������ҵ��Դ��Լ����̬��������������ϸ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_ChemicalReportItem'
+GO
+
+
+
+CREATE TABLE [dbo].[Meeting_CompanySafetyMeeting](
+	[CompanySafetyMeetingId] [nvarchar](50) NOT NULL,
+	[CompanySafetyMeetingCode] [nvarchar](50) NULL,
+	[CompanySafetyMeetingName] [nvarchar](50) NULL,
+	[CompanySafetyMeetingDate] [datetime] NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompanySafetyMeetingContents] [nvarchar](max) NULL,
+	[CompileDate] [datetime] NULL,
+	[AttentPersonNum] [int] NULL,
+	[MeetingHours] [decimal](9, 1) NULL,
+	[MeetingHostMan] [nvarchar](50) NULL,
+	[AttentPerson] [nvarchar](300) NULL,
+	[MeetingPlace] [nvarchar](200) NULL,
+	[MeetingHostManId] [nvarchar](50) NULL,
+	[AttentPersonIds] [nvarchar](4000) NULL,
+	[MeetingHostManOther] [nvarchar](500) NULL,
+ CONSTRAINT [PK_Meeting_CompanySafetyMeeting] PRIMARY KEY CLUSTERED 
+(
+	[CompanySafetyMeetingId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompanySafetyMeetingId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompanySafetyMeetingCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompanySafetyMeetingName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompanySafetyMeetingDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompileMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompanySafetyMeetingContents'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompileDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'AttentPersonNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����ʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHours'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'AttentPerson'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����ص�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'MeetingPlace'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostManId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'AttentPersonIds'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostManOther'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ҵ��ί��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting'
+GO
+
+
+CREATE TABLE [dbo].[Meeting_CompanySpecialMeeting](
+	[CompanySpecialMeetingId] [nvarchar](50) NOT NULL,
+	[CompanySpecialMeetingCode] [nvarchar](50) NULL,
+	[CompanySpecialMeetingName] [nvarchar](50) NULL,
+	[CompanySpecialMeetingDate] [datetime] NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompanySpecialMeetingContents] [nvarchar](max) NULL,
+	[CompileDate] [datetime] NULL,
+	[AttentPersonNum] [int] NULL,
+	[MeetingHours] [decimal](9, 1) NULL,
+	[MeetingHostMan] [nvarchar](50) NULL,
+	[AttentPerson] [nvarchar](300) NULL,
+	[MeetingPlace] [nvarchar](200) NULL,
+	[MeetingHostManId] [nvarchar](50) NULL,
+	[AttentPersonIds] [nvarchar](4000) NULL,
+	[MeetingHostManOther] [nvarchar](500) NULL,
+ CONSTRAINT [PK_Meeting_CompanySpecialMeeting] PRIMARY KEY CLUSTERED 
+(
+	[CompanySpecialMeetingId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompanySpecialMeetingId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompanySpecialMeetingCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompanySpecialMeetingName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompanySpecialMeetingDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompileMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompanySpecialMeetingContents'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompileDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'AttentPersonNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����ʱ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHours'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'AttentPerson'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����ص�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'MeetingPlace'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostManId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'AttentPersonIds'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostManOther'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ҵר���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting'
+GO
+
+CREATE TABLE [dbo].[Meeting_SafetyLeaderGroupMeeting](
+	[SafetyLeaderGroupMeetingId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[SafetyLeaderGroupMeetingCode] [nvarchar](50) NULL,
+	[SafetyLeaderGroupMeetingName] [nvarchar](50) NULL,
+	[SafetyLeaderGroupMeetingDate] [datetime] NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[SafetyLeaderGroupMeetingContents] [nvarchar](max) NULL,
+	[CompileDate] [datetime] NULL,
+	[States] [char](1) NULL,
+	[AttentPersonNum] [int] NULL,
+	[MeetingHours] [decimal](9, 1) NULL,
+	[MeetingHostMan] [nvarchar](50) NULL,
+	[AttentPerson] [nvarchar](300) NULL,
+	[MeetingPlace] [nvarchar](200) NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[MeetingHostManId] [nvarchar](50) NULL,
+	[AttentPersonIds] [nvarchar](4000) NULL,
+	[MeetingHostManOther] [nvarchar](500) NULL,
+ CONSTRAINT [PK_Meeting_SafetyLeaderGroupMeeting] PRIMARY KEY CLUSTERED 
+(
+	[SafetyLeaderGroupMeetingId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'SafetyLeaderGroupMeetingId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'SafetyLeaderGroupMeetingCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'SafetyLeaderGroupMeetingName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'SafetyLeaderGroupMeetingDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'CompileMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ȫ�쵼С������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting'
+GO
+
+
+ALTER TABLE Base_Certificate ADD CertificateType char(1) NULL
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Certificate', @level2type=N'COLUMN',@level2name=N'CertificateType'
+GO
+ALTER TABLE SitePerson_Person ADD IsSafetyMonitoring BIT NULL
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�Ƿ�ȫ�໤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_Person', @level2type=N'COLUMN',@level2name=N'IsSafetyMonitoring'
+GO
+ALTER TABLE Base_Certificate ADD IsRegisterHSSE BIT NULL
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�Ƿ�ע��ʦ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Certificate', @level2type=N'COLUMN',@level2name=N'IsRegisterHSSE'
+GO
+
+ALTER TABLE Comprehensive_InspectionMachine ADD IsCheckOK BIT NULL
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�ϸ�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_InspectionMachine', @level2type=N'COLUMN',@level2name=N'IsCheckOK'
+GO
+
+ALTER TABLE Comprehensive_InspectionPerson ADD IsTrain BIT NULL
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_InspectionPerson', @level2type=N'COLUMN',@level2name=N'IsTrain'
+GO
+
+ALTER TABLE Comprehensive_DesignDetails ADD JoinPersonNum int NULL
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_DesignDetails', @level2type=N'COLUMN',@level2name=N'JoinPersonNum'
+GO
+
+ALTER TABLE Supervise_SuperviseCheckReport ADD CheckType char(1) NULL
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Supervise_SuperviseCheckReport', @level2type=N'COLUMN',@level2name=N'CheckType'
+GO
+
+
+CREATE TABLE [dbo].[Person_CompanyBranchPerson](
+	[CompanyBranchPersonId] [nvarchar](50) NOT NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[PersonName] [nvarchar](50) NULL,
+	[Sex] [char](1) NULL,
+	[IdentityCard] [nvarchar](50) NULL,
+	[WorkPostId] [nvarchar](50) NULL,
+	[Telephone] [nvarchar](50) NULL,
+	[Address] [nvarchar](500) NULL,
+	[IsOnJob] [bit] NULL,
+	[Remark] [nvarchar](500) NULL,
+ CONSTRAINT [PK_Person_Person] PRIMARY KEY CLUSTERED 
+(
+	[CompanyBranchPersonId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[Person_CompanyBranchPerson]  WITH CHECK ADD  CONSTRAINT [FK_Person_CompanyBranchPerson_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[Person_CompanyBranchPerson] CHECK CONSTRAINT [FK_Person_CompanyBranchPerson_Base_Unit]
+GO
+
+ALTER TABLE [dbo].[Person_CompanyBranchPerson]  WITH CHECK ADD  CONSTRAINT [FK_Person_CompanyBranchPerson_Base_WorkPost] FOREIGN KEY([WorkPostId])
+REFERENCES [dbo].[Base_WorkPost] ([WorkPostId])
+GO
+
+ALTER TABLE [dbo].[Person_CompanyBranchPerson] CHECK CONSTRAINT [FK_Person_CompanyBranchPerson_Base_WorkPost]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'CompanyBranchPersonId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'UnitId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'PersonName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�Ա�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'Sex'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����֤��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'IdentityCard'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'WorkPostId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�绰' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'Telephone'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ͥ��ַ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'Address'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�Ƿ���ְ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'IsOnJob'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson', @level2type=N'COLUMN',@level2name=N'Remark'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ҵ�ܲ�����֧������Ա��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_CompanyBranchPerson'
+GO
+
+ALTER TABLE InApproveManager_GeneralEquipmentInItem ADD IsUsed BIT NULL
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'InApproveManager_GeneralEquipmentInItem', @level2type=N'COLUMN',@level2name=N'IsUsed'
+GO
+ALTER TABLE InApproveManager_EquipmentInItem ADD IsUsed BIT NULL
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'InApproveManager_EquipmentInItem', @level2type=N'COLUMN',@level2name=N'IsUsed'
+GO
+
+
+
+ALTER VIEW [dbo].[View_License_LicenseManager]
+AS
+/*�ֳ���ȫ����֤*/
+SELECT LicenseManager.LicenseManagerId, 
+	LicenseManager.ProjectId, 
+	LicenseManager.LicenseTypeId, 
+	LicenseManager.LicenseManagerCode, 
+	LicenseManager.LicenseManageName, 
+	LicenseManager.UnitId, 
+	LicenseManager.LicenseManageContents, 
+	LicenseManager.CompileMan, 
+	LicenseManager.CompileDate, 
+	LicenseManager.States,
+	Project.ProjectCode,
+	Project.ProjectName,
+	LicenseType.LicenseTypeName,
+	Unit.UnitName,
+	UnitType.UnitTypeId,
+	UnitType.UnitTypeName,
+	Users.UserName,
+	LicenseManager.WorkAreaId,
+	--WorkArea.WorkAreaName,
+	LicenseManager.StartDate,
+	LicenseManager.EndDate,
+	LicenseManager.ApplicantMan,
+	--LicenseManager.IsHighRisk,
+	LicenseManager.WorkStates,
+	case LicenseManager.WorkStates when '1' then '������'
+	                               when '2' then '��ҵ��'
+								   when '3' then '�ѹر�'
+								   when '-1' then '��ȡ��'
+								   else '' end as WorkStatesStr,
+	WorkAreaName = STUFF(( SELECT ',' + UnitWorkName FROM WBS_UnitWork
+				    where PATINDEX('%,' + RTRIM(WBS_UnitWork.UnitWorkId) + ',%',',' + LicenseManager.WorkAreaId + ',')>0
+					ORDER BY PATINDEX('%,' + RTRIM(LicenseManager.WorkAreaId) + ',%',',' + LicenseManager.WorkAreaId + ',')
+					FOR XML PATH('')), 1, 1,'')
+FROM dbo.License_LicenseManager AS LicenseManager
+LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = LicenseManager.ProjectId
+LEFT JOIN dbo.Base_LicenseType AS LicenseType ON LicenseType.LicenseTypeId = LicenseManager.LicenseTypeId
+LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = LicenseManager.UnitId
+LEFT JOIN dbo.Sys_User AS Users ON Users.UserId = LicenseManager.CompileMan
+LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = LicenseManager.WorkAreaId
+LEFT JOIN dbo.Base_UnitType as UnitType ON UnitType.UnitTypeId=Unit.UnitTypeId
+
+
+GO
+
+alter table [dbo].[WBS_Division] add SubItemType char(1) null
+alter table [dbo].[WBS_DivisionProject] add SubItemType char(1) null
+GO
+
+alter table [dbo].[WBS_Breakdown] add CheckAcceptType char(1) null
+alter table [dbo].[WBS_BreakdownProject] add CheckAcceptType char(1) null
+GO
\ No newline at end of file
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 1e1423c6..af45da18 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -924,6 +924,16 @@ namespace BLL
         #endregion
 
         #region 内置岗位
+        /// <summary>
+        /// 安全总监岗位Id
+        /// </summary>
+        public static string WorkPost_HSSEDirector = "8A7C2CDF-AFB5-4826-9951-343253342DAC";
+
+        /// <summary>
+        /// 项目安全总监岗位Id
+        /// </summary>
+        public static string WorkPost_ProjectHSSEDirector = "5e6e259e-ea0a-4a63-8f52-df4a19a6c9fa";
+
         /// <summary>
         /// HSE工程师岗位Id
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/DataShow/Accident.aspx b/SGGL/FineUIPro.Web/DataShow/Accident.aspx
new file mode 100644
index 00000000..ae1532fc
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Accident.aspx
@@ -0,0 +1,131 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Accident.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.Accident" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>安全事故</title>
+</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="ID" DataIDField="ID" AllowSorting="true"
+                    SortField="ProjectCode,AccidentDate" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" 
+                    EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                 <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                <f:RadioButtonList runat="server" ID="rbType" Width="600px" Label="类型" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                    <f:RadioItem Text="未遂" Value="0" Selected="true" />
+                                    <f:RadioItem Text="可记录" Value="1" />
+                                      <f:RadioItem Text="一般" Value="2" />
+                                    <f:RadioItem Text="较大" Value="3" />
+                                    <f:RadioItem Text="重大" Value="4" />
+                                    <f:RadioItem Text="特别重大" Value="5" />
+                                </f:RadioButtonList>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                  <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                            <f:RenderField Width="400px" ColumnID="ProjectName" DataField="ProjectName"
+                             FieldType="String" HeaderText="项目" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                           <f:RenderField Width="100px" ColumnID="AccidentTypeName" DataField="AccidentTypeName" 
+                               FieldType="String" HeaderText="事故类型" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="110px" ColumnID="AccidentDate" DataField="AccidentDate"
+                               FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                HeaderText="发生时间" HeaderTextAlign="Center" TextAlign="Center">
+                            </f:RenderField>
+                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
+                            SortField="UnitName" FieldType="String" HeaderText="责任单位" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                         <f:RenderField Width="100px" ColumnID="IdentityCard" DataField="IdentityCard"
+                            SortField="IdentityCard" FieldType="String" HeaderText="人数" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="Info" DataField="Info"
+                            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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
new file mode 100644
index 00000000..828a7bd9
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
@@ -0,0 +1,200 @@
+using BLL;
+using FineUIPro.Web.BaseInfo;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using static NPOI.HSSF.Util.HSSFColor;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class Accident : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = string.Empty;
+            List<SqlParameter> listStr = new List<SqlParameter>();
+
+            if (rbType.SelectedValue == "0" || rbType.SelectedValue == "1")
+            {
+                strSql = @"SELECT Record.AccidentPersonRecordId AS ID,Record.ProjectId,Project.ProjectCode,Project.ProjectName,
+                        Record.AccidentTypeId,AccidentType.AccidentTypeName,Record.AccidentDate
+                        ,Unit.UnitId,Unit.UnitName,Record.States, 1 AS PeopleNum
+                        ,(CASE WHEN Record.Injury =1 THEN '死亡' WHEN Record.Injury =2 THEN '重伤' ELSE '轻伤' END) AS Info
+                         FROM Accident_AccidentPersonRecord AS Record 
+                         LEFT JOIN Base_AccidentType AS AccidentType ON AccidentType.AccidentTypeId = Record.AccidentTypeId 
+                         LEFT JOIN Base_Project AS Project ON Record.ProjectId = Project.ProjectId 
+                          LEFT JOIN SitePerson_Person AS Person ON Person.PersonId = Record.PersonId 
+                          LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId
+                         WHERE 1=1  ";
+
+                if (rbType.SelectedValue == "0")
+                {
+                    strSql += " AND AccidentType.AccidentTypeName LIKE @values";
+                    listStr.Add(new SqlParameter("@values", "% 未遂%"));
+                }
+                else
+                {
+                    strSql += " AND  '未遂' NOT IN (AccidentType.AccidentTypeName)";
+                }
+            }
+            else
+            {
+                strSql = @"SELECT Record.AccidentReportId AS ID,Record.ProjectId,Project.ProjectCode,Project.ProjectName,
+                                Record.AccidentTypeId,ConstText AS AccidentTypeName,Record.AccidentDate
+                                ,Unit.UnitId,Unit.UnitName,Record.States, 1 AS PeopleNum
+                                , Record.Abstract AS Info
+                                FROM Accident_AccidentReport AS Record
+                                 LEFT JOIN Sys_Const AS AccidentType ON AccidentType.ConstValue = Record.AccidentTypeId AND GroupId='AccidentReportRegistration'
+                                LEFT JOIN Base_Project AS Project ON Record.ProjectId = Project.ProjectId
+                                LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Record.UnitId
+                                WHERE 1 = 1   ";
+                if (rbType.SelectedValue == "2")
+                {
+                    strSql += " AND Record.AccidentDegree ='1'";
+                }
+                else if (rbType.SelectedValue == "3")
+                {
+                    strSql += " AND Record.AccidentDegree ='2'";
+                }
+                else if (rbType.SelectedValue == "4")
+                {
+                    strSql += " AND Record.AccidentDegree ='3'";
+                }
+                else if (rbType.SelectedValue == "5")
+                {
+                    strSql += " AND Record.AccidentDegree ='4'";
+                }
+            }
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND Record.ProjectId = @ProjectId";
+                listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.rbType.SelectedValue == "0" || this.rbType.SelectedValue == "1")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/Accident/AccidentPersonRecordView.aspx?AccidentPersonRecordId={0}", Grid1.SelectedRowID, "查看 - ")));
+            }
+            else
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/Accident/AccidentReportView.aspx?AccidentReportId={0}", Grid1.SelectedRowID, "查看 - ")));
+            }
+        }
+        #endregion
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/Accident.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/Accident.aspx.designer.cs
new file mode 100644
index 00000000..4a52699e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Accident.aspx.designer.cs
@@ -0,0 +1,152 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class Accident
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// rbType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbType;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/Check.aspx b/SGGL/FineUIPro.Web/DataShow/Check.aspx
new file mode 100644
index 00000000..9a68b38d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Check.aspx
@@ -0,0 +1,130 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Check.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.Check" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>安全监督检查</title>
+</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="ID" DataIDField="ID" AllowSorting="true"
+                    SortField="CheckDate" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:RadioButtonList runat="server" ID="rbCom" Width="900px" Label="类型" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                    <f:RadioItem Text="企业负责人带班检查" Value="1" Selected="true" />
+                                    <f:RadioItem Text="企业综合检查" Value="2" />
+                                    <f:RadioItem Text="企业专项检查" Value="3" />
+                                    <f:RadioItem Text="项目负责人带班检查" Value="4" />
+                                    <f:RadioItem Text="项目专业检查" Value="5" />
+                                    <f:RadioItem Text="项目专项检查" Value="6" />
+                                </f:RadioButtonList>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="50px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true" Hidden="true">
+                                </f:DropDownList>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                          <f:GroupField HeaderText="检查对象" TextAlign="Left" HeaderTextAlign="Center">
+                            <Columns>
+                                   <f:RenderField Width="230px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String"
+                                    HeaderText="项目" HeaderToolTip="检查项目" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
+                                </f:RenderField>
+                                <f:RenderField Width="220px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
+                                    HeaderText="单位" HeaderToolTip="检查单位" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>                             
+                            </Columns>
+                        </f:GroupField>
+                          <f:RenderField Width="170px" ColumnID="CheckTeam" DataField="CheckTeam" SortField="CheckTeam"
+                            FieldType="String" HeaderText="检查组/人" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="CheckDate" DataField="CheckDate" SortField="CheckDate"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" 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" OnClose="Window1_Close"
+            Width="1200px" Height="620px" Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
new file mode 100644
index 00000000..68ff82dc
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
@@ -0,0 +1,283 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class Check : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            if (this.rbCom.SelectedValue == "1" || this.rbCom.SelectedValue == "2" || this.rbCom.SelectedValue == "3")
+            {
+                string strSql = @"SELECT S.SuperviseCheckReportId AS ID,S.SuperviseCheckReportCode,S.CheckDate,S.ProjectId,P.ProjectName,S.UnitId,u.UnitName,S.CheckTeam,S.EvaluationResult,S.AttachUrl,S.IsIssued,case S.CheckType when '1' then '企业负责人带班检查' when '2' then '企业综合检查' when '3' then '企业专项检查' else '' end as CheckTypeName"
+                          + @" FROM dbo.Supervise_SuperviseCheckReport AS S"
+                          + @" LEFT JOIN dbo.Base_Project AS P ON P.ProjectId=S.ProjectId"
+                          + @" LEFT JOIN dbo.Base_Unit AS U ON U.UnitId=S.UnitId"
+                          + @" WHERE 1=1 ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                strSql += " AND  S.CheckType= @CheckType";
+                listStr.Add(new SqlParameter("@CheckType", this.rbCom.SelectedValue));
+                if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+                {
+                    strSql += " AND  S.CheckDate >=@StartTime";
+                    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+                }
+                if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+                {
+                    strSql += " AND  S.CheckDate <=@EndTime";
+                    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+                }
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+                Grid1.RecordCount = tb.Rows.Count;
+                //tb = GetFilteredTable(Grid1.FilteredData, tb);
+                var table = this.GetPagedDataTable(Grid1, tb);
+
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+            }
+            ///项目负责人带班检查
+            else if (this.rbCom.SelectedValue == "4")
+            {
+                string strSql = @"select C.ProjectLeaderCheckId AS ID,C.UnitIds,C.ProjectId,P.ProjectName,C.LeaderIds,C.LeaderNames AS CheckTeam,C.CheckDate
+                        ,UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +C.UnitIds + ',')>0 FOR XML PATH('')), 1, 1,'')
+                        ,CheckTeam= STUFF((SELECT ',' + UserName FROM dbo.Sys_User where PATINDEX('%,' + RTRIM(UserId) + ',%',',' +C.LeaderIds + ',')>0 FOR XML PATH('')), 1, 1,'')
+                        from Check_ProjectLeaderCheck AS C
+                        LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId
+                            where  1=1 ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                if (this.drpProject.SelectedValue != Const._Null)
+                {
+                    strSql += " AND  C.ProjectId =@ProjectId";
+                    listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+                }
+                if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+                {
+                    strSql += " AND  C.CheckDate >=@StartTime";
+                    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+                }
+                if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+                {
+                    strSql += " AND C.CheckDate <=@EndTime";
+                    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+                }
+
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                Grid1.RecordCount = tb.Rows.Count;
+                var table = this.GetPagedDataTable(Grid1, tb);
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+                this.Grid1.Columns[1].Hidden = false;
+            }
+            ///项目专业检查
+            else if (this.rbCom.SelectedValue == "5")
+            {
+                string strSql = @"select C.HazardRegisterId AS ID,C.ResponsibleUnit,C.ProjectId,P.ProjectName,C.CheckManId,U.UserName AS CheckTeam,C.CheckTime AS CheckDate,Ut.UnitName
+                            from HSSE_Hazard_HazardRegister AS C
+                            LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId
+                            LEFT JOIN Sys_User AS U ON C.CheckManId=U.UserId
+                            LEFT JOIN Base_Unit AS Ut ON C.ResponsibleUnit=Ut.UnitId
+                            where  1=1 ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                if (this.drpProject.SelectedValue != Const._Null)
+                {
+                    strSql += " AND  C.ProjectId =@ProjectId";
+                    listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+                }
+                if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+                {
+                    strSql += " AND  C.CheckTime >=@StartTime";
+                    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+                }
+                if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+                {
+                    strSql += " AND C.CheckTime <=@EndTime";
+                    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+                }
+
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                Grid1.RecordCount = tb.Rows.Count;
+                var table = this.GetPagedDataTable(Grid1, tb);
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+                this.Grid1.Columns[1].Hidden = false;
+            }
+            ///项目专项目检查
+            else if (this.rbCom.SelectedValue == "6")
+            {
+                string strSql = @"select C.CheckSpecialId AS ID,C.ProjectId,P.ProjectName, ISNULL(C.PartInPersonNames,'') AS CheckTeam,C.CheckTime AS CheckDate
+                        ,UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +(C.PartInUnits) + ',')>0 FOR XML PATH('')), 1, 1,'')
+                        from Check_CheckSpecial AS C
+                        LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId
+                        where  1=1 ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                if (this.drpProject.SelectedValue != Const._Null)
+                {
+                    strSql += " AND  C.ProjectId =@ProjectId";
+                    listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+                }
+                if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+                {
+                    strSql += " AND  C.CheckTime >=@StartTime";
+                    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+                }
+                if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+                {
+                    strSql += " AND C.CheckTime <=@EndTime";
+                    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+                }
+
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                Grid1.RecordCount = tb.Rows.Count;
+                var table = this.GetPagedDataTable(Grid1, tb);
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+                this.Grid1.Columns[1].Hidden = false;
+            }
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (this.rbCom.SelectedValue == "4" || this.rbCom.SelectedValue == "5" || this.rbCom.SelectedValue == "6")
+            {
+                this.drpProject.Hidden = false;
+            }
+            else
+            {
+                this.drpProject.Hidden = true;
+            }
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.rbCom.SelectedValue == "1"|| this.rbCom.SelectedValue == "2" || this.rbCom.SelectedValue == "3")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../ZHGL/Supervise/SuperviseCheckReportEdit.aspx?SuperviseCheckReportId={0}&type=-1", Grid1.SelectedRowID, "查看 - ")));
+            }          
+            else if (this.rbCom.SelectedValue == "4")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/Check/ProjectLeaderCheckView.aspx?ProjectLeaderCheckId={0}", Grid1.SelectedRowID, "查看 - ")));
+            }
+            else if (this.rbCom.SelectedValue == "5")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/HiddenInspection/HiddenRectificationView.aspx?HazardRegisterId={0}", Grid1.SelectedRowID, "查看 - ")));
+            }
+            else if (this.rbCom.SelectedValue == "6")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/Check/CheckSpecialView.aspx?CheckSpecialId={0}", Grid1.SelectedRowID, "查看 - ")));
+            }
+        }
+        #endregion
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/Check.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/Check.aspx.designer.cs
new file mode 100644
index 00000000..be33626f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Check.aspx.designer.cs
@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class Check
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// rbCom 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbCom;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx
new file mode 100644
index 00000000..1e738c86
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx
@@ -0,0 +1,116 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CompanyPerson.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.CompanyPerson" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>企业总部人员</title>
+</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="CompanyBranchPersonId" DataIDField="CompanyBranchPersonId" AllowSorting="true"
+                    SortField="PersonName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:RadioButtonList runat="server" ID="rbCom" Width="250px" Label="企业" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                    <f:RadioItem Text="企业总部" Value="0" Selected="true" />
+                                    <f:RadioItem Text="分支机构" Value="1" />
+                                </f:RadioButtonList>
+                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                <f:RadioButtonList runat="server" ID="rbType" Width="200px" Label="类型" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                    <f:RadioItem Text="总监" Value="0" Selected="true" />
+                                    <f:RadioItem Text="专职" Value="1" />
+                                </f:RadioButtonList>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
+                            SortField="UnitName" FieldType="String" HeaderText="单位" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName"
+                            SortField="PersonName" FieldType="String" HeaderText="姓名" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="SexStr" DataField="SexStr"
+                            SortField="SexStr" FieldType="String" HeaderText="性别" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="IdentityCard" DataField="IdentityCard"
+                            SortField="IdentityCard" FieldType="String" HeaderText="身份证号" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="WorkPostName" DataField="WorkPostName"
+                            SortField="WorkPostName" FieldType="String" HeaderText="岗位" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Telephone" DataField="Telephone"
+                            SortField="Telephone" 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>
+    </form>
+    <script type="text/javascript">
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            // F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
new file mode 100644
index 00000000..b710c640
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
@@ -0,0 +1,125 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class CompanyPerson : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+          
+            string strSql = @"SELECT Person.CompanyBranchPersonId,Unit.UnitName, Person.PersonName,case Person.Sex when '1' then '男' else '女' end as SexStr,Person.IdentityCard,WorkPost.WorkPostName,Person.Telephone,Person.IsOnJob,Person.Remark "
+             + @" FROM Person_CompanyBranchPerson AS Person "
+             + @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId "
+             + @" LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE 1=1 ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (this.rbCom.SelectedValue == "0")
+            {
+                strSql += " AND Person.UnitId = @UnitId";              
+            }
+            else
+            {
+                strSql += " AND Person.UnitId != @UnitId";
+            }
+            listStr.Add(new SqlParameter("@UnitId", Const.UnitId_CD));
+
+            if (rbType.SelectedValue == "0")
+            {
+                strSql += " AND Person.WorkPostId = @WorkPostId";
+                listStr.Add(new SqlParameter("@WorkPostId", Const.WorkPost_HSSEDirector));
+            }
+            else
+            {
+                strSql += " AND WorkPost.IsHsse = 1";
+            }
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.designer.cs
new file mode 100644
index 00000000..3c98fe80
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.designer.cs
@@ -0,0 +1,125 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class CompanyPerson
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// rbCom 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbCom;
+
+        /// <summary>
+        /// rbType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbType;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx
new file mode 100644
index 00000000..ad869f82
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx
@@ -0,0 +1,143 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ConstructionEquipment.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.ConstructionEquipment" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>施工机具</title>
+</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="ID" DataIDField="ID" AllowSorting="true"
+                    SortField="ProjectCode,SizeModel" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" 
+                    EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                 <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                <f:RadioButtonList runat="server" ID="rbType" Width="600px" Label="类型" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                    <f:RadioItem Text="在用" Value="1" Selected="true" />
+                                    <f:RadioItem Text="特种设备" Value="2" />
+                                </f:RadioButtonList>
+                                  <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNew();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                            <f:RenderField Width="400px" ColumnID="ProjectName" DataField="ProjectName"
+                             FieldType="String" HeaderText="项目" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                           <f:RenderField Width="220px" ColumnID="UnitName" DataField="UnitName" 
+                               FieldType="String" HeaderText="单位" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                           <f:RenderField Width="150px" ColumnID="EquipmentName" DataField="EquipmentName" 
+                               FieldType="String" HeaderText="设备" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="80px" ColumnID="EQType" DataField="EQType" 
+                               FieldType="String" HeaderText="类型" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="SizeModel" DataField="SizeModel" 
+                               FieldType="String" HeaderText="规格型号" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="OwnerCheck" DataField="OwnerCheck" 
+                               FieldType="String" HeaderText="进场自检情况" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                           <f:RenderField Width="150px" ColumnID="CertificateNum" DataField="CertificateNum" 
+                               FieldType="String" HeaderText="设备合格证号" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                           <f:CheckBoxField Width="60px" SortField="IsUsed" RenderAsStaticField="true" DataField="IsUsed"
+                            HeaderText="在用" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:CheckBoxField>
+                    </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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        // 点击标题栏工具图标 - 退出
+        function closeNew(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf("Firefox") !== -1 || navigator.userAgent.indexOf("Chrome") !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs
new file mode 100644
index 00000000..4895b81f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs
@@ -0,0 +1,189 @@
+using BLL;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class ConstructionEquipment : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+             //   btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = string.Empty;
+            List<SqlParameter> listStr = new List<SqlParameter>();
+
+            strSql = @"SELECT ID,ProjectId,ProjectCode,ProjectName,UnitId,UnitName,SpecialEquipmentId,SpecialEquipmentName,SizeModel,OwnerCheck,CertificateNum,IsUsed,CompileDate,EQType
+                    FROM (SELECT Item.EquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId
+                    ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,Item.IsUsed,EQ.CompileDate,'特种设备' AS EQType
+                    FROM InApproveManager_EquipmentInItem AS Item 
+                    LEFT JOIN InApproveManager_EquipmentIn AS EQ ON EQ.EquipmentInId = Item.EquipmentInId 
+                    LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId 
+                    LEFT JOIN Base_Project AS P ON EQ.ProjectId = P.ProjectId
+                    LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId 
+                    UNION ALL SELECT Item.GeneralEquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId
+                    ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,Item.IsUsed,EQ.CompileDate,'一般设备' AS EQType
+                    FROM InApproveManager_GeneralEquipmentInItem AS Item 
+                    LEFT JOIN InApproveManager_GeneralEquipmentIn AS EQ ON EQ.GeneralEquipmentInId = Item.GeneralEquipmentInId 
+                    LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId 
+                    LEFT JOIN Base_Project AS P ON EQ.ProjectId = P.ProjectId
+                    LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId ) V
+                    WHERE 1=1 ";
+
+            strSql += " AND  V.IsUsed = @IsUsed";
+            listStr.Add(new SqlParameter("@IsUsed", "1"));
+            if (this.rbType.SelectedValue == "2")
+            {
+                strSql += " AND  V.EQType = @EQType";
+                listStr.Add(new SqlParameter("@EQType", "特种设备"));
+            }
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND  V.ProjectId = @ProjectId";
+                listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+            }
+            if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            {
+                strSql += " AND  V.CompileDate >=@StartTime";
+                listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+            }
+            if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            {
+                strSql += " AND  V.CompileDate <=@EndTime";
+                listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            var getEQ = Funs.DB.InApproveManager_EquipmentInItem.FirstOrDefault(x => x.EquipmentInItemId == Grid1.SelectedRowID);
+            if (getEQ != null)
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/InApproveManager/EquipmentInView.aspx?EquipmentInId={0}", getEQ.EquipmentInId, "查看 - ")));
+            }
+            else
+            {
+                var getGEQ = Funs.DB.InApproveManager_GeneralEquipmentInItem.FirstOrDefault(x => x.GeneralEquipmentInItemId == Grid1.SelectedRowID);
+                if (getGEQ != null)
+                {
+                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/InApproveManager/GeneralEquipmentInView.aspx?EquipmentInId={0}", getGEQ.GeneralEquipmentInId, "查看 - ")));
+                }
+                }
+
+            
+        }
+        #endregion
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.designer.cs
new file mode 100644
index 00000000..1d814f00
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.designer.cs
@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class ConstructionEquipment
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// rbType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbType;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx
new file mode 100644
index 00000000..f2e3f055
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx
@@ -0,0 +1,133 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EduTrain.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.EduTrain" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>教育培训</title>
+</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="TrainingId" DataIDField="TrainingId" AllowSorting="true"
+                    SortField="ProjectCode,TrainStartDate" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" 
+                    EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                 <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                <f:RadioButtonList runat="server" ID="rbType" Width="600px" Label="类型" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                    <f:RadioItem Text="三级教育培训" Value="1" Selected="true" />
+                                    <f:RadioItem Text="专项培训" Value="2" />
+                                      <f:RadioItem Text="特种作业培训" Value="3" />
+                                </f:RadioButtonList>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                            <f:RenderField Width="400px" ColumnID="ProjectName" DataField="ProjectName"
+                             FieldType="String" HeaderText="项目" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                           <f:RenderField Width="100px" ColumnID="TrainTitle" DataField="TrainTitle" 
+                               FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="110px" ColumnID="TrainStartDate" DataField="TrainStartDate"
+                               FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                HeaderText="培训时间" HeaderTextAlign="Center" TextAlign="Center">
+                            </f:RenderField>
+                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
+                            SortField="UnitName" FieldType="String" HeaderText="单位" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                         <f:RenderField Width="100px" ColumnID="TrainPersonNum" DataField="TrainPersonNum"
+                            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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
new file mode 100644
index 00000000..065d83b0
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
@@ -0,0 +1,159 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class EduTrain : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = string.Empty;
+            List<SqlParameter> listStr = new List<SqlParameter>();
+
+            strSql = @"select TrainRecord.TrainingId,TrainRecord.TrainTitle,TrainType.TrainTypeName,Project.ProjectId,Project.ProjectCode,Project.ProjectName
+            ,TrainRecord.TrainStartDate,TrainRecord.TrainEndDate,TrainRecord.TrainPersonNum,TrainRecord.UnitIds
+            ,UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +TrainRecord.UnitIds + ',')>0 FOR XML PATH('')), 1, 1,'')
+             from EduTrain_TrainRecord AS TrainRecord 
+             LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId 
+              LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId 
+             WHERE 1=1 ";
+
+            strSql += " AND TrainType.TrainType =@TrainType";
+            listStr.Add(new SqlParameter("@TrainType", this.rbType.SelectedValue));
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND TrainRecord.ProjectId = @ProjectId";
+                listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+            }
+            if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            {
+                strSql += " AND TrainRecord.TrainEndDate >=@StartTime";
+                listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+            }
+            if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            {
+                strSql += " AND TrainRecord.TrainEndDate <=@EndTime";
+                listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/EduTrain/TrainRecordView.aspx?TrainingId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.designer.cs
new file mode 100644
index 00000000..a7d0f0e5
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.designer.cs
@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class EduTrain
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// rbType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbType;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/Emergency.aspx b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx
new file mode 100644
index 00000000..61b6967a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx
@@ -0,0 +1,215 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Emergency.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.Emergency" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>应急信息</title>
+</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:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="750px" ShowBorder="true"
+                    TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server"
+                    ActiveTabIndex="0">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:RadioButtonList runat="server" ID="rbCom" Width="200px" Label="类型" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                    <f:RadioItem Text="企业" Value="0" Selected="true" />
+                                    <f:RadioItem Text="项目" Value="1" />
+                                </f:RadioButtonList>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="50px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true" Hidden="true">
+                                </f:DropDownList>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                               <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Tabs>
+                        <f:Tab ID="Tab1" Title="应急预案" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
+                            <Items>
+                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="应急预案" EnableCollapse="true"
+                                    runat="server" BoxFlex="1" DataKeyNames="EmergencyListId" DataIDField="EmergencyListId" AllowSorting="true"
+                                    SortField="CompileDate" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                                    <Columns>
+                                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                                            TextAlign="Center">
+                                            <ItemTemplate>
+                                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String"
+                                            HeaderText="项目名称" TextAlign="Left"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="150px" ColumnID="EmergencyTypeName" DataField="EmergencyTypeName" FieldType="String"
+                                            HeaderText="类型" TextAlign="Left" HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="200px" ColumnID="EmergencyName" DataField="EmergencyName"
+                                            SortField="EmergencyName" FieldType="String" HeaderText="文件名称" HeaderTextAlign="Center"
+                                            TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="EmergencyTypeName" DataField="EmergencyTypeName"
+                                            SortField="EmergencyTypeName" FieldType="String" HeaderText="预案类型" HeaderTextAlign="Center"
+                                            TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="75px" ColumnID="VersionCode" DataField="VersionCode"
+                                            SortField="VersionCode" FieldType="String" HeaderText="版次" HeaderTextAlign="Center"
+                                            TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName"
+                                            SortField="UnitName" FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
+                                            TextAlign="Left">
+                                        </f:RenderField>
+                                        <f:RenderField Width="110px" ColumnID="CompileDate" DataField="CompileDate"
+                                            SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                            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:Tab>
+                        <f:Tab ID="Tab3" Title="应急演练" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server">
+                            <Items>
+                                <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="应急演练" EnableCollapse="true"
+                                    runat="server" BoxFlex="1" DataKeyNames="DrillRecordListId" DataIDField="DrillRecordListId" AllowSorting="true"
+                                    SortField="DrillRecordDate" SortDirection="DESC" OnSort="Grid2_Sort" EnableColumnLines="true" AllowPaging="true"
+                                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid2_PageIndexChange" ForceFit="true"
+                                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid2_RowDoubleClick" EnableTextSelection="True">
+                                    <Columns>
+                                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                                            TextAlign="Center">
+                                            <ItemTemplate>
+                                                <asp:Label ID="Label1" runat="server" Text='<%# Grid2.PageIndex * Grid2.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String"
+                                            HeaderText="项目名称" TextAlign="Left"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="160px" ColumnID="DrillRecordName" DataField="DrillRecordName" 
+                                        SortField="DrillRecordName" FieldType="String" HeaderText="演练名称" HeaderTextAlign="Center"
+                                        TextAlign="Left">
+                                    </f:RenderField>
+                                    <f:RenderField Width="120px" ColumnID="DrillRecordTypeName" DataField="DrillRecordTypeName"
+                                        SortField="DrillRecordTypeName" FieldType="String" HeaderText="演练类型" HeaderTextAlign="Center"
+                                        TextAlign="Left">
+                                    </f:RenderField>
+                                    <f:RenderField Width="300px" ColumnID="UnitNames" DataField="UnitNames" ExpandUnusedSpace="true"
+                                        SortField="UnitNames" FieldType="String" HeaderText="参与单位" HeaderTextAlign="Center"
+                                        TextAlign="Left">
+                                    </f:RenderField>
+                                    <f:RenderField Width="100px" ColumnID="JointPersonNum" DataField="JointPersonNum" SortField="JointPersonNum"
+                                        FieldType="String" HeaderText="参演人数" HeaderTextAlign="Center" TextAlign="Left">
+                                    </f:RenderField>
+                                    <f:RenderField Width="100px" ColumnID="DrillCost" DataField="DrillCost"
+                                        SortField="DrillCost" FieldType="Float" HeaderText="直接投入" HeaderTextAlign="Center"
+                                        TextAlign="Left">
+                                    </f:RenderField>
+                                    <f:RenderField Width="100px" ColumnID="DrillRecordDate" DataField="DrillRecordDate"
+                                        SortField="DrillRecordDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                        HeaderText="演练日期" HeaderTextAlign="Center" TextAlign="Center">
+                                    </f:RenderField>
+                                    </Columns>
+                                    <Listeners>
+                                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu2" />
+                                    </Listeners>
+                                    <PageItems>
+                                        <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
+                                        </f:ToolbarSeparator>
+                                        <f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
+                                        </f:ToolbarText>
+                                        <f:DropDownList runat="server" ID="ddlPageSize2" Width="80px" AutoPostBack="true"
+                                            OnSelectedIndexChanged="ddlPageSize2_SelectedIndexChanged">
+                                        </f:DropDownList>
+                                    </PageItems>
+                                </f:Grid>
+                            </Items>
+                        </f:Tab>
+                    </Tabs>
+                </f:TabStrip>
+            </Items>
+        </f:Panel>
+       <f:Window ID="Window1" Title="详情" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+         <f:Menu ID="Menu2" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView2" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView2_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+        var menuID2 = '<%= Menu2.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        function onRowContextMenu2(event, rowId) {
+            F(menuID2).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs
new file mode 100644
index 00000000..262fd200
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs
@@ -0,0 +1,357 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class Emergency : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);           
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                ddlPageSize2.SelectedValue = Grid2.PageSize.ToString();
+                // 绑定表格t
+                BindGrid();
+                BindGrid2();
+            }
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (this.rbCom.SelectedValue == "1")
+            {
+                this.drpProject.Hidden = false;
+            }
+            else
+            {
+                this.drpProject.Hidden = true;
+            }
+            this.BindGrid();
+            this.BindGrid2();
+        }
+        #endregion
+
+        #region 数据绑定1
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            if (this.rbCom.SelectedValue == "0")
+            {
+                string strSql = @"SELECT Em.EmergencyListId,Em.UnitId,Unit.UnitName,EmergencyType.EmergencyTypeName
+                    ,Em.EmergencyName,Em.CompileDate,Em.CompileMan,Users.UserName AS CompileManName
+                    ,Em.VersionCode,Em.States
+                    FROM Emergency_EmergencyList_Unit AS Em 
+                    LEFT JOIN Base_Unit AS Unit ON Em.UnitId=Unit.UnitId 
+                    LEFT JOIN Base_EmergencyType AS EmergencyType ON Em.EmergencyTypeId=EmergencyType.EmergencyTypeId
+                    LEFT JOIN Sys_User AS Users ON Em.CompileMan=Users.UserId WHERE 1=1 ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+                {
+                    strSql += " AND Em.CompileDate >=@StartTime";
+                    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+                }
+                if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+                {
+                    strSql += " AND Em.CompileDate <=@EndTime";
+                    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+                }
+
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                Grid1.RecordCount = tb.Rows.Count;
+                var table = this.GetPagedDataTable(Grid1, tb);
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+                this.Grid1.Columns[1].Hidden = true;
+            }
+            else if (this.rbCom.SelectedValue == "1")
+            {
+                string strSql = @"SELECT Em.EmergencyListId,Project.ProjectId,Project.ProjectCode,Project.ProjectName
+                    ,Em.UnitId,Unit.UnitName,EmergencyType.EmergencyTypeName
+                    ,Em.EmergencyName,Em.CompileDate,Em.CompileMan,Users.UserName AS CompileManName
+                    ,Em.VersionCode,Em.States
+                    FROM Emergency_EmergencyList AS Em 
+                    LEFT JOIN Base_Unit AS Unit ON Em.UnitId=Unit.UnitId 
+                    LEFT JOIN Base_Project AS Project ON Em.ProjectId=Project.ProjectId 
+                    LEFT JOIN Base_EmergencyType AS EmergencyType ON Em.EmergencyTypeId=EmergencyType.EmergencyTypeId
+                    LEFT JOIN Sys_User AS Users ON Em.CompileMan=Users.UserId WHERE 1=1  ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                if (this.drpProject.SelectedValue != Const._Null)
+                {
+                    strSql += " AND Project.ProjectId =@ProjectId";
+                    listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+                }
+                if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+                {
+                    strSql += " AND Em.CompileDate >=@StartTime";
+                    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+                }
+                if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+                {
+                    strSql += " AND Em.CompileDate <=@EndTime";
+                    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+                }
+
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                Grid1.RecordCount = tb.Rows.Count;
+                var table = this.GetPagedDataTable(Grid1, tb);
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+                this.Grid1.Columns[1].Hidden = true;
+            }
+        }
+    
+        #endregion                
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData1();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData1()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.rbCom.SelectedValue == "0")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../ZHGL/Emergency/EmergencyListView.aspx?EmergencyListId={0}", Grid1.SelectedRowID, "查看 - ")));
+            }
+            else if (this.rbCom.SelectedValue == "1")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/Emergency/EmergencyListView.aspx?EmergencyListId={0}", Grid1.SelectedRowID, "查看 - ")));
+            }
+           
+        }
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData1();
+        }
+
+        protected void btnView2_Click(object sender, EventArgs e)
+        {
+            EditData2();
+        }
+
+
+        #region 数据绑定2
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid2()
+        {
+            if (this.rbCom.SelectedValue == "0")
+            {
+                string strSql = @"SELECT List.DrillRecordListId
+                            ,DrillRecordType.ConstText AS DrillRecordTypeName,List.JointPersonNum,List.DrillCost
+                            ,List.DrillRecordName,List.DrillRecordDate
+                            ,List.UnitIds,List.UnitNames
+                            ,List.States 
+                            FROM Emergency_DrillRecordList_Unit AS List  
+                            LEFT JOIN Sys_Const AS DrillRecordType ON DrillRecordType.ConstValue = List.DrillRecordType 
+                            and DrillRecordType.GroupId='DrillRecordType'
+                            WHERE 1=1  ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+                {
+                    strSql += " AND Em.CompileDate >=@StartTime";
+                    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+                }
+                if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+                {
+                    strSql += " AND Em.CompileDate <=@EndTime";
+                    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+                }
+
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                Grid2.RecordCount = tb.Rows.Count;
+                var table = this.GetPagedDataTable(Grid2, tb);
+                Grid2.DataSource = table;
+                Grid2.DataBind();
+                this.Grid2.Columns[1].Hidden = true;
+            }
+            else if (this.rbCom.SelectedValue == "1")
+            {
+                string strSql = @"SELECT List.DrillRecordListId,List.ProjectId,Project.PostCode,Project.ProjectName
+                        ,DrillRecordType.ConstText AS DrillRecordTypeName,List.JointPersonNum,List.DrillCost
+                        ,List.DrillRecordName,List.DrillRecordDate
+                        ,List.UnitIds,List.UnitNames
+                        ,List.States 
+                        FROM Emergency_DrillRecordList AS List  
+                        LEFT JOIN Base_Project AS Project ON List.Projectid = Project.ProjectId
+                        LEFT JOIN Sys_Const AS DrillRecordType ON DrillRecordType.ConstValue = List.DrillRecordType 
+                        and DrillRecordType.GroupId='DrillRecordType'
+                        WHERE 1=1   ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                if (this.drpProject.SelectedValue != Const._Null)
+                {
+                    strSql += " AND Project.ProjectId =@ProjectId";
+                    listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+                }
+                if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+                {
+                    strSql += " AND Em.CompileDate >=@StartTime";
+                    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+                }
+                if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+                {
+                    strSql += " AND Em.CompileDate <=@EndTime";
+                    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+                }
+
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                Grid2.RecordCount = tb.Rows.Count;
+                var table = this.GetPagedDataTable(Grid2, tb);
+                Grid2.DataSource = table;
+                Grid2.DataBind();
+                this.Grid2.Columns[1].Hidden = true;
+            }
+        }
+
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid2();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid2_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid2();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize2_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid2.PageSize = Convert.ToInt32(ddlPageSize2.SelectedValue);
+            BindGrid2();
+        }
+
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid2_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData2();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData2()
+        {
+            if (Grid2.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.rbCom.SelectedValue == "0")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../ZHGL/Emergency/DrillRecordListView.aspx?DrillRecordListId={0}", Grid2.SelectedRowID, "查看 - ")));
+            }
+            else if (this.rbCom.SelectedValue == "1")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/Emergency/DrillRecordListView.aspx?DrillRecordListId={0}", Grid2.SelectedRowID, "查看 - ")));
+            }
+
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.designer.cs
new file mode 100644
index 00000000..6ab11a35
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.designer.cs
@@ -0,0 +1,269 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class Emergency
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// TabStrip1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// rbCom 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbCom;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// Tab1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Tab3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab3;
+
+        /// <summary>
+        /// Grid2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid2;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// ToolbarSeparator2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
+
+        /// <summary>
+        /// ToolbarText2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText2;
+
+        /// <summary>
+        /// ddlPageSize2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize2;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+
+        /// <summary>
+        /// Menu2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu2;
+
+        /// <summary>
+        /// btnView2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView2;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/Environmental.aspx b/SGGL/FineUIPro.Web/DataShow/Environmental.aspx
new file mode 100644
index 00000000..54f5ac7a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Environmental.aspx
@@ -0,0 +1,129 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Environmental.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.Environmental" %>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>环保数据</title>
+</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="ID" DataIDField="ID" AllowSorting="true"
+                    SortField="M" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
+                    EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>  
+                                <f:RadioButtonList runat="server" ID="rbType" Width="600px" Label="类型" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                    <f:RadioItem Text="化工" Value="1"  />
+                                    <f:RadioItem Text="建筑" Value="2" Selected="true"/>
+                                </f:RadioButtonList>
+                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                         <f:RenderField Width="120px" ColumnID="Year" DataField="Year"
+                            FieldType="Int"  HeaderText="年度"
+                            HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                            <f:RenderField Width="120px" ColumnID="M" DataField="M"
+                            FieldType="Int"  HeaderText="月份"
+                            HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="TotalEnergyConsumption" DataField="TotalEnergyConsumption"
+                            FieldType="Double" HeaderText="能耗总量(万吨标准煤)" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="IncomeComprehensiveEnergyConsumption" DataField="IncomeComprehensiveEnergyConsumption"
+                            FieldType="Double" HeaderText="万元营业收入综合能耗(吨标准煤/万元)" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="TotalEnergyConsumption" DataField="TotalEnergyConsumption"
+                            FieldType="Double" HeaderText="用新水量(万吨)" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                         <f:RenderField Width="100px" ColumnID="FillingDate" DataField="FillingDate"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM" 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" OnClose="Window1_Close"
+            Width="1200px" Height="620px" Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/Environmental.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Environmental.aspx.cs
new file mode 100644
index 00000000..25bf4e16
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Environmental.aspx.cs
@@ -0,0 +1,183 @@
+using BLL;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class Environmental : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = string.Empty;
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (this.rbType.SelectedValue == "1")
+            {
+                strSql = @"SELECT Report.ChemicalReportId AS ID,Report.Year,Report.Month AS M,Report.FillingDate
+                ,(SELECT ThisYearValue FROM Environmental_ChemicalReportItem WHERE SortIndex='01' 
+	                AND ChemicalReportId=Report.ChemicalReportId) AS TotalEnergyConsumption 
+                ,0 AS IncomeComprehensiveEnergyConsumption
+                ,(SELECT ThisYearValue FROM Environmental_ChemicalReportItem WHERE SortIndex='25' 
+	                AND ChemicalReportId=Report.ChemicalReportId) AS TotalEnergyConsumption 
+                FROM Environmental_ChemicalReport AS Report";
+            }
+            else
+            {
+                strSql = @"SELECT Report.ArchitectureReportId AS ID,Report.Year,Report.Quarters AS M,Report.FillingDate
+                ,(SELECT ThisYearValue FROM Environmental_ArchitectureReportItem WHERE SortIndex='01' 
+	                AND ArchitectureReportId=Report.ArchitectureReportId) AS TotalEnergyConsumption 
+                ,(SELECT ThisYearValue FROM Environmental_ArchitectureReportItem WHERE SortIndex='15' 
+	                AND ArchitectureReportId=Report.ArchitectureReportId)  AS IncomeComprehensiveEnergyConsumption
+                ,(SELECT ThisYearValue FROM Environmental_ArchitectureReportItem WHERE SortIndex='24' 
+	                AND ArchitectureReportId=Report.ArchitectureReportId) AS TotalEnergyConsumption 
+                FROM Environmental_ArchitectureReport AS Report
+                WHERE 1=1 ";
+            }
+            if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            {
+                strSql += " AND  Report.FillingDate >=@StartTime";
+                listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+            }
+            if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            {
+                strSql += " AND  Report.FillingDate <=@EndTime";
+                listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+            if (this.rbType.SelectedValue == "1")
+            {
+                Grid1.Columns[2].HeaderText = "月份";
+                Grid1.Columns[4].Hidden = true;
+            }
+            else
+            {
+                Grid1.Columns[2].HeaderText = "季度";
+                Grid1.Columns[4].Hidden = false;
+            }
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.rbType.SelectedValue == "1")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../ZHGL/Environmental/ChemicalReportSave.aspx?ChemicalReportId={0}&type=-1", Grid1.SelectedRowID, "查看 - ")));
+            }
+            else
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../ZHGL/Environmental/ArchitectureReportSave.aspx?ArchitectureReportId={0}&type=-1", Grid1.SelectedRowID, "查看 - ")));
+            }
+            
+        }
+        #endregion
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/Environmental.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/Environmental.aspx.designer.cs
new file mode 100644
index 00000000..0fc67a5f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Environmental.aspx.designer.cs
@@ -0,0 +1,170 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class Environmental
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// rbType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbType;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx
new file mode 100644
index 00000000..bcfa4311
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx
@@ -0,0 +1,115 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HJGLDefect.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.HJGLDefect" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>缺陷分析</title>
+</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="ID" DataIDField="ID" AllowSorting="true"
+                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <%--    <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>--%>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                         <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                            <f:RenderField Width="100px" ColumnID="Defects_Definition" DataField="Defects_Definition" FieldType="String"
+                            HeaderText="缺陷项" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Counts" DataField="Counts" FieldType="Int"
+                            HeaderText="数量" TextAlign="Left" HeaderTextAlign="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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>--%>
+    </form>
+    <script type="text/javascript">
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            //     F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs
new file mode 100644
index 00000000..5cb335d8
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs
@@ -0,0 +1,126 @@
+using BLL;
+using FineUIPro.Web.BaseInfo;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class HJGLDefect : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+        #endregion
+
+        #region 加载页面
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT Project.ProjectId,Project.ProjectName,Defects_Definition,COUNT(Item.CHT_CheckItemID) AS Counts
+                        FROM CH_CheckItem AS Item 
+                        LEFT JOIN CH_Check AS Checks ON Item.CHT_CheckID =Checks.CHT_CheckID
+                        LEFT JOIN Base_Project AS Project ON Checks.ProjectId =Project.ProjectId 
+                        WHERE 1=1  ";      
+
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND Checks.projectId = @projectId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
+
+            //if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate >=@StartTime";
+            //    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate <=@EndTime";
+            //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+            //}
+            strSql += " GROUP BY Project.ProjectId,Project.ProjectName,Defects_Definition";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.designer.cs
new file mode 100644
index 00000000..029e3470
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.designer.cs
@@ -0,0 +1,116 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class HJGLDefect
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx
new file mode 100644
index 00000000..a5a4c52e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx
@@ -0,0 +1,129 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HJGLWelder.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.HJGLWelder" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>焊工</title>
+</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="WED_ID" DataIDField="WED_ID" AllowSorting="true"
+                    SortField="ProjectCode,UnitName,WED_Name" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" 
+                    EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                 <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                            <f:RenderField Width="400px" ColumnID="ProjectName" DataField="ProjectName"
+                            SortField="ProjectName" FieldType="String" HeaderText="项目" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                       <f:RenderField Width="300px" ColumnID="UnitName" DataField="UnitName" FieldType="String"
+                            HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="TeamGroupName" DataField="TeamGroupName" FieldType="String"
+                            HeaderText="班组" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="WED_Code" DataField="WED_Code" FieldType="String"
+                            HeaderText="焊工代号" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="WED_Name" DataField="WED_Name" FieldType="String"
+                            HeaderText="焊工姓名" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="80px" ColumnID="WED_Sex" DataField="WED_Sex" FieldType="String"
+                            HeaderText="性别" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="WED_Birthday" DataField="WED_Birthday" FieldType="Date"
+                            HeaderText="出生日期" HeaderTextAlign="Center" TextAlign="Left" Renderer="Date">
+                        </f:RenderField>    
+                        <f:RenderField Width="180px" ColumnID="WED_WorkCode" DataField="WED_WorkCode" FieldType="String"
+                            HeaderText="上岗证号" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="180px" ColumnID="WED_Class" DataField="WED_Class" FieldType="String"
+                            HeaderText="焊工等级" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="80px" ColumnID="WED_IfOnGuardName" DataField="WED_IfOnGuardName" 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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs
new file mode 100644
index 00000000..9056aff7
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs
@@ -0,0 +1,149 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class HJGLWelder : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {          
+            string strSql = @"SELECT Welder.WED_ID,Welder.ProjectId,Project.ProjectCode,Project.ProjectName,Welder.WED_Unit,Unit.UnitName
+                    ,Welder.TeamGroupId,TeamGroup.TeamGroupName,Welder.WED_Code,Welder.WED_Name,(CASE WHEN Welder.WED_Sex='2' THEN '女' ELSE '男' END ) AS WED_Sex,
+                    Welder.WED_Birthday,Welder.WED_WorkCode,Welder.WED_Class,Welder.WederType,
+                    (CASE WHEN Welder.WED_IfOnGuard= 1 THEN '是' ELSE '否' END) AS WED_IfOnGuardName
+                    FROM BS_Welder AS Welder
+                    LEFT JOIN Base_Project AS Project ON Welder.ProjectId = Project.ProjectId
+                    LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Welder.WED_Unit
+                    LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId = Welder.TeamGroupId
+                    WHERE  (Welder.WederType='1' OR Welder.WederType is null)  AND Welder.ProjectId IS NOT NULL";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (this.drpProject.SelectedValue !=Const._Null)
+            {
+                strSql += " AND Welder.ProjectId = @ProjectId";
+                listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+            }
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HJGL/PersonManage/PersonManageView.aspx?welderId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.designer.cs
new file mode 100644
index 00000000..0a827aaf
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.designer.cs
@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class HJGLWelder
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx
new file mode 100644
index 00000000..5fd5207f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx
@@ -0,0 +1,130 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HJGLWelding.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.HJGLWelding" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>焊接数据</title>
+</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="ProjectId" DataIDField="ProjectId" AllowSorting="true"
+                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>          
+                           <f:TemplateField ColumnID="Count1" Width="120px" HeaderText="总达因数" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                           <f:TemplateField ColumnID="Count2" Width="120px" HeaderText="完成达因数" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                           <f:TemplateField ColumnID="Count3" Width="120px" HeaderText="总片数" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label4" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                                <f:TemplateField ColumnID="Count3" Width="120px" HeaderText="合格片数" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label5" runat="server" Text='<%# Count4(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
new file mode 100644
index 00000000..d6b2f6f7
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
@@ -0,0 +1,280 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class HJGLWelding : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);                
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+   
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string cpara = string.Empty;
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND projectId = @projectId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
+
+            //if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate >=@StartTime";
+            //    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+
+            //    cpara += " AND c.RegisterDate >=" + this.txtStartTime.Text;
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate <=@EndTime";
+            //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+
+            //    cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
+            //}
+            
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HJGLWeldingItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion        
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 总工时数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected decimal Count1(object projectId)
+        {
+            decimal cout1 = 0;
+            if (projectId != null)
+            {
+                var getD1 = from x in Funs.DB.PW_JointInfo
+                            where x.ProjectId == projectId.ToString()
+                            select x;              
+                if (getD1.Count() > 0)
+                {
+                    cout1 = getD1.Sum(x => x.JOT_Size ?? 0);
+                }
+            }
+            return cout1;
+        }
+
+        /// <summary>
+        /// 损失工时数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected decimal Count2(object projectId)
+        {
+            decimal cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getD1 = from x in Funs.DB.PW_JointInfo             
+                            join y in Funs.DB.BO_WeldReportMain on x.DReportID equals y.DReportID
+                            where x.ProjectId == projectId.ToString() 
+                            select new { x.JOT_DoneDin ,y.JOT_WeldDate};
+                if (datetime1.HasValue)
+                {
+                    getD1 = getD1.Where(x => x.JOT_WeldDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getD1 = getD1.Where(x => x.JOT_WeldDate <= datetime2);
+                }
+                if (getD1.Count() > 0)
+                {
+                    cout1 += getD1.Sum(x => x.JOT_DoneDin ?? 0);
+                }
+             
+            }
+            return cout1;
+        }
+
+        /// <summary>
+        /// 焊接数据数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected decimal Count3(object projectId)
+        {
+            decimal cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getC1 = from x in Funs.DB.CH_CheckItem
+                            join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
+                            where y.ProjectId == projectId.ToString()
+                            select new { x.CHT_TotalFilm, y.CHT_CheckDate };
+
+                if (datetime1.HasValue)
+                {
+                    getC1 = getC1.Where(x => x.CHT_CheckDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getC1 = getC1.Where(x => x.CHT_CheckDate <= datetime2);
+                }
+                if (getC1.Count() > 0)
+                {
+                    cout1 = getC1.Sum(x => x.CHT_TotalFilm ?? 0);
+                }
+
+            }
+            return cout1;
+        }
+
+        /// <summary>
+        /// 焊接数据数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected decimal Count4(object projectId)
+        {
+            decimal cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getC1 = from x in Funs.DB.CH_CheckItem
+                            join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
+                            where y.ProjectId == projectId.ToString()
+                            select new { x.CHT_PassFilm, y.CHT_CheckDate };
+
+                if (datetime1.HasValue)
+                {
+                    getC1 = getC1.Where(x => x.CHT_CheckDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getC1 = getC1.Where(x => x.CHT_CheckDate <= datetime2);
+                }
+                if (getC1.Count() > 0)
+                {
+                    cout1 = getC1.Sum(x => x.CHT_PassFilm ?? 0);
+                }
+
+            }
+            return cout1;
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.designer.cs
new file mode 100644
index 00000000..a00a73ef
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.designer.cs
@@ -0,0 +1,206 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class HJGLWelding
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// Label4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label4;
+
+        /// <summary>
+        /// Label5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label5;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx b/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx
new file mode 100644
index 00000000..47dd5a13
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx
@@ -0,0 +1,148 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HJGLWeldingItem.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.HJGLWeldingItem" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>焊接数据</title>
+</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="JOT_ID" DataIDField="JOT_ID" AllowSorting="true"
+                    SortField="ISO_IsoNo,JOT_JointNo" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtProject" runat="server" Label="项目" Width="500px"
+                                    LabelWidth="80px" Readonly="true" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="焊接日期" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField HeaderText="焊口代号" ColumnID="JOT_JointNo" DataField="JOT_JointNo" SortField="JOT_JointNo"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px" Locked="true">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="是否焊接" ColumnID="is_hj" DataField="is_hj" SortField="is_hj"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="焊口状态" ColumnID="JointStatusName" DataField="JointStatusName"
+                            SortField="JointStatusName" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
+                            Width="90px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="焊接日期" ColumnID="JOT_WeldDate" DataField="JOT_WeldDate"
+                            SortField="JOT_WeldDate" FieldType="Date" Renderer="Date" HeaderTextAlign="Center"
+                            TextAlign="Left" Width="100px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="材质" ColumnID="STE_Name1" DataField="STE_Name1" SortField="STE_Name1"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="盖面焊工" ColumnID="WED_Code1" DataField="WED_Code1" SortField="WED_Code1"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="打底焊工" ColumnID="WED_Code2" DataField="WED_Code2" SortField="WED_Code2"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="焊口规格" ColumnID="JOT_JointDesc" DataField="JOT_JointDesc"
+                            SortField="JOT_JointDesc" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
+                            Width="90px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="外径" ColumnID="JOT_Dia" DataField="JOT_Dia" SortField="JOT_Dia"
+                            FieldType="Double" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="寸径" ColumnID="JOT_Size" DataField="JOT_Size" SortField="JOT_Size"
+                            FieldType="Double" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="壁厚" ColumnID="JOT_Sch" DataField="JOT_Sch" SortField="JOT_Sch"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="坡口类型" ColumnID="GrooveTypeName" DataField="GrooveTypeName" SortField="GrooveTypeName"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="110px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="焊缝类型" ColumnID="WeldTypeName" DataField="WeldTypeName" SortField="WeldTypeName"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="焊接方法" ColumnID="WeldingMethodName" DataField="WeldingMethodName" SortField="WeldingMethodName"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="焊接区域" ColumnID="WeldingLocationName" DataField="WeldingLocationName" SortField="WeldingLocationName"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="完成达因" ColumnID="JOT_DoneDin" DataField="JOT_DoneDin" SortField="JOT_DoneDin"
+                            FieldType="Double" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="焊口属性" ColumnID="JOT_JointAttribute" DataField="JOT_JointAttribute"
+                            SortField="JOT_JointAttribute" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
+                            Width="90px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="点口日期" ColumnID="PointDate" DataField="PointDate" SortField="PointDate"
+                            FieldType="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left"
+                            Width="100px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="委托日期" ColumnID="CH_TrustDate" DataField="CH_TrustDate"
+                            SortField="CH_TrustDate" FieldType="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center"
+                            TextAlign="Left" Width="100px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="是否热处理" ColumnID="IS_Proess" DataField="IS_Proess" SortField="IS_Proess"
+                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="热处理日期" ColumnID="JOT_ProessDate" DataField="JOT_ProessDate"
+                            SortField="JOT_ProessDate" FieldType="Date" Renderer="Date" HeaderTextAlign="Center"
+                            TextAlign="Left" Width="110px">
+                        </f:RenderField>
+                        <f:RenderField HeaderText="检测日期" ColumnID="CHT_CheckDate" DataField="CHT_CheckDate"
+                            SortField="CHT_CheckDate" FieldType="Date" Renderer="Date" HeaderTextAlign="Center"
+                            TextAlign="Left" Width="110px">
+                        </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>
+    </form>
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            //   F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.cs
new file mode 100644
index 00000000..ce4c8754
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.cs
@@ -0,0 +1,188 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class HJGLWeldingItem : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string projectId = Request.Params["projectId"];
+                this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
+                Funs.DropDownPageSize(this.ddlPageSize);
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT jointInfo.JOT_ID, 
+                                    jointInfo.ProjectId, 
+                                    jointInfo.JOT_JointNo, 
+                                    jointInfo.is_hj, 
+                                    jointInfo.JointStatusName, 
+                                    jointInfo.JOT_TrustFlagName, 
+                                    jointInfo.JOT_CheckFlagName, 
+                                    jointInfo.ISO_ID, 
+                                    jointInfo.ISO_IsoNo, 
+                                    jointInfo.WorkAreaId, 
+                                    jointInfo.WorkAreaCode, 
+                                    jointInfo.JOT_WeldDate, 
+                                    jointInfo.JOT_DailyReportNo, 
+                                    jointInfo.STE_Name1, 
+                                    jointInfo.STE_Name2, 
+                                    jointInfo.Component1, 
+                                    jointInfo.Component2, 
+                                    jointInfo.WED_Code1, 
+                                    jointInfo.WED_Name1, 
+                                    jointInfo.WED_Code2, 
+                                    jointInfo.WED_Name2, 
+                                    jointInfo.JOT_JointDesc, 
+                                    jointInfo.JOT_Dia, 
+                                    jointInfo.JOT_Size, 
+                                    jointInfo.JOT_Sch, 
+                                    jointInfo.JOT_FactSch, 
+                                    jointInfo.GrooveTypeName, 
+                                    jointInfo.JOTY_ID, 
+                                    jointInfo.WeldTypeName, 
+                                    jointInfo.WME_ID, 
+                                    jointInfo.WeldingMethodName, 
+                                    jointInfo.WeldSilk, 
+                                    jointInfo.WeldMat, 
+                                    jointInfo.WLO_Code, 
+                                    jointInfo.WeldingLocationName, 
+                                    jointInfo.JOT_DoneDin, 
+                                    jointInfo.JOT_PrepareTemp, 
+                                    jointInfo.JOT_JointAttribute, 
+                                    jointInfo.JOT_CellTemp, 
+                                    jointInfo.JOT_LastTemp, 
+                                    jointInfo.JOT_HeartNo1, 
+                                    jointInfo.JOT_HeartNo2, 
+                                    jointInfo.PointDate, 
+                                    jointInfo.PointNo, 
+                                    jointInfo.CH_TrustCode, 
+                                    jointInfo.CH_TrustDate, 
+                                    jointInfo.JOT_FaceCheckResult, 
+                                    jointInfo.JOT_FaceCheckDate, 
+                                    jointInfo.JOT_FaceChecker,  
+                                    detectionRate.DetectionRateValue,
+                                    jointInfo.IS_Proess, 
+                                    jointInfo.JOT_BelongPipe, 
+                                    jointInfo.JOT_Electricity, 
+                                    detectionType.DetectionTypeName,
+                                    jointInfo.JOT_Voltage, 
+                                    jointInfo.JOT_ProessDate, 
+                                    jointInfo.JOT_HotRpt, 
+                                    jointInfo.Extend_Length,
+                                    (select top 1 CHT_CheckDate from CH_Check c left join CH_CheckItem ci on ci.CHT_CheckID=c.CHT_CheckID where ci.JOT_ID=jointInfo.JOT_ID order by CHT_CheckDate desc) as CHT_CheckDate,
+                                    (select top 1 CHT_CheckCode from CH_Check c left join CH_CheckItem ci on ci.CHT_CheckID=c.CHT_CheckID where ci.JOT_ID=jointInfo.JOT_ID order by CHT_CheckDate desc) as CHT_CheckCode,
+                                    jointInfo.JOT_Remark
+                                    from View_JointInfo as jointInfo 
+                                    LEFT JOIN Base_DetectionRate AS detectionRate ON detectionRate.DetectionRateId = jointInfo.DetectionRateId
+                                    LEFT JOIN Base_DetectionType AS detectionType ON detectionType.DetectionTypeId = jointInfo.DetectionTypeId
+                                    WHERE 1=1  ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            strSql += " AND jointInfo.ProjectId = @ProjectId";
+            listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
+
+            if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
+            {
+                strSql += " AND jointInfo.JOT_WeldDate >= @StartTime";
+                listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim()));
+            }
+            if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
+            {
+                strSql += " AND jointInfo.JOT_WeldDate <= @EndTime";
+                listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
+            }
+      
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+
+        /// <summary>
+        /// 转换当日人工时
+        /// </summary>
+        /// <param name="workStage"></param>
+        /// <returns></returns>
+        protected string ConvertPersonWorkTimeSum(object dayReportId)
+        {
+            if (dayReportId != null)
+            {
+                return (Funs.DB.SitePerson_DayReportDetail.Where(x => x.DayReportId == dayReportId.ToString()).Sum(x => x.PersonWorkTime) ?? 0).ToString();
+            }
+            return "";
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.designer.cs
new file mode 100644
index 00000000..dc1ba2aa
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.designer.cs
@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class HJGLWeldingItem
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx
new file mode 100644
index 00000000..5473a570
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx
@@ -0,0 +1,135 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HiddenRectification.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.HiddenRectification" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>隐患排查</title>
+</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="ProjectId" DataIDField="ProjectId" AllowSorting="true"
+                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="检查时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                     <f:RadioButtonList runat="server" ID="rbType" Width="200px" Label="级别" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                    <f:RadioItem Text="重大" Value="0" Selected="true" />
+                                    <f:RadioItem Text="一般" Value="1" />
+                                </f:RadioButtonList>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>                         
+                           <f:TemplateField ColumnID="Count1" Width="120px" HeaderText="问题数量" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>       
+                           <f:TemplateField ColumnID="Count2" Width="120px" HeaderText="整改数量" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>       
+                           <f:TemplateField ColumnID="Count3" Width="120px" HeaderText="未整改数量" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label4" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>       
+                           <f:TemplateField ColumnID="Count4" Width="120px" HeaderText="整改率（%）" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label5" runat="server" Text='<%# Count4(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>    
+                    </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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
new file mode 100644
index 00000000..dbf0a5eb
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
@@ -0,0 +1,284 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class HiddenRectification : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string cpara = string.Empty;
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND projectId = @projectId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
+
+            //if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate >=@StartTime";
+            //    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+
+            //    cpara += " AND c.RegisterDate >=" + this.txtStartTime.Text;
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate <=@EndTime";
+            //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+
+            //    cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
+            //}
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+        
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count1(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getT = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "4");
+                if (datetime1.HasValue)
+                {
+                    getT = getT.Where(x => x.RegisterDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getT = getT.Where(x => x.RegisterDate <= datetime2);
+                }
+                if (this.rbType.SelectedValue == "0")
+                {
+                    getT = getT.Where(x => x.Risk_Level == "重大");
+                }
+                else
+                {
+                    getT = getT.Where(x => x.Risk_Level == "一般");
+                }
+                cout1 = getT.Count();
+            }
+            return cout1;
+        }
+
+        protected int Count2(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getT = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States == "3");
+                if (datetime1.HasValue)
+                {
+                    getT = getT.Where(x => x.RegisterDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getT = getT.Where(x => x.RegisterDate <= datetime2);
+                }
+                if (this.rbType.SelectedValue == "0")
+                {
+                    getT = getT.Where(x => x.Risk_Level == "重大");
+                }
+                else
+                {
+                    getT = getT.Where(x => x.Risk_Level == "一般");
+                }
+                cout1 = getT.Count();
+            }
+            return cout1;
+        }
+
+        protected int Count3(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getT = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "3" && x.States != "4");
+                if (datetime1.HasValue)
+                {
+                    getT = getT.Where(x => x.RegisterDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getT = getT.Where(x => x.RegisterDate <= datetime2);
+                }
+                if (this.rbType.SelectedValue == "0")
+                {
+                    getT = getT.Where(x => x.Risk_Level == "重大");
+                }
+                else
+                {
+                    getT = getT.Where(x => x.Risk_Level == "一般");
+                }
+                cout1 = getT.Count();
+            }
+            return cout1;
+        }
+
+        protected string Count4(object projectId)
+        {
+            string rate = string.Empty;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getALL = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "4");
+                if (this.rbType.SelectedValue == "0")
+                {
+                    getALL = getALL.Where(x => x.Risk_Level == "重大");
+                }
+                else
+                {
+                    getALL = getALL.Where(x => x.Risk_Level == "一般");
+                }
+                if (datetime1.HasValue)
+                {
+                    getALL = getALL.Where(x => x.RegisterDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getALL = getALL.Where(x => x.RegisterDate >= datetime1);
+                }
+                var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && x.States == "3");
+                int coutall = getALL.Count();
+                int cout0 = getT.Count();
+                if (coutall > 0)
+                {
+                    rate = Math.Round(cout0 * 1.0 / coutall * 100, 2).ToString();
+                }
+            }
+            return rate;
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.designer.cs
new file mode 100644
index 00000000..06e534a6
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.designer.cs
@@ -0,0 +1,215 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class HiddenRectification
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// rbType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbType;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// Label4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label4;
+
+        /// <summary>
+        /// Label5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label5;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx b/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx
new file mode 100644
index 00000000..e1593bd4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx
@@ -0,0 +1,113 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HiddenRectificationItem.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.HiddenRectificationItem" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>隐患排查详细</title>
+</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="HazardRegisterId" DataIDField="HazardRegisterId" AllowSorting="true"
+                    SortField="RectificationTime" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtProject" runat="server" Label="项目" Width="500px" LabelWidth="80px" Readonly="true" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="检查时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                    <f:DropDownList ID="drpStates" runat="server" Label="状态" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
+                                    LabelWidth="70px" LabelAlign="Right" Width="210px">
+                                </f:DropDownList>
+                                      <f:RadioButtonList runat="server" ID="rbType" Width="200px" Label="级别" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                    <f:RadioItem Text="重大" Value="0" Selected="true" />
+                                    <f:RadioItem Text="一般" Value="1" />
+                                </f:RadioButtonList>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="110px" ColumnID="CheckTime" DataField="CheckTime" SortField="CheckTime"
+                            HeaderText="检查时间" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="RegisterTypesName" DataField="RegisterTypesName"
+                            SortField="RegisterTypesName" FieldType="String" HeaderText="问题类型" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="tfImageUrl1" Width="120px" HeaderText="整改前" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                            <ItemTemplate>
+                                <asp:Label ID="lbImageUrl1" runat="server" Text='<%# ConvertImageUrlByImage(Eval("HazardRegisterId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField ColumnID="tfImageUrl2" Width="120px" HeaderText="整改后" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                            <ItemTemplate>
+                                <asp:Label ID="lbImageUrl2" runat="server" Text='<%# ConvertImgUrlByImage(Eval("HazardRegisterId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="200px" ColumnID="RegisterDef" DataField="RegisterDef" SortField="RegisterDef"
+                            FieldType="String" HeaderText="问题描述" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="Rectification" DataField="Rectification" SortField="Rectification"
+                            FieldType="String" HeaderText="采取措施" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="ResponsibilityUnitName" DataField="ResponsibilityUnitName"
+                            SortField="ResponsibilityUnitName" FieldType="String" HeaderText="责任单位" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="RectificationTime" DataField="RectificationTime"
+                            SortField="RectificationTime" HeaderText="整改时间" TextAlign="Left" HeaderTextAlign="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>
+    </form>
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+         //   F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs
new file mode 100644
index 00000000..99952f98
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs
@@ -0,0 +1,198 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class HiddenRectificationItem : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string projectId = Request.Params["projectId"];
+                this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
+                Funs.DropDownPageSize(this.ddlPageSize);
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+
+                this.drpStates.DataValueField = "Id";
+                this.drpStates.DataTextField = "Name";
+                List<Model.HandleStep> handleSteps = new List<Model.HandleStep>();
+                Model.HandleStep handleStep1 = new Model.HandleStep();
+                handleStep1.Id = "1";
+                handleStep1.Name = "待整改";
+                handleSteps.Add(handleStep1);
+                Model.HandleStep handleStep2 = new Model.HandleStep();
+                handleStep2.Id = "2";
+                handleStep2.Name = "已整改-待复查验收";
+                handleSteps.Add(handleStep2);
+                Model.HandleStep handleStep3 = new Model.HandleStep();
+                handleStep3.Id = "3";
+                handleStep3.Name = "已闭环";
+                handleSteps.Add(handleStep3);
+                //Model.HandleStep handleStep4 = new Model.HandleStep();
+                //handleStep4.Id = "4";
+                //handleStep4.Name = "已作废";
+                //handleSteps.Add(handleStep4);
+                this.drpStates.DataSource = handleSteps; ;
+                this.drpStates.DataBind();
+                Funs.FineUIPleaseSelect(this.drpStates);
+
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = "SELECT * FROM View_Hazard_HazardRegister WHERE ProblemTypes in ('1' ,'2') ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            strSql += " AND ProjectId = @ProjectId";
+            listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
+
+            if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
+            {
+                strSql += " AND CheckTime >= @StartTime";
+                listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim()));
+            }
+            if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
+            {
+                strSql += " AND CheckTime <= @EndTime";
+                listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
+            }
+            if (this.drpStates.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND States LIKE @States";
+                listStr.Add(new SqlParameter("@States", "%" + this.drpStates.SelectedValue + "%"));
+            }
+            if (this.rbType.SelectedValue == "0")
+            {
+                strSql += " AND Risk_Level = '重大'";
+            }
+            else
+            {
+                strSql += " AND  Risk_Level ='一般'";
+            }
+            listStr.Add(new SqlParameter("@HazardValue", "3"));
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+
+        /// <summary>
+        /// 获取整改前图片(放于Img中)
+        /// </summary>
+        /// <param name="registrationId"></param>
+        /// <returns></returns>
+        protected string ConvertImageUrlByImage(object registrationId)
+        {
+            string url = string.Empty;
+            string httpUrl = string.Empty;
+            var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault();
+            if (sysSet6 != null)
+            {
+                httpUrl = sysSet6.SetValue;
+            }
+            if (registrationId != null)
+            {
+                var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString());
+                if (registration != null)
+                {
+                    url = BLL.UploadAttachmentService.ShowImage(httpUrl, registration.ImageUrl);
+                }
+            }
+            return url;
+        }
+
+
+        /// <summary>
+        /// 获取整改后图片(放于Img中)
+        /// </summary>
+        /// <param name="registrationId"></param>
+        /// <returns></returns>
+        protected string ConvertImgUrlByImage(object registrationId)
+        {
+            string url = string.Empty;
+            string httpUrl = string.Empty;
+            var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault();
+            if (sysSet6 != null)
+            {
+                httpUrl = sysSet6.SetValue;
+            }
+            if (registrationId != null)
+            {
+                var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString());
+                if (registration != null)
+                {
+                    url = BLL.UploadAttachmentService.ShowImage(httpUrl, registration.RectificationImageUrl);
+                }
+            }
+            return url;
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.designer.cs
new file mode 100644
index 00000000..1cd16b48
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.designer.cs
@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class HiddenRectificationItem
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// drpStates 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpStates;
+
+        /// <summary>
+        /// rbType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbType;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// lbImageUrl1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbImageUrl1;
+
+        /// <summary>
+        /// lbImageUrl2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbImageUrl2;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx
new file mode 100644
index 00000000..9f1df1d1
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx
@@ -0,0 +1,140 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LargeEngineering.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.LargeEngineering" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>危大工程</title>
+</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="ProjectId" DataIDField="ProjectId" AllowSorting="true"
+                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                           <%--     <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>--%>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                            <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>          
+                           <f:TemplateField ColumnID="Count1" Width="90px" HeaderText="危大工程数量" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                          <f:TemplateField ColumnID="Count2" Width="100px" HeaderText="超危大工程数量" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                         <f:TemplateField ColumnID="Count3" Width="100px" HeaderText="在施危大工程数量" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label4" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                         <f:TemplateField ColumnID="Count4" Width="90px" HeaderText="审批完成数量" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label5" runat="server" Text='<%# Count4(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                              <f:TemplateField ColumnID="Count5" Width="90px" HeaderText="培训人次数" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label6" runat="server" Text='<%# Count5(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                          <f:TemplateField ColumnID="Count6" Width="90px" HeaderText="完工个数" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label7" runat="server" Text='<%# Count6(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </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="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs
new file mode 100644
index 00000000..3eaef7bc
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs
@@ -0,0 +1,247 @@
+using Aspose.Words;
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.ServiceModel.Configuration;
+using System.Text;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class LargeEngineering : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                LargerHazard = (from x in Funs.DB.Solution_LargerHazard
+                               join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
+                               where y.ProjectState == Const.ProjectState_1
+                               select x).ToList();
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        public static List<Model.Solution_LargerHazard> LargerHazard = new List<Model.Solution_LargerHazard>(); 
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string cpara = string.Empty;
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND projectId = @projectId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("LargeEngineeringItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 获取危大工程数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count1(object projectId)
+        {
+          int cout1 = 0;
+            if (projectId != null)
+            {
+                cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && x.IsSuperLargerHazard == false).Count();
+            }
+            return cout1;
+        }
+
+        /// <summary>
+        /// 获取超危大工程数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count2(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && x.IsSuperLargerHazard == true).Count();
+            }
+            return cout1;
+        }
+        /// <summary>
+        /// 在施危大工程数量
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count3(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && x.States == Const.State_2).Count();
+            }
+            return cout1;
+        }
+
+        /// <summary>
+        /// 审批完成数量
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count4(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && x.States == Const.State_1).Count();
+            }
+            return cout1;
+        }
+
+
+        /// <summary>
+        /// 培训人次数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count5(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString()).Sum(x=>x.TrainPersonNum ?? 0);
+            }
+            return cout1;
+        }
+
+        /// <summary>
+        /// 完工个数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count6(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                cout1 = LargerHazard.Where(x => x.ProjectId == projectId.ToString() && x.States == Const.State_3).Count();
+            }
+            return cout1;
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.designer.cs
new file mode 100644
index 00000000..a183be96
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.designer.cs
@@ -0,0 +1,197 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class LargeEngineering
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// Label4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label4;
+
+        /// <summary>
+        /// Label5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label5;
+
+        /// <summary>
+        /// Label6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label6;
+
+        /// <summary>
+        /// Label7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label7;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx b/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx
new file mode 100644
index 00000000..9b6187cd
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx
@@ -0,0 +1,116 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LargeEngineeringItem.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.LargeEngineeringItem" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>危大工程</title>
+</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="HazardId" DataIDField="HazardId" AllowSorting="true"
+                    SortField="RecordTime" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtProject" runat="server" Label="项目" Width="500px" LabelWidth="80px" Readonly="true" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="180px" ColumnID="TypeName" DataField="TypeName" 
+                        SortField="TypeName" FieldType="String" HeaderText="类型" TextAlign="Left"
+                        HeaderTextAlign="Center">
+                    </f:RenderField>
+                          <f:RenderField Width="125px" ColumnID="IsSuperLargerHazardStr" DataField="IsSuperLargerHazardStr" 
+                        FieldType="String" HeaderText="超危大工程" TextAlign="Center" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="180px" ColumnID="Address" DataField="Address" 
+                        SortField="Address" FieldType="String" HeaderText="地点" TextAlign="Left"
+                        HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="100px" ColumnID="RecordTime" DataField="RecordTime" SortField="RecordTime"
+                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制时间"
+                        HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                         <f:RenderField Width="100px" ColumnID="ExpectedTime" DataField="ExpectedTime"
+                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="预计施工"
+                        HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="125px" ColumnID="IsArgumentStr" DataField="IsArgumentStr" 
+                        FieldType="String" HeaderText="专家论证" TextAlign="Center" HeaderTextAlign="Center">
+                    </f:RenderField>
+                        <f:RenderField Width="125px" ColumnID="TrainPersonNum" DataField="TrainPersonNum" 
+                        FieldType="String" HeaderText="培训人数次" TextAlign="Center" HeaderTextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="150px" ColumnID="StatesStr" DataField="StatesStr"
+                        SortField="StatesStr" 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="1200px" Height="620px" Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx.cs
new file mode 100644
index 00000000..df3fcf26
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx.cs
@@ -0,0 +1,151 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class LargeEngineeringItem : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                string projectId = Request.Params["projectId"];
+                this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
+                Funs.DropDownPageSize(this.ddlPageSize);        
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT L.HazardId,L.ProjectId,L.Address,Users.UserName,L.ExpectedTime,L.RecordTime ,L.TrainPersonNum 
+                    ,case L.States when '1' then '审批完成' when '2' then '作业中' when '3' then '已关闭'
+                    when '0' then '已取消' else '' end as StatesStr
+                    , case when L.IsArgument=1 then '是' else '否' end as IsArgumentStr,Const.ConstText as TypeName
+                    ,case when L.IsSuperLargerHazard=1 then '是' else '否' end as IsSuperLargerHazardStr
+                    FROM Solution_LargerHazard AS L 
+                    LEFT JOIN Sys_User AS Users ON L.RecardMan=Users.UserId 
+                    LEFT JOIN Sys_Const AS Const ON L.HazardType=Const.ConstValue and Const.GroupId='LargerHazardType' 
+                    LEFT JOIN Sys_CodeRecords AS CodeRecords ON L.HazardId=CodeRecords.DataId WHERE 1=1  ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            strSql += " AND L.ProjectId = @ProjectId";
+            listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
+
+            if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
+            {
+                strSql += " AND L.RecordTime >= @StartTime";
+                listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim()));
+            }
+            if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
+            {
+                strSql += " AND L.RecordTime <= @EndTime";
+                listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/Solution/LargerHazardView.aspx?HazardId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx.designer.cs
new file mode 100644
index 00000000..0fb4bd57
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx.designer.cs
@@ -0,0 +1,170 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class LargeEngineeringItem
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/License.aspx b/SGGL/FineUIPro.Web/DataShow/License.aspx
new file mode 100644
index 00000000..10a43a58
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/License.aspx
@@ -0,0 +1,147 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="License.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.License" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>施工机具</title>
+</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="LicenseManagerId" DataIDField="LicenseManagerId" AllowSorting="true"
+                    SortField="CompileDate" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
+                    EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                <f:RadioButtonList runat="server" ID="rbType" Width="600px" Label="类型" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                    <f:RadioItem Text="许可证" Value="1" Selected="true" />
+                                    <f:RadioItem Text="关闭项" Value="2" />
+                                </f:RadioButtonList>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="400px" ColumnID="ProjectName" DataField="ProjectName"
+                            FieldType="String" HeaderText="项目" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="125px" ColumnID="LicenseTypeName" DataField="LicenseTypeName"
+                            SortField="LicenseTypeName" FieldType="String" HeaderText="类型" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
+                            FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="125px" ColumnID="UnitTypeName" DataField="UnitTypeName" SortField="UnitTypeName"
+                            FieldType="String" HeaderText="单位类型" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="140px" ColumnID="WorkAreaName" DataField="WorkAreaName" SortField="WorkAreaName"
+                            FieldType="String" HeaderText="单位工程" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:CheckBoxField Width="100px" SortField="IsHighRisk" RenderAsStaticField="true" DataField="IsHighRisk"
+                            HeaderText="高风险作业" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:CheckBoxField>
+                        <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="申请日期"
+                            HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="StartDate" DataField="StartDate" SortField="StartDate"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="开始时间"
+                            HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="EndDate" DataField="EndDate" SortField="EndDate"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="结束时间"
+                            HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="WorkStatesStr" DataField="WorkStatesStr" SortField="WorkStatesStr"
+                            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" OnClose="Window1_Close"
+            Width="1200px" Height="620px" Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = 'about:blank'
+                window.close()
+            } else {
+                window.opener = null
+                window.open('', '_self')
+                window.close()
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/License.aspx.cs b/SGGL/FineUIPro.Web/DataShow/License.aspx.cs
new file mode 100644
index 00000000..53daa911
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/License.aspx.cs
@@ -0,0 +1,160 @@
+using BLL;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class License : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = string.Empty;
+            List<SqlParameter> listStr = new List<SqlParameter>();
+
+            strSql = @"SELECT V.LicenseManagerId,V.ProjectId,V.ProjectCode,V.ProjectName,V.LicenseTypeName,V.UnitName,V.UnitTypeName
+                        ,V.WorkAreaName,V.CompileDate,V.StartDate,V.EndDate,V.WorkStatesStr,V.LicenseTypeId,V.UnitId,V.LicenseManageContents
+                        ,V.CompileMan,V.CompileDate,V.States,V.UserName
+                        FROM View_License_LicenseManager AS V
+                        WHERE 1=1";
+            if (this.rbType.SelectedValue=="2")
+            {
+                strSql += " AND  V.WorkStates = @WorkStates";
+                listStr.Add(new SqlParameter("@WorkStates", Const.State_3));
+            }
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND  V.ProjectId = @ProjectId";
+                listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+            }
+            if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            {
+                strSql += " AND  V.StartDate >=@StartTime";
+                listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+            }
+            if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            {
+                strSql += " AND  V.StartDate <=@EndTime";
+                listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/License/LicenseManagerView.aspx?LicenseManagerId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/License.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/License.aspx.designer.cs
new file mode 100644
index 00000000..545e7144
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/License.aspx.designer.cs
@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class License
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// rbType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbType;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/Meeting.aspx b/SGGL/FineUIPro.Web/DataShow/Meeting.aspx
new file mode 100644
index 00000000..ab5e01a3
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Meeting.aspx
@@ -0,0 +1,130 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Meeting.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.Meeting" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>会议</title>
+</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="ID" DataIDField="ID" AllowSorting="true"
+                    SortField="MeetingDate" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                  <f:RadioButtonList runat="server" ID="rbCom" Width="550px" Label="类型" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                    <f:RadioItem Text="企业安委会" Value="0" Selected="true" />
+                                    <f:RadioItem Text="企业专题会" Value="1" />
+                                    <f:RadioItem Text="项目安全领导小组" Value="2" />
+                                    <f:RadioItem Text="项目安全例会" Value="3" />
+                                </f:RadioButtonList>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="50px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true" Hidden="true">
+                                </f:DropDownList>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="会议时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                              <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" 
+                            HeaderText="项目名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>                         
+                        <f:RenderField Width="150px" ColumnID="MeetingName" DataField="MeetingName" FieldType="String"
+                            HeaderText="标题" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                          <f:RenderField Width="150px" ColumnID="MeetingDate" DataField="MeetingDate" FieldType="String"
+                            HeaderText="日期" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                          <f:RenderField Width="100px" ColumnID="HostMan" DataField="HostMan" FieldType="String"
+                            HeaderText="主持人" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                         <f:RenderField Width="100px" ColumnID="AttentPersonNum" DataField="AttentPersonNum" FieldType="String"
+                            HeaderText="参会人数" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                          <f:RenderField Width="300px" ColumnID="AttentPerson" DataField="AttentPerson" FieldType="String"
+                            HeaderText="参会人员" TextAlign="Left" HeaderTextAlign="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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs
new file mode 100644
index 00000000..ef10572d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs
@@ -0,0 +1,294 @@
+using Aspose.Words;
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class Meeting : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            if (this.rbCom.SelectedValue == "0")
+            {
+                string strSql = @"SELECT Meeting.CompanySafetyMeetingId AS ID,Meeting.CompanySafetyMeetingName AS MeetingName
+                    ,Meeting.CompanySafetyMeetingDate AS MeetingDate,Meeting.MeetingHours
+                       ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson 
+                        FROM Meeting_CompanySafetyMeeting AS Meeting 
+                        LEFT JOIN Sys_User AS Users ON Meeting.MeetingHostMan=Users.UserId 
+                            where  1=1 ";
+                List<SqlParameter> listStr = new List<SqlParameter>();      
+                if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+                {
+                    strSql += " AND Meeting.CompanySafetyMeetingDate >=@StartTime";
+                    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+                }
+                if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+                {
+                    strSql += " AND Meeting.CompanySafetyMeetingDate <=@EndTime";
+                    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+                }
+     
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                Grid1.RecordCount = tb.Rows.Count;
+                var table = this.GetPagedDataTable(Grid1, tb);
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+                this.Grid1.Columns[1].Hidden = true;
+            }
+            else if (this.rbCom.SelectedValue == "1")
+            {
+                string strSql = @"SELECT Meeting.CompanySpecialMeetingId AS ID,Meeting.CompanySpecialMeetingName AS MeetingName
+                        ,Meeting.CompanySpecialMeetingDate AS MeetingDate,Meeting.MeetingHours
+                            ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson 
+                            FROM Meeting_CompanySpecialMeeting AS Meeting 
+                            LEFT JOIN Sys_User AS Users ON Meeting.MeetingHostMan=Users.UserId 
+                            where  1=1 ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+                {
+                    strSql += " AND Meeting.CompanySpecialMeetingDate >=@StartTime";
+                    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+                }
+                if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+                {
+                    strSql += " AND Meeting.CompanySpecialMeetingDate <=@EndTime";
+                    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+                }
+
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                Grid1.RecordCount = tb.Rows.Count;
+                var table = this.GetPagedDataTable(Grid1, tb);
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+                this.Grid1.Columns[1].Hidden = true;
+            }
+            else if (this.rbCom.SelectedValue == "2")
+            {
+                string strSql = @"SELECT Project.ProjectName,Meeting.SafetyLeaderGroupMeetingId AS ID,Meeting.SafetyLeaderGroupMeetingName AS MeetingName,Meeting.SafetyLeaderGroupMeetingDate AS MeetingDate,Meeting.MeetingHours
+                            ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson 
+                            FROM Meeting_SafetyLeaderGroupMeeting AS Meeting 
+                            LEFT JOIN Sys_User AS Users ON Meeting.MeetingHostMan=Users.UserId 
+                            LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId 
+                            where  1=1 ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                if (this.drpProject.SelectedValue != Const._Null)
+                {
+                    strSql += " AND Project.ProjectId =@ProjectId";
+                    listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+                }
+                if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+                {
+                    strSql += " AND Meeting.SafetyLeaderGroupMeetingDate >=@StartTime";
+                    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+                }
+                if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+                {
+                    strSql += " AND Meeting.SafetyLeaderGroupMeetingDate <=@EndTime";
+                    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+                }
+
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                Grid1.RecordCount = tb.Rows.Count;
+                var table = this.GetPagedDataTable(Grid1, tb);
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+                this.Grid1.Columns[1].Hidden = false;
+            }
+
+            else if (this.rbCom.SelectedValue == "3")
+            {
+                string strSql = @"SELECT ProjectId,ProjectName, ID, MeetingName, MeetingDate,MeetingHours,HostMan,AttentPersonNum,AttentPerson 
+                                FROM (SELECT  Project.ProjectId,Project.ProjectName,Meeting.MonthMeetingId AS ID,Meeting.MonthMeetingName AS MeetingName,Meeting.MonthMeetingDate AS MeetingDate,Meeting.MeetingHours
+                                ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson
+                                FROM Meeting_MonthMeeting AS Meeting 
+                                LEFT JOIN Sys_User AS Users ON Meeting.MeetingHostMan=Users.UserId 
+                                LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId 
+                                union all
+                                SELECT Project.ProjectId,Project.ProjectName,Meeting.WeekMeetingId AS ID,Meeting.WeekMeetingName AS MeetingName,Meeting.WeekMeetingDate AS MeetingDate,Meeting.MeetingHours
+                                ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson 
+                                FROM Meeting_WeekMeeting AS Meeting 
+                                LEFT JOIN Sys_User AS Users ON Meeting.MeetingHostMan=Users.UserId 
+                                LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId ) V
+                            where  1=1 ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                if (this.drpProject.SelectedValue != Const._Null)
+                {
+                    strSql += " AND  V.ProjectId =@ProjectId";
+                    listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+                }
+                if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+                {
+                    strSql += " AND  V.MeetingDate >=@StartTime";
+                    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+                }
+                if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+                {
+                    strSql += " AND  V.MeetingDate <=@EndTime";
+                    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+                }
+
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                Grid1.RecordCount = tb.Rows.Count;
+                var table = this.GetPagedDataTable(Grid1, tb);
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+                this.Grid1.Columns[1].Hidden = false;
+            }
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (this.rbCom.SelectedValue == "2" || this.rbCom.SelectedValue == "3")
+            {
+                this.drpProject.Hidden = false;
+            }
+            else
+            {
+                this.drpProject.Hidden = true;
+            }
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.rbCom.SelectedValue == "0")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../ZHGL/Meeting/CompanySafetyMeetingView.aspx?CompanySafetyMeetingId={0}", Grid1.SelectedRowID, "查看 - ")));
+            }
+            else if (this.rbCom.SelectedValue == "1")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../ZHGL/Meeting/CompanySpecialMeetingView.aspx?CompanySpecialMeetingId={0}", Grid1.SelectedRowID, "查看 - ")));
+            }
+            else if (this.rbCom.SelectedValue == "2")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/Meeting/SafetyLeaderGroupMeetingView.aspx?SafetyLeaderGroupMeetingId={0}", Grid1.SelectedRowID, "查看 - ")));
+            }
+            else if (this.rbCom.SelectedValue == "3")
+            {
+                var getMeet = BLL.WeekMeetingService.GetWeekMeetingById(Grid1.SelectedRowID);
+                if (getMeet != null)
+                {
+                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/Meeting/WeekMeetingView.aspx?WeekMeetingId={0}", Grid1.SelectedRowID, "查看 - ")));
+                }
+                else
+                {
+                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/Meeting/MonthMeetingView.aspx?MonthMeetingId={0}", Grid1.SelectedRowID, "查看 - ")));
+                }
+            }
+        }
+        #endregion
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.designer.cs
new file mode 100644
index 00000000..10881159
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.designer.cs
@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class Meeting
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// rbCom 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbCom;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/Project.aspx b/SGGL/FineUIPro.Web/DataShow/Project.aspx
new file mode 100644
index 00000000..9d9bafcd
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Project.aspx
@@ -0,0 +1,154 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Project.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.Project" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>项目</title>
+</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="ProjectId" DataIDField="ProjectId" AllowSorting="true"
+                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableTextSelection="True"  EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>                               
+                              <f:RadioButtonList runat="server" ID="ckState" AutoPostBack="true" Label="项目状态" LabelWidth="80px" LabelAlign="Right"
+                                OnSelectedIndexChanged="TextBox_TextChanged" Width="320px">
+                                <f:RadioItem Text="全部" Value="0" />
+                                <f:RadioItem Text="在建" Value="1" Selected="true" />
+                                <f:RadioItem Text="停工" Value="2" />
+                                <f:RadioItem Text="竣工" Value="3" />
+                            </f:RadioButtonList>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="100px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" FieldType="String"
+                        HeaderText="项目代号">
+                    </f:RenderField>
+                    <f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
+                        FieldType="String" HeaderText="项目名称"  HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="90px" ColumnID="ProjectTypeName" DataField="ProjectTypeName" SortField="ProjectTypeName"
+                        FieldType="String" HeaderText="项目类型"  HeaderTextAlign="Center" TextAlign="Left" >
+                    </f:RenderField>
+                 <%--   <f:RenderField Width="100px" ColumnID="ProjectStateName" DataField="ProjectStateName" SortField="ProjectStateName"
+                        FieldType="String" HeaderText="项目状态"  HeaderTextAlign="Center" TextAlign="Left" >
+                    </f:RenderField>--%>
+                    <f:RenderField Width="130px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
+                        FieldType="String" HeaderText="所属单位"  HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="110px" ColumnID="ProjectMoney" DataField="ProjectMoney" 
+                        FieldType="String" HeaderText="合同额(万元)"  HeaderTextAlign="Center" TextAlign="Right">
+                    </f:RenderField>
+                     <f:RenderField Width="120px" ColumnID="ConstructionMoney" DataField="ConstructionMoney" 
+                        FieldType="String" HeaderText="施工合同额(万元)"  HeaderTextAlign="Center" TextAlign="Right">
+                    </f:RenderField>
+                    <f:TemplateField ColumnID="tfCM" Width="85px" HeaderText="项目经理" HeaderTextAlign="Center" TextAlign="Left">
+                        <ItemTemplate>
+                            <asp:Label ID="lblCM" runat="server" Text='<%# ConvertProjectManager(Eval("ProjectId")) %>'
+                                ToolTip='<%# ConvertProjectManager(Eval("ProjectId")) %>'></asp:Label>
+                        </ItemTemplate>
+                    </f:TemplateField>
+                    <f:TemplateField ColumnID="tfSubcontractor" Width="400px" HeaderText="施工分包商" HeaderTextAlign="Center" TextAlign="Left">
+                        <ItemTemplate>
+                            <asp:Label ID="lbSubcontractor" runat="server" Text='<%# ConvertSubcontractor(Eval("ProjectId")) %>'
+                                ToolTip='<%# ConvertSubcontractor(Eval("ProjectId")) %>'></asp:Label>
+                        </ItemTemplate>
+                    </f:TemplateField>
+                      <f:TemplateField ColumnID="tfOwn" Width="150px" HeaderText="建设单位" HeaderTextAlign="Center" TextAlign="Left">
+                        <ItemTemplate>
+                            <asp:Label ID="lbOwn" runat="server" Text='<%# ConvertOwn(Eval("ProjectId")) %>'
+                                ToolTip='<%# ConvertOwn(Eval("ProjectId")) %>'></asp:Label>
+                        </ItemTemplate>
+                    </f:TemplateField>
+                     <f:RenderField Width="150px" ColumnID="ProjectAddress" DataField="ProjectAddress" SortField="ProjectAddress" FieldType="String"
+                        HeaderText="项目地址"  HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>    
+                     <f:RenderField Width="100px" ColumnID="StartDate" DataField="StartDate" SortField="StartDate"
+                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="开工日期"
+                         HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="100px" ColumnID="EndDate" DataField="EndDate" SortField="EndDate"
+                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="竣工日期"
+                       HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="DayCount" DataField="DayCount"
+                        FieldType="String" HeaderText="工程总日历天数" HeaderTextAlign="Center" TextAlign="Right">
+                    </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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
+
diff --git a/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs
new file mode 100644
index 00000000..a1fb51d1
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs
@@ -0,0 +1,204 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class Project : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = "SELECT Project.ProjectId,Project.ProjectCode,Project.ProjectName,unit.UnitName,Project.StartDate,Project.EndDate,Project.ProjectAddress,ShortName, ConstructionMoney,"
+                            + @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工'  ELSE '施工中' END) AS ProjectStateName,Project.ProjectState"
+                            + @" ,ProjectMoney,DATEDIFF(DAY,Project.StartDate,GETDATE()) AS DayCount,ProjectType.ProjectTypeName AS ProjectTypeName,sysConst.ConstText as ProjectStateName2"
+                            + @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId "
+                            + @" LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType =ProjectType.ProjectTypeId"
+                            + @" LEFT JOIN Sys_Const AS sysConst ON Project.ProjectState2 =sysConst.ConstValue AND sysConst.GroupId= '" + BLL.ConstValue.GroupId_ProjectState + "' "
+                            + @" WHERE 1=1";
+            List<SqlParameter> listStr = new List<SqlParameter>();          
+       
+            if (this.ckState.SelectedValue != "0")
+            {
+                if (this.ckState.SelectedValue == "1")
+                {
+                    strSql += " AND (ProjectState = '1' OR ProjectState IS NULL)";
+                }
+                else
+                {
+                    strSql += " AND (ProjectState = @states )";
+                    listStr.Add(new SqlParameter("@states", this.ckState.SelectedValue));
+                }
+            }
+            
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            Grid1.DataSource = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 项目经理
+        /// <summary>
+        /// 项目经理
+        /// </summary>
+        /// <param name="unitId"></param>
+        /// <returns></returns>
+        protected string ConvertProjectManager(object projectId)
+        {
+            return ProjectService.GetProjectManagerName(projectId.ToString());
+        }
+
+        /// <summary>
+        /// 施工经理
+        /// </summary>
+        /// <param name="unitId"></param>
+        /// <returns></returns>
+        protected string ConvertConstructionManager(object projectId)
+        {
+            return BLL.ProjectService.GetConstructionManagerName(projectId.ToString());
+        }
+
+        /// <summary>
+        /// 施工分包商
+        /// </summary>
+        /// <param name="unitId"></param>
+        /// <returns></returns>
+        protected string ConvertSubcontractor(object projectId)
+        {
+            string unitName = string.Empty;
+            if (projectId != null)
+            {
+                unitName = ProjectService.getProjectUnitNameByUnitType(projectId.ToString(), Const.ProjectUnitType_2);
+            }
+            return unitName;
+        }
+
+        protected string ConvertOwn(object projectId)
+        {
+            string unitName = string.Empty;
+            if (projectId != null)
+            {
+                unitName = ProjectService.getProjectUnitNameByUnitType(projectId.ToString(), Const.ProjectUnitType_4);
+            }
+            return unitName;
+        }
+        #endregion
+
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../ProjectData/ProjectSetView.aspx?ProjectId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/Project.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/Project.aspx.designer.cs
new file mode 100644
index 00000000..5270a3dc
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/Project.aspx.designer.cs
@@ -0,0 +1,170 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class Project
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// ckState 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList ckState;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// lblCM 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblCM;
+
+        /// <summary>
+        /// lbSubcontractor 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbSubcontractor;
+
+        /// <summary>
+        /// lbOwn 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbOwn;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx b/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx
new file mode 100644
index 00000000..eda71a1a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx
@@ -0,0 +1,125 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectDivision.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.ProjectDivision" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>工程划分</title>
+</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="ProjectId" DataIDField="ProjectId" AllowSorting="true"
+                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                     EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                          </f:DropDownList>
+                                  <%--    <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>--%>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                               <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>          
+                       <f:RenderField Width="100px" ColumnID="count1" DataField="count1" FieldType="Int"
+                            HeaderText="单项工程个数" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                       <f:RenderField Width="100px" ColumnID="count2" DataField="count2" FieldType="Int"
+                            HeaderText="单位工程个数" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="count3" DataField="count3" FieldType="Int"
+                            HeaderText="分部工程个数" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                          <f:RenderField Width="100px" ColumnID="count4" DataField="count4" FieldType="Int"
+                            HeaderText="分项工程个数" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                         <f:RenderField Width="100px" ColumnID="count5" DataField="count5" FieldType="Int"
+                            HeaderText="检验批个数" TextAlign="Left" HeaderTextAlign="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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>--%>
+    </form>
+    <script type="text/javascript">
+        
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+       //     F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs
new file mode 100644
index 00000000..7fc1e75f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs
@@ -0,0 +1,127 @@
+using BLL;
+using FineUIPro.Web.BaseInfo;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class ProjectDivision : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+        #endregion
+
+        #region 加载页面
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT  P.ProjectId,P.ProjectCode,P.ProjectName
+                        ,(SELECT COUNT(*) FROM Project_Installation AS A WHERE A.ProjectId =P.ProjectId AND A.SuperInstallationId='0') AS count1
+                        ,(SELECT COUNT(*) FROM WBS_UnitWork AS B WHERE B.ProjectId =P.ProjectId) AS count2
+                        ,(SELECT COUNT(*) FROM WBS_DivisionProject AS C WHERE C.ProjectId =P.ProjectId AND C.SubItemType= '1') AS count3
+                        ,(SELECT COUNT(*) FROM WBS_DivisionProject AS D WHERE D.ProjectId =P.ProjectId AND D.SubItemType= '3') AS count4
+                        ,(SELECT COUNT(*) FROM WBS_BreakdownProject AS E WHERE E.ProjectId =P.ProjectId ) AS count5
+                        FROM Base_Project AS P
+                        WHERE P.ProjectState = 1 ";      
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND P.projectId = @projectId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
+
+            //if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate >=@StartTime";
+            //    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate <=@EndTime";
+            //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+            //}
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.designer.cs
new file mode 100644
index 00000000..c39c6292
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.designer.cs
@@ -0,0 +1,116 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class ProjectDivision
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx
new file mode 100644
index 00000000..3043435d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx
@@ -0,0 +1,137 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectPerson.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.ProjectPerson" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>项目人员</title>
+</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="PersonId" DataIDField="PersonId" AllowSorting="true"
+                    SortField="ProjectCode,UnitName,PersonName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" 
+                    EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                 <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                <f:RadioButtonList runat="server" ID="rbType" Width="600px" Label="类型" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                    <f:RadioItem Text="总监" Value="0" Selected="true" />
+                                    <f:RadioItem Text="专职" Value="1" />
+                                      <f:RadioItem Text="安全监护" Value="2" />
+                                    <f:RadioItem Text="注安师(在岗执业)" Value="3" />
+                                    <f:RadioItem Text="A证" Value="4" />
+                                    <f:RadioItem Text="B证" Value="5" />
+                                    <f:RadioItem Text="C证" Value="6" />
+                                </f:RadioButtonList>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                               <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                            <f:RenderField Width="400px" ColumnID="ProjectName" DataField="ProjectName"
+                            SortField="ProjectName" FieldType="String" HeaderText="项目" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
+                            SortField="UnitName" FieldType="String" HeaderText="单位" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName"
+                            SortField="PersonName" FieldType="String" HeaderText="姓名" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="80px" ColumnID="SexStr" DataField="SexStr"
+                            SortField="SexStr" FieldType="String" HeaderText="性别" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="IdentityCard" DataField="IdentityCard"
+                            SortField="IdentityCard" FieldType="String" HeaderText="身份证号" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="WorkPostName" DataField="WorkPostName"
+                            SortField="WorkPostName" FieldType="String" HeaderText="岗位" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="Telephone" DataField="Telephone"
+                            SortField="Telephone" 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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs
new file mode 100644
index 00000000..573dd821
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs
@@ -0,0 +1,176 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class ProjectPerson : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {          
+            string strSql = @"SELECT Person.ProjectId,Project.ProjectCode,Project.ProjectName,Unit.UnitId,Unit.UnitId,Unit.UnitName,
+                        Person.PersonName,Person.PersonId,Person.IdentityCard,Person.Sex,Person.WorkPostId,WorkPost.WorkPostName,Person.Telephone
+                        ,(CASE WHEN Sex=2 THEN '女'  WHEN Sex=1 THEN '男' ELSE '' END) AS SexStr
+                        FROM SitePerson_Person  AS Person
+                        LEFT JOIN Base_Project AS Project ON Person.ProjectId =Project.ProjectId
+                        LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId
+                        LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId
+                        WHERE IsUsed=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (this.drpProject.SelectedValue !=Const._Null)
+            {
+                strSql += " AND Person.ProjectId = @ProjectId";
+                listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+            }
+            if (rbType.SelectedValue == "0")
+            {
+                strSql += " AND Person.WorkPostId = @WorkPostId";
+                listStr.Add(new SqlParameter("@WorkPostId", Const.WorkPost_HSSEDirector));
+            }
+            else if (rbType.SelectedValue == "1")
+            {
+                strSql += " AND WorkPost.IsHsse = 1";
+            }
+            else if (rbType.SelectedValue == "2")
+            {
+                strSql += " AND Person.IsSafetyMonitoring = 1";
+            }
+            else if (rbType.SelectedValue == "3")
+            {
+                strSql += " AND  (SELECT COUNT(*) FROM  QualityAudit_PersonQuality AS Q LEFT JOIN Base_Certificate AS Cer ON Q.CertificateId =Cer.CertificateId WHERE Q.PersonId = Person.PersonId AND IsRegisterHSSE =1) > 0";
+            }
+            else if (rbType.SelectedValue == "4")
+            {
+                strSql += " AND (SELECT COUNT(*) FROM  QualityAudit_PersonQuality AS Q LEFT JOIN Base_Certificate AS Cer ON Q.CertificateId =Cer.CertificateId WHERE Q.PersonId = Person.PersonId AND CertificateType ='A') > 0";
+            }
+            else if (rbType.SelectedValue == "5")
+            {
+                strSql += " AND (SELECT COUNT(*) FROM  QualityAudit_PersonQuality AS Q LEFT JOIN Base_Certificate AS Cer ON Q.CertificateId =Cer.CertificateId WHERE Q.PersonId = Person.PersonId AND CertificateType ='B') > 0";
+            }
+            else if (rbType.SelectedValue == "6")
+            {
+                strSql += " AND (SELECT COUNT(*) FROM  QualityAudit_PersonQuality AS Q LEFT JOIN Base_Certificate AS Cer ON Q.CertificateId =Cer.CertificateId WHERE Q.PersonId = Person.PersonId AND CertificateType ='C') > 0";
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/SitePerson/PersonListEdit.aspx?PersonId={0}&type=-1", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.designer.cs
new file mode 100644
index 00000000..c3c2155a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.designer.cs
@@ -0,0 +1,152 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class ProjectPerson
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// rbType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbType;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx b/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx
new file mode 100644
index 00000000..16f9bd6e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx
@@ -0,0 +1,129 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualityAcceptance.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.QualityAcceptance" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>质量验收</title>
+</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="ID" DataIDField="ID" AllowSorting="true"
+                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:RadioButtonList runat="server" ID="rbType" Width="600px" Label="类型" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                    <f:RadioItem Text="关键工序" Value="1" Selected="true" />
+                                    <f:RadioItem Text="特殊过程" Value="2" />
+                                    <f:RadioItem Text="隐蔽工程" Value="3" />
+                                    <f:RadioItem Text="单位工程一次验收" Value="4" />
+                                    <f:RadioItem Text="材料进场复验" Value="5" />
+                                </f:RadioButtonList>
+                                <%--    <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>--%>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="allcount" DataField="allcount" FieldType="Int"
+                            HeaderText="总项数" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="ccount" DataField="ccount" FieldType="Int"
+                            HeaderText="合格数" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="ucCount" DataField="ucCount" FieldType="Int"
+                            HeaderText="不合格数" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="rateV" DataField="rateV" FieldType="String" HeaderText="一次验收合格率（%）" TextAlign="Left"
+                            HeaderTextAlign="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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>--%>
+    </form>
+    <script type="text/javascript">
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            //     F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs
new file mode 100644
index 00000000..e3821fec
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs
@@ -0,0 +1,136 @@
+using BLL;
+using FineUIPro.Web.BaseInfo;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class QualityAcceptance : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+        #endregion
+
+        #region 加载页面
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select NEWID() as ID, v.ProjectId,v.ProjectCode,v.ProjectName,v.allcount,v.ccount,isnull(v.allCount,0)-ISNULL(v.cCount,0) as ucCount,
+                    (case when isnull(v.allCount,0) > 0 then cast((isnull(v.allCount,0)-ISNULL(v.cCount,0)) *1.0 /isnull(v.allCount,0)*100  as decimal(18, 2))
+	                    else 0 end) as rateV
+                    from (select B.ProjectId,p.ProjectCode,p.ProjectName,COUNT(*) as allCount,
+                    isnull((select COUNT(*)
+				                    from ProcessControl_InspectionManagementDetail AS Detail 
+				                    LEFT JOIN WBS_BreakdownProject AS Breakp ON Detail.ControlPointType=Breakp.BreakdownProjectId
+				                    LEFT JOIN ProcessControl_InspectionManagement AS Inspection ON Detail.InspectionId=Inspection.InspectionId
+				                    where Breakp.CheckAcceptType =@type AND Inspection.IsOnceQualified = 1
+				                    group by Breakp.ProjectId),0) as cCount
+                    FROM ProcessControl_InspectionManagementDetail AS A 
+                    LEFT JOIN WBS_BreakdownProject AS B ON A.ControlPointType=B.BreakdownProjectId
+                    left join Base_Project as p on B.ProjectId=p.ProjectId
+                    where p.projectId is not null AND B.CheckAcceptType =@type ";      
+
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@type", this.rbType.SelectedValue));
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND B.projectId = @projectId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
+
+            //if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate >=@StartTime";
+            //    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate <=@EndTime";
+            //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+            //}
+            strSql += " group by B.ProjectId,p.ProjectCode,p.ProjectName) as v";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.designer.cs
new file mode 100644
index 00000000..d628a759
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.designer.cs
@@ -0,0 +1,125 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class QualityAcceptance
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// rbType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbType;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx b/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx
new file mode 100644
index 00000000..4c7f65b7
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx
@@ -0,0 +1,129 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualityControlPoint.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.QualityControlPoint" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>质量控制点</title>
+</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="ProjectId" DataIDField="ProjectId" AllowSorting="true"
+                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                     EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                          </f:DropDownList>
+                                  <%--    <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>--%>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                              <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>          
+                           <f:TemplateField ColumnID="Count1" Width="120px" HeaderText="S级" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                           <f:TemplateField ColumnID="Count2" Width="120px" HeaderText="A级" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                           <f:TemplateField ColumnID="Count3" Width="120px" HeaderText="B级" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label4" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                         <f:TemplateField ColumnID="Count3" Width="120px" HeaderText="C级" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label5" runat="server" Text='<%# Count4(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>--%>
+    </form>
+    <script type="text/javascript">
+        
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+       //     F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs
new file mode 100644
index 00000000..d90b2bc7
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs
@@ -0,0 +1,199 @@
+using BLL;
+using FineUIPro.Web.BaseInfo;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class QualityControlPoint : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+        #endregion
+
+        #region 加载页面
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string cpara = string.Empty;
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND projectId = @projectId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
+
+            //if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate >=@StartTime";
+            //    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+
+            //    cpara += " AND c.RegisterDate >=" + this.txtStartTime.Text;
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate <=@EndTime";
+            //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+
+            //    cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
+            //}
+            
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        /// <summary>
+        /// 总工时数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count1(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                cout1 = getcount(projectId.ToString(), "S");
+            }
+            return cout1;
+        }
+
+        /// <summary>
+        /// 损失工时数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count2(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                cout1 = getcount(projectId.ToString(), "A");
+            }
+            return cout1;
+        }
+
+        /// <summary>
+        /// 安全工时数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count3(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                cout1= getcount(projectId.ToString(), "B");
+            }
+            return cout1;
+        }
+
+        protected int Count4(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                cout1 = getcount(projectId.ToString(), "C");
+            }
+            return cout1;
+        }
+        /// <summary>
+        /// 定义变量
+        /// </summary>
+        private static IQueryable<Model.WBS_BreakdownProject> getDataLists = from x in Funs.DB.WBS_BreakdownProject
+                                                                             select x;
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="level"></param>
+        /// <returns></returns>
+        private int getcount(string projectId, string level)
+        {
+             int count = 0;
+            count = getDataLists.Where(x => x.ProjectId == projectId && x.Class.Contains(level)).Count();
+            return count;
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.designer.cs
new file mode 100644
index 00000000..eb094496
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.designer.cs
@@ -0,0 +1,152 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class QualityControlPoint
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// Label4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label4;
+
+        /// <summary>
+        /// Label5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label5;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx b/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx
new file mode 100644
index 00000000..46c5e71d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx
@@ -0,0 +1,121 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualityInstruments.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.QualityInstruments" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>计量器具</title>
+</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="ProjectId" DataIDField="ProjectId" AllowSorting="true"
+                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>          
+                           <f:TemplateField ColumnID="Count1" Width="120px" HeaderText="在用计量器具数" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                           <f:TemplateField ColumnID="Count2" Width="120px" HeaderText="校验合格数" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs
new file mode 100644
index 00000000..1c7be0de
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs
@@ -0,0 +1,217 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class QualityInstruments : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+   
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string cpara = string.Empty;
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND projectId = @projectId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
+
+            //if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate >=@StartTime";
+            //    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+
+            //    cpara += " AND c.RegisterDate >=" + this.txtStartTime.Text;
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate <=@EndTime";
+            //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+
+            //    cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
+            //}
+            
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualityInstrumentsItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+        
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 总工时数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count1(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getD1 = from x in Funs.DB.Comprehensive_InspectionMachine
+                            where  x.ProjectId == projectId.ToString() && x.IsOnSite == true && x.InspectionType.Contains("计量")
+                            select x; 
+                if (datetime1.HasValue)
+                {
+                    getD1 = getD1.Where(x => x.CompileDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getD1 = getD1.Where(x => x.CompileDate <= datetime2);
+                }
+
+                cout1 = getD1.Count();
+            }
+            return cout1;
+        }
+
+        /// <summary>
+        /// 损失工时数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count2(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getD1 = from x in Funs.DB.Comprehensive_InspectionMachine
+                            where x.ProjectId == projectId.ToString() && x.IsOnSite == true && x.InspectionType.Contains("计量") && x.IsCheckOK == true
+                            select x; 
+                if (datetime1.HasValue)
+                {
+                    getD1 = getD1.Where(x => x.CompileDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getD1 = getD1.Where(x => x.CompileDate <= datetime2);
+                }
+          
+                cout1 = getD1.Count();
+            }
+            return cout1;
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.designer.cs
new file mode 100644
index 00000000..5287b22b
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.designer.cs
@@ -0,0 +1,188 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class QualityInstruments
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx b/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx
new file mode 100644
index 00000000..f87ebe4a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx
@@ -0,0 +1,123 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualityInstrumentsItem.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.QualityInstrumentsItem" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>计量器具</title>
+</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="InspectionMachineId" DataIDField="InspectionMachineId" AllowSorting="true"
+                    SortField="InspectionDate" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtProject" runat="server" Label="项目" Width="500px"
+                                    LabelWidth="80px" Readonly="true" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                         <f:RenderField ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="报验单位" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="220px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="InspectionMachineCode" DataField="InspectionMachineCode" FieldType="String" HeaderText="报验编号" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="InspectionMachineName" DataField="InspectionMachineName" FieldType="String" HeaderText="名称" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="InspectionType" DataField="InspectionType" FieldType="String" HeaderText="类型" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="SpecificationModel" DataField="SpecificationModel" FieldType="String" HeaderText="规格型号" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="NextTestDate" DataField="NextTestDate" FieldType="Date" Renderer="Date" HeaderText="下次检验日期" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="TestCycle" DataField="TestCycle" FieldType="String" HeaderText="检验周期" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="IsVerification" DataField="IsVerification" FieldType="String" HeaderText="在校验期内" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="IsCheckOK" DataField="IsCheckOK" FieldType="String" HeaderText="校验合格" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="100px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" FieldType="Date" Renderer="Date" HeaderText="报验日期" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="UnitsCount" DataField="UnitsCount" FieldType="String" HeaderText="台数" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="LeaveDate" DataField="LeaveDate" FieldType="Date" Renderer="Date" HeaderText="离场时间" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>  
+                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
+                            <ItemTemplate>
+                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" 
+                                                 Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("InspectionMachineId")) %>'   ToolTip="附件查看"></asp:LinkButton>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </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="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
+            EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"
+            IsModal="true" Width="700px" Height="500px">
+        </f:Window>
+    </form>
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+         //   F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx.cs
new file mode 100644
index 00000000..4a4bd54e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx.cs
@@ -0,0 +1,130 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class QualityInstrumentsItem : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string projectId = Request.Params["projectId"];
+                this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
+                Funs.DropDownPageSize(this.ddlPageSize);
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select InspectionMachineId, InspectionMachineCode, U.UnitName,CN.ProfessionalName ,Status,
+                              InspectionMachineName, SpecificationModel, NextTestDate, TestCycle, C.InspectionDate,
+                            (CASE WHEN IsVerification=1 THEN '是' WHEN IsVerification=0 THEN '否' ELSE '' END) AS IsVerification,(CASE WHEN IsCheckOK=1 THEN '是' WHEN IsCheckOK=0 THEN '否' ELSE '' END) AS IsCheckOK, InspectionType, LeaveDate, UnitsCount  
+                              from Comprehensive_InspectionMachine C 
+                              left join Base_Unit U on C.UnitId=U.UnitId
+                              left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId
+                              where C.ProjectId = @ProjectId";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            strSql += " AND C.ProjectId = @ProjectId";
+            listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
+
+            if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
+            {
+                strSql += " AND C.InspectionDate >= @StartTime";
+                listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim()));
+            }
+            if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
+            {
+                strSql += " AND C.InspectionDate <= @EndTime";
+                listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
+            }
+      
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+
+        /// <summary>
+        /// 转换当日人工时
+        /// </summary>
+        /// <param name="workStage"></param>
+        /// <returns></returns>
+        protected string ConvertPersonWorkTimeSum(object dayReportId)
+        {
+            if (dayReportId != null)
+            {
+                return (Funs.DB.SitePerson_DayReportDetail.Where(x => x.DayReportId == dayReportId.ToString()).Sum(x => x.PersonWorkTime) ?? 0).ToString();
+            }
+            return "";
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx.designer.cs
new file mode 100644
index 00000000..c2a12f1c
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx.designer.cs
@@ -0,0 +1,161 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class QualityInstrumentsItem
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// lbtnFileUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx
new file mode 100644
index 00000000..f65375f3
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx
@@ -0,0 +1,118 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualityPerson.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.QualityPerson" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>质量人员</title>
+</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="ID" DataIDField="ID" AllowSorting="true"
+                    SortField="ProjectName,UnitName, PersonName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:RadioButtonList runat="server" ID="rbCom" Width="500px" Label="类型" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                    <f:RadioItem Text="企业总部人员" Value="1" Selected="true" />
+                                    <f:RadioItem Text="分支机构人员" Value="2" />
+                                    <f:RadioItem Text="项目部人员" Value="3" />
+                                </f:RadioButtonList>     
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true" Hidden="true">
+                                </f:DropDownList>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>                      
+                        <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" 
+                            FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>       
+                          <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName"
+                            SortField="UnitName" FieldType="String" HeaderText="单位" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName"
+                            SortField="PersonName" FieldType="String" HeaderText="姓名" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="SexStr" DataField="SexStr"
+                            SortField="SexStr" FieldType="String" HeaderText="性别" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="120px" ColumnID="IdentityCard" DataField="IdentityCard"
+                            SortField="IdentityCard" FieldType="String" HeaderText="身份证号" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="WorkPostName" DataField="WorkPostName"
+                            SortField="WorkPostName" FieldType="String" HeaderText="岗位" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Telephone" DataField="Telephone"
+                            SortField="Telephone" 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>
+    </form>
+    <script type="text/javascript">      
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+       //     F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
new file mode 100644
index 00000000..3a6b7271
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
@@ -0,0 +1,143 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class QualityPerson : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+   
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = string.Empty;
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (this.rbCom.SelectedValue != "3")
+            {
+                strSql = @"SELECT Person.CompanyBranchPersonId  AS ID,Unit.UnitName, Person.PersonName,case Person.Sex when '1' then '男' else '女' end as SexStr
+                    ,Person.IdentityCard,WorkPost.WorkPostName,Person.Telephone,Person.IsOnJob,Person.Remark, '' as ProjectName "
+                + @" FROM Person_CompanyBranchPerson AS Person "
+                + @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId "
+                + @" LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 ";
+         
+                if (this.rbCom.SelectedValue == "1")
+                {
+                    strSql += " AND Person.UnitId = @UnitId";
+                }
+                else
+                {
+                    strSql += " AND Person.UnitId != @UnitId";
+                }
+                listStr.Add(new SqlParameter("@UnitId", Const.UnitId_CD));
+                this.Grid1.Columns[1].Hidden = true;
+            }
+            else
+            {
+                strSql = @"SELECT Person.PersonId AS ID,Unit.UnitName,Project.ProjectName,Person.PersonName,case Person.Sex when '1' then '男' else '女' end as SexStr,Person.IdentityCard,WorkPost.WorkPostName,Person.Telephone,Person.Remark 
+                 FROM SitePerson_Person AS Person 
+                LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId 
+                LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId 
+                LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 ";
+                if (this.drpProject.SelectedValue  != Const._Null)
+                {
+                    strSql += " AND Person.ProjectId = @ProjectId";
+                    listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+                }
+                this.Grid1.Columns[1].Hidden = false;
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (this.rbCom.SelectedValue == "3")
+            {
+                this.drpProject.Hidden = false;
+            }
+            else 
+            { 
+                this.drpProject.Hidden = true; 
+            }
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion    
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.designer.cs
new file mode 100644
index 00000000..fd068a50
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.designer.cs
@@ -0,0 +1,125 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class QualityPerson
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// rbCom 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbCom;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx b/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx
new file mode 100644
index 00000000..4db771a9
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx
@@ -0,0 +1,131 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualityProblem.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.QualityProblem" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>质量问题</title>
+</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="ProjectId" DataIDField="ProjectId" AllowSorting="true"
+                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="检查时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="Count1" Width="120px" HeaderText="问题数量" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField ColumnID="Count2" Width="120px" HeaderText="整改数量" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField ColumnID="Count3" Width="120px" HeaderText="未整改数量" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label4" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField ColumnID="Count4" Width="120px" HeaderText="整改率（%）" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label5" runat="server" Text='<%# Count4(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </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" OnClose="Window1_Close"
+            Width="1200px" Height="620px" Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs
new file mode 100644
index 00000000..30e1b596
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs
@@ -0,0 +1,255 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class QualityProblem : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string cpara = string.Empty;
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND projectId = @projectId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
+
+            //if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate >=@StartTime";
+            //    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+
+            //    cpara += " AND c.RegisterDate >=" + this.txtStartTime.Text;
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate <=@EndTime";
+            //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+
+            //    cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
+            //}
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualityProblemItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+        
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count1(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getT = Funs.DB.Check_CheckControl.Where(x => x.ProjectId == projectId.ToString() );
+                if (datetime1.HasValue)
+                {
+                    getT = getT.Where(x => x.CheckDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getT = getT.Where(x => x.CheckDate <= datetime2);
+                }
+            
+                cout1 = getT.Count();
+            }
+            return cout1;
+        }
+
+        protected int Count2(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getT = Funs.DB.Check_CheckControl.Where(x => x.ProjectId == projectId.ToString() && x.State == "7");
+                if (datetime1.HasValue)
+                {
+                    getT = getT.Where(x => x.CheckDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getT = getT.Where(x => x.CheckDate <= datetime2);
+                }
+        
+                cout1 = getT.Count();
+            }
+            return cout1;
+        }
+
+        protected int Count3(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getT = Funs.DB.Check_CheckControl.Where(x => x.ProjectId == projectId.ToString() && x.State != "7");
+                if (datetime1.HasValue)
+                {
+                    getT = getT.Where(x => x.CheckDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getT = getT.Where(x => x.CheckDate <= datetime2);
+                }
+                cout1 = getT.Count();
+            }
+            return cout1;
+        }
+
+        protected string Count4(object projectId)
+        {
+            string rate = string.Empty;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getALL = Funs.DB.Check_CheckControl.Where(x => x.ProjectId == projectId.ToString());
+                
+                if (datetime1.HasValue)
+                {
+                    getALL = getALL.Where(x => x.CheckDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getALL = getALL.Where(x => x.CheckDate >= datetime1);
+                }
+                var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && x.State == "7");
+                int coutall = getALL.Count();
+                int cout0 = getT.Count();
+                if (coutall > 0)
+                {
+                    rate = Math.Round(cout0 * 1.0 / coutall * 100, 2).ToString();
+                }
+            }
+            return rate;
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.designer.cs
new file mode 100644
index 00000000..ab3a76bc
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.designer.cs
@@ -0,0 +1,206 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class QualityProblem
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// Label4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label4;
+
+        /// <summary>
+        /// Label5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label5;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx b/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx
new file mode 100644
index 00000000..194ea691
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx
@@ -0,0 +1,118 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualityProblemItem.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.QualityProblemItem" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>质量问题详细</title>
+</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="CheckControlCode" DataIDField="CheckControlCode" AllowSorting="true"
+                    SortField="CheckDate" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtProject" runat="server" Label="项目" Width="500px" LabelWidth="80px" Readonly="true" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="检查时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                   <f:DropDownList ID="dpHandelStatus" runat="server" Label="整改状态" LabelAlign="Right" EnableEdit="true">
+                                       <f:ListItem Text="全部" Value="0" Selected="true" />  
+                                        <f:ListItem Text="待整改" Value="4" />  
+                                        <f:ListItem Text="已整改-待复查验收" Value="1" />
+                                        <f:ListItem Text="超期未整改" Value="3" />        
+                                       <f:ListItem Text="已闭环" Value="2" />
+                                </f:DropDownList>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="95px" ColumnID="CheckDate" DataField="CheckDate" SortField="CheckDate"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="巡检日期" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                          <f:RenderField Width="100px" ColumnID="UnitWorkName" DataField="UnitWorkName"
+                            SortField="UnitWorkName" FieldType="String" HeaderText="单位工程名称" TextAlign="Center"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="UnitName" DataField="UnitName"
+                            SortField="UnitName" FieldType="String" HeaderText="施工单位" TextAlign="Left" 
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="80px" ColumnID="ProfessionalName" DataField="ProfessionalName" SortField="ProfessionalName"
+                            FieldType="String" HeaderText="专业" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="90px" ColumnID="QuestionType" DataField="QuestionType" SortField="QuestionType"
+                            FieldType="String" HeaderText="问题类别" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="tfImageUrl1" Width="120px" HeaderText="整改前" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                            <ItemTemplate>
+                                <asp:Label ID="lbImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("CheckControlCode")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField ColumnID="tfImageUrl2" Width="120px" HeaderText="整改后" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                            <ItemTemplate>
+                                <asp:Label ID="lbImageUrl2" runat="server" Text='<%# ConvertImgUrlByImage(Eval("CheckControlCode")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="70px" ColumnID="CheckSite" DataField="CheckSite" SortField="CheckSite"
+                            FieldType="String" HeaderText="部位" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>            
+                        <f:TemplateField ColumnID="State2" Width="80px" HeaderText="整改状态" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="lbState2" runat="server" Text='<%# Convertstatus(Eval("CheckControlCode")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField> 
+                    </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>
+    </form>
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+         //   F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx.cs
new file mode 100644
index 00000000..6415ff6b
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx.cs
@@ -0,0 +1,205 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class QualityProblemItem : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string projectId = Request.Params["projectId"];
+                this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
+                Funs.DropDownPageSize(this.ddlPageSize);
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT chec.CheckControlCode,chec.CheckSite,chec.ProjectId,chec.unitId,cNProfessional.ProfessionalName,
+                QualityQuestionType.QualityQuestionType as QuestionType,
+                chec.checkman,chec.CheckDate,chec.DocCode,chec.submitman,chec.state,chec.CNProfessionalCode,
+                unit.UnitName,unitWork.UnitWorkName+(case unitWork.ProjectType when '1' then '(建筑)' else '(安装)' end) as UnitWorkName 
+                FROM Check_CheckControl chec
+                left join Base_Unit unit on unit.unitId=chec.unitId
+                left join Base_CNProfessional cNProfessional on cNProfessional.CNProfessionalId=chec.CNProfessionalCode
+                left join WBS_UnitWork unitWork on unitWork.UnitWorkId = chec.UnitWorkId
+                left join Base_QualityQuestionType QualityQuestionType on QualityQuestionType.QualityQuestionTypeId = chec.QuestionType
+                WHERE 1=1  ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            strSql += " AND chec.ProjectId = @ProjectId";
+            listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
+
+            strSql += " AND (chec.CheckDate>=@startTime or @startTime='') and (chec.CheckDate<=@endTime or @endTime='') ";
+            listStr.Add(new SqlParameter("@startTime", !string.IsNullOrEmpty(txtStartTime.Text.Trim()) ? txtStartTime.Text.Trim() + " 00:00:00" : ""));
+            listStr.Add(new SqlParameter("@endTime", !string.IsNullOrEmpty(txtEndTime.Text.Trim()) ? txtEndTime.Text.Trim() + "  23:59:59" : ""));
+            if (dpHandelStatus.SelectedValue != "0")
+            {
+                if (dpHandelStatus.SelectedValue.Equals("1"))
+                {
+                    strSql += " AND (chec.state='5' or chec.state='6')";
+                }
+                else if (dpHandelStatus.SelectedValue.Equals("2"))
+                {
+                    strSql += " AND chec.state='7'";
+                }
+                else if (dpHandelStatus.SelectedValue.Equals("3"))
+                {
+                    strSql += " AND DATEADD(day,1,chec.LimitDate)< GETDATE() and chec.state<>5 and chec.state<>6 and chec.state<>7";
+                }
+                else if (dpHandelStatus.SelectedValue.Equals("4"))
+                {
+                    strSql += " AND DATEADD(day,1,chec.LimitDate)> GETDATE() and chec.state<>5 and chec.state<>6 and chec.state<>7";
+                }
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+        protected string ConvertImageUrlByImage(object registrationId)
+        {
+            string url = string.Empty;
+            string httpUrl = string.Empty;
+            var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault();
+            if (sysSet6 != null)
+            {
+                httpUrl = sysSet6.SetValue;
+            }
+            if (registrationId != null)
+            {
+                IList<Model.AttachFile> sourlist = AttachFileService.GetBeforeFileList(registrationId.ToString(), BLL.Const.CheckListMenuId);
+
+                if (sourlist != null && sourlist.Count > 0)
+                {
+                    string AttachUrl = "";
+                    foreach (var item in sourlist)
+                    {
+                        if (!string.IsNullOrEmpty(item.AttachUrl) && item.AttachUrl.ToLower().EndsWith(".jpg") || item.AttachUrl.ToLower().EndsWith(".jpeg") || item.AttachUrl.ToLower().EndsWith(".png"))
+                            AttachUrl += item.AttachUrl.TrimEnd(',') + ",";
+                    }
+                    url = BLL.UploadAttachmentService.ShowImage(httpUrl, AttachUrl.TrimEnd(','));
+                }
+            }
+            return url;
+        }
+        protected string ConvertImgUrlByImage(object registrationId)
+        {
+            string url = string.Empty;
+            string httpUrl = string.Empty;
+            var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault();
+            if (sysSet6 != null)
+            {
+                httpUrl = sysSet6.SetValue;
+            }
+            if (registrationId != null)
+            {
+                IList<Model.AttachFile> sourlist = AttachFileService.Getfilelist(registrationId.ToString() + "r", BLL.Const.CheckListMenuId);
+
+                if (sourlist != null && sourlist.Count > 0)
+                {
+                    string AttachUrl = "";
+                    foreach (var item in sourlist)
+                    {
+                        if (!string.IsNullOrEmpty(item.AttachUrl) && item.AttachUrl.ToLower().EndsWith(".jpg") || item.AttachUrl.ToLower().EndsWith(".jpeg") || item.AttachUrl.ToLower().EndsWith(".png"))
+                            AttachUrl += item.AttachUrl.TrimEnd(',') + ",";
+                    }
+                    url = BLL.UploadAttachmentService.ShowImage(httpUrl, AttachUrl.TrimEnd(','));
+                }
+            }
+            return url;
+        }
+
+        public string Convertstatus(Object code)
+        {
+            Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(code.ToString());
+            if (checkControl.State.Equals("5") || checkControl.State.Equals("6"))
+            {
+                return "未确认";
+            }
+            else if (checkControl.State == Const.CheckControl_Complete)
+            { //闭环
+                return "已闭环";
+            }
+            //else if( checkControl.LimitDate> )
+            else if (Convert.ToDateTime(checkControl.LimitDate).AddDays(1) < DateTime.Now)  //延期未整改
+            {
+                return "超期未整改";
+
+            }
+            else  //期内未整改
+            {
+                return "未整改";
+
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx.designer.cs
new file mode 100644
index 00000000..d9377d68
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx.designer.cs
@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class QualityProblemItem
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// dpHandelStatus 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList dpHandelStatus;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// lbImageUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbImageUrl;
+
+        /// <summary>
+        /// lbImageUrl2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbImageUrl2;
+
+        /// <summary>
+        /// lbState2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbState2;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx b/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx
new file mode 100644
index 00000000..69161753
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx
@@ -0,0 +1,121 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualityTraining.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.QualityTraining" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>质量培训</title>
+</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="ProjectId" DataIDField="ProjectId" AllowSorting="true"
+                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:RadioButtonList runat="server" ID="rbCom" Width="300px" Label="类型" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                    <f:RadioItem Text="质量培训" Value="1" Selected="true" />
+                                    <f:RadioItem Text="技术交底" Value="2" />
+                                </f:RadioButtonList>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="450px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>          
+                           <f:TemplateField ColumnID="Count1" Width="120px" HeaderText="人次数" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>                       
+                    </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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs
new file mode 100644
index 00000000..b304f043
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs
@@ -0,0 +1,210 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class QualityTraining : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+   
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string cpara = string.Empty;
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND projectId = @projectId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
+
+            //if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate >=@StartTime";
+            //    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+
+            //    cpara += " AND c.RegisterDate >=" + this.txtStartTime.Text;
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate <=@EndTime";
+            //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+
+            //    cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
+            //}
+            
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.rbCom.SelectedValue == "1")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualityTrainingItem1.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
+            }
+            else
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualityTrainingItem2.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
+            }
+        }
+        #endregion
+        
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count1(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                if (this.rbCom.SelectedValue == "1")
+                {
+                    var getT = Funs.DB.Comprehensive_InspectionPerson.Where(x => x.ProjectId == projectId.ToString() && x.IsTrain == true);
+                    if (datetime1.HasValue)
+                    {
+                        getT = getT.Where(x => x.CompileDate >= datetime1);
+                    }
+                    if (datetime2.HasValue)
+                    {
+                        getT = getT.Where(x => x.CompileDate <= datetime2);
+                    }
+                    cout1 = getT.Count();
+                }
+                else
+                {
+                    var getT = Funs.DB.Comprehensive_DesignDetails.Where(x => x.ProjectId == projectId.ToString());
+                    if (datetime1.HasValue)
+                    {
+                        getT = getT.Where(x => x.CompileDate >= datetime1);
+                    }
+                    if (datetime2.HasValue)
+                    {
+                        getT = getT.Where(x => x.CompileDate <= datetime2);
+                    }
+                    if (getT.Count() > 0)
+                    {
+                        cout1 = getT.Sum(x => x.JoinPersonNum ?? 0);
+                    }
+                }
+            }
+            return cout1;
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.designer.cs
new file mode 100644
index 00000000..3ac9ca04
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.designer.cs
@@ -0,0 +1,188 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class QualityTraining
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// rbCom 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbCom;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx
new file mode 100644
index 00000000..8802be55
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx
@@ -0,0 +1,127 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualityTrainingItem1.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.QualityTrainingItem1" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>质量培训</title>
+</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="InspectionPersonId" DataIDField="InspectionPersonId" AllowSorting="true"
+                    SortField="CompileDate" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtProject" runat="server" Label="项目" Width="500px"
+                                    LabelWidth="80px" Readonly="true" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="单位" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="250px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="InspectionPersonCode" DataField="InspectionPersonCode" FieldType="String" HeaderText="报验编号" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="150px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="100px">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="UnitWorkName" Width="110px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField ColumnID="PostName" DataField="PostName" FieldType="String" HeaderText="工种" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="100px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="PersonName" DataField="PersonName" FieldType="String" HeaderText="姓名" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="100px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="CertificateNumber" DataField="CertificateNumber" FieldType="String" HeaderText="证书编号" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="QualifiedProjectCode" DataField="QualifiedProjectCode" FieldType="String" HeaderText="合格项目代号（级别）" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ValidityDate" DataField="ValidityDate" FieldType="Date" Renderer="Date" HeaderText="有效期" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="110px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ApprovalTime" DataField="ApprovalTime" FieldType="Date" Renderer="Date" HeaderText="批准时间" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="110px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="DepartureTime" DataField="DepartureTime" FieldType="Date" Renderer="Date" HeaderText="离场时间" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="110px">
+                        </f:RenderField>
+                               <%--<f:TemplateField ColumnID="Status" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="txtStatus" runat="server" Text='<%# ConvertState(Eval("Status")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>--%>
+                         
+                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
+                            <ItemTemplate>
+                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
+                                                 Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("InspectionPersonId")) %>'   ToolTip="附件查看"></asp:LinkButton>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:LinkButtonField TextAlign="Center" HeaderText="焊工资质"
+                            ColumnID="lbfAction1" Width="80px" CommandName="Action1" Text="资质条件" />
+                    </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="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
+            EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"
+            IsModal="true" Width="700px" Height="500px">
+        </f:Window>
+    </form>
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+         //   F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx.cs
new file mode 100644
index 00000000..c3a38788
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx.cs
@@ -0,0 +1,150 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class QualityTrainingItem1 : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string projectId = Request.Params["projectId"];
+                this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
+                Funs.DropDownPageSize(this.ddlPageSize);
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select InspectionPersonId, InspectionPersonCode, PersonName, Status,
+                              CertificateNumber, QualifiedProjectCode, ValidityDate, ApprovalTime, 
+                              DepartureTime, AttachUrl,CompileMan, CompileDate, 
+                              IsOnSite, UnitWorkId,U.UnitName,CN.ProfessionalName ,P.WorkPostName as PostName
+                              from Comprehensive_InspectionPerson C 
+                              left join Base_Unit U on C.UnitId=U.UnitId
+                              left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId 
+                              left join Base_WorkPost P on C.PostId=P.WorkPostId
+                              where C.ProjectId = @ProjectId";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            strSql += " AND C.ProjectId = @ProjectId";
+            listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
+
+            if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
+            {
+                strSql += " AND C.CompileDate >= @StartTime";
+                listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim()));
+            }
+            if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
+            {
+                strSql += " AND C.CompileDate <= @EndTime";
+                listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
+            }
+      
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+
+        #region 格式化字符串
+        /// <summary>
+        /// 获取单位工程名称
+        /// </summary>
+        /// <param name="CarryUnitWorks"></param>
+        /// <returns></returns>
+        protected string ConvertUnitWork(object CarryUnitWorks)
+        {
+            string CarryUnitWorkName = string.Empty;
+            if (CarryUnitWorks != null)
+            {
+                string[] Ids = CarryUnitWorks.ToString().Split(',');
+                foreach (string t in Ids)
+                {
+                    var UnitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(t);
+                    if (UnitWork != null)
+                    {
+                        CarryUnitWorkName += UnitWork.UnitWorkName + ",";
+                    }
+                }
+            }
+            if (CarryUnitWorkName != string.Empty)
+            {
+                return CarryUnitWorkName.Substring(0, CarryUnitWorkName.Length - 1);
+            }
+            else
+            {
+                return "";
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx.designer.cs
new file mode 100644
index 00000000..74f0bacb
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx.designer.cs
@@ -0,0 +1,170 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class QualityTrainingItem1
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// lbtnFileUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx
new file mode 100644
index 00000000..4af1b43b
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx
@@ -0,0 +1,106 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualityTrainingItem2.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.QualityTrainingItem2" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>质量培训</title>
+</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="DesignDetailsId" DataIDField="DesignDetailsId" AllowSorting="true"
+                    SortField="DetailsDate" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtProject" runat="server" Label="项目" Width="500px"
+                                    LabelWidth="80px" Readonly="true" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="DesignDetailsCode" DataField="DesignDetailsCode" FieldType="String" HeaderText="编号" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="160px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="DetailsMan" DataField="DetailsMan" FieldType="String" HeaderText="交底人" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="DetailsDate" DataField="DetailsDate" FieldType="Date" Renderer="Date" HeaderText="交底日期" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="UnitWorkName" Width="180px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField ColumnID="UnitName" Width="180px" HeaderText="参加单位" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%# ConvertCarryUnit(Eval("UnitName")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>  
+                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
+                            <ItemTemplate>
+                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" 
+                                                 Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("DesignDetailsId")) %>'   ToolTip="附件查看"></asp:LinkButton>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </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="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
+            EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"
+            IsModal="true" Width="700px" Height="500px">
+        </f:Window>
+    </form>
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+         //   F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx.cs
new file mode 100644
index 00000000..c79981bc
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx.cs
@@ -0,0 +1,176 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class QualityTrainingItem2 : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string projectId = Request.Params["projectId"];
+                this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
+                Funs.DropDownPageSize(this.ddlPageSize);
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select DesignDetailsId,DesignDetailsCode, DetailsMan, DetailsDate, UnitWorkId,Status,
+                               UnitName, AttachUrl, CompileMan, CN.ProfessionalName 
+                              from Comprehensive_DesignDetails C 
+                              left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId 
+                              where C.ProjectId = @ProjectId";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            strSql += " AND C.ProjectId = @ProjectId";
+            listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
+
+            if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
+            {
+                strSql += " AND C.DetailsDate >= @StartTime";
+                listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim()));
+            }
+            if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
+            {
+                strSql += " AND C.DetailsDate <= @EndTime";
+                listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
+            }
+      
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+
+        #region 格式化字符串
+        /// <summary>
+        /// 获取单位工程名称
+        /// </summary>
+        /// <param name="CarryUnitWorks"></param>
+        /// <returns></returns>
+        protected string ConvertUnitWork(object CarryUnitWorks)
+        {
+            string CarryUnitWorkName = string.Empty;
+            if (CarryUnitWorks != null)
+            {
+                string[] Ids = CarryUnitWorks.ToString().Split(',');
+                foreach (string t in Ids)
+                {
+                    var UnitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(t);
+                    if (UnitWork != null)
+                    {
+                        CarryUnitWorkName += UnitWork.UnitWorkName + ",";
+                    }
+                }
+            }
+            if (CarryUnitWorkName != string.Empty)
+            {
+                return CarryUnitWorkName.Substring(0, CarryUnitWorkName.Length - 1);
+            }
+            else
+            {
+                return "";
+            }
+        }
+
+        /// <summary>
+        /// 获取单位名称
+        /// </summary>
+        /// <param name="CarryUnitIds"></param>
+        /// <returns></returns>
+        protected string ConvertCarryUnit(object CarryUnitIds)
+        {
+            string CarryUnitName = string.Empty;
+            if (CarryUnitIds != null)
+            {
+                string[] Ids = CarryUnitIds.ToString().Split(',');
+                foreach (string t in Ids)
+                {
+                    var type = BLL.UnitService.GetUnitByUnitId(t);
+                    if (type != null)
+                    {
+                        CarryUnitName += type.UnitName + ",";
+                    }
+                }
+            }
+            if (CarryUnitName != string.Empty)
+            {
+                return CarryUnitName.Substring(0, CarryUnitName.Length - 1);
+            }
+            else
+            {
+                return "";
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx.designer.cs
new file mode 100644
index 00000000..5def9f8c
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx.designer.cs
@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class QualityTrainingItem2
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// lbtnFileUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx b/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx
new file mode 100644
index 00000000..1c9f63d1
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx
@@ -0,0 +1,126 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SecurityCost.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.SecurityCost" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>安全费用</title>
+</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="CostSmallDetailId" DataIDField="CostSmallDetailId" AllowSorting="true"
+                    SortField="Months" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
+                    EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
+                                <f:RadioButtonList runat="server" ID="rbType" Width="600px" Label="类型" LabelWidth="50px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                    <f:RadioItem Text="提取（万元）" Value="1"  />
+                                    <f:RadioItem Text="使用" Value="2" Selected="true"/>
+                                </f:RadioButtonList>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="400px" ColumnID="ProjectName" DataField="ProjectName"
+                            FieldType="String" HeaderText="项目" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" 
+                            FieldType="String" HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Months" DataField="Months"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM" HeaderText="月份"
+                            HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="SUMCost" DataField="SUMCost" 
+                            FieldType="Double" 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" OnClose="Window1_Close"
+            Width="1200px" Height="620px" Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs b/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs
new file mode 100644
index 00000000..d1dfc6e8
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs
@@ -0,0 +1,158 @@
+using BLL;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class SecurityCost : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = string.Empty;
+            List<SqlParameter> listStr = new List<SqlParameter>();
+
+            strSql = @"SELECT cost.CostSmallDetailId, p.ProjectId,p.ProjectCode,p.ProjectName,cost.UnitId,Unit.UnitName,cost.Months
+                        ,(CAST((SELECT SUM(ISNULL(CostMoney,0)) FROM CostGoods_CostSmallDetailItem 
+                        WHERE CostSmallDetailId=cost.CostSmallDetailId) *1.0 /10000 as decimal(18, 2) ))AS SUMCost
+                        FROM CostGoods_CostSmallDetail as cost
+                        left join Base_Project as p on cost.ProjectId =p.ProjectId
+                        left join Base_Unit as Unit on cost.UnitId =Unit.UnitId
+                        WHERE 1=1";
+
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND  cost.ProjectId = @ProjectId";
+                listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+            }
+            if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            {
+                strSql += " AND  cost.Months >=@StartTime";
+                listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+            }
+            if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            {
+                strSql += " AND  cost.Months <=@EndTime";
+                listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/CostGoods/CostSmallDetailView.aspx?CostSmallDetailId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.designer.cs
new file mode 100644
index 00000000..cf334106
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.designer.cs
@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class SecurityCost
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// rbType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbType;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx
new file mode 100644
index 00000000..135eb840
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx
@@ -0,0 +1,131 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SecurityRisk.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.SecurityRisk" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>安全风险</title>
+</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="ProjectId" DataIDField="ProjectId" AllowSorting="true"
+                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                          </f:DropDownList>
+                                  <%--    <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>--%>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>          
+                           <f:TemplateField ColumnID="Count1" Width="120px" HeaderText="低风险" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                           <f:TemplateField ColumnID="Count2" Width="120px" HeaderText="一般风险" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                           <f:TemplateField ColumnID="Count3" Width="120px" HeaderText="较大风险" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label4" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                         <f:TemplateField ColumnID="Count3" Width="120px" HeaderText="重大风险" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label5" runat="server" Text='<%# Count4(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
new file mode 100644
index 00000000..6e8b8a5f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
@@ -0,0 +1,247 @@
+using BLL;
+using FineUIPro.Web.BaseInfo;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class SecurityRisk : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+        #endregion
+
+        #region 加载页面
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string cpara = string.Empty;
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND projectId = @projectId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
+
+            //if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate >=@StartTime";
+            //    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+
+            //    cpara += " AND c.RegisterDate >=" + this.txtStartTime.Text;
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate <=@EndTime";
+            //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+
+            //    cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
+            //}
+            
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SecurityRiskItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 总工时数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count1(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                cout1 = getcount(projectId.ToString(), 1);
+            }
+            return cout1;
+        }
+
+        /// <summary>
+        /// 损失工时数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count2(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                cout1 = getcount(projectId.ToString(),2);
+            }
+            return cout1;
+        }
+
+        /// <summary>
+        /// 安全工时数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected int Count3(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                cout1= getcount(projectId.ToString(), 3);
+            }
+            return cout1;
+        }
+
+        protected int Count4(object projectId)
+        {
+            int cout1 = 0;
+            if (projectId != null)
+            {
+                cout1 = getcount(projectId.ToString(), 4);
+            }
+            return cout1;
+        }
+        /// <summary>
+        /// 定义变量
+        /// </summary>
+        private static IQueryable<Model.Hazard_HazardList> getDataLists = from x in Funs.DB.Hazard_HazardList
+                                                                                  select x;
+        /// <summary>
+        /// 定义变量
+        /// </summary>
+        private static IQueryable<Model.Hazard_HazardSelectedItem> getDataItemLists = from x in Funs.DB.Hazard_HazardSelectedItem
+                                                                                  where x.IsStart == true
+                                                                                  select x;
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="level"></param>
+        /// <returns></returns>
+        private int getcount(string projectId, int level)
+        {
+             int count = 0;
+            var getlevel = Funs.DB.Base_RiskLevel.FirstOrDefault(x => x.RiskLevel == level);
+            if (getlevel != null)
+            {
+                count = getDataItemLists.Where(x => x.ProjectId == projectId && x.HazardLevel == getlevel.RiskLevelId).Count();
+            }
+            return count;
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.designer.cs
new file mode 100644
index 00000000..531461aa
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.designer.cs
@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class SecurityRisk
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// Label4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label4;
+
+        /// <summary>
+        /// Label5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label5;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx b/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx
new file mode 100644
index 00000000..719a7784
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx
@@ -0,0 +1,134 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SecurityRiskItem.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.SecurityRiskItem" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>安全工时</title>
+</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="HazardSelectedItemId" DataIDField="HazardSelectedItemId" AllowSorting="true"
+                    SortField="IdentificationDate" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtProject" runat="server" Label="项目" Width="500px"
+                                    LabelWidth="80px" Readonly="true" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                     <f:RenderField Width="130px" ColumnID="WorkAreaName" DataField="WorkAreaName"
+                            SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:TemplateField Width="150px" HeaderText="工作阶段" HeaderTextAlign="Center" TextAlign="Center" ColumnID="WorkStageName">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertWorkStage(Eval("WorkStage")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField Width="100px" HeaderText="危险源类别" HeaderTextAlign="Center" TextAlign="Center" ColumnID="SupHazardListType">
+                            <ItemTemplate>
+                                <asp:Label ID="Label4" runat="server" Text='<%# ConvertSupHazardListTypeId(Eval("HazardListTypeId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField Width="100px" HeaderText="危险源项" HeaderTextAlign="Center" TextAlign="Center" ColumnID="HazardListType">
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%# ConvertHazardListTypeId(Eval("HazardListTypeId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField Width="150px" HeaderText="危险源代码" HeaderTextAlign="Center" TextAlign="Center" ColumnID="Hazard">
+                            <ItemTemplate>
+                                <asp:Label ID="lblHazardId" runat="server" Text='<%# ConvertHazardCode(Eval("HazardId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="1px" ColumnID="HazardListTypeId" DataField="HazardListTypeId"
+                            FieldType="String" HeaderText="" Hidden="true" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="1px" ColumnID="HazardListId" DataField="HazardListId"
+                            FieldType="String" HeaderText="" Hidden="true" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="180px" ColumnID="HazardItems" DataField="HazardItems" FieldType="String"
+                            HeaderText="危险因素明细" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="DefectsType" DataField="DefectsType" FieldType="String"
+                            HeaderText="缺陷类型" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="180px" ColumnID="MayLeadAccidents" DataField="MayLeadAccidents"
+                            FieldType="String" HeaderText="可能导致的事故" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="HelperMethod" DataField="HelperMethod" FieldType="String"
+                            HeaderText="辅助方法" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="L" DataField="HazardJudge_L" FieldType="String"
+                            HeaderText="危险评价(L)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="E" DataField="HazardJudge_E" FieldType="String"
+                            HeaderText="危险评价(E)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="C" DataField="HazardJudge_C" FieldType="String"
+                            HeaderText="危险评价(C)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="D" DataField="HazardJudge_D" FieldType="Double"
+                            HeaderText="危险评价(D)" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="90px" ColumnID="G" DataField="RiskLevelName" FieldType="String"
+                            HeaderText="危险级别" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="180px" ColumnID="ControlMeasures" DataField="ControlMeasures"
+                            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>
+    </form>
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+         //   F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.cs
new file mode 100644
index 00000000..9c06345f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.cs
@@ -0,0 +1,205 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class SecurityRiskItem : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string projectId = Request.Params["projectId"];
+                this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
+                Funs.DropDownPageSize(this.ddlPageSize);
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select Item.HazardSelectedItemId,Item.HazardListId,List.IdentificationDate,List.WorkAreaName,Item.WorkStage,Item.HazardListTypeId
+                    , Item.HazardListTypeId,Item.HazardId,Item.HazardItems,Item.DefectsType,Item.MayLeadAccidents
+                    ,Item.HelperMethod,Item.HazardJudge_L,Item.HazardJudge_E,Item.HazardJudge_C,Item.HazardJudge_E
+                    ,level.RiskLevelName,Item.ControlMeasures
+                    from Hazard_HazardSelectedItem AS Item
+                    LEFT JOIN Hazard_HazardList AS List on List.HazardListId = Item.HazardListId
+                    LEFT JOIN Base_RiskLevel as level on level.RiskLevelId = Item.HazardLevel
+                WHERE List.States = " + BLL.Const.State_2;
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            strSql += " AND List.ProjectId = @ProjectId";
+            listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
+            if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
+            {
+                strSql += " AND List.IdentificationDate >= @StartTime";
+                listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim()));
+            }
+            if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
+            {
+                strSql += " AND List.IdentificationDate <= @EndTime";
+                listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+
+
+        #region 转换字符串
+        /// <summary>
+        /// 转换工作阶段
+        /// </summary>
+        /// <param name="workStage"></param>
+        /// <returns></returns>
+        protected string ConvertWorkStage(object workStage)
+        {
+            if (workStage != null)
+            {
+                string workStages = string.Empty;
+                string[] strList = workStage.ToString().Split(',');
+                foreach (string str in strList)
+                {
+                    Model.Base_WorkStage c = BLL.WorkStageService.GetWorkStageById(str);
+                    if (c != null)
+                    {
+                        workStages += c.WorkStageName + ",";
+                    }
+                }
+                if (!string.IsNullOrEmpty(workStages))
+                {
+                    workStages = workStages.Substring(0, workStages.LastIndexOf(","));
+                }
+                return workStages;
+            }
+            return "";
+        }
+
+        /// <summary>
+        /// 获取危险源编号
+        /// </summary>
+        /// <param name="WorkStage"></param>
+        /// <returns></returns>
+        protected string ConvertHazardCode(object HazardId)
+        {
+            string hazardCode = string.Empty;
+            if (HazardId != null)
+            {
+                Model.Technique_HazardList hazardList = BLL.HazardListService.GetHazardListById(HazardId.ToString());
+                if (hazardList != null)
+                {
+                    hazardCode = hazardList.HazardCode;
+                }
+            }
+            return hazardCode;
+        }
+
+        /// <summary>
+        /// 获取危险源类别
+        /// </summary>
+        /// <param name="hazardListTypeId"></param>
+        /// <returns></returns>
+        protected string ConvertSupHazardListTypeId(object hazardListTypeId)
+        {
+            if (hazardListTypeId != null)
+            {
+                Model.Technique_HazardListType hazardListType = BLL.HazardListTypeService.GetHazardListTypeById(hazardListTypeId.ToString());
+                if (hazardListType != null)
+                {
+                    var hazard = BLL.HazardListTypeService.GetHazardListTypeById(hazardListType.SupHazardListTypeId);
+                    if (hazard != null)
+                    {
+                        return hazard.HazardListTypeName;
+                    }
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 获取危险源项
+        /// </summary>
+        /// <param name="hazardListTypeId"></param>
+        /// <returns></returns>
+        protected string ConvertHazardListTypeId(object hazardListTypeId)
+        {
+            if (hazardListTypeId != null)
+            {
+                Model.Technique_HazardListType hazardListType = BLL.HazardListTypeService.GetHazardListTypeById(hazardListTypeId.ToString());
+                if (hazardListType != null)
+                {
+                    return hazardListType.HazardListTypeName;
+                }
+            }
+            return null;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.designer.cs
new file mode 100644
index 00000000..a2ef7d65
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.designer.cs
@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class SecurityRiskItem
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// Label4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label4;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// lblHazardId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblHazardId;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx b/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx
new file mode 100644
index 00000000..e65b871a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx
@@ -0,0 +1,125 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WorkingHours.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.WorkingHours" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>安全工时</title>
+</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="ProjectId" DataIDField="ProjectId" AllowSorting="true"
+                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                    EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
+                                </f:DropDownList>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                               <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>          
+                           <f:TemplateField ColumnID="Count1" Width="120px" HeaderText="总工时数" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                           <f:TemplateField ColumnID="Count2" Width="120px" HeaderText="损失工时数" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                           <f:TemplateField ColumnID="Count3" Width="120px" HeaderText="安全工时数" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label4" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </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" OnClose="Window1_Close"
+            Width="1200px" Height="620px"  Maximized="true">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
+                    Text="查看" Icon="Find" OnClick="btnView_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+        // 点击标题栏工具图标 - 退出
+        function closeNow(event) {
+            var bConfirmed = confirm('您确定要退出吗?');
+            if (bConfirmed) { closePage(); }
+        }
+
+        function closePage() {
+            if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
+                window.location.href = "about:blank";
+                window.close();
+            } else {
+                window.opener = null;
+                window.open("", "_self");
+                window.close();
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs b/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs
new file mode 100644
index 00000000..edebf72f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs
@@ -0,0 +1,297 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class WorkingHours : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                // 绑定表格t
+                BindGrid();
+            }
+        }
+
+   
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string cpara = string.Empty;
+            if (this.drpProject.SelectedValue != Const._Null)
+            {
+                strSql += " AND projectId = @projectId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
+            }
+
+            //if (!string.IsNullOrEmpty(this.txtStartTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate >=@StartTime";
+            //    listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+
+            //    cpara += " AND c.RegisterDate >=" + this.txtStartTime.Text;
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            //{
+            //    strSql += " AND h.RegisterDate <=@EndTime";
+            //    listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+
+            //    cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
+            //}
+            
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region Grid双击事件 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WorkingHoursItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+        
+
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            EditData();
+        }
+
+
+        /// <summary>
+        /// 总工时数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected decimal Count1(object projectId)
+        {
+            decimal cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getD1 = from x in Funs.DB.SitePerson_DayReport
+                            join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
+                            where y.ProjectState == Const.ProjectState_1
+                            select x; 
+                if (datetime1.HasValue)
+                {
+                    getD1 = getD1.Where(x => x.CompileDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getD1 = getD1.Where(x => x.CompileDate <= datetime2);
+                }
+                var getC = from x in Funs.DB.SitePerson_DayReportDetail
+                           join y in getD1 on x.DayReportId equals y.DayReportId
+                           where y.ProjectId == projectId.ToString()
+                           select x;
+                if (getC.Count() > 0)
+                {
+                    cout1 = getC.Sum(x => x.PersonWorkTime ?? 0);
+                }
+            }
+            return cout1;
+        }
+
+        /// <summary>
+        /// 损失工时数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected decimal Count2(object projectId)
+        {
+            decimal cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getD1 = from x in Funs.DB.Accident_AccidentHandle
+                            join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
+                            where y.ProjectState == Const.ProjectState_1
+                            select x; 
+                var getD2 = from x in Funs.DB.Accident_AccidentReport
+                            join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
+                            where y.ProjectState == Const.ProjectState_1
+                            select x;
+                if (datetime1.HasValue)
+                {
+                    getD1 = getD1.Where(x => x.AccidentDate >= datetime1);
+                    getD2 = getD2.Where(x => x.CompileDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getD1 = getD1.Where(x => x.AccidentDate <= datetime2);
+                    getD2 = getD2.Where(x => x.CompileDate <= datetime2);
+                }
+                if (getD1.Count() > 0)
+                {
+                    cout1 += getD1.Sum(x => x.WorkHoursLoss ?? 0);
+                }
+                if (getD2.Count() > 0)
+                {
+                    cout1 += getD2.Sum(x => x.WorkingHoursLoss ?? 0);
+                }
+            }
+            return cout1;
+        }
+
+        /// <summary>
+        /// 安全工时数
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        protected decimal Count3(object projectId)
+        {
+            decimal cout1 = 0;
+            if (projectId != null)
+            {
+                var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
+                var getC1 = from x in Funs.DB.SitePerson_DayReport
+                            join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
+                            where y.ProjectState == Const.ProjectState_1
+                            select x;
+
+                var getD1 = from x in Funs.DB.Accident_AccidentHandle
+                            join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
+                            where y.ProjectState == Const.ProjectState_1
+                            select x;
+                var getD2 = from x in Funs.DB.Accident_AccidentReport
+                            join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
+                            where y.ProjectState == Const.ProjectState_1
+                            select x;
+
+                if (datetime1.HasValue)
+                {
+                    getC1 = getC1.Where(x => x.CompileDate >= datetime1);
+                    getD1 = getD1.Where(x => x.AccidentDate >= datetime1);
+                    getD2 = getD2.Where(x => x.CompileDate >= datetime1);
+                }
+                if (datetime2.HasValue)
+                {
+                    getC1 = getC1.Where(x => x.CompileDate <= datetime2);
+                    getD1 = getD1.Where(x => x.AccidentDate <= datetime2);
+                    getD2 = getD2.Where(x => x.CompileDate <= datetime2);
+                }
+                var getC = from x in Funs.DB.SitePerson_DayReportDetail
+                           join y in getC1 on x.DayReportId equals y.DayReportId
+                           where y.ProjectId == projectId.ToString()
+                           select x;
+                if (getC.Count() > 0)
+                {
+                    cout1 = getC.Sum(x => x.PersonWorkTime ?? 0);
+                }
+
+                if (getD1.Count() > 0)
+                {
+                    cout1 = cout1 -getD1.Sum(x => x.WorkHoursLoss ?? 0);
+                }
+                if (getD2.Count() > 0)
+                {
+                    cout1 = cout1- getD2.Sum(x => x.WorkingHoursLoss ?? 0);
+                }
+            }
+            return cout1;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.designer.cs
new file mode 100644
index 00000000..1f9e1eb8
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.designer.cs
@@ -0,0 +1,197 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class WorkingHours
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// Label4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label4;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx b/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx
new file mode 100644
index 00000000..54435244
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx
@@ -0,0 +1,84 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WorkingHoursItem.aspx.cs"
+    Inherits="FineUIPro.Web.DataShow.WorkingHoursItem" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <title>安全工时</title>
+</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="DayReportId" DataIDField="DayReportId" AllowSorting="true"
+                    SortField="CompileDate" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtProject" runat="server" Label="项目" Width="500px"
+                                    LabelWidth="80px" Readonly="true" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                    Width="130px">
+                                </f:DatePicker>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                          <f:RenderField Width="150px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="日期"
+                        HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:TemplateField ColumnID="tfWorkTime" Width="200px" HeaderText="当日人工时" HeaderTextAlign="Center"
+                        TextAlign="Center">
+                        <ItemTemplate>
+                            <asp:Label ID="lblWorkTime" runat="server" Text='<%# ConvertPersonWorkTimeSum(Eval("DayReportId")) %>'></asp:Label>
+                        </ItemTemplate>
+                    </f:TemplateField>
+                    </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>
+    </form>
+    <script type="text/javascript">
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+         //   F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx.cs
new file mode 100644
index 00000000..22fdd1bb
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx.cs
@@ -0,0 +1,124 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DataShow
+{
+    public partial class WorkingHoursItem : PageBase
+    {
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string projectId = Request.Params["projectId"];
+                this.txtProject.Text=ProjectService.GetProjectNameByProjectId(projectId);
+                Funs.DropDownPageSize(this.ddlPageSize);
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"select DayReportId,CompileDate,ProjectId from SitePerson_DayReport   WHERE 1=1 ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            strSql += " AND ProjectId = @ProjectId";
+            listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
+
+            if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
+            {
+                strSql += " AND CompileDate >= @StartTime";
+                listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim()));
+            }
+            if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
+            {
+                strSql += " AND CompileDate <= @EndTime";
+                listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
+            }
+      
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+
+        /// <summary>
+        /// 转换当日人工时
+        /// </summary>
+        /// <param name="workStage"></param>
+        /// <returns></returns>
+        protected string ConvertPersonWorkTimeSum(object dayReportId)
+        {
+            if (dayReportId != null)
+            {
+                return (Funs.DB.SitePerson_DayReportDetail.Where(x => x.DayReportId == dayReportId.ToString()).Sum(x => x.PersonWorkTime) ?? 0).ToString();
+            }
+            return "";
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx.designer.cs b/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx.designer.cs
new file mode 100644
index 00000000..6b77216f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx.designer.cs
@@ -0,0 +1,152 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DataShow
+{
+
+
+    public partial class WorkingHoursItem
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProject;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// lblWorkTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblWorkTime;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 31ff2189..077c0bf0 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -1897,3 +1897,590 @@ IP地址:::1
 
 出错时间:03/07/2023 22:43:33
 
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'CheckType' 无效。
+列名 'CheckType' 无效。
+列名 'CheckType' 无效。
+列名 'CheckType' 无效。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\ChengDa\sggl_cd\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.DataShow.Check.BindGrid() 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\Check.aspx.cs:行号 60
+   在 FineUIPro.Web.DataShow.Check.Page_Load(Object sender, EventArgs e) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\Check.aspx.cs:行号 30
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/29/2023 10:01:43
+出错文件:http://localhost:1295/DataShow/Check.aspx
+IP地址:::1
+
+出错时间:03/29/2023 10:01:43
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:对象名 'Person_CompanyBranchPerson' 无效。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\ChengDa\sggl_cd\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.DataShow.CompanyPerson.BindGrid() 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\CompanyPerson.aspx.cs:行号 61
+   在 FineUIPro.Web.DataShow.CompanyPerson.Page_Load(Object sender, EventArgs e) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\CompanyPerson.aspx.cs:行号 25
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/29/2023 10:17:19
+出错文件:http://localhost:1295/DataShow/CompanyPerson.aspx
+IP地址:::1
+
+出错时间:03/29/2023 10:17:19
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'IsUsed' 无效。
+列名 'IsUsed' 无效。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\ChengDa\sggl_cd\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.DataShow.ConstructionEquipment.BindGrid() 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\ConstructionEquipment.aspx.cs:行号 80
+   在 FineUIPro.Web.DataShow.ConstructionEquipment.Page_Load(Object sender, EventArgs e) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\ConstructionEquipment.aspx.cs:行号 28
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/29/2023 10:19:11
+出错文件:http://localhost:1295/DataShow/ConstructionEquipment.aspx
+IP地址:::1
+
+出错时间:03/29/2023 10:19:11
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'IsUsed' 无效。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\ChengDa\sggl_cd\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.DataShow.ConstructionEquipment.BindGrid() 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\ConstructionEquipment.aspx.cs:行号 80
+   在 FineUIPro.Web.DataShow.ConstructionEquipment.Page_Load(Object sender, EventArgs e) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\ConstructionEquipment.aspx.cs:行号 28
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/29/2023 10:20:29
+出错文件:http://localhost:1295/DataShow/ConstructionEquipment.aspx
+IP地址:::1
+
+出错时间:03/29/2023 10:20:29
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'IsUsed' 无效。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\ChengDa\sggl_cd\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.DataShow.ConstructionEquipment.BindGrid() 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\ConstructionEquipment.aspx.cs:行号 80
+   在 FineUIPro.Web.DataShow.ConstructionEquipment.Page_Load(Object sender, EventArgs e) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\ConstructionEquipment.aspx.cs:行号 28
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/29/2023 10:20:48
+出错文件:http://localhost:1295/DataShow/ConstructionEquipment.aspx
+IP地址:::1
+
+出错时间:03/29/2023 10:20:48
+
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:文件“/HJGL/PersonManage/PersonManageView.aspx”不存在。
+错误堆栈:
+   在 System.Web.UI.Util.CheckVirtualFileExists(VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:03/29/2023 10:25:32
+出错文件:http://localhost:1295/HJGL/PersonManage/PersonManageView.aspx?welderId=05205efb-3ccf-4231-b4a2-d85d797fcd6e
+IP地址:::1
+
+出错时间:03/29/2023 10:25:32
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:执行超时已过期。完成操作之前已超时或服务器未响应。 
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.ExecuteReader()
+   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
+   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
+   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
+   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
+   在 System.Linq.Queryable.Count[TSource](IQueryable`1 source)
+   在 FineUIPro.Web.DataShow.HJGLWelding.Count1(Object projectId) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\HJGLWelding.aspx.cs:行号 171
+   在 ASP.datashow_hjglwelding_aspx.__DataBindingLabel2(Object sender, EventArgs e) 位置 e:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\HJGLWelding.aspx:行号 58
+   在 System.Web.UI.Control.OnDataBinding(EventArgs e)
+   在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+   在 System.Web.UI.Control.DataBind()
+   在 System.Web.UI.Control.DataBindChildren()
+   在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+   在 System.Web.UI.Control.DataBind()
+   在 (Control )
+   在 FineUIPro.GridRow.BkpgFeAELTFlAvoTrOBrConfcLJbA()
+   在 (GridRow )
+   在 FineUIPro.Grid.BkpgFeAELTFlAvoTrOBrConfcLJbA(Int32 , Object )
+   在 (Grid , Int32 , Object )
+   在 FineUIPro.Grid.LDChsdiaqdhUTcxBcQPMKyQFfjEDB(DataTable , Boolean )
+   在 (Grid , DataTable , Boolean )
+   在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
+   在 (Grid , Boolean )
+   在 FineUIPro.Grid.DataBind()
+   在 FineUIPro.Web.DataShow.HJGLWelding.BindGrid() 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\HJGLWelding.aspx.cs:行号 66
+   在 FineUIPro.Web.DataShow.HJGLWelding.Page_Load(Object sender, EventArgs e) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\HJGLWelding.aspx.cs:行号 27
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+----错误类型:Win32Exception
+----错误信息:
+----等待的操作过时。
+----错误堆栈:
+    出错时间:03/29/2023 10:27:13
+出错文件:http://localhost:1295/DataShow/HJGLWelding.aspx
+IP地址:::1
+
+出错时间:03/29/2023 10:27:14
+
+
+错误信息开始=====>
+错误类型:IndexOutOfRangeException
+错误信息:无法找到列 CompileDate。
+错误堆栈:
+   在 System.Data.DataTable.ParseSortString(String sortString)
+   在 System.Data.DataView.CheckSort(String sort)
+   在 System.Data.DataView.set_Sort(String value)
+   在 FineUIPro.Web.PageBase.GetPagedDataTable(Grid Grid1, DataTable tb) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\common\PageBase.cs:行号 496
+   在 FineUIPro.Web.DataShow.HJGLWeldingItem.BindGrid() 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\HJGLWeldingItem.aspx.cs:行号 122
+   在 FineUIPro.Web.DataShow.HJGLWeldingItem.Page_Load(Object sender, EventArgs e) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\HJGLWeldingItem.aspx.cs:行号 29
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/29/2023 10:30:00
+出错文件:http://localhost:1295/DataShow/HJGLWeldingItem.aspx?projectId=b11a16ea-148c-4bae-a5a1-32158b599482
+IP地址:::1
+
+出错时间:03/29/2023 10:30:00
+
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 (Object )
+   在 FineUIPro.GridRow.kxpUEMXYxcbykrOznAFBzkoxlAnb()
+   在 (GridRow )
+   在 FineUIPro.GridRow.InitTemplateContainers()
+   在 (GridRow )
+   在 FineUIPro.Grid.BkpgFeAELTFlAvoTrOBrConfcLJbA(Int32 , Object )
+   在 (Grid , Int32 , Object )
+   在 FineUIPro.Grid.LDChsdiaqdhUTcxBcQPMKyQFfjEDB(DataTable , Boolean )
+   在 (Grid , DataTable , Boolean )
+   在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
+   在 (Grid , Boolean )
+   在 FineUIPro.Grid.DataBind()
+   在 FineUIPro.Web.DataShow.HJGLWeldingItem.BindGrid() 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\HJGLWeldingItem.aspx.cs:行号 125
+   在 FineUIPro.Web.DataShow.HJGLWeldingItem.Page_Load(Object sender, EventArgs e) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\HJGLWeldingItem.aspx.cs:行号 29
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/29/2023 10:31:56
+出错文件:http://localhost:1295/DataShow/HJGLWeldingItem.aspx?projectId=b11a16ea-148c-4bae-a5a1-32158b599482
+IP地址:::1
+
+出错时间:03/29/2023 10:31:56
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'UnitTypeName' 无效。
+列名 'WorkStatesStr' 无效。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\ChengDa\sggl_cd\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.DataShow.License.BindGrid() 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\License.aspx.cs:行号 65
+   在 FineUIPro.Web.DataShow.License.Page_Load(Object sender, EventArgs e) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\License.aspx.cs:行号 27
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/29/2023 10:34:16
+出错文件:http://localhost:1295/DataShow/License.aspx
+IP地址:::1
+
+出错时间:03/29/2023 10:34:16
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'ProjectAttribute' 无效。
+列名 'ProjectAttribute' 无效。
+列名 'ProjectAttribute' 无效。
+列名 'ProjectAttribute' 无效。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\ChengDa\sggl_cd\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.DataShow.Project.BindGrid() 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\Project.aspx.cs:行号 57
+   在 FineUIPro.Web.DataShow.Project.Page_Load(Object sender, EventArgs e) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\Project.aspx.cs:行号 25
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/29/2023 10:36:26
+出错文件:http://localhost:1295/DataShow/Project.aspx
+IP地址:::1
+
+出错时间:03/29/2023 10:36:26
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'ProjectAttribute' 无效。
+列名 'ProjectAttribute' 无效。
+列名 'ProjectAttribute' 无效。
+列名 'ProjectAttribute' 无效。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\ChengDa\sggl_cd\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.DataShow.Project.BindGrid() 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\Project.aspx.cs:行号 57
+   在 FineUIPro.Web.DataShow.Project.Page_Load(Object sender, EventArgs e) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\Project.aspx.cs:行号 25
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/29/2023 10:37:10
+出错文件:http://localhost:1295/DataShow/Project.aspx
+IP地址:::1
+
+出错时间:03/29/2023 10:37:10
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'ProjectAttribute' 无效。
+列名 'ProjectAttribute' 无效。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\ChengDa\sggl_cd\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.DataShow.Project.BindGrid() 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\Project.aspx.cs:行号 57
+   在 FineUIPro.Web.DataShow.Project.Page_Load(Object sender, EventArgs e) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\Project.aspx.cs:行号 25
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/29/2023 10:37:40
+出错文件:http://localhost:1295/DataShow/Project.aspx
+IP地址:::1
+
+出错时间:03/29/2023 10:37:40
+
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'SubItemType' 无效。
+列名 'SubItemType' 无效。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\ChengDa\sggl_cd\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.DataShow.ProjectDivision.BindGrid() 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\ProjectDivision.aspx.cs:行号 65
+   在 FineUIPro.Web.DataShow.ProjectDivision.Page_Load(Object sender, EventArgs e) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\ProjectDivision.aspx.cs:行号 28
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/29/2023 10:38:55
+出错文件:http://localhost:1295/DataShow/ProjectDivision.aspx
+IP地址:::1
+
+出错时间:03/29/2023 10:38:55
+
+
+错误信息开始=====>
+错误类型:HttpParseException
+错误信息:内容(“</Columns>”)与“FineUIPro.TemplateField”内的任何属性都不匹配，请确保该内容是格式良好。
+错误堆栈:
+   在 System.Web.UI.TemplateParser.ProcessException(Exception ex)
+   在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
+   在 System.Web.UI.TemplateParser.ParseString(String text, VirtualPath virtualPath, Encoding fileEncoding)
+----错误类型:HttpException
+----错误信息:
+----内容(“</Columns>”)与“FineUIPro.TemplateField”内的任何属性都不匹配，请确保该内容是格式良好。
+----错误堆栈:
+       在 System.Web.UI.ControlBuilder.AppendLiteralString(String s)
+       在 System.Web.UI.TemplateParser.ProcessLiteral()
+出错时间:03/29/2023 10:53:44
+出错文件:http://localhost:1295/DataShow/QualityProblem.aspx
+IP地址:::1
+
+出错时间:03/29/2023 10:53:44
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'HazardSelectedItemId' 无效。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\ChengDa\sggl_cd\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.DataShow.SecurityRiskItem.BindGrid() 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\SecurityRiskItem.aspx.cs:行号 59
+   在 FineUIPro.Web.DataShow.SecurityRiskItem.Page_Load(Object sender, EventArgs e) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\SecurityRiskItem.aspx.cs:行号 28
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/29/2023 10:56:14
+出错文件:http://localhost:1295/DataShow/SecurityRiskItem.aspx?projectId=8c9033ae-071d-4a3a-bfd0-cdfbc3e345f2
+IP地址:::1
+操作人员:JT
+
+出错时间:03/29/2023 10:56:14
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'HazardSelectedItemId' 无效。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\ChengDa\sggl_cd\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.DataShow.SecurityRiskItem.BindGrid() 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\SecurityRiskItem.aspx.cs:行号 59
+   在 FineUIPro.Web.DataShow.SecurityRiskItem.Page_Load(Object sender, EventArgs e) 位置 E:\ChengDa\sggl_cd\SGGL\FineUIPro.Web\DataShow\SecurityRiskItem.aspx.cs:行号 28
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/29/2023 10:56:22
+出错文件:http://localhost:1295/DataShow/SecurityRiskItem.aspx?projectId=6e74501c-5949-49d5-81ae-2ded642407c0
+IP地址:::1
+操作人员:JT
+
+出错时间:03/29/2023 10:56:22
+
diff --git a/SGGL/FineUIPro.Web/FileUpload/QRCodeFile/person/20230329/20230329104610865.jpg b/SGGL/FineUIPro.Web/FileUpload/QRCodeFile/person/20230329/20230329104610865.jpg
new file mode 100644
index 00000000..d21c3075
Binary files /dev/null and b/SGGL/FineUIPro.Web/FileUpload/QRCodeFile/person/20230329/20230329104610865.jpg differ
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 52af7b91..78f974a7 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -537,6 +537,41 @@
     <Content Include="CQMS\ZLCH\ZlgltxEdit.aspx" />
     <Content Include="CQMS\ZLCH\Zlssjh.aspx" />
     <Content Include="CQMS\ZLCH\ZlssjhEdit.aspx" />
+    <Content Include="DataShow\Accident.aspx" />
+    <Content Include="DataShow\Check.aspx" />
+    <Content Include="DataShow\CompanyPerson.aspx" />
+    <Content Include="DataShow\ConstructionEquipment.aspx" />
+    <Content Include="DataShow\EduTrain.aspx" />
+    <Content Include="DataShow\Emergency.aspx" />
+    <Content Include="DataShow\Environmental.aspx" />
+    <Content Include="DataShow\HiddenRectification.aspx" />
+    <Content Include="DataShow\HiddenRectificationItem.aspx" />
+    <Content Include="DataShow\HJGLDefect.aspx" />
+    <Content Include="DataShow\HJGLWelder.aspx" />
+    <Content Include="DataShow\HJGLWelding.aspx" />
+    <Content Include="DataShow\HJGLWeldingItem.aspx" />
+    <Content Include="DataShow\LargeEngineering.aspx" />
+    <Content Include="DataShow\LargeEngineeringItem.aspx" />
+    <Content Include="DataShow\License.aspx" />
+    <Content Include="DataShow\Meeting.aspx" />
+    <Content Include="DataShow\Project.aspx" />
+    <Content Include="DataShow\ProjectDivision.aspx" />
+    <Content Include="DataShow\ProjectPerson.aspx" />
+    <Content Include="DataShow\QualityAcceptance.aspx" />
+    <Content Include="DataShow\QualityControlPoint.aspx" />
+    <Content Include="DataShow\QualityInstruments.aspx" />
+    <Content Include="DataShow\QualityInstrumentsItem.aspx" />
+    <Content Include="DataShow\QualityPerson.aspx" />
+    <Content Include="DataShow\QualityProblem.aspx" />
+    <Content Include="DataShow\QualityProblemItem.aspx" />
+    <Content Include="DataShow\QualityTraining.aspx" />
+    <Content Include="DataShow\QualityTrainingItem1.aspx" />
+    <Content Include="DataShow\QualityTrainingItem2.aspx" />
+    <Content Include="DataShow\SecurityCost.aspx" />
+    <Content Include="DataShow\SecurityRisk.aspx" />
+    <Content Include="DataShow\SecurityRiskItem.aspx" />
+    <Content Include="DataShow\WorkingHours.aspx" />
+    <Content Include="DataShow\WorkingHoursItem.aspx" />
     <Content Include="DigData\HSEDataCollect.aspx" />
     <Content Include="Door\AbsenceDuty.aspx" />
     <Content Include="Door\InOutManHoursItem.aspx" />
@@ -645,6 +680,7 @@
     <Content Include="HJGL\PersonManage\PersonManage.aspx" />
     <Content Include="HJGL\PersonManage\PersonEntranceManageEdit.aspx" />
     <Content Include="HJGL\PersonManage\PersonManageEdit.aspx" />
+    <Content Include="HJGL\PersonManage\PersonManageView.aspx" />
     <Content Include="HJGL\PersonManage\PersonQualifiedProject.aspx" />
     <Content Include="HJGL\PersonManage\PersonQualifiedProjectEdit.aspx" />
     <Content Include="HJGL\PersonManage\WelderScore.aspx" />
@@ -8117,6 +8153,251 @@
     <Compile Include="CQMS\ZLCH\ZlssjhEdit.aspx.designer.cs">
       <DependentUpon>ZlssjhEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="DataShow\Accident.aspx.cs">
+      <DependentUpon>Accident.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\Accident.aspx.designer.cs">
+      <DependentUpon>Accident.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\Check.aspx.cs">
+      <DependentUpon>Check.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\Check.aspx.designer.cs">
+      <DependentUpon>Check.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\CompanyPerson.aspx.cs">
+      <DependentUpon>CompanyPerson.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\CompanyPerson.aspx.designer.cs">
+      <DependentUpon>CompanyPerson.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\ConstructionEquipment.aspx.cs">
+      <DependentUpon>ConstructionEquipment.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\ConstructionEquipment.aspx.designer.cs">
+      <DependentUpon>ConstructionEquipment.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\EduTrain.aspx.cs">
+      <DependentUpon>EduTrain.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\EduTrain.aspx.designer.cs">
+      <DependentUpon>EduTrain.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\Emergency.aspx.cs">
+      <DependentUpon>Emergency.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\Emergency.aspx.designer.cs">
+      <DependentUpon>Emergency.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\Environmental.aspx.cs">
+      <DependentUpon>Environmental.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\Environmental.aspx.designer.cs">
+      <DependentUpon>Environmental.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\HiddenRectification.aspx.cs">
+      <DependentUpon>HiddenRectification.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\HiddenRectification.aspx.designer.cs">
+      <DependentUpon>HiddenRectification.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\HiddenRectificationItem.aspx.cs">
+      <DependentUpon>HiddenRectificationItem.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\HiddenRectificationItem.aspx.designer.cs">
+      <DependentUpon>HiddenRectificationItem.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\HJGLDefect.aspx.cs">
+      <DependentUpon>HJGLDefect.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\HJGLDefect.aspx.designer.cs">
+      <DependentUpon>HJGLDefect.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\HJGLWelder.aspx.cs">
+      <DependentUpon>HJGLWelder.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\HJGLWelder.aspx.designer.cs">
+      <DependentUpon>HJGLWelder.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\HJGLWelding.aspx.cs">
+      <DependentUpon>HJGLWelding.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\HJGLWelding.aspx.designer.cs">
+      <DependentUpon>HJGLWelding.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\HJGLWeldingItem.aspx.cs">
+      <DependentUpon>HJGLWeldingItem.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\HJGLWeldingItem.aspx.designer.cs">
+      <DependentUpon>HJGLWeldingItem.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\LargeEngineering.aspx.cs">
+      <DependentUpon>LargeEngineering.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\LargeEngineering.aspx.designer.cs">
+      <DependentUpon>LargeEngineering.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\LargeEngineeringItem.aspx.cs">
+      <DependentUpon>LargeEngineeringItem.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\LargeEngineeringItem.aspx.designer.cs">
+      <DependentUpon>LargeEngineeringItem.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\License.aspx.cs">
+      <DependentUpon>License.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\License.aspx.designer.cs">
+      <DependentUpon>License.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\Meeting.aspx.cs">
+      <DependentUpon>Meeting.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\Meeting.aspx.designer.cs">
+      <DependentUpon>Meeting.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\Project.aspx.cs">
+      <DependentUpon>Project.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\Project.aspx.designer.cs">
+      <DependentUpon>Project.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\ProjectDivision.aspx.cs">
+      <DependentUpon>ProjectDivision.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\ProjectDivision.aspx.designer.cs">
+      <DependentUpon>ProjectDivision.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\ProjectPerson.aspx.cs">
+      <DependentUpon>ProjectPerson.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\ProjectPerson.aspx.designer.cs">
+      <DependentUpon>ProjectPerson.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\QualityAcceptance.aspx.cs">
+      <DependentUpon>QualityAcceptance.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\QualityAcceptance.aspx.designer.cs">
+      <DependentUpon>QualityAcceptance.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\QualityControlPoint.aspx.cs">
+      <DependentUpon>QualityControlPoint.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\QualityControlPoint.aspx.designer.cs">
+      <DependentUpon>QualityControlPoint.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\QualityInstruments.aspx.cs">
+      <DependentUpon>QualityInstruments.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\QualityInstruments.aspx.designer.cs">
+      <DependentUpon>QualityInstruments.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\QualityInstrumentsItem.aspx.cs">
+      <DependentUpon>QualityInstrumentsItem.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\QualityInstrumentsItem.aspx.designer.cs">
+      <DependentUpon>QualityInstrumentsItem.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\QualityPerson.aspx.cs">
+      <DependentUpon>QualityPerson.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\QualityPerson.aspx.designer.cs">
+      <DependentUpon>QualityPerson.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\QualityProblem.aspx.cs">
+      <DependentUpon>QualityProblem.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\QualityProblem.aspx.designer.cs">
+      <DependentUpon>QualityProblem.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\QualityProblemItem.aspx.cs">
+      <DependentUpon>QualityProblemItem.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\QualityProblemItem.aspx.designer.cs">
+      <DependentUpon>QualityProblemItem.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\QualityTraining.aspx.cs">
+      <DependentUpon>QualityTraining.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\QualityTraining.aspx.designer.cs">
+      <DependentUpon>QualityTraining.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\QualityTrainingItem1.aspx.cs">
+      <DependentUpon>QualityTrainingItem1.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\QualityTrainingItem1.aspx.designer.cs">
+      <DependentUpon>QualityTrainingItem1.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\QualityTrainingItem2.aspx.cs">
+      <DependentUpon>QualityTrainingItem2.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\QualityTrainingItem2.aspx.designer.cs">
+      <DependentUpon>QualityTrainingItem2.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\SecurityCost.aspx.cs">
+      <DependentUpon>SecurityCost.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\SecurityCost.aspx.designer.cs">
+      <DependentUpon>SecurityCost.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\SecurityRisk.aspx.cs">
+      <DependentUpon>SecurityRisk.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\SecurityRisk.aspx.designer.cs">
+      <DependentUpon>SecurityRisk.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\SecurityRiskItem.aspx.cs">
+      <DependentUpon>SecurityRiskItem.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\SecurityRiskItem.aspx.designer.cs">
+      <DependentUpon>SecurityRiskItem.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\WorkingHours.aspx.cs">
+      <DependentUpon>WorkingHours.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\WorkingHours.aspx.designer.cs">
+      <DependentUpon>WorkingHours.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DataShow\WorkingHoursItem.aspx.cs">
+      <DependentUpon>WorkingHoursItem.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DataShow\WorkingHoursItem.aspx.designer.cs">
+      <DependentUpon>WorkingHoursItem.aspx</DependentUpon>
+    </Compile>
     <Compile Include="DigData\HSEDataCollect.aspx.cs">
       <DependentUpon>HSEDataCollect.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8873,6 +9154,13 @@
     <Compile Include="HJGL\PersonManage\PersonManageEdit.aspx.designer.cs">
       <DependentUpon>PersonManageEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HJGL\PersonManage\PersonManageView.aspx.cs">
+      <DependentUpon>PersonManageView.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\PersonManage\PersonManageView.aspx.designer.cs">
+      <DependentUpon>PersonManageView.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HJGL\PersonManage\PersonQualifiedProject.aspx.cs">
       <DependentUpon>PersonQualifiedProject.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -16253,7 +16541,7 @@
           <DevelopmentServerPort>0</DevelopmentServerPort>
           <DevelopmentServerVPath>
           </DevelopmentServerVPath>
-          <IISUrl>http://localhost:8119/</IISUrl>
+          <IISUrl>http://localhost:1295/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageView.aspx b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageView.aspx
new file mode 100644
index 00000000..3b748f0e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageView.aspx
@@ -0,0 +1,156 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PersonManageView.aspx.cs" Inherits="FineUIPro.Web.HJGL.PersonManage.PersonManageView" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>编辑人员管理</title>
+    <style type="text/css">
+        .userphoto .f-field-label {
+            margin-top: 0;
+        }
+
+        .userphoto img {
+            margin-left: 100px;
+            width: 150px;
+        }
+
+        .uploadbutton .f-btn {
+            width: 100px;
+            margin-left: 10px;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="drpUnitId" runat="server" Label="单位" LabelAlign="Right" Readonly="true" LabelWidth="120px"></f:TextBox>
+                        <f:TextBox ID="drpTeamGroupId" runat="server" Label="班组" LabelAlign="Right"  Readonly="true"></f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtWED_Name" runat="server" Label="焊工姓名"
+                            Required="true" MaxLength="20" ShowRedStar="true" LabelAlign="Right" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:TextBox ID="txtWED_Code" runat="server" Label="焊工代号"
+                            Required="true" MaxLength="50" ShowRedStar="true" LabelAlign="Right">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DatePicker ID="txtBirthday" runat="server" Label="出生日期" LabelAlign="Right" LabelWidth="120px"></f:DatePicker>
+                        <f:RadioButtonList ID="rblSex" runat="server" Label="性别" LabelAlign="Right">
+                            <f:RadioItem Value="1" Text="男" Selected="true" />
+                            <f:RadioItem Value="2" Text="女" />
+                        </f:RadioButtonList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtWorkCode" runat="server" Label="上岗证号"
+                            MaxLength="20" LabelAlign="Right" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:DatePicker ID="txtLimitDate" runat="server" Label="有效期限" LabelAlign="Right"></f:DatePicker>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtClass" runat="server" Label="焊工等级"
+                            MaxLength="200" LabelAlign="Right" LabelWidth="120px">
+                        </f:TextBox>
+                        <f:CheckBox ID="cbIfOnGuard" runat="server" Label="是否在岗" LabelAlign="Right"></f:CheckBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtIdentityCard" runat="server" Label="身份证号" LabelAlign="Right" LabelWidth="120px"></f:TextBox>
+                        <f:RadioButtonList ID="rbtype" runat="server" Label="焊工类型" LabelAlign="Right">
+                            <f:RadioItem Value="管道" Text="管道" Selected="true" />
+                            <f:RadioItem Value="设备" Text="设备" />
+                        </f:RadioButtonList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownBox ID="dpWeldMethod" runat="server" Label="焊接方法" LabelWidth="120px" DataControlID="cbWeldMethod" EnableMultiSelect="true">
+                            <PopPanel>
+                                <f:SimpleForm ID="SimpleForm4" BodyPadding="10px" runat="server" AutoScroll="true"
+                                    ShowBorder="true" ShowHeader="false" Hidden="true">
+                                    <Items>
+                                        <f:CheckBoxList ID="cbWeldMethod" ColumnNumber="3" runat="server">
+                                        </f:CheckBoxList>
+                                    </Items>
+                                </f:SimpleForm>
+                            </PopPanel>
+                        </f:DropDownBox>
+                        <f:DropDownList ID="dpJOTSch" runat="server" Label="壁厚" LabelAlign="Right">
+                            <f:ListItem Value="" Text="不限" />
+                            <f:ListItem Value="1" Text="<12" />
+                            <f:ListItem Value="2" Text=">=12" />
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownBox ID="drpSteType" runat="server" Label="母材类别" DataControlID="cbSteType" EnableMultiSelect="true">
+                            <PopPanel>
+                                <f:SimpleForm ID="SimpleForm3" BodyPadding="10px" runat="server" AutoScroll="true"
+                                    ShowBorder="true" ShowHeader="false" Hidden="true">
+                                    <Items>
+                                        <f:CheckBoxList ID="cbSteType" ColumnNumber="3" runat="server">
+                                        </f:CheckBoxList>
+                                    </Items>
+                                </f:SimpleForm>
+                            </PopPanel>
+                        </f:DropDownBox>
+                        <f:TextBox ID="txtRemak" runat="server" Label="备注" MaxLength="50" LabelAlign="Right"></f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtSE_EquipmentID" runat="server" Label="合格项目代号" LabelWidth="120px" LabelAlign="Right" MaxLength="1000">
+                        </f:TextArea>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Panel ID="Panel1" ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
+                            <Items>
+                                <f:Image ID="imgPhoto" Width="100px" CssClass="userphoto" ImageUrl="~/res/images/blank_150.png"
+                                    runat="server" BoxFlex="1">
+                                </f:Image>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:HiddenField ID="hdWelderId" runat="server"></f:HiddenField>
+                        <f:Button ID="btnAttachUrl" Text="焊工资质证书" ToolTip="焊工资质证书" runat="server" OnClick="btnAttachUrl_Click"
+                            ValidateForms="SimpleForm1">
+                        </f:Button>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                        <f:Button ID="btnClose" EnablePostBack="false" Text="关闭" ToolTip="关闭"
+                            runat="server" Icon="SystemClose">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+        <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageView.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageView.aspx.cs
new file mode 100644
index 00000000..ec24e5b5
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageView.aspx.cs
@@ -0,0 +1,112 @@
+using BLL;
+using System;
+using System.Linq;
+
+namespace FineUIPro.Web.HJGL.PersonManage
+{
+    public partial class PersonManageView : PageBase
+    {
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+           
+                this.cbWeldMethod.DataTextField = "WeldingMethodCode";
+                this.cbWeldMethod.DataValueField = "WeldingMethodId";
+                this.cbWeldMethod.DataSource = BLL.WeldMethodItemService.GetWeldMethodList();
+                this.cbWeldMethod.DataBind();
+
+
+                this.cbSteType.DataTextField = "Text";
+                this.cbSteType.DataValueField = "Value";
+                this.cbSteType.DataSource = BLL.DropListService.HJGL_GetSteTypeList();
+                this.cbSteType.DataBind();
+
+                string welderId = Request.Params["welderId"];
+                if (!string.IsNullOrEmpty(welderId))
+                {
+                    this.hdWelderId.Text = welderId;
+                    Model.BS_Welder welder = BLL.WelderService.GetWelderById(this.hdWelderId.Text);
+                    if (welder != null)
+                    {
+                        this.drpUnitId.Text = UnitService.GetUnitNameByUnitId(welder.WED_Unit);
+                        this.drpTeamGroupId.Text = TeamGroupService.GetTeamGroupNameByTeamGroupId(welder.TeamGroupId);
+
+
+                        if (!string.IsNullOrEmpty(welder.AttachUrl))
+                        {
+                            imgPhoto.ImageUrl = "~/" + welder.AttachUrl;
+                        }
+
+                        this.txtWED_Name.Text = welder.WED_Name;
+                        this.txtWED_Code.Text = welder.WED_Code;
+                        this.txtBirthday.Text = welder.WED_Birthday.HasValue ? string.Format("{0:yyyy-MM-dd}", welder.WED_Birthday) : "";
+                        if (!string.IsNullOrEmpty(welder.WED_TYPE))
+                        {
+                            this.rbtype.SelectedValue = welder.WED_TYPE;
+                        }
+                        if (!string.IsNullOrEmpty(welder.WED_Sex))
+                        {
+                            this.rblSex.SelectedValue = welder.WED_Sex.Trim();
+                        }
+                        this.txtWorkCode.Text = welder.WED_WorkCode;
+                        this.txtLimitDate.Text = welder.LimitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", welder.LimitDate) : "";
+                        this.txtClass.Text = welder.WED_Class;
+                        if (welder.WED_IfOnGuard.HasValue)
+                        {
+
+
+                            if (welder.WED_IfOnGuard.Value == true)
+                            {
+                                this.cbIfOnGuard.Checked = true;
+                            }
+                            else
+                            {
+                                this.cbIfOnGuard.Checked = false;
+                            }
+                        }
+                        this.txtIdentityCard.Text = welder.IdentityCard;
+                        if (!string.IsNullOrEmpty(welder.WED_Remark))
+                            this.txtRemak.Text = welder.WED_Remark;
+                        if (!string.IsNullOrEmpty(welder.SE_EquipmentID))
+                            this.txtSE_EquipmentID.Text = welder.SE_EquipmentID;
+                        var items = from x in Funs.DB.BS_WeldMethodItem where x.WED_ID == welder.WED_ID select x.WME_ID;
+                        this.dpWeldMethod.Values = items.ToArray();
+                        if (!string.IsNullOrEmpty(welder.JOT_Sch))
+                            this.dpJOTSch.SelectedValue = welder.JOT_Sch;
+
+                        if (!string.IsNullOrEmpty(welder.Steels))
+                        {
+                            this.drpSteType.Values = welder.Steels.Split(',');
+
+                        }
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #region 附件上传
+        /// <summary>
+        /// 上传附件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttachUrl_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(this.hdWelderId.Text))
+            {
+                this.hdWelderId.Text = SQLHelper.GetNewID(typeof(Model.BS_Welder));
+            }
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/HJGL/PersonManage/&menuId={1}&type=-1", this.hdWelderId.Text, BLL.Const.HJGL_WelderManageMenuId)));
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageView.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageView.aspx.designer.cs
new file mode 100644
index 00000000..98d43eef
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageView.aspx.designer.cs
@@ -0,0 +1,305 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.PersonManage
+{
+
+
+    public partial class PersonManageView
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// drpUnitId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox drpUnitId;
+
+        /// <summary>
+        /// drpTeamGroupId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox drpTeamGroupId;
+
+        /// <summary>
+        /// txtWED_Name 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWED_Name;
+
+        /// <summary>
+        /// txtWED_Code 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWED_Code;
+
+        /// <summary>
+        /// txtBirthday 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtBirthday;
+
+        /// <summary>
+        /// rblSex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblSex;
+
+        /// <summary>
+        /// txtWorkCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWorkCode;
+
+        /// <summary>
+        /// txtLimitDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtLimitDate;
+
+        /// <summary>
+        /// txtClass 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtClass;
+
+        /// <summary>
+        /// cbIfOnGuard 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox cbIfOnGuard;
+
+        /// <summary>
+        /// txtIdentityCard 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtIdentityCard;
+
+        /// <summary>
+        /// rbtype 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rbtype;
+
+        /// <summary>
+        /// dpWeldMethod 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownBox dpWeldMethod;
+
+        /// <summary>
+        /// SimpleForm4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.SimpleForm SimpleForm4;
+
+        /// <summary>
+        /// cbWeldMethod 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBoxList cbWeldMethod;
+
+        /// <summary>
+        /// dpJOTSch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList dpJOTSch;
+
+        /// <summary>
+        /// drpSteType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownBox drpSteType;
+
+        /// <summary>
+        /// SimpleForm3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.SimpleForm SimpleForm3;
+
+        /// <summary>
+        /// cbSteType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBoxList cbSteType;
+
+        /// <summary>
+        /// txtRemak 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRemak;
+
+        /// <summary>
+        /// txtSE_EquipmentID 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtSE_EquipmentID;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// imgPhoto 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Image imgPhoto;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// hdWelderId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdWelderId;
+
+        /// <summary>
+        /// btnAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttachUrl;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
index 8e6192c9..aac868e6 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
@@ -80,7 +80,10 @@ namespace FineUIPro.Web.HSSE.SitePerson
             {
                 btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ////权限按钮方法
-                this.GetButtonPower();
+                if (Request.Params["type"] != "-1")
+                {
+                    this.GetButtonPower();
+                }
                 this.ProjectId = Request.Params["ProjectId"];
                 this.UnitId = Request.Params["UnitId"];
                 this.PersonId = Request.Params["PersonId"];
@@ -92,10 +95,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
                     if (person != null)
                     {
                         this.ProjectId = person.ProjectId;
-                        if (this.ProjectId != this.CurrUser.LoginProjectId)
-                        {
-                            this.InitDropDownList();
-                        }
+                        this.InitDropDownList();
                         if (!string.IsNullOrEmpty(person.Sex))
                         {
                             this.rblSex.SelectedValue = person.Sex;
@@ -258,7 +258,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
         /// </summary>
         private void InitDropDownList()
         {
-            gvWorkArea.DataSource = BLL.UnitWorkService.GetUnitWorkLists(this.CurrUser.LoginProjectId);
+            gvWorkArea.DataSource = BLL.UnitWorkService.GetUnitWorkLists(this.ProjectId);
             gvWorkArea.DataBind();//单位工程 
             WorkPostService.InitWorkPostDropDownList(this.drpPost, true);
             PositionService.InitPositionDropDownList(this.drpPosition, true);
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index de5ee3b5..1b183d88 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -197,6 +197,9 @@ namespace Model
     partial void InsertBase_QuestionType(Base_QuestionType instance);
     partial void UpdateBase_QuestionType(Base_QuestionType instance);
     partial void DeleteBase_QuestionType(Base_QuestionType instance);
+    partial void InsertBase_RiskLevel(Base_RiskLevel instance);
+    partial void UpdateBase_RiskLevel(Base_RiskLevel instance);
+    partial void DeleteBase_RiskLevel(Base_RiskLevel instance);
     partial void InsertBase_RulesRegulationsType(Base_RulesRegulationsType instance);
     partial void UpdateBase_RulesRegulationsType(Base_RulesRegulationsType instance);
     partial void DeleteBase_RulesRegulationsType(Base_RulesRegulationsType instance);
@@ -419,6 +422,9 @@ namespace Model
     partial void InsertCheck_ProjectCheckItemSet(Check_ProjectCheckItemSet instance);
     partial void UpdateCheck_ProjectCheckItemSet(Check_ProjectCheckItemSet instance);
     partial void DeleteCheck_ProjectCheckItemSet(Check_ProjectCheckItemSet instance);
+    partial void InsertCheck_ProjectLeaderCheck(Check_ProjectLeaderCheck instance);
+    partial void UpdateCheck_ProjectLeaderCheck(Check_ProjectLeaderCheck instance);
+    partial void DeleteCheck_ProjectLeaderCheck(Check_ProjectLeaderCheck instance);
     partial void InsertCheck_PunishNotice(Check_PunishNotice instance);
     partial void UpdateCheck_PunishNotice(Check_PunishNotice instance);
     partial void DeleteCheck_PunishNotice(Check_PunishNotice instance);
@@ -830,9 +836,15 @@ namespace Model
     partial void InsertEmergency_DrillRecordList(Emergency_DrillRecordList instance);
     partial void UpdateEmergency_DrillRecordList(Emergency_DrillRecordList instance);
     partial void DeleteEmergency_DrillRecordList(Emergency_DrillRecordList instance);
+    partial void InsertEmergency_DrillRecordList_Unit(Emergency_DrillRecordList_Unit instance);
+    partial void UpdateEmergency_DrillRecordList_Unit(Emergency_DrillRecordList_Unit instance);
+    partial void DeleteEmergency_DrillRecordList_Unit(Emergency_DrillRecordList_Unit instance);
     partial void InsertEmergency_EmergencyList(Emergency_EmergencyList instance);
     partial void UpdateEmergency_EmergencyList(Emergency_EmergencyList instance);
     partial void DeleteEmergency_EmergencyList(Emergency_EmergencyList instance);
+    partial void InsertEmergency_EmergencyList_Unit(Emergency_EmergencyList_Unit instance);
+    partial void UpdateEmergency_EmergencyList_Unit(Emergency_EmergencyList_Unit instance);
+    partial void DeleteEmergency_EmergencyList_Unit(Emergency_EmergencyList_Unit instance);
     partial void InsertEmergency_EmergencyProcess(Emergency_EmergencyProcess instance);
     partial void UpdateEmergency_EmergencyProcess(Emergency_EmergencyProcess instance);
     partial void DeleteEmergency_EmergencyProcess(Emergency_EmergencyProcess instance);
@@ -848,6 +860,18 @@ namespace Model
     partial void InsertEmergency_EmergencyTeamItem(Emergency_EmergencyTeamItem instance);
     partial void UpdateEmergency_EmergencyTeamItem(Emergency_EmergencyTeamItem instance);
     partial void DeleteEmergency_EmergencyTeamItem(Emergency_EmergencyTeamItem instance);
+    partial void InsertEnvironmental_ArchitectureReport(Environmental_ArchitectureReport instance);
+    partial void UpdateEnvironmental_ArchitectureReport(Environmental_ArchitectureReport instance);
+    partial void DeleteEnvironmental_ArchitectureReport(Environmental_ArchitectureReport instance);
+    partial void InsertEnvironmental_ArchitectureReportItem(Environmental_ArchitectureReportItem instance);
+    partial void UpdateEnvironmental_ArchitectureReportItem(Environmental_ArchitectureReportItem instance);
+    partial void DeleteEnvironmental_ArchitectureReportItem(Environmental_ArchitectureReportItem instance);
+    partial void InsertEnvironmental_ChemicalReport(Environmental_ChemicalReport instance);
+    partial void UpdateEnvironmental_ChemicalReport(Environmental_ChemicalReport instance);
+    partial void DeleteEnvironmental_ChemicalReport(Environmental_ChemicalReport instance);
+    partial void InsertEnvironmental_ChemicalReportItem(Environmental_ChemicalReportItem instance);
+    partial void UpdateEnvironmental_ChemicalReportItem(Environmental_ChemicalReportItem instance);
+    partial void DeleteEnvironmental_ChemicalReportItem(Environmental_ChemicalReportItem instance);
     partial void InsertEnvironmental_EIAReport(Environmental_EIAReport instance);
     partial void UpdateEnvironmental_EIAReport(Environmental_EIAReport instance);
     partial void DeleteEnvironmental_EIAReport(Environmental_EIAReport instance);
@@ -1442,9 +1466,18 @@ namespace Model
     partial void InsertMeeting_ClassMeeting(Meeting_ClassMeeting instance);
     partial void UpdateMeeting_ClassMeeting(Meeting_ClassMeeting instance);
     partial void DeleteMeeting_ClassMeeting(Meeting_ClassMeeting instance);
+    partial void InsertMeeting_CompanySafetyMeeting(Meeting_CompanySafetyMeeting instance);
+    partial void UpdateMeeting_CompanySafetyMeeting(Meeting_CompanySafetyMeeting instance);
+    partial void DeleteMeeting_CompanySafetyMeeting(Meeting_CompanySafetyMeeting instance);
+    partial void InsertMeeting_CompanySpecialMeeting(Meeting_CompanySpecialMeeting instance);
+    partial void UpdateMeeting_CompanySpecialMeeting(Meeting_CompanySpecialMeeting instance);
+    partial void DeleteMeeting_CompanySpecialMeeting(Meeting_CompanySpecialMeeting instance);
     partial void InsertMeeting_MonthMeeting(Meeting_MonthMeeting instance);
     partial void UpdateMeeting_MonthMeeting(Meeting_MonthMeeting instance);
     partial void DeleteMeeting_MonthMeeting(Meeting_MonthMeeting instance);
+    partial void InsertMeeting_SafetyLeaderGroupMeeting(Meeting_SafetyLeaderGroupMeeting instance);
+    partial void UpdateMeeting_SafetyLeaderGroupMeeting(Meeting_SafetyLeaderGroupMeeting instance);
+    partial void DeleteMeeting_SafetyLeaderGroupMeeting(Meeting_SafetyLeaderGroupMeeting instance);
     partial void InsertMeeting_SpecialMeeting(Meeting_SpecialMeeting instance);
     partial void UpdateMeeting_SpecialMeeting(Meeting_SpecialMeeting instance);
     partial void DeleteMeeting_SpecialMeeting(Meeting_SpecialMeeting instance);
@@ -2765,6 +2798,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Base_RiskLevel> Base_RiskLevel
+		{
+			get
+			{
+				return this.GetTable<Base_RiskLevel>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Base_RulesRegulationsType> Base_RulesRegulationsType
 		{
 			get
@@ -3357,6 +3398,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Check_ProjectLeaderCheck> Check_ProjectLeaderCheck
+		{
+			get
+			{
+				return this.GetTable<Check_ProjectLeaderCheck>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Check_PunishNotice> Check_PunishNotice
 		{
 			get
@@ -4453,6 +4502,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Emergency_DrillRecordList_Unit> Emergency_DrillRecordList_Unit
+		{
+			get
+			{
+				return this.GetTable<Emergency_DrillRecordList_Unit>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Emergency_EmergencyList> Emergency_EmergencyList
 		{
 			get
@@ -4461,6 +4518,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Emergency_EmergencyList_Unit> Emergency_EmergencyList_Unit
+		{
+			get
+			{
+				return this.GetTable<Emergency_EmergencyList_Unit>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Emergency_EmergencyProcess> Emergency_EmergencyProcess
 		{
 			get
@@ -4501,6 +4566,38 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Environmental_ArchitectureReport> Environmental_ArchitectureReport
+		{
+			get
+			{
+				return this.GetTable<Environmental_ArchitectureReport>();
+			}
+		}
+		
+		public System.Data.Linq.Table<Environmental_ArchitectureReportItem> Environmental_ArchitectureReportItem
+		{
+			get
+			{
+				return this.GetTable<Environmental_ArchitectureReportItem>();
+			}
+		}
+		
+		public System.Data.Linq.Table<Environmental_ChemicalReport> Environmental_ChemicalReport
+		{
+			get
+			{
+				return this.GetTable<Environmental_ChemicalReport>();
+			}
+		}
+		
+		public System.Data.Linq.Table<Environmental_ChemicalReportItem> Environmental_ChemicalReportItem
+		{
+			get
+			{
+				return this.GetTable<Environmental_ChemicalReportItem>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Environmental_EIAReport> Environmental_EIAReport
 		{
 			get
@@ -6109,6 +6206,22 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Meeting_CompanySafetyMeeting> Meeting_CompanySafetyMeeting
+		{
+			get
+			{
+				return this.GetTable<Meeting_CompanySafetyMeeting>();
+			}
+		}
+		
+		public System.Data.Linq.Table<Meeting_CompanySpecialMeeting> Meeting_CompanySpecialMeeting
+		{
+			get
+			{
+				return this.GetTable<Meeting_CompanySpecialMeeting>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Meeting_MonthMeeting> Meeting_MonthMeeting
 		{
 			get
@@ -6117,6 +6230,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Meeting_SafetyLeaderGroupMeeting> Meeting_SafetyLeaderGroupMeeting
+		{
+			get
+			{
+				return this.GetTable<Meeting_SafetyLeaderGroupMeeting>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Meeting_SpecialMeeting> Meeting_SpecialMeeting
 		{
 			get
@@ -10646,6 +10767,8 @@ namespace Model
 		
 		private System.Nullable<bool> _NotConfirmed;
 		
+		private string _AccidentDegree;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Base_Unit> _Base_Unit;
@@ -10716,6 +10839,8 @@ namespace Model
     partial void OnNotConfirmEconomicOtherLossChanged();
     partial void OnNotConfirmedChanging(System.Nullable<bool> value);
     partial void OnNotConfirmedChanged();
+    partial void OnAccidentDegreeChanging(string value);
+    partial void OnAccidentDegreeChanged();
     #endregion
 		
 		public Accident_AccidentReport()
@@ -11323,6 +11448,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AccidentDegree", DbType="Char(1)")]
+		public string AccidentDegree
+		{
+			get
+			{
+				return this._AccidentDegree;
+			}
+			set
+			{
+				if ((this._AccidentDegree != value))
+				{
+					this.OnAccidentDegreeChanging(value);
+					this.SendPropertyChanging();
+					this._AccidentDegree = value;
+					this.SendPropertyChanged("AccidentDegree");
+					this.OnAccidentDegreeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentReport_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -16562,6 +16707,10 @@ namespace Model
 		
 		private string _Remark;
 		
+		private string _CertificateType;
+		
+		private System.Nullable<bool> _IsRegisterHSSE;
+		
 		private EntitySet<QualityAudit_EquipmentPersonQuality> _QualityAudit_EquipmentPersonQuality;
 		
 		private EntitySet<QualityAudit_PersonQuality> _QualityAudit_PersonQuality;
@@ -16578,6 +16727,10 @@ namespace Model
     partial void OnCertificateNameChanged();
     partial void OnRemarkChanging(string value);
     partial void OnRemarkChanged();
+    partial void OnCertificateTypeChanging(string value);
+    partial void OnCertificateTypeChanged();
+    partial void OnIsRegisterHSSEChanging(System.Nullable<bool> value);
+    partial void OnIsRegisterHSSEChanged();
     #endregion
 		
 		public Base_Certificate()
@@ -16667,6 +16820,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateType", DbType="Char(1)")]
+		public string CertificateType
+		{
+			get
+			{
+				return this._CertificateType;
+			}
+			set
+			{
+				if ((this._CertificateType != value))
+				{
+					this.OnCertificateTypeChanging(value);
+					this.SendPropertyChanging();
+					this._CertificateType = value;
+					this.SendPropertyChanged("CertificateType");
+					this.OnCertificateTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsRegisterHSSE", DbType="Bit")]
+		public System.Nullable<bool> IsRegisterHSSE
+		{
+			get
+			{
+				return this._IsRegisterHSSE;
+			}
+			set
+			{
+				if ((this._IsRegisterHSSE != value))
+				{
+					this.OnIsRegisterHSSEChanging(value);
+					this.SendPropertyChanging();
+					this._IsRegisterHSSE = value;
+					this.SendPropertyChanged("IsRegisterHSSE");
+					this.OnIsRegisterHSSEChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_QualityAudit_EquipmentPersonQuality_Base_Certificate", Storage="_QualityAudit_EquipmentPersonQuality", ThisKey="CertificateId", OtherKey="CertificateId", DeleteRule="NO ACTION")]
 		public EntitySet<QualityAudit_EquipmentPersonQuality> QualityAudit_EquipmentPersonQuality
 		{
@@ -24299,6 +24492,8 @@ namespace Model
 		
 		private EntitySet<Check_ProjectCheckItemSet> _Check_ProjectCheckItemSet;
 		
+		private EntitySet<Check_ProjectLeaderCheck> _Check_ProjectLeaderCheck;
+		
 		private EntitySet<Check_PunishNotice> _Check_PunishNotice;
 		
 		private EntitySet<Check_RectifyNotices> _Check_RectifyNotices;
@@ -24886,6 +25081,7 @@ namespace Model
 			this._Check_JointCheck = new EntitySet<Check_JointCheck>(new Action<Check_JointCheck>(this.attach_Check_JointCheck), new Action<Check_JointCheck>(this.detach_Check_JointCheck));
 			this._Check_PauseNotice = new EntitySet<Check_PauseNotice>(new Action<Check_PauseNotice>(this.attach_Check_PauseNotice), new Action<Check_PauseNotice>(this.detach_Check_PauseNotice));
 			this._Check_ProjectCheckItemSet = new EntitySet<Check_ProjectCheckItemSet>(new Action<Check_ProjectCheckItemSet>(this.attach_Check_ProjectCheckItemSet), new Action<Check_ProjectCheckItemSet>(this.detach_Check_ProjectCheckItemSet));
+			this._Check_ProjectLeaderCheck = new EntitySet<Check_ProjectLeaderCheck>(new Action<Check_ProjectLeaderCheck>(this.attach_Check_ProjectLeaderCheck), new Action<Check_ProjectLeaderCheck>(this.detach_Check_ProjectLeaderCheck));
 			this._Check_PunishNotice = new EntitySet<Check_PunishNotice>(new Action<Check_PunishNotice>(this.attach_Check_PunishNotice), new Action<Check_PunishNotice>(this.detach_Check_PunishNotice));
 			this._Check_RectifyNotices = new EntitySet<Check_RectifyNotices>(new Action<Check_RectifyNotices>(this.attach_Check_RectifyNotices), new Action<Check_RectifyNotices>(this.detach_Check_RectifyNotices));
 			this._Check_SpotCheck = new EntitySet<Check_SpotCheck>(new Action<Check_SpotCheck>(this.attach_Check_SpotCheck), new Action<Check_SpotCheck>(this.detach_Check_SpotCheck));
@@ -26387,6 +26583,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_ProjectLeaderCheck_Base_Project", Storage="_Check_ProjectLeaderCheck", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+		public EntitySet<Check_ProjectLeaderCheck> Check_ProjectLeaderCheck
+		{
+			get
+			{
+				return this._Check_ProjectLeaderCheck;
+			}
+			set
+			{
+				this._Check_ProjectLeaderCheck.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_PunishNotice_Base_Project", Storage="_Check_PunishNotice", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
 		public EntitySet<Check_PunishNotice> Check_PunishNotice
 		{
@@ -29930,6 +30139,18 @@ namespace Model
 			entity.Base_Project = null;
 		}
 		
+		private void attach_Check_ProjectLeaderCheck(Check_ProjectLeaderCheck entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Project = this;
+		}
+		
+		private void detach_Check_ProjectLeaderCheck(Check_ProjectLeaderCheck entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Project = null;
+		}
+		
 		private void attach_Check_PunishNotice(Check_PunishNotice entity)
 		{
 			this.SendPropertyChanging();
@@ -33664,6 +33885,236 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_RiskLevel")]
+	public partial class Base_RiskLevel : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _RiskLevelId;
+		
+		private System.Nullable<int> _RiskLevel;
+		
+		private string _RiskLevelName;
+		
+		private System.Nullable<int> _MinValue;
+		
+		private System.Nullable<int> _MaxValue;
+		
+		private string _ControlMeasures;
+		
+		private System.Nullable<int> _Days;
+		
+		private string _Remark;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnRiskLevelIdChanging(string value);
+    partial void OnRiskLevelIdChanged();
+    partial void OnRiskLevelChanging(System.Nullable<int> value);
+    partial void OnRiskLevelChanged();
+    partial void OnRiskLevelNameChanging(string value);
+    partial void OnRiskLevelNameChanged();
+    partial void OnMinValueChanging(System.Nullable<int> value);
+    partial void OnMinValueChanged();
+    partial void OnMaxValueChanging(System.Nullable<int> value);
+    partial void OnMaxValueChanged();
+    partial void OnControlMeasuresChanging(string value);
+    partial void OnControlMeasuresChanged();
+    partial void OnDaysChanging(System.Nullable<int> value);
+    partial void OnDaysChanged();
+    partial void OnRemarkChanging(string value);
+    partial void OnRemarkChanged();
+    #endregion
+		
+		public Base_RiskLevel()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RiskLevelId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string RiskLevelId
+		{
+			get
+			{
+				return this._RiskLevelId;
+			}
+			set
+			{
+				if ((this._RiskLevelId != value))
+				{
+					this.OnRiskLevelIdChanging(value);
+					this.SendPropertyChanging();
+					this._RiskLevelId = value;
+					this.SendPropertyChanged("RiskLevelId");
+					this.OnRiskLevelIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RiskLevel", DbType="Int")]
+		public System.Nullable<int> RiskLevel
+		{
+			get
+			{
+				return this._RiskLevel;
+			}
+			set
+			{
+				if ((this._RiskLevel != value))
+				{
+					this.OnRiskLevelChanging(value);
+					this.SendPropertyChanging();
+					this._RiskLevel = value;
+					this.SendPropertyChanged("RiskLevel");
+					this.OnRiskLevelChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RiskLevelName", DbType="NVarChar(50)")]
+		public string RiskLevelName
+		{
+			get
+			{
+				return this._RiskLevelName;
+			}
+			set
+			{
+				if ((this._RiskLevelName != value))
+				{
+					this.OnRiskLevelNameChanging(value);
+					this.SendPropertyChanging();
+					this._RiskLevelName = value;
+					this.SendPropertyChanged("RiskLevelName");
+					this.OnRiskLevelNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MinValue", DbType="Int")]
+		public System.Nullable<int> MinValue
+		{
+			get
+			{
+				return this._MinValue;
+			}
+			set
+			{
+				if ((this._MinValue != value))
+				{
+					this.OnMinValueChanging(value);
+					this.SendPropertyChanging();
+					this._MinValue = value;
+					this.SendPropertyChanged("MinValue");
+					this.OnMinValueChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaxValue", DbType="Int")]
+		public System.Nullable<int> MaxValue
+		{
+			get
+			{
+				return this._MaxValue;
+			}
+			set
+			{
+				if ((this._MaxValue != value))
+				{
+					this.OnMaxValueChanging(value);
+					this.SendPropertyChanging();
+					this._MaxValue = value;
+					this.SendPropertyChanged("MaxValue");
+					this.OnMaxValueChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ControlMeasures", DbType="NVarChar(500)")]
+		public string ControlMeasures
+		{
+			get
+			{
+				return this._ControlMeasures;
+			}
+			set
+			{
+				if ((this._ControlMeasures != value))
+				{
+					this.OnControlMeasuresChanging(value);
+					this.SendPropertyChanging();
+					this._ControlMeasures = value;
+					this.SendPropertyChanged("ControlMeasures");
+					this.OnControlMeasuresChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Days", DbType="Int")]
+		public System.Nullable<int> Days
+		{
+			get
+			{
+				return this._Days;
+			}
+			set
+			{
+				if ((this._Days != value))
+				{
+					this.OnDaysChanging(value);
+					this.SendPropertyChanging();
+					this._Days = value;
+					this.SendPropertyChanged("Days");
+					this.OnDaysChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(100)")]
+		public string Remark
+		{
+			get
+			{
+				return this._Remark;
+			}
+			set
+			{
+				if ((this._Remark != value))
+				{
+					this.OnRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._Remark = value;
+					this.SendPropertyChanged("Remark");
+					this.OnRemarkChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_RulesRegulationsType")]
 	public partial class Base_RulesRegulationsType : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -35773,6 +36224,8 @@ namespace Model
 		
 		private System.Nullable<bool> _IsRepeat;
 		
+		private string _TrainType;
+		
 		private EntitySet<Base_TrainTypeItem> _Base_TrainTypeItem;
 		
 		private EntitySet<EduTrain_TrainRecord> _EduTrain_TrainRecord;
@@ -35797,6 +36250,8 @@ namespace Model
     partial void OnIsAboutSendCardChanged();
     partial void OnIsRepeatChanging(System.Nullable<bool> value);
     partial void OnIsRepeatChanged();
+    partial void OnTrainTypeChanging(string value);
+    partial void OnTrainTypeChanged();
     #endregion
 		
 		public Base_TrainType()
@@ -35928,6 +36383,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainType", DbType="Char(1)")]
+		public string TrainType
+		{
+			get
+			{
+				return this._TrainType;
+			}
+			set
+			{
+				if ((this._TrainType != value))
+				{
+					this.OnTrainTypeChanging(value);
+					this.SendPropertyChanging();
+					this._TrainType = value;
+					this.SendPropertyChanged("TrainType");
+					this.OnTrainTypeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_TrainTypeItem_Base_TrainType", Storage="_Base_TrainTypeItem", ThisKey="TrainTypeId", OtherKey="TrainTypeId", DeleteRule="NO ACTION")]
 		public EntitySet<Base_TrainTypeItem> Base_TrainTypeItem
 		{
@@ -36503,6 +36978,10 @@ namespace Model
 		
 		private EntitySet<Emergency_EmergencyTeamAndTrain> _Emergency_EmergencyTeamAndTrain;
 		
+		private EntitySet<Environmental_ArchitectureReport> _Environmental_ArchitectureReport;
+		
+		private EntitySet<Environmental_ChemicalReport> _Environmental_ChemicalReport;
+		
 		private EntitySet<HJGL_Hard_Trust> _HJGL_Hard_Trust;
 		
 		private EntitySet<HJGL_Batch_BatchTrust> _HJGL_Batch_BatchTrust;
@@ -36830,6 +37309,8 @@ namespace Model
 			this._Emergency_EmergencyList = new EntitySet<Emergency_EmergencyList>(new Action<Emergency_EmergencyList>(this.attach_Emergency_EmergencyList), new Action<Emergency_EmergencyList>(this.detach_Emergency_EmergencyList));
 			this._Emergency_EmergencySupply = new EntitySet<Emergency_EmergencySupply>(new Action<Emergency_EmergencySupply>(this.attach_Emergency_EmergencySupply), new Action<Emergency_EmergencySupply>(this.detach_Emergency_EmergencySupply));
 			this._Emergency_EmergencyTeamAndTrain = new EntitySet<Emergency_EmergencyTeamAndTrain>(new Action<Emergency_EmergencyTeamAndTrain>(this.attach_Emergency_EmergencyTeamAndTrain), new Action<Emergency_EmergencyTeamAndTrain>(this.detach_Emergency_EmergencyTeamAndTrain));
+			this._Environmental_ArchitectureReport = new EntitySet<Environmental_ArchitectureReport>(new Action<Environmental_ArchitectureReport>(this.attach_Environmental_ArchitectureReport), new Action<Environmental_ArchitectureReport>(this.detach_Environmental_ArchitectureReport));
+			this._Environmental_ChemicalReport = new EntitySet<Environmental_ChemicalReport>(new Action<Environmental_ChemicalReport>(this.attach_Environmental_ChemicalReport), new Action<Environmental_ChemicalReport>(this.detach_Environmental_ChemicalReport));
 			this._HJGL_Hard_Trust = new EntitySet<HJGL_Hard_Trust>(new Action<HJGL_Hard_Trust>(this.attach_HJGL_Hard_Trust), new Action<HJGL_Hard_Trust>(this.detach_HJGL_Hard_Trust));
 			this._HJGL_Batch_BatchTrust = new EntitySet<HJGL_Batch_BatchTrust>(new Action<HJGL_Batch_BatchTrust>(this.attach_HJGL_Batch_BatchTrust), new Action<HJGL_Batch_BatchTrust>(this.detach_HJGL_Batch_BatchTrust));
 			this._HJGL_ElectrodeBake = new EntitySet<HJGL_ElectrodeBake>(new Action<HJGL_ElectrodeBake>(this.attach_HJGL_ElectrodeBake), new Action<HJGL_ElectrodeBake>(this.detach_HJGL_ElectrodeBake));
@@ -38305,6 +38786,32 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Environmental_ArchitectureReport_Base_Unit", Storage="_Environmental_ArchitectureReport", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")]
+		public EntitySet<Environmental_ArchitectureReport> Environmental_ArchitectureReport
+		{
+			get
+			{
+				return this._Environmental_ArchitectureReport;
+			}
+			set
+			{
+				this._Environmental_ArchitectureReport.Assign(value);
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Environmental_ChemicalReport_Base_Unit", Storage="_Environmental_ChemicalReport", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")]
+		public EntitySet<Environmental_ChemicalReport> Environmental_ChemicalReport
+		{
+			get
+			{
+				return this._Environmental_ChemicalReport;
+			}
+			set
+			{
+				this._Environmental_ChemicalReport.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Hard_Trust_Base_Unit", Storage="_HJGL_Hard_Trust", ThisKey="UnitId", OtherKey="CheckUnit", DeleteRule="NO ACTION")]
 		public EntitySet<HJGL_Hard_Trust> HJGL_Hard_Trust
 		{
@@ -40442,6 +40949,30 @@ namespace Model
 			entity.Base_Unit = null;
 		}
 		
+		private void attach_Environmental_ArchitectureReport(Environmental_ArchitectureReport entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Unit = this;
+		}
+		
+		private void detach_Environmental_ArchitectureReport(Environmental_ArchitectureReport entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Unit = null;
+		}
+		
+		private void attach_Environmental_ChemicalReport(Environmental_ChemicalReport entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Unit = this;
+		}
+		
+		private void detach_Environmental_ChemicalReport(Environmental_ChemicalReport entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Unit = null;
+		}
+		
 		private void attach_HJGL_Hard_Trust(HJGL_Hard_Trust entity)
 		{
 			this.SendPropertyChanging();
@@ -42453,6 +42984,8 @@ namespace Model
 		
 		private string _Template;
 		
+		private System.Nullable<bool> _IsCQMS;
+		
 		private EntitySet<Check_ViolationPerson> _Check_ViolationPerson;
 		
 		private EntitySet<HSSESystem_HSSEMainDuty> _HSSESystem_HSSEMainDuty;
@@ -42491,6 +43024,8 @@ namespace Model
     partial void OnCNCodesChanged();
     partial void OnTemplateChanging(string value);
     partial void OnTemplateChanged();
+    partial void OnIsCQMSChanging(System.Nullable<bool> value);
+    partial void OnIsCQMSChanged();
     #endregion
 		
 		public Base_WorkPost()
@@ -42667,6 +43202,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCQMS", DbType="Bit")]
+		public System.Nullable<bool> IsCQMS
+		{
+			get
+			{
+				return this._IsCQMS;
+			}
+			set
+			{
+				if ((this._IsCQMS != value))
+				{
+					this.OnIsCQMSChanging(value);
+					this.SendPropertyChanging();
+					this._IsCQMS = value;
+					this.SendPropertyChanged("IsCQMS");
+					this.OnIsCQMSChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_ViolationPerson_Base_WorkPost", Storage="_Check_ViolationPerson", ThisKey="WorkPostId", OtherKey="WorkPostId", DeleteRule="NO ACTION")]
 		public EntitySet<Check_ViolationPerson> Check_ViolationPerson
 		{
@@ -68511,6 +69066,373 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Check_ProjectLeaderCheck")]
+	public partial class Check_ProjectLeaderCheck : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _ProjectLeaderCheckId;
+		
+		private string _ProjectId;
+		
+		private string _UnitIds;
+		
+		private string _CheckCode;
+		
+		private string _LeaderIds;
+		
+		private System.Nullable<System.DateTime> _CheckDate;
+		
+		private string _QuestionDef;
+		
+		private System.Nullable<bool> _IsHoldMeet;
+		
+		private string _Requirement;
+		
+		private string _LeaderNames;
+		
+		private string _CompileMan;
+		
+		private System.Nullable<System.DateTime> _CompileDate;
+		
+		private EntityRef<Base_Project> _Base_Project;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnProjectLeaderCheckIdChanging(string value);
+    partial void OnProjectLeaderCheckIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnUnitIdsChanging(string value);
+    partial void OnUnitIdsChanged();
+    partial void OnCheckCodeChanging(string value);
+    partial void OnCheckCodeChanged();
+    partial void OnLeaderIdsChanging(string value);
+    partial void OnLeaderIdsChanged();
+    partial void OnCheckDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCheckDateChanged();
+    partial void OnQuestionDefChanging(string value);
+    partial void OnQuestionDefChanged();
+    partial void OnIsHoldMeetChanging(System.Nullable<bool> value);
+    partial void OnIsHoldMeetChanged();
+    partial void OnRequirementChanging(string value);
+    partial void OnRequirementChanged();
+    partial void OnLeaderNamesChanging(string value);
+    partial void OnLeaderNamesChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompileDateChanged();
+    #endregion
+		
+		public Check_ProjectLeaderCheck()
+		{
+			this._Base_Project = default(EntityRef<Base_Project>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectLeaderCheckId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string ProjectLeaderCheckId
+		{
+			get
+			{
+				return this._ProjectLeaderCheckId;
+			}
+			set
+			{
+				if ((this._ProjectLeaderCheckId != value))
+				{
+					this.OnProjectLeaderCheckIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectLeaderCheckId = value;
+					this.SendPropertyChanged("ProjectLeaderCheckId");
+					this.OnProjectLeaderCheckIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					if (this._Base_Project.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitIds", DbType="NVarChar(500)")]
+		public string UnitIds
+		{
+			get
+			{
+				return this._UnitIds;
+			}
+			set
+			{
+				if ((this._UnitIds != value))
+				{
+					this.OnUnitIdsChanging(value);
+					this.SendPropertyChanging();
+					this._UnitIds = value;
+					this.SendPropertyChanged("UnitIds");
+					this.OnUnitIdsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckCode", DbType="NVarChar(50)")]
+		public string CheckCode
+		{
+			get
+			{
+				return this._CheckCode;
+			}
+			set
+			{
+				if ((this._CheckCode != value))
+				{
+					this.OnCheckCodeChanging(value);
+					this.SendPropertyChanging();
+					this._CheckCode = value;
+					this.SendPropertyChanged("CheckCode");
+					this.OnCheckCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LeaderIds", DbType="NVarChar(500)")]
+		public string LeaderIds
+		{
+			get
+			{
+				return this._LeaderIds;
+			}
+			set
+			{
+				if ((this._LeaderIds != value))
+				{
+					this.OnLeaderIdsChanging(value);
+					this.SendPropertyChanging();
+					this._LeaderIds = value;
+					this.SendPropertyChanged("LeaderIds");
+					this.OnLeaderIdsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CheckDate
+		{
+			get
+			{
+				return this._CheckDate;
+			}
+			set
+			{
+				if ((this._CheckDate != value))
+				{
+					this.OnCheckDateChanging(value);
+					this.SendPropertyChanging();
+					this._CheckDate = value;
+					this.SendPropertyChanged("CheckDate");
+					this.OnCheckDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionDef", DbType="NVarChar(2000)")]
+		public string QuestionDef
+		{
+			get
+			{
+				return this._QuestionDef;
+			}
+			set
+			{
+				if ((this._QuestionDef != value))
+				{
+					this.OnQuestionDefChanging(value);
+					this.SendPropertyChanging();
+					this._QuestionDef = value;
+					this.SendPropertyChanged("QuestionDef");
+					this.OnQuestionDefChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsHoldMeet", DbType="Bit")]
+		public System.Nullable<bool> IsHoldMeet
+		{
+			get
+			{
+				return this._IsHoldMeet;
+			}
+			set
+			{
+				if ((this._IsHoldMeet != value))
+				{
+					this.OnIsHoldMeetChanging(value);
+					this.SendPropertyChanging();
+					this._IsHoldMeet = value;
+					this.SendPropertyChanged("IsHoldMeet");
+					this.OnIsHoldMeetChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Requirement", DbType="NVarChar(2000)")]
+		public string Requirement
+		{
+			get
+			{
+				return this._Requirement;
+			}
+			set
+			{
+				if ((this._Requirement != value))
+				{
+					this.OnRequirementChanging(value);
+					this.SendPropertyChanging();
+					this._Requirement = value;
+					this.SendPropertyChanged("Requirement");
+					this.OnRequirementChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LeaderNames", DbType="NVarChar(500)")]
+		public string LeaderNames
+		{
+			get
+			{
+				return this._LeaderNames;
+			}
+			set
+			{
+				if ((this._LeaderNames != value))
+				{
+					this.OnLeaderNamesChanging(value);
+					this.SendPropertyChanging();
+					this._LeaderNames = value;
+					this.SendPropertyChanged("LeaderNames");
+					this.OnLeaderNamesChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
+		public string CompileMan
+		{
+			get
+			{
+				return this._CompileMan;
+			}
+			set
+			{
+				if ((this._CompileMan != value))
+				{
+					this.OnCompileManChanging(value);
+					this.SendPropertyChanging();
+					this._CompileMan = value;
+					this.SendPropertyChanged("CompileMan");
+					this.OnCompileManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompileDate
+		{
+			get
+			{
+				return this._CompileDate;
+			}
+			set
+			{
+				if ((this._CompileDate != value))
+				{
+					this.OnCompileDateChanging(value);
+					this.SendPropertyChanging();
+					this._CompileDate = value;
+					this.SendPropertyChanged("CompileDate");
+					this.OnCompileDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_ProjectLeaderCheck_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
+		public Base_Project Base_Project
+		{
+			get
+			{
+				return this._Base_Project.Entity;
+			}
+			set
+			{
+				Base_Project previousValue = this._Base_Project.Entity;
+				if (((previousValue != value) 
+							|| (this._Base_Project.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Base_Project.Entity = null;
+						previousValue.Check_ProjectLeaderCheck.Remove(this);
+					}
+					this._Base_Project.Entity = value;
+					if ((value != null))
+					{
+						value.Check_ProjectLeaderCheck.Add(this);
+						this._ProjectId = value.ProjectId;
+					}
+					else
+					{
+						this._ProjectId = default(string);
+					}
+					this.SendPropertyChanged("Base_Project");
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Check_PunishNotice")]
 	public partial class Check_PunishNotice : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -82539,6 +83461,8 @@ namespace Model
 		
 		private string _Status;
 		
+		private System.Nullable<int> _JoinPersonNum;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Sys_User> _Sys_User;
@@ -82573,6 +83497,8 @@ namespace Model
     partial void OnAuditManChanged();
     partial void OnStatusChanging(string value);
     partial void OnStatusChanged();
+    partial void OnJoinPersonNumChanging(System.Nullable<int> value);
+    partial void OnJoinPersonNumChanged();
     #endregion
 		
 		public Comprehensive_DesignDetails()
@@ -82850,6 +83776,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JoinPersonNum", DbType="Int")]
+		public System.Nullable<int> JoinPersonNum
+		{
+			get
+			{
+				return this._JoinPersonNum;
+			}
+			set
+			{
+				if ((this._JoinPersonNum != value))
+				{
+					this.OnJoinPersonNumChanging(value);
+					this.SendPropertyChanging();
+					this._JoinPersonNum = value;
+					this.SendPropertyChanged("JoinPersonNum");
+					this.OnJoinPersonNumChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_DesignDetails_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -85777,6 +86723,8 @@ namespace Model
 		
 		private string _Status;
 		
+		private System.Nullable<bool> _IsCheckOK;
+		
 		private EntityRef<Base_CNProfessional> _Base_CNProfessional;
 		
 		private EntityRef<Base_Project> _Base_Project;
@@ -85827,6 +86775,8 @@ namespace Model
     partial void OnAuditManChanged();
     partial void OnStatusChanging(string value);
     partial void OnStatusChanged();
+    partial void OnIsCheckOKChanging(System.Nullable<bool> value);
+    partial void OnIsCheckOKChanged();
     #endregion
 		
 		public Comprehensive_InspectionMachine()
@@ -86249,6 +87199,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCheckOK", DbType="Bit")]
+		public System.Nullable<bool> IsCheckOK
+		{
+			get
+			{
+				return this._IsCheckOK;
+			}
+			set
+			{
+				if ((this._IsCheckOK != value))
+				{
+					this.OnIsCheckOKChanging(value);
+					this.SendPropertyChanging();
+					this._IsCheckOK = value;
+					this.SendPropertyChanged("IsCheckOK");
+					this.OnIsCheckOKChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_InspectionMachine_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)]
 		public Base_CNProfessional Base_CNProfessional
 		{
@@ -86672,6 +87642,8 @@ namespace Model
 		
 		private string _Status;
 		
+		private System.Nullable<bool> _IsTrain;
+		
 		private EntityRef<Base_Post> _Base_Post;
 		
 		private EntityRef<Base_Project> _Base_Project;
@@ -86730,6 +87702,8 @@ namespace Model
     partial void OnAuditManChanged();
     partial void OnStatusChanging(string value);
     partial void OnStatusChanged();
+    partial void OnIsTrainChanging(System.Nullable<bool> value);
+    partial void OnIsTrainChanged();
     #endregion
 		
 		public Comprehensive_InspectionPerson()
@@ -87160,6 +88134,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsTrain", DbType="Bit")]
+		public System.Nullable<bool> IsTrain
+		{
+			get
+			{
+				return this._IsTrain;
+			}
+			set
+			{
+				if ((this._IsTrain != value))
+				{
+					this.OnIsTrainChanging(value);
+					this.SendPropertyChanging();
+					this._IsTrain = value;
+					this.SendPropertyChanged("IsTrain");
+					this.OnIsTrainChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_InspectionPerson_Base_Post", Storage="_Base_Post", ThisKey="PostId", OtherKey="PostId", IsForeignKey=true)]
 		public Base_Post Base_Post
 		{
@@ -133195,6 +134189,452 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Emergency_DrillRecordList_Unit")]
+	public partial class Emergency_DrillRecordList_Unit : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _DrillRecordListId;
+		
+		private string _ProjectId;
+		
+		private string _DrillRecordCode;
+		
+		private string _DrillRecordName;
+		
+		private string _UnitIds;
+		
+		private string _UnitNames;
+		
+		private string _UserIds;
+		
+		private string _UserNames;
+		
+		private System.Nullable<System.DateTime> _DrillRecordDate;
+		
+		private string _DrillRecordContents;
+		
+		private string _CompileMan;
+		
+		private System.Nullable<System.DateTime> _CompileDate;
+		
+		private string _States;
+		
+		private string _AttachUrl;
+		
+		private string _DrillRecordType;
+		
+		private System.Nullable<int> _JointPersonNum;
+		
+		private System.Nullable<decimal> _DrillCost;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnDrillRecordListIdChanging(string value);
+    partial void OnDrillRecordListIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnDrillRecordCodeChanging(string value);
+    partial void OnDrillRecordCodeChanged();
+    partial void OnDrillRecordNameChanging(string value);
+    partial void OnDrillRecordNameChanged();
+    partial void OnUnitIdsChanging(string value);
+    partial void OnUnitIdsChanged();
+    partial void OnUnitNamesChanging(string value);
+    partial void OnUnitNamesChanged();
+    partial void OnUserIdsChanging(string value);
+    partial void OnUserIdsChanged();
+    partial void OnUserNamesChanging(string value);
+    partial void OnUserNamesChanged();
+    partial void OnDrillRecordDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnDrillRecordDateChanged();
+    partial void OnDrillRecordContentsChanging(string value);
+    partial void OnDrillRecordContentsChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompileDateChanged();
+    partial void OnStatesChanging(string value);
+    partial void OnStatesChanged();
+    partial void OnAttachUrlChanging(string value);
+    partial void OnAttachUrlChanged();
+    partial void OnDrillRecordTypeChanging(string value);
+    partial void OnDrillRecordTypeChanged();
+    partial void OnJointPersonNumChanging(System.Nullable<int> value);
+    partial void OnJointPersonNumChanged();
+    partial void OnDrillCostChanging(System.Nullable<decimal> value);
+    partial void OnDrillCostChanged();
+    #endregion
+		
+		public Emergency_DrillRecordList_Unit()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrillRecordListId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string DrillRecordListId
+		{
+			get
+			{
+				return this._DrillRecordListId;
+			}
+			set
+			{
+				if ((this._DrillRecordListId != value))
+				{
+					this.OnDrillRecordListIdChanging(value);
+					this.SendPropertyChanging();
+					this._DrillRecordListId = value;
+					this.SendPropertyChanged("DrillRecordListId");
+					this.OnDrillRecordListIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrillRecordCode", DbType="NVarChar(50)")]
+		public string DrillRecordCode
+		{
+			get
+			{
+				return this._DrillRecordCode;
+			}
+			set
+			{
+				if ((this._DrillRecordCode != value))
+				{
+					this.OnDrillRecordCodeChanging(value);
+					this.SendPropertyChanging();
+					this._DrillRecordCode = value;
+					this.SendPropertyChanged("DrillRecordCode");
+					this.OnDrillRecordCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrillRecordName", DbType="NVarChar(500)")]
+		public string DrillRecordName
+		{
+			get
+			{
+				return this._DrillRecordName;
+			}
+			set
+			{
+				if ((this._DrillRecordName != value))
+				{
+					this.OnDrillRecordNameChanging(value);
+					this.SendPropertyChanging();
+					this._DrillRecordName = value;
+					this.SendPropertyChanged("DrillRecordName");
+					this.OnDrillRecordNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitIds", DbType="NVarChar(4000)")]
+		public string UnitIds
+		{
+			get
+			{
+				return this._UnitIds;
+			}
+			set
+			{
+				if ((this._UnitIds != value))
+				{
+					this.OnUnitIdsChanging(value);
+					this.SendPropertyChanging();
+					this._UnitIds = value;
+					this.SendPropertyChanged("UnitIds");
+					this.OnUnitIdsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitNames", DbType="NVarChar(4000)")]
+		public string UnitNames
+		{
+			get
+			{
+				return this._UnitNames;
+			}
+			set
+			{
+				if ((this._UnitNames != value))
+				{
+					this.OnUnitNamesChanging(value);
+					this.SendPropertyChanging();
+					this._UnitNames = value;
+					this.SendPropertyChanged("UnitNames");
+					this.OnUnitNamesChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserIds", DbType="NVarChar(4000)")]
+		public string UserIds
+		{
+			get
+			{
+				return this._UserIds;
+			}
+			set
+			{
+				if ((this._UserIds != value))
+				{
+					this.OnUserIdsChanging(value);
+					this.SendPropertyChanging();
+					this._UserIds = value;
+					this.SendPropertyChanged("UserIds");
+					this.OnUserIdsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserNames", DbType="NVarChar(4000)")]
+		public string UserNames
+		{
+			get
+			{
+				return this._UserNames;
+			}
+			set
+			{
+				if ((this._UserNames != value))
+				{
+					this.OnUserNamesChanging(value);
+					this.SendPropertyChanging();
+					this._UserNames = value;
+					this.SendPropertyChanged("UserNames");
+					this.OnUserNamesChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrillRecordDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> DrillRecordDate
+		{
+			get
+			{
+				return this._DrillRecordDate;
+			}
+			set
+			{
+				if ((this._DrillRecordDate != value))
+				{
+					this.OnDrillRecordDateChanging(value);
+					this.SendPropertyChanging();
+					this._DrillRecordDate = value;
+					this.SendPropertyChanged("DrillRecordDate");
+					this.OnDrillRecordDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrillRecordContents", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string DrillRecordContents
+		{
+			get
+			{
+				return this._DrillRecordContents;
+			}
+			set
+			{
+				if ((this._DrillRecordContents != value))
+				{
+					this.OnDrillRecordContentsChanging(value);
+					this.SendPropertyChanging();
+					this._DrillRecordContents = value;
+					this.SendPropertyChanged("DrillRecordContents");
+					this.OnDrillRecordContentsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
+		public string CompileMan
+		{
+			get
+			{
+				return this._CompileMan;
+			}
+			set
+			{
+				if ((this._CompileMan != value))
+				{
+					this.OnCompileManChanging(value);
+					this.SendPropertyChanging();
+					this._CompileMan = value;
+					this.SendPropertyChanged("CompileMan");
+					this.OnCompileManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompileDate
+		{
+			get
+			{
+				return this._CompileDate;
+			}
+			set
+			{
+				if ((this._CompileDate != value))
+				{
+					this.OnCompileDateChanging(value);
+					this.SendPropertyChanging();
+					this._CompileDate = value;
+					this.SendPropertyChanged("CompileDate");
+					this.OnCompileDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_States", DbType="Char(1)")]
+		public string States
+		{
+			get
+			{
+				return this._States;
+			}
+			set
+			{
+				if ((this._States != value))
+				{
+					this.OnStatesChanging(value);
+					this.SendPropertyChanging();
+					this._States = value;
+					this.SendPropertyChanged("States");
+					this.OnStatesChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttachUrl", DbType="NVarChar(2000)")]
+		public string AttachUrl
+		{
+			get
+			{
+				return this._AttachUrl;
+			}
+			set
+			{
+				if ((this._AttachUrl != value))
+				{
+					this.OnAttachUrlChanging(value);
+					this.SendPropertyChanging();
+					this._AttachUrl = value;
+					this.SendPropertyChanged("AttachUrl");
+					this.OnAttachUrlChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrillRecordType", DbType="Char(1)")]
+		public string DrillRecordType
+		{
+			get
+			{
+				return this._DrillRecordType;
+			}
+			set
+			{
+				if ((this._DrillRecordType != value))
+				{
+					this.OnDrillRecordTypeChanging(value);
+					this.SendPropertyChanging();
+					this._DrillRecordType = value;
+					this.SendPropertyChanged("DrillRecordType");
+					this.OnDrillRecordTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JointPersonNum", DbType="Int")]
+		public System.Nullable<int> JointPersonNum
+		{
+			get
+			{
+				return this._JointPersonNum;
+			}
+			set
+			{
+				if ((this._JointPersonNum != value))
+				{
+					this.OnJointPersonNumChanging(value);
+					this.SendPropertyChanging();
+					this._JointPersonNum = value;
+					this.SendPropertyChanged("JointPersonNum");
+					this.OnJointPersonNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrillCost", DbType="Decimal(9,2)")]
+		public System.Nullable<decimal> DrillCost
+		{
+			get
+			{
+				return this._DrillCost;
+			}
+			set
+			{
+				if ((this._DrillCost != value))
+				{
+					this.OnDrillCostChanging(value);
+					this.SendPropertyChanging();
+					this._DrillCost = value;
+					this.SendPropertyChanged("DrillCost");
+					this.OnDrillCostChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Emergency_EmergencyList")]
 	public partial class Emergency_EmergencyList : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -133815,6 +135255,380 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Emergency_EmergencyList_Unit")]
+	public partial class Emergency_EmergencyList_Unit : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _EmergencyListId;
+		
+		private string _ProjectId;
+		
+		private string _EmergencyCode;
+		
+		private string _EmergencyName;
+		
+		private string _UnitId;
+		
+		private string _EmergencyTypeId;
+		
+		private string _VersionCode;
+		
+		private string _EmergencyContents;
+		
+		private string _CompileMan;
+		
+		private System.Nullable<System.DateTime> _CompileDate;
+		
+		private string _States;
+		
+		private string _AttachUrl;
+		
+		private string _AuditMan;
+		
+		private string _ApproveMan;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnEmergencyListIdChanging(string value);
+    partial void OnEmergencyListIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnEmergencyCodeChanging(string value);
+    partial void OnEmergencyCodeChanged();
+    partial void OnEmergencyNameChanging(string value);
+    partial void OnEmergencyNameChanged();
+    partial void OnUnitIdChanging(string value);
+    partial void OnUnitIdChanged();
+    partial void OnEmergencyTypeIdChanging(string value);
+    partial void OnEmergencyTypeIdChanged();
+    partial void OnVersionCodeChanging(string value);
+    partial void OnVersionCodeChanged();
+    partial void OnEmergencyContentsChanging(string value);
+    partial void OnEmergencyContentsChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompileDateChanged();
+    partial void OnStatesChanging(string value);
+    partial void OnStatesChanged();
+    partial void OnAttachUrlChanging(string value);
+    partial void OnAttachUrlChanged();
+    partial void OnAuditManChanging(string value);
+    partial void OnAuditManChanged();
+    partial void OnApproveManChanging(string value);
+    partial void OnApproveManChanged();
+    #endregion
+		
+		public Emergency_EmergencyList_Unit()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EmergencyListId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string EmergencyListId
+		{
+			get
+			{
+				return this._EmergencyListId;
+			}
+			set
+			{
+				if ((this._EmergencyListId != value))
+				{
+					this.OnEmergencyListIdChanging(value);
+					this.SendPropertyChanging();
+					this._EmergencyListId = value;
+					this.SendPropertyChanged("EmergencyListId");
+					this.OnEmergencyListIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EmergencyCode", DbType="NVarChar(50)")]
+		public string EmergencyCode
+		{
+			get
+			{
+				return this._EmergencyCode;
+			}
+			set
+			{
+				if ((this._EmergencyCode != value))
+				{
+					this.OnEmergencyCodeChanging(value);
+					this.SendPropertyChanging();
+					this._EmergencyCode = value;
+					this.SendPropertyChanged("EmergencyCode");
+					this.OnEmergencyCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EmergencyName", DbType="NVarChar(500)")]
+		public string EmergencyName
+		{
+			get
+			{
+				return this._EmergencyName;
+			}
+			set
+			{
+				if ((this._EmergencyName != value))
+				{
+					this.OnEmergencyNameChanging(value);
+					this.SendPropertyChanging();
+					this._EmergencyName = value;
+					this.SendPropertyChanged("EmergencyName");
+					this.OnEmergencyNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
+		public string UnitId
+		{
+			get
+			{
+				return this._UnitId;
+			}
+			set
+			{
+				if ((this._UnitId != value))
+				{
+					this.OnUnitIdChanging(value);
+					this.SendPropertyChanging();
+					this._UnitId = value;
+					this.SendPropertyChanged("UnitId");
+					this.OnUnitIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EmergencyTypeId", DbType="NVarChar(50)")]
+		public string EmergencyTypeId
+		{
+			get
+			{
+				return this._EmergencyTypeId;
+			}
+			set
+			{
+				if ((this._EmergencyTypeId != value))
+				{
+					this.OnEmergencyTypeIdChanging(value);
+					this.SendPropertyChanging();
+					this._EmergencyTypeId = value;
+					this.SendPropertyChanged("EmergencyTypeId");
+					this.OnEmergencyTypeIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_VersionCode", DbType="NVarChar(50)")]
+		public string VersionCode
+		{
+			get
+			{
+				return this._VersionCode;
+			}
+			set
+			{
+				if ((this._VersionCode != value))
+				{
+					this.OnVersionCodeChanging(value);
+					this.SendPropertyChanging();
+					this._VersionCode = value;
+					this.SendPropertyChanged("VersionCode");
+					this.OnVersionCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EmergencyContents", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string EmergencyContents
+		{
+			get
+			{
+				return this._EmergencyContents;
+			}
+			set
+			{
+				if ((this._EmergencyContents != value))
+				{
+					this.OnEmergencyContentsChanging(value);
+					this.SendPropertyChanging();
+					this._EmergencyContents = value;
+					this.SendPropertyChanged("EmergencyContents");
+					this.OnEmergencyContentsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
+		public string CompileMan
+		{
+			get
+			{
+				return this._CompileMan;
+			}
+			set
+			{
+				if ((this._CompileMan != value))
+				{
+					this.OnCompileManChanging(value);
+					this.SendPropertyChanging();
+					this._CompileMan = value;
+					this.SendPropertyChanged("CompileMan");
+					this.OnCompileManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompileDate
+		{
+			get
+			{
+				return this._CompileDate;
+			}
+			set
+			{
+				if ((this._CompileDate != value))
+				{
+					this.OnCompileDateChanging(value);
+					this.SendPropertyChanging();
+					this._CompileDate = value;
+					this.SendPropertyChanged("CompileDate");
+					this.OnCompileDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_States", DbType="Char(1)")]
+		public string States
+		{
+			get
+			{
+				return this._States;
+			}
+			set
+			{
+				if ((this._States != value))
+				{
+					this.OnStatesChanging(value);
+					this.SendPropertyChanging();
+					this._States = value;
+					this.SendPropertyChanged("States");
+					this.OnStatesChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttachUrl", DbType="NVarChar(2000)")]
+		public string AttachUrl
+		{
+			get
+			{
+				return this._AttachUrl;
+			}
+			set
+			{
+				if ((this._AttachUrl != value))
+				{
+					this.OnAttachUrlChanging(value);
+					this.SendPropertyChanging();
+					this._AttachUrl = value;
+					this.SendPropertyChanged("AttachUrl");
+					this.OnAttachUrlChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditMan", DbType="NVarChar(50)")]
+		public string AuditMan
+		{
+			get
+			{
+				return this._AuditMan;
+			}
+			set
+			{
+				if ((this._AuditMan != value))
+				{
+					this.OnAuditManChanging(value);
+					this.SendPropertyChanging();
+					this._AuditMan = value;
+					this.SendPropertyChanged("AuditMan");
+					this.OnAuditManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(50)")]
+		public string ApproveMan
+		{
+			get
+			{
+				return this._ApproveMan;
+			}
+			set
+			{
+				if ((this._ApproveMan != value))
+				{
+					this.OnApproveManChanging(value);
+					this.SendPropertyChanging();
+					this._ApproveMan = value;
+					this.SendPropertyChanged("ApproveMan");
+					this.OnApproveManChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Emergency_EmergencyProcess")]
 	public partial class Emergency_EmergencyProcess : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -135335,6 +137149,1050 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Environmental_ArchitectureReport")]
+	public partial class Environmental_ArchitectureReport : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _ArchitectureReportId;
+		
+		private string _UnitId;
+		
+		private System.Nullable<int> _Year;
+		
+		private System.Nullable<int> _Quarters;
+		
+		private string _FillingMan;
+		
+		private System.Nullable<System.DateTime> _FillingDate;
+		
+		private string _DutyPerson;
+		
+		private string _UpState;
+		
+		private EntityRef<Base_Unit> _Base_Unit;
+		
+		private EntitySet<Environmental_ArchitectureReportItem> _Environmental_ArchitectureReportItem;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnArchitectureReportIdChanging(string value);
+    partial void OnArchitectureReportIdChanged();
+    partial void OnUnitIdChanging(string value);
+    partial void OnUnitIdChanged();
+    partial void OnYearChanging(System.Nullable<int> value);
+    partial void OnYearChanged();
+    partial void OnQuartersChanging(System.Nullable<int> value);
+    partial void OnQuartersChanged();
+    partial void OnFillingManChanging(string value);
+    partial void OnFillingManChanged();
+    partial void OnFillingDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnFillingDateChanged();
+    partial void OnDutyPersonChanging(string value);
+    partial void OnDutyPersonChanged();
+    partial void OnUpStateChanging(string value);
+    partial void OnUpStateChanged();
+    #endregion
+		
+		public Environmental_ArchitectureReport()
+		{
+			this._Base_Unit = default(EntityRef<Base_Unit>);
+			this._Environmental_ArchitectureReportItem = new EntitySet<Environmental_ArchitectureReportItem>(new Action<Environmental_ArchitectureReportItem>(this.attach_Environmental_ArchitectureReportItem), new Action<Environmental_ArchitectureReportItem>(this.detach_Environmental_ArchitectureReportItem));
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ArchitectureReportId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string ArchitectureReportId
+		{
+			get
+			{
+				return this._ArchitectureReportId;
+			}
+			set
+			{
+				if ((this._ArchitectureReportId != value))
+				{
+					this.OnArchitectureReportIdChanging(value);
+					this.SendPropertyChanging();
+					this._ArchitectureReportId = value;
+					this.SendPropertyChanged("ArchitectureReportId");
+					this.OnArchitectureReportIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
+		public string UnitId
+		{
+			get
+			{
+				return this._UnitId;
+			}
+			set
+			{
+				if ((this._UnitId != value))
+				{
+					if (this._Base_Unit.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnUnitIdChanging(value);
+					this.SendPropertyChanging();
+					this._UnitId = value;
+					this.SendPropertyChanged("UnitId");
+					this.OnUnitIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Year", DbType="Int")]
+		public System.Nullable<int> Year
+		{
+			get
+			{
+				return this._Year;
+			}
+			set
+			{
+				if ((this._Year != value))
+				{
+					this.OnYearChanging(value);
+					this.SendPropertyChanging();
+					this._Year = value;
+					this.SendPropertyChanged("Year");
+					this.OnYearChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quarters", DbType="Int")]
+		public System.Nullable<int> Quarters
+		{
+			get
+			{
+				return this._Quarters;
+			}
+			set
+			{
+				if ((this._Quarters != value))
+				{
+					this.OnQuartersChanging(value);
+					this.SendPropertyChanging();
+					this._Quarters = value;
+					this.SendPropertyChanged("Quarters");
+					this.OnQuartersChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FillingMan", DbType="NVarChar(50)")]
+		public string FillingMan
+		{
+			get
+			{
+				return this._FillingMan;
+			}
+			set
+			{
+				if ((this._FillingMan != value))
+				{
+					this.OnFillingManChanging(value);
+					this.SendPropertyChanging();
+					this._FillingMan = value;
+					this.SendPropertyChanged("FillingMan");
+					this.OnFillingManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FillingDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> FillingDate
+		{
+			get
+			{
+				return this._FillingDate;
+			}
+			set
+			{
+				if ((this._FillingDate != value))
+				{
+					this.OnFillingDateChanging(value);
+					this.SendPropertyChanging();
+					this._FillingDate = value;
+					this.SendPropertyChanged("FillingDate");
+					this.OnFillingDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DutyPerson", DbType="NVarChar(50)")]
+		public string DutyPerson
+		{
+			get
+			{
+				return this._DutyPerson;
+			}
+			set
+			{
+				if ((this._DutyPerson != value))
+				{
+					this.OnDutyPersonChanging(value);
+					this.SendPropertyChanging();
+					this._DutyPerson = value;
+					this.SendPropertyChanged("DutyPerson");
+					this.OnDutyPersonChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UpState", DbType="Char(1)")]
+		public string UpState
+		{
+			get
+			{
+				return this._UpState;
+			}
+			set
+			{
+				if ((this._UpState != value))
+				{
+					this.OnUpStateChanging(value);
+					this.SendPropertyChanging();
+					this._UpState = value;
+					this.SendPropertyChanged("UpState");
+					this.OnUpStateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Environmental_ArchitectureReport_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
+		public Base_Unit Base_Unit
+		{
+			get
+			{
+				return this._Base_Unit.Entity;
+			}
+			set
+			{
+				Base_Unit previousValue = this._Base_Unit.Entity;
+				if (((previousValue != value) 
+							|| (this._Base_Unit.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Base_Unit.Entity = null;
+						previousValue.Environmental_ArchitectureReport.Remove(this);
+					}
+					this._Base_Unit.Entity = value;
+					if ((value != null))
+					{
+						value.Environmental_ArchitectureReport.Add(this);
+						this._UnitId = value.UnitId;
+					}
+					else
+					{
+						this._UnitId = default(string);
+					}
+					this.SendPropertyChanged("Base_Unit");
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Environmental_ArchitectureReportItem_Environmental_ArchitectureReport", Storage="_Environmental_ArchitectureReportItem", ThisKey="ArchitectureReportId", OtherKey="ArchitectureReportId", DeleteRule="NO ACTION")]
+		public EntitySet<Environmental_ArchitectureReportItem> Environmental_ArchitectureReportItem
+		{
+			get
+			{
+				return this._Environmental_ArchitectureReportItem;
+			}
+			set
+			{
+				this._Environmental_ArchitectureReportItem.Assign(value);
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+		
+		private void attach_Environmental_ArchitectureReportItem(Environmental_ArchitectureReportItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.Environmental_ArchitectureReport = this;
+		}
+		
+		private void detach_Environmental_ArchitectureReportItem(Environmental_ArchitectureReportItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.Environmental_ArchitectureReport = null;
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Environmental_ArchitectureReportItem")]
+	public partial class Environmental_ArchitectureReportItem : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _ArchitectureReportItemId;
+		
+		private string _ArchitectureReportId;
+		
+		private string _SortIndex;
+		
+		private string _LastYearValue;
+		
+		private string _ThisYearValue;
+		
+		private string _Rate;
+		
+		private EntityRef<Environmental_ArchitectureReport> _Environmental_ArchitectureReport;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnArchitectureReportItemIdChanging(string value);
+    partial void OnArchitectureReportItemIdChanged();
+    partial void OnArchitectureReportIdChanging(string value);
+    partial void OnArchitectureReportIdChanged();
+    partial void OnSortIndexChanging(string value);
+    partial void OnSortIndexChanged();
+    partial void OnLastYearValueChanging(string value);
+    partial void OnLastYearValueChanged();
+    partial void OnThisYearValueChanging(string value);
+    partial void OnThisYearValueChanged();
+    partial void OnRateChanging(string value);
+    partial void OnRateChanged();
+    #endregion
+		
+		public Environmental_ArchitectureReportItem()
+		{
+			this._Environmental_ArchitectureReport = default(EntityRef<Environmental_ArchitectureReport>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ArchitectureReportItemId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string ArchitectureReportItemId
+		{
+			get
+			{
+				return this._ArchitectureReportItemId;
+			}
+			set
+			{
+				if ((this._ArchitectureReportItemId != value))
+				{
+					this.OnArchitectureReportItemIdChanging(value);
+					this.SendPropertyChanging();
+					this._ArchitectureReportItemId = value;
+					this.SendPropertyChanged("ArchitectureReportItemId");
+					this.OnArchitectureReportItemIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ArchitectureReportId", DbType="NVarChar(50)")]
+		public string ArchitectureReportId
+		{
+			get
+			{
+				return this._ArchitectureReportId;
+			}
+			set
+			{
+				if ((this._ArchitectureReportId != value))
+				{
+					if (this._Environmental_ArchitectureReport.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnArchitectureReportIdChanging(value);
+					this.SendPropertyChanging();
+					this._ArchitectureReportId = value;
+					this.SendPropertyChanged("ArchitectureReportId");
+					this.OnArchitectureReportIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="NVarChar(50)")]
+		public string SortIndex
+		{
+			get
+			{
+				return this._SortIndex;
+			}
+			set
+			{
+				if ((this._SortIndex != value))
+				{
+					this.OnSortIndexChanging(value);
+					this.SendPropertyChanging();
+					this._SortIndex = value;
+					this.SendPropertyChanged("SortIndex");
+					this.OnSortIndexChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LastYearValue", DbType="NVarChar(50)")]
+		public string LastYearValue
+		{
+			get
+			{
+				return this._LastYearValue;
+			}
+			set
+			{
+				if ((this._LastYearValue != value))
+				{
+					this.OnLastYearValueChanging(value);
+					this.SendPropertyChanging();
+					this._LastYearValue = value;
+					this.SendPropertyChanged("LastYearValue");
+					this.OnLastYearValueChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ThisYearValue", DbType="NVarChar(50)")]
+		public string ThisYearValue
+		{
+			get
+			{
+				return this._ThisYearValue;
+			}
+			set
+			{
+				if ((this._ThisYearValue != value))
+				{
+					this.OnThisYearValueChanging(value);
+					this.SendPropertyChanging();
+					this._ThisYearValue = value;
+					this.SendPropertyChanged("ThisYearValue");
+					this.OnThisYearValueChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rate", DbType="NVarChar(50)")]
+		public string Rate
+		{
+			get
+			{
+				return this._Rate;
+			}
+			set
+			{
+				if ((this._Rate != value))
+				{
+					this.OnRateChanging(value);
+					this.SendPropertyChanging();
+					this._Rate = value;
+					this.SendPropertyChanged("Rate");
+					this.OnRateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Environmental_ArchitectureReportItem_Environmental_ArchitectureReport", Storage="_Environmental_ArchitectureReport", ThisKey="ArchitectureReportId", OtherKey="ArchitectureReportId", IsForeignKey=true)]
+		public Environmental_ArchitectureReport Environmental_ArchitectureReport
+		{
+			get
+			{
+				return this._Environmental_ArchitectureReport.Entity;
+			}
+			set
+			{
+				Environmental_ArchitectureReport previousValue = this._Environmental_ArchitectureReport.Entity;
+				if (((previousValue != value) 
+							|| (this._Environmental_ArchitectureReport.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Environmental_ArchitectureReport.Entity = null;
+						previousValue.Environmental_ArchitectureReportItem.Remove(this);
+					}
+					this._Environmental_ArchitectureReport.Entity = value;
+					if ((value != null))
+					{
+						value.Environmental_ArchitectureReportItem.Add(this);
+						this._ArchitectureReportId = value.ArchitectureReportId;
+					}
+					else
+					{
+						this._ArchitectureReportId = default(string);
+					}
+					this.SendPropertyChanged("Environmental_ArchitectureReport");
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Environmental_ChemicalReport")]
+	public partial class Environmental_ChemicalReport : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _ChemicalReportId;
+		
+		private string _UnitId;
+		
+		private System.Nullable<int> _Year;
+		
+		private System.Nullable<int> _Month;
+		
+		private string _FillingMan;
+		
+		private System.Nullable<System.DateTime> _FillingDate;
+		
+		private string _DutyPerson;
+		
+		private string _UpState;
+		
+		private EntityRef<Base_Unit> _Base_Unit;
+		
+		private EntitySet<Environmental_ChemicalReportItem> _Environmental_ChemicalReportItem;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnChemicalReportIdChanging(string value);
+    partial void OnChemicalReportIdChanged();
+    partial void OnUnitIdChanging(string value);
+    partial void OnUnitIdChanged();
+    partial void OnYearChanging(System.Nullable<int> value);
+    partial void OnYearChanged();
+    partial void OnMonthChanging(System.Nullable<int> value);
+    partial void OnMonthChanged();
+    partial void OnFillingManChanging(string value);
+    partial void OnFillingManChanged();
+    partial void OnFillingDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnFillingDateChanged();
+    partial void OnDutyPersonChanging(string value);
+    partial void OnDutyPersonChanged();
+    partial void OnUpStateChanging(string value);
+    partial void OnUpStateChanged();
+    #endregion
+		
+		public Environmental_ChemicalReport()
+		{
+			this._Base_Unit = default(EntityRef<Base_Unit>);
+			this._Environmental_ChemicalReportItem = new EntitySet<Environmental_ChemicalReportItem>(new Action<Environmental_ChemicalReportItem>(this.attach_Environmental_ChemicalReportItem), new Action<Environmental_ChemicalReportItem>(this.detach_Environmental_ChemicalReportItem));
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ChemicalReportId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string ChemicalReportId
+		{
+			get
+			{
+				return this._ChemicalReportId;
+			}
+			set
+			{
+				if ((this._ChemicalReportId != value))
+				{
+					this.OnChemicalReportIdChanging(value);
+					this.SendPropertyChanging();
+					this._ChemicalReportId = value;
+					this.SendPropertyChanged("ChemicalReportId");
+					this.OnChemicalReportIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
+		public string UnitId
+		{
+			get
+			{
+				return this._UnitId;
+			}
+			set
+			{
+				if ((this._UnitId != value))
+				{
+					if (this._Base_Unit.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnUnitIdChanging(value);
+					this.SendPropertyChanging();
+					this._UnitId = value;
+					this.SendPropertyChanged("UnitId");
+					this.OnUnitIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Year", DbType="Int")]
+		public System.Nullable<int> Year
+		{
+			get
+			{
+				return this._Year;
+			}
+			set
+			{
+				if ((this._Year != value))
+				{
+					this.OnYearChanging(value);
+					this.SendPropertyChanging();
+					this._Year = value;
+					this.SendPropertyChanged("Year");
+					this.OnYearChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Month", DbType="Int")]
+		public System.Nullable<int> Month
+		{
+			get
+			{
+				return this._Month;
+			}
+			set
+			{
+				if ((this._Month != value))
+				{
+					this.OnMonthChanging(value);
+					this.SendPropertyChanging();
+					this._Month = value;
+					this.SendPropertyChanged("Month");
+					this.OnMonthChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FillingMan", DbType="NVarChar(50)")]
+		public string FillingMan
+		{
+			get
+			{
+				return this._FillingMan;
+			}
+			set
+			{
+				if ((this._FillingMan != value))
+				{
+					this.OnFillingManChanging(value);
+					this.SendPropertyChanging();
+					this._FillingMan = value;
+					this.SendPropertyChanged("FillingMan");
+					this.OnFillingManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FillingDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> FillingDate
+		{
+			get
+			{
+				return this._FillingDate;
+			}
+			set
+			{
+				if ((this._FillingDate != value))
+				{
+					this.OnFillingDateChanging(value);
+					this.SendPropertyChanging();
+					this._FillingDate = value;
+					this.SendPropertyChanged("FillingDate");
+					this.OnFillingDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DutyPerson", DbType="NVarChar(50)")]
+		public string DutyPerson
+		{
+			get
+			{
+				return this._DutyPerson;
+			}
+			set
+			{
+				if ((this._DutyPerson != value))
+				{
+					this.OnDutyPersonChanging(value);
+					this.SendPropertyChanging();
+					this._DutyPerson = value;
+					this.SendPropertyChanged("DutyPerson");
+					this.OnDutyPersonChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UpState", DbType="Char(1)")]
+		public string UpState
+		{
+			get
+			{
+				return this._UpState;
+			}
+			set
+			{
+				if ((this._UpState != value))
+				{
+					this.OnUpStateChanging(value);
+					this.SendPropertyChanging();
+					this._UpState = value;
+					this.SendPropertyChanged("UpState");
+					this.OnUpStateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Environmental_ChemicalReport_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
+		public Base_Unit Base_Unit
+		{
+			get
+			{
+				return this._Base_Unit.Entity;
+			}
+			set
+			{
+				Base_Unit previousValue = this._Base_Unit.Entity;
+				if (((previousValue != value) 
+							|| (this._Base_Unit.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Base_Unit.Entity = null;
+						previousValue.Environmental_ChemicalReport.Remove(this);
+					}
+					this._Base_Unit.Entity = value;
+					if ((value != null))
+					{
+						value.Environmental_ChemicalReport.Add(this);
+						this._UnitId = value.UnitId;
+					}
+					else
+					{
+						this._UnitId = default(string);
+					}
+					this.SendPropertyChanged("Base_Unit");
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Environmental_ChemicalReportItem_Environmental_ChemicalReport", Storage="_Environmental_ChemicalReportItem", ThisKey="ChemicalReportId", OtherKey="ChemicalReportId", DeleteRule="NO ACTION")]
+		public EntitySet<Environmental_ChemicalReportItem> Environmental_ChemicalReportItem
+		{
+			get
+			{
+				return this._Environmental_ChemicalReportItem;
+			}
+			set
+			{
+				this._Environmental_ChemicalReportItem.Assign(value);
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+		
+		private void attach_Environmental_ChemicalReportItem(Environmental_ChemicalReportItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.Environmental_ChemicalReport = this;
+		}
+		
+		private void detach_Environmental_ChemicalReportItem(Environmental_ChemicalReportItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.Environmental_ChemicalReport = null;
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Environmental_ChemicalReportItem")]
+	public partial class Environmental_ChemicalReportItem : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _ChemicalReportItemId;
+		
+		private string _ChemicalReportId;
+		
+		private string _SortIndex;
+		
+		private string _LastYearValue;
+		
+		private string _ThisYearValue;
+		
+		private string _Rate;
+		
+		private EntityRef<Environmental_ChemicalReport> _Environmental_ChemicalReport;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnChemicalReportItemIdChanging(string value);
+    partial void OnChemicalReportItemIdChanged();
+    partial void OnChemicalReportIdChanging(string value);
+    partial void OnChemicalReportIdChanged();
+    partial void OnSortIndexChanging(string value);
+    partial void OnSortIndexChanged();
+    partial void OnLastYearValueChanging(string value);
+    partial void OnLastYearValueChanged();
+    partial void OnThisYearValueChanging(string value);
+    partial void OnThisYearValueChanged();
+    partial void OnRateChanging(string value);
+    partial void OnRateChanged();
+    #endregion
+		
+		public Environmental_ChemicalReportItem()
+		{
+			this._Environmental_ChemicalReport = default(EntityRef<Environmental_ChemicalReport>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ChemicalReportItemId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string ChemicalReportItemId
+		{
+			get
+			{
+				return this._ChemicalReportItemId;
+			}
+			set
+			{
+				if ((this._ChemicalReportItemId != value))
+				{
+					this.OnChemicalReportItemIdChanging(value);
+					this.SendPropertyChanging();
+					this._ChemicalReportItemId = value;
+					this.SendPropertyChanged("ChemicalReportItemId");
+					this.OnChemicalReportItemIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ChemicalReportId", DbType="NVarChar(50)")]
+		public string ChemicalReportId
+		{
+			get
+			{
+				return this._ChemicalReportId;
+			}
+			set
+			{
+				if ((this._ChemicalReportId != value))
+				{
+					if (this._Environmental_ChemicalReport.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnChemicalReportIdChanging(value);
+					this.SendPropertyChanging();
+					this._ChemicalReportId = value;
+					this.SendPropertyChanged("ChemicalReportId");
+					this.OnChemicalReportIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="NVarChar(50)")]
+		public string SortIndex
+		{
+			get
+			{
+				return this._SortIndex;
+			}
+			set
+			{
+				if ((this._SortIndex != value))
+				{
+					this.OnSortIndexChanging(value);
+					this.SendPropertyChanging();
+					this._SortIndex = value;
+					this.SendPropertyChanged("SortIndex");
+					this.OnSortIndexChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LastYearValue", DbType="NVarChar(50)")]
+		public string LastYearValue
+		{
+			get
+			{
+				return this._LastYearValue;
+			}
+			set
+			{
+				if ((this._LastYearValue != value))
+				{
+					this.OnLastYearValueChanging(value);
+					this.SendPropertyChanging();
+					this._LastYearValue = value;
+					this.SendPropertyChanged("LastYearValue");
+					this.OnLastYearValueChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ThisYearValue", DbType="NVarChar(50)")]
+		public string ThisYearValue
+		{
+			get
+			{
+				return this._ThisYearValue;
+			}
+			set
+			{
+				if ((this._ThisYearValue != value))
+				{
+					this.OnThisYearValueChanging(value);
+					this.SendPropertyChanging();
+					this._ThisYearValue = value;
+					this.SendPropertyChanged("ThisYearValue");
+					this.OnThisYearValueChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rate", DbType="NVarChar(50)")]
+		public string Rate
+		{
+			get
+			{
+				return this._Rate;
+			}
+			set
+			{
+				if ((this._Rate != value))
+				{
+					this.OnRateChanging(value);
+					this.SendPropertyChanging();
+					this._Rate = value;
+					this.SendPropertyChanged("Rate");
+					this.OnRateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Environmental_ChemicalReportItem_Environmental_ChemicalReport", Storage="_Environmental_ChemicalReport", ThisKey="ChemicalReportId", OtherKey="ChemicalReportId", IsForeignKey=true)]
+		public Environmental_ChemicalReport Environmental_ChemicalReport
+		{
+			get
+			{
+				return this._Environmental_ChemicalReport.Entity;
+			}
+			set
+			{
+				Environmental_ChemicalReport previousValue = this._Environmental_ChemicalReport.Entity;
+				if (((previousValue != value) 
+							|| (this._Environmental_ChemicalReport.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Environmental_ChemicalReport.Entity = null;
+						previousValue.Environmental_ChemicalReportItem.Remove(this);
+					}
+					this._Environmental_ChemicalReport.Entity = value;
+					if ((value != null))
+					{
+						value.Environmental_ChemicalReportItem.Add(this);
+						this._ChemicalReportId = value.ChemicalReportId;
+					}
+					else
+					{
+						this._ChemicalReportId = default(string);
+					}
+					this.SendPropertyChanged("Environmental_ChemicalReport");
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Environmental_EIAReport")]
 	public partial class Environmental_EIAReport : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -140460,6 +143318,10 @@ namespace Model
 		
 		private string _WorkStage;
 		
+		private System.Nullable<bool> _IsStart;
+		
+		private string _ProjectId;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -140500,6 +143362,10 @@ namespace Model
     partial void OnRemarkChanged();
     partial void OnWorkStageChanging(string value);
     partial void OnWorkStageChanged();
+    partial void OnIsStartChanging(System.Nullable<bool> value);
+    partial void OnIsStartChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
     #endregion
 		
 		public Hazard_HazardSelectedItem()
@@ -140867,6 +143733,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsStart", DbType="Bit")]
+		public System.Nullable<bool> IsStart
+		{
+			get
+			{
+				return this._IsStart;
+			}
+			set
+			{
+				if ((this._IsStart != value))
+				{
+					this.OnIsStartChanging(value);
+					this.SendPropertyChanging();
+					this._IsStart = value;
+					this.SendPropertyChanged("IsStart");
+					this.OnIsStartChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -231059,6 +233965,802 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Meeting_CompanySafetyMeeting")]
+	public partial class Meeting_CompanySafetyMeeting : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _CompanySafetyMeetingId;
+		
+		private string _CompanySafetyMeetingCode;
+		
+		private string _CompanySafetyMeetingName;
+		
+		private System.Nullable<System.DateTime> _CompanySafetyMeetingDate;
+		
+		private string _CompileMan;
+		
+		private string _CompanySafetyMeetingContents;
+		
+		private System.Nullable<System.DateTime> _CompileDate;
+		
+		private System.Nullable<int> _AttentPersonNum;
+		
+		private System.Nullable<decimal> _MeetingHours;
+		
+		private string _MeetingHostMan;
+		
+		private string _AttentPerson;
+		
+		private string _MeetingPlace;
+		
+		private string _MeetingHostManId;
+		
+		private string _AttentPersonIds;
+		
+		private string _MeetingHostManOther;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnCompanySafetyMeetingIdChanging(string value);
+    partial void OnCompanySafetyMeetingIdChanged();
+    partial void OnCompanySafetyMeetingCodeChanging(string value);
+    partial void OnCompanySafetyMeetingCodeChanged();
+    partial void OnCompanySafetyMeetingNameChanging(string value);
+    partial void OnCompanySafetyMeetingNameChanged();
+    partial void OnCompanySafetyMeetingDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompanySafetyMeetingDateChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnCompanySafetyMeetingContentsChanging(string value);
+    partial void OnCompanySafetyMeetingContentsChanged();
+    partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompileDateChanged();
+    partial void OnAttentPersonNumChanging(System.Nullable<int> value);
+    partial void OnAttentPersonNumChanged();
+    partial void OnMeetingHoursChanging(System.Nullable<decimal> value);
+    partial void OnMeetingHoursChanged();
+    partial void OnMeetingHostManChanging(string value);
+    partial void OnMeetingHostManChanged();
+    partial void OnAttentPersonChanging(string value);
+    partial void OnAttentPersonChanged();
+    partial void OnMeetingPlaceChanging(string value);
+    partial void OnMeetingPlaceChanged();
+    partial void OnMeetingHostManIdChanging(string value);
+    partial void OnMeetingHostManIdChanged();
+    partial void OnAttentPersonIdsChanging(string value);
+    partial void OnAttentPersonIdsChanged();
+    partial void OnMeetingHostManOtherChanging(string value);
+    partial void OnMeetingHostManOtherChanged();
+    #endregion
+		
+		public Meeting_CompanySafetyMeeting()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanySafetyMeetingId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string CompanySafetyMeetingId
+		{
+			get
+			{
+				return this._CompanySafetyMeetingId;
+			}
+			set
+			{
+				if ((this._CompanySafetyMeetingId != value))
+				{
+					this.OnCompanySafetyMeetingIdChanging(value);
+					this.SendPropertyChanging();
+					this._CompanySafetyMeetingId = value;
+					this.SendPropertyChanged("CompanySafetyMeetingId");
+					this.OnCompanySafetyMeetingIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanySafetyMeetingCode", DbType="NVarChar(50)")]
+		public string CompanySafetyMeetingCode
+		{
+			get
+			{
+				return this._CompanySafetyMeetingCode;
+			}
+			set
+			{
+				if ((this._CompanySafetyMeetingCode != value))
+				{
+					this.OnCompanySafetyMeetingCodeChanging(value);
+					this.SendPropertyChanging();
+					this._CompanySafetyMeetingCode = value;
+					this.SendPropertyChanged("CompanySafetyMeetingCode");
+					this.OnCompanySafetyMeetingCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanySafetyMeetingName", DbType="NVarChar(50)")]
+		public string CompanySafetyMeetingName
+		{
+			get
+			{
+				return this._CompanySafetyMeetingName;
+			}
+			set
+			{
+				if ((this._CompanySafetyMeetingName != value))
+				{
+					this.OnCompanySafetyMeetingNameChanging(value);
+					this.SendPropertyChanging();
+					this._CompanySafetyMeetingName = value;
+					this.SendPropertyChanged("CompanySafetyMeetingName");
+					this.OnCompanySafetyMeetingNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanySafetyMeetingDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompanySafetyMeetingDate
+		{
+			get
+			{
+				return this._CompanySafetyMeetingDate;
+			}
+			set
+			{
+				if ((this._CompanySafetyMeetingDate != value))
+				{
+					this.OnCompanySafetyMeetingDateChanging(value);
+					this.SendPropertyChanging();
+					this._CompanySafetyMeetingDate = value;
+					this.SendPropertyChanged("CompanySafetyMeetingDate");
+					this.OnCompanySafetyMeetingDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
+		public string CompileMan
+		{
+			get
+			{
+				return this._CompileMan;
+			}
+			set
+			{
+				if ((this._CompileMan != value))
+				{
+					this.OnCompileManChanging(value);
+					this.SendPropertyChanging();
+					this._CompileMan = value;
+					this.SendPropertyChanged("CompileMan");
+					this.OnCompileManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanySafetyMeetingContents", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string CompanySafetyMeetingContents
+		{
+			get
+			{
+				return this._CompanySafetyMeetingContents;
+			}
+			set
+			{
+				if ((this._CompanySafetyMeetingContents != value))
+				{
+					this.OnCompanySafetyMeetingContentsChanging(value);
+					this.SendPropertyChanging();
+					this._CompanySafetyMeetingContents = value;
+					this.SendPropertyChanged("CompanySafetyMeetingContents");
+					this.OnCompanySafetyMeetingContentsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompileDate
+		{
+			get
+			{
+				return this._CompileDate;
+			}
+			set
+			{
+				if ((this._CompileDate != value))
+				{
+					this.OnCompileDateChanging(value);
+					this.SendPropertyChanging();
+					this._CompileDate = value;
+					this.SendPropertyChanged("CompileDate");
+					this.OnCompileDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPersonNum", DbType="Int")]
+		public System.Nullable<int> AttentPersonNum
+		{
+			get
+			{
+				return this._AttentPersonNum;
+			}
+			set
+			{
+				if ((this._AttentPersonNum != value))
+				{
+					this.OnAttentPersonNumChanging(value);
+					this.SendPropertyChanging();
+					this._AttentPersonNum = value;
+					this.SendPropertyChanged("AttentPersonNum");
+					this.OnAttentPersonNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingHours", DbType="Decimal(9,1)")]
+		public System.Nullable<decimal> MeetingHours
+		{
+			get
+			{
+				return this._MeetingHours;
+			}
+			set
+			{
+				if ((this._MeetingHours != value))
+				{
+					this.OnMeetingHoursChanging(value);
+					this.SendPropertyChanging();
+					this._MeetingHours = value;
+					this.SendPropertyChanged("MeetingHours");
+					this.OnMeetingHoursChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingHostMan", DbType="NVarChar(50)")]
+		public string MeetingHostMan
+		{
+			get
+			{
+				return this._MeetingHostMan;
+			}
+			set
+			{
+				if ((this._MeetingHostMan != value))
+				{
+					this.OnMeetingHostManChanging(value);
+					this.SendPropertyChanging();
+					this._MeetingHostMan = value;
+					this.SendPropertyChanged("MeetingHostMan");
+					this.OnMeetingHostManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(300)")]
+		public string AttentPerson
+		{
+			get
+			{
+				return this._AttentPerson;
+			}
+			set
+			{
+				if ((this._AttentPerson != value))
+				{
+					this.OnAttentPersonChanging(value);
+					this.SendPropertyChanging();
+					this._AttentPerson = value;
+					this.SendPropertyChanged("AttentPerson");
+					this.OnAttentPersonChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingPlace", DbType="NVarChar(200)")]
+		public string MeetingPlace
+		{
+			get
+			{
+				return this._MeetingPlace;
+			}
+			set
+			{
+				if ((this._MeetingPlace != value))
+				{
+					this.OnMeetingPlaceChanging(value);
+					this.SendPropertyChanging();
+					this._MeetingPlace = value;
+					this.SendPropertyChanged("MeetingPlace");
+					this.OnMeetingPlaceChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingHostManId", DbType="NVarChar(50)")]
+		public string MeetingHostManId
+		{
+			get
+			{
+				return this._MeetingHostManId;
+			}
+			set
+			{
+				if ((this._MeetingHostManId != value))
+				{
+					this.OnMeetingHostManIdChanging(value);
+					this.SendPropertyChanging();
+					this._MeetingHostManId = value;
+					this.SendPropertyChanged("MeetingHostManId");
+					this.OnMeetingHostManIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPersonIds", DbType="NVarChar(4000)")]
+		public string AttentPersonIds
+		{
+			get
+			{
+				return this._AttentPersonIds;
+			}
+			set
+			{
+				if ((this._AttentPersonIds != value))
+				{
+					this.OnAttentPersonIdsChanging(value);
+					this.SendPropertyChanging();
+					this._AttentPersonIds = value;
+					this.SendPropertyChanged("AttentPersonIds");
+					this.OnAttentPersonIdsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingHostManOther", DbType="NVarChar(500)")]
+		public string MeetingHostManOther
+		{
+			get
+			{
+				return this._MeetingHostManOther;
+			}
+			set
+			{
+				if ((this._MeetingHostManOther != value))
+				{
+					this.OnMeetingHostManOtherChanging(value);
+					this.SendPropertyChanging();
+					this._MeetingHostManOther = value;
+					this.SendPropertyChanged("MeetingHostManOther");
+					this.OnMeetingHostManOtherChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Meeting_CompanySpecialMeeting")]
+	public partial class Meeting_CompanySpecialMeeting : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _CompanySpecialMeetingId;
+		
+		private string _CompanySpecialMeetingCode;
+		
+		private string _CompanySpecialMeetingName;
+		
+		private System.Nullable<System.DateTime> _CompanySpecialMeetingDate;
+		
+		private string _CompileMan;
+		
+		private string _CompanySpecialMeetingContents;
+		
+		private System.Nullable<System.DateTime> _CompileDate;
+		
+		private System.Nullable<int> _AttentPersonNum;
+		
+		private System.Nullable<decimal> _MeetingHours;
+		
+		private string _MeetingHostMan;
+		
+		private string _AttentPerson;
+		
+		private string _MeetingPlace;
+		
+		private string _MeetingHostManId;
+		
+		private string _AttentPersonIds;
+		
+		private string _MeetingHostManOther;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnCompanySpecialMeetingIdChanging(string value);
+    partial void OnCompanySpecialMeetingIdChanged();
+    partial void OnCompanySpecialMeetingCodeChanging(string value);
+    partial void OnCompanySpecialMeetingCodeChanged();
+    partial void OnCompanySpecialMeetingNameChanging(string value);
+    partial void OnCompanySpecialMeetingNameChanged();
+    partial void OnCompanySpecialMeetingDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompanySpecialMeetingDateChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnCompanySpecialMeetingContentsChanging(string value);
+    partial void OnCompanySpecialMeetingContentsChanged();
+    partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompileDateChanged();
+    partial void OnAttentPersonNumChanging(System.Nullable<int> value);
+    partial void OnAttentPersonNumChanged();
+    partial void OnMeetingHoursChanging(System.Nullable<decimal> value);
+    partial void OnMeetingHoursChanged();
+    partial void OnMeetingHostManChanging(string value);
+    partial void OnMeetingHostManChanged();
+    partial void OnAttentPersonChanging(string value);
+    partial void OnAttentPersonChanged();
+    partial void OnMeetingPlaceChanging(string value);
+    partial void OnMeetingPlaceChanged();
+    partial void OnMeetingHostManIdChanging(string value);
+    partial void OnMeetingHostManIdChanged();
+    partial void OnAttentPersonIdsChanging(string value);
+    partial void OnAttentPersonIdsChanged();
+    partial void OnMeetingHostManOtherChanging(string value);
+    partial void OnMeetingHostManOtherChanged();
+    #endregion
+		
+		public Meeting_CompanySpecialMeeting()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanySpecialMeetingId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string CompanySpecialMeetingId
+		{
+			get
+			{
+				return this._CompanySpecialMeetingId;
+			}
+			set
+			{
+				if ((this._CompanySpecialMeetingId != value))
+				{
+					this.OnCompanySpecialMeetingIdChanging(value);
+					this.SendPropertyChanging();
+					this._CompanySpecialMeetingId = value;
+					this.SendPropertyChanged("CompanySpecialMeetingId");
+					this.OnCompanySpecialMeetingIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanySpecialMeetingCode", DbType="NVarChar(50)")]
+		public string CompanySpecialMeetingCode
+		{
+			get
+			{
+				return this._CompanySpecialMeetingCode;
+			}
+			set
+			{
+				if ((this._CompanySpecialMeetingCode != value))
+				{
+					this.OnCompanySpecialMeetingCodeChanging(value);
+					this.SendPropertyChanging();
+					this._CompanySpecialMeetingCode = value;
+					this.SendPropertyChanged("CompanySpecialMeetingCode");
+					this.OnCompanySpecialMeetingCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanySpecialMeetingName", DbType="NVarChar(50)")]
+		public string CompanySpecialMeetingName
+		{
+			get
+			{
+				return this._CompanySpecialMeetingName;
+			}
+			set
+			{
+				if ((this._CompanySpecialMeetingName != value))
+				{
+					this.OnCompanySpecialMeetingNameChanging(value);
+					this.SendPropertyChanging();
+					this._CompanySpecialMeetingName = value;
+					this.SendPropertyChanged("CompanySpecialMeetingName");
+					this.OnCompanySpecialMeetingNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanySpecialMeetingDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompanySpecialMeetingDate
+		{
+			get
+			{
+				return this._CompanySpecialMeetingDate;
+			}
+			set
+			{
+				if ((this._CompanySpecialMeetingDate != value))
+				{
+					this.OnCompanySpecialMeetingDateChanging(value);
+					this.SendPropertyChanging();
+					this._CompanySpecialMeetingDate = value;
+					this.SendPropertyChanged("CompanySpecialMeetingDate");
+					this.OnCompanySpecialMeetingDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
+		public string CompileMan
+		{
+			get
+			{
+				return this._CompileMan;
+			}
+			set
+			{
+				if ((this._CompileMan != value))
+				{
+					this.OnCompileManChanging(value);
+					this.SendPropertyChanging();
+					this._CompileMan = value;
+					this.SendPropertyChanged("CompileMan");
+					this.OnCompileManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanySpecialMeetingContents", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string CompanySpecialMeetingContents
+		{
+			get
+			{
+				return this._CompanySpecialMeetingContents;
+			}
+			set
+			{
+				if ((this._CompanySpecialMeetingContents != value))
+				{
+					this.OnCompanySpecialMeetingContentsChanging(value);
+					this.SendPropertyChanging();
+					this._CompanySpecialMeetingContents = value;
+					this.SendPropertyChanged("CompanySpecialMeetingContents");
+					this.OnCompanySpecialMeetingContentsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompileDate
+		{
+			get
+			{
+				return this._CompileDate;
+			}
+			set
+			{
+				if ((this._CompileDate != value))
+				{
+					this.OnCompileDateChanging(value);
+					this.SendPropertyChanging();
+					this._CompileDate = value;
+					this.SendPropertyChanged("CompileDate");
+					this.OnCompileDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPersonNum", DbType="Int")]
+		public System.Nullable<int> AttentPersonNum
+		{
+			get
+			{
+				return this._AttentPersonNum;
+			}
+			set
+			{
+				if ((this._AttentPersonNum != value))
+				{
+					this.OnAttentPersonNumChanging(value);
+					this.SendPropertyChanging();
+					this._AttentPersonNum = value;
+					this.SendPropertyChanged("AttentPersonNum");
+					this.OnAttentPersonNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingHours", DbType="Decimal(9,1)")]
+		public System.Nullable<decimal> MeetingHours
+		{
+			get
+			{
+				return this._MeetingHours;
+			}
+			set
+			{
+				if ((this._MeetingHours != value))
+				{
+					this.OnMeetingHoursChanging(value);
+					this.SendPropertyChanging();
+					this._MeetingHours = value;
+					this.SendPropertyChanged("MeetingHours");
+					this.OnMeetingHoursChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingHostMan", DbType="NVarChar(50)")]
+		public string MeetingHostMan
+		{
+			get
+			{
+				return this._MeetingHostMan;
+			}
+			set
+			{
+				if ((this._MeetingHostMan != value))
+				{
+					this.OnMeetingHostManChanging(value);
+					this.SendPropertyChanging();
+					this._MeetingHostMan = value;
+					this.SendPropertyChanged("MeetingHostMan");
+					this.OnMeetingHostManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(300)")]
+		public string AttentPerson
+		{
+			get
+			{
+				return this._AttentPerson;
+			}
+			set
+			{
+				if ((this._AttentPerson != value))
+				{
+					this.OnAttentPersonChanging(value);
+					this.SendPropertyChanging();
+					this._AttentPerson = value;
+					this.SendPropertyChanged("AttentPerson");
+					this.OnAttentPersonChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingPlace", DbType="NVarChar(200)")]
+		public string MeetingPlace
+		{
+			get
+			{
+				return this._MeetingPlace;
+			}
+			set
+			{
+				if ((this._MeetingPlace != value))
+				{
+					this.OnMeetingPlaceChanging(value);
+					this.SendPropertyChanging();
+					this._MeetingPlace = value;
+					this.SendPropertyChanged("MeetingPlace");
+					this.OnMeetingPlaceChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingHostManId", DbType="NVarChar(50)")]
+		public string MeetingHostManId
+		{
+			get
+			{
+				return this._MeetingHostManId;
+			}
+			set
+			{
+				if ((this._MeetingHostManId != value))
+				{
+					this.OnMeetingHostManIdChanging(value);
+					this.SendPropertyChanging();
+					this._MeetingHostManId = value;
+					this.SendPropertyChanged("MeetingHostManId");
+					this.OnMeetingHostManIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPersonIds", DbType="NVarChar(4000)")]
+		public string AttentPersonIds
+		{
+			get
+			{
+				return this._AttentPersonIds;
+			}
+			set
+			{
+				if ((this._AttentPersonIds != value))
+				{
+					this.OnAttentPersonIdsChanging(value);
+					this.SendPropertyChanging();
+					this._AttentPersonIds = value;
+					this.SendPropertyChanged("AttentPersonIds");
+					this.OnAttentPersonIdsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingHostManOther", DbType="NVarChar(500)")]
+		public string MeetingHostManOther
+		{
+			get
+			{
+				return this._MeetingHostManOther;
+			}
+			set
+			{
+				if ((this._MeetingHostManOther != value))
+				{
+					this.OnMeetingHostManOtherChanging(value);
+					this.SendPropertyChanging();
+					this._MeetingHostManOther = value;
+					this.SendPropertyChanged("MeetingHostManOther");
+					this.OnMeetingHostManOtherChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Meeting_MonthMeeting")]
 	public partial class Meeting_MonthMeeting : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -231693,6 +235395,476 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Meeting_SafetyLeaderGroupMeeting")]
+	public partial class Meeting_SafetyLeaderGroupMeeting : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _SafetyLeaderGroupMeetingId;
+		
+		private string _ProjectId;
+		
+		private string _SafetyLeaderGroupMeetingCode;
+		
+		private string _SafetyLeaderGroupMeetingName;
+		
+		private System.Nullable<System.DateTime> _SafetyLeaderGroupMeetingDate;
+		
+		private string _CompileMan;
+		
+		private string _SafetyLeaderGroupMeetingContents;
+		
+		private System.Nullable<System.DateTime> _CompileDate;
+		
+		private string _States;
+		
+		private System.Nullable<int> _AttentPersonNum;
+		
+		private System.Nullable<decimal> _MeetingHours;
+		
+		private string _MeetingHostMan;
+		
+		private string _AttentPerson;
+		
+		private string _MeetingPlace;
+		
+		private string _UnitId;
+		
+		private string _MeetingHostManId;
+		
+		private string _AttentPersonIds;
+		
+		private string _MeetingHostManOther;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnSafetyLeaderGroupMeetingIdChanging(string value);
+    partial void OnSafetyLeaderGroupMeetingIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnSafetyLeaderGroupMeetingCodeChanging(string value);
+    partial void OnSafetyLeaderGroupMeetingCodeChanged();
+    partial void OnSafetyLeaderGroupMeetingNameChanging(string value);
+    partial void OnSafetyLeaderGroupMeetingNameChanged();
+    partial void OnSafetyLeaderGroupMeetingDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnSafetyLeaderGroupMeetingDateChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnSafetyLeaderGroupMeetingContentsChanging(string value);
+    partial void OnSafetyLeaderGroupMeetingContentsChanged();
+    partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompileDateChanged();
+    partial void OnStatesChanging(string value);
+    partial void OnStatesChanged();
+    partial void OnAttentPersonNumChanging(System.Nullable<int> value);
+    partial void OnAttentPersonNumChanged();
+    partial void OnMeetingHoursChanging(System.Nullable<decimal> value);
+    partial void OnMeetingHoursChanged();
+    partial void OnMeetingHostManChanging(string value);
+    partial void OnMeetingHostManChanged();
+    partial void OnAttentPersonChanging(string value);
+    partial void OnAttentPersonChanged();
+    partial void OnMeetingPlaceChanging(string value);
+    partial void OnMeetingPlaceChanged();
+    partial void OnUnitIdChanging(string value);
+    partial void OnUnitIdChanged();
+    partial void OnMeetingHostManIdChanging(string value);
+    partial void OnMeetingHostManIdChanged();
+    partial void OnAttentPersonIdsChanging(string value);
+    partial void OnAttentPersonIdsChanged();
+    partial void OnMeetingHostManOtherChanging(string value);
+    partial void OnMeetingHostManOtherChanged();
+    #endregion
+		
+		public Meeting_SafetyLeaderGroupMeeting()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyLeaderGroupMeetingId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string SafetyLeaderGroupMeetingId
+		{
+			get
+			{
+				return this._SafetyLeaderGroupMeetingId;
+			}
+			set
+			{
+				if ((this._SafetyLeaderGroupMeetingId != value))
+				{
+					this.OnSafetyLeaderGroupMeetingIdChanging(value);
+					this.SendPropertyChanging();
+					this._SafetyLeaderGroupMeetingId = value;
+					this.SendPropertyChanged("SafetyLeaderGroupMeetingId");
+					this.OnSafetyLeaderGroupMeetingIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyLeaderGroupMeetingCode", DbType="NVarChar(50)")]
+		public string SafetyLeaderGroupMeetingCode
+		{
+			get
+			{
+				return this._SafetyLeaderGroupMeetingCode;
+			}
+			set
+			{
+				if ((this._SafetyLeaderGroupMeetingCode != value))
+				{
+					this.OnSafetyLeaderGroupMeetingCodeChanging(value);
+					this.SendPropertyChanging();
+					this._SafetyLeaderGroupMeetingCode = value;
+					this.SendPropertyChanged("SafetyLeaderGroupMeetingCode");
+					this.OnSafetyLeaderGroupMeetingCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyLeaderGroupMeetingName", DbType="NVarChar(50)")]
+		public string SafetyLeaderGroupMeetingName
+		{
+			get
+			{
+				return this._SafetyLeaderGroupMeetingName;
+			}
+			set
+			{
+				if ((this._SafetyLeaderGroupMeetingName != value))
+				{
+					this.OnSafetyLeaderGroupMeetingNameChanging(value);
+					this.SendPropertyChanging();
+					this._SafetyLeaderGroupMeetingName = value;
+					this.SendPropertyChanged("SafetyLeaderGroupMeetingName");
+					this.OnSafetyLeaderGroupMeetingNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyLeaderGroupMeetingDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> SafetyLeaderGroupMeetingDate
+		{
+			get
+			{
+				return this._SafetyLeaderGroupMeetingDate;
+			}
+			set
+			{
+				if ((this._SafetyLeaderGroupMeetingDate != value))
+				{
+					this.OnSafetyLeaderGroupMeetingDateChanging(value);
+					this.SendPropertyChanging();
+					this._SafetyLeaderGroupMeetingDate = value;
+					this.SendPropertyChanged("SafetyLeaderGroupMeetingDate");
+					this.OnSafetyLeaderGroupMeetingDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
+		public string CompileMan
+		{
+			get
+			{
+				return this._CompileMan;
+			}
+			set
+			{
+				if ((this._CompileMan != value))
+				{
+					this.OnCompileManChanging(value);
+					this.SendPropertyChanging();
+					this._CompileMan = value;
+					this.SendPropertyChanged("CompileMan");
+					this.OnCompileManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyLeaderGroupMeetingContents", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string SafetyLeaderGroupMeetingContents
+		{
+			get
+			{
+				return this._SafetyLeaderGroupMeetingContents;
+			}
+			set
+			{
+				if ((this._SafetyLeaderGroupMeetingContents != value))
+				{
+					this.OnSafetyLeaderGroupMeetingContentsChanging(value);
+					this.SendPropertyChanging();
+					this._SafetyLeaderGroupMeetingContents = value;
+					this.SendPropertyChanged("SafetyLeaderGroupMeetingContents");
+					this.OnSafetyLeaderGroupMeetingContentsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompileDate
+		{
+			get
+			{
+				return this._CompileDate;
+			}
+			set
+			{
+				if ((this._CompileDate != value))
+				{
+					this.OnCompileDateChanging(value);
+					this.SendPropertyChanging();
+					this._CompileDate = value;
+					this.SendPropertyChanged("CompileDate");
+					this.OnCompileDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_States", DbType="Char(1)")]
+		public string States
+		{
+			get
+			{
+				return this._States;
+			}
+			set
+			{
+				if ((this._States != value))
+				{
+					this.OnStatesChanging(value);
+					this.SendPropertyChanging();
+					this._States = value;
+					this.SendPropertyChanged("States");
+					this.OnStatesChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPersonNum", DbType="Int")]
+		public System.Nullable<int> AttentPersonNum
+		{
+			get
+			{
+				return this._AttentPersonNum;
+			}
+			set
+			{
+				if ((this._AttentPersonNum != value))
+				{
+					this.OnAttentPersonNumChanging(value);
+					this.SendPropertyChanging();
+					this._AttentPersonNum = value;
+					this.SendPropertyChanged("AttentPersonNum");
+					this.OnAttentPersonNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingHours", DbType="Decimal(9,1)")]
+		public System.Nullable<decimal> MeetingHours
+		{
+			get
+			{
+				return this._MeetingHours;
+			}
+			set
+			{
+				if ((this._MeetingHours != value))
+				{
+					this.OnMeetingHoursChanging(value);
+					this.SendPropertyChanging();
+					this._MeetingHours = value;
+					this.SendPropertyChanged("MeetingHours");
+					this.OnMeetingHoursChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingHostMan", DbType="NVarChar(50)")]
+		public string MeetingHostMan
+		{
+			get
+			{
+				return this._MeetingHostMan;
+			}
+			set
+			{
+				if ((this._MeetingHostMan != value))
+				{
+					this.OnMeetingHostManChanging(value);
+					this.SendPropertyChanging();
+					this._MeetingHostMan = value;
+					this.SendPropertyChanged("MeetingHostMan");
+					this.OnMeetingHostManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(300)")]
+		public string AttentPerson
+		{
+			get
+			{
+				return this._AttentPerson;
+			}
+			set
+			{
+				if ((this._AttentPerson != value))
+				{
+					this.OnAttentPersonChanging(value);
+					this.SendPropertyChanging();
+					this._AttentPerson = value;
+					this.SendPropertyChanged("AttentPerson");
+					this.OnAttentPersonChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingPlace", DbType="NVarChar(200)")]
+		public string MeetingPlace
+		{
+			get
+			{
+				return this._MeetingPlace;
+			}
+			set
+			{
+				if ((this._MeetingPlace != value))
+				{
+					this.OnMeetingPlaceChanging(value);
+					this.SendPropertyChanging();
+					this._MeetingPlace = value;
+					this.SendPropertyChanged("MeetingPlace");
+					this.OnMeetingPlaceChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
+		public string UnitId
+		{
+			get
+			{
+				return this._UnitId;
+			}
+			set
+			{
+				if ((this._UnitId != value))
+				{
+					this.OnUnitIdChanging(value);
+					this.SendPropertyChanging();
+					this._UnitId = value;
+					this.SendPropertyChanged("UnitId");
+					this.OnUnitIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingHostManId", DbType="NVarChar(50)")]
+		public string MeetingHostManId
+		{
+			get
+			{
+				return this._MeetingHostManId;
+			}
+			set
+			{
+				if ((this._MeetingHostManId != value))
+				{
+					this.OnMeetingHostManIdChanging(value);
+					this.SendPropertyChanging();
+					this._MeetingHostManId = value;
+					this.SendPropertyChanged("MeetingHostManId");
+					this.OnMeetingHostManIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPersonIds", DbType="NVarChar(4000)")]
+		public string AttentPersonIds
+		{
+			get
+			{
+				return this._AttentPersonIds;
+			}
+			set
+			{
+				if ((this._AttentPersonIds != value))
+				{
+					this.OnAttentPersonIdsChanging(value);
+					this.SendPropertyChanging();
+					this._AttentPersonIds = value;
+					this.SendPropertyChanged("AttentPersonIds");
+					this.OnAttentPersonIdsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingHostManOther", DbType="NVarChar(500)")]
+		public string MeetingHostManOther
+		{
+			get
+			{
+				return this._MeetingHostManOther;
+			}
+			set
+			{
+				if ((this._MeetingHostManOther != value))
+				{
+					this.OnMeetingHostManOtherChanging(value);
+					this.SendPropertyChanging();
+					this._MeetingHostManOther = value;
+					this.SendPropertyChanged("MeetingHostManOther");
+					this.OnMeetingHostManOtherChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Meeting_SpecialMeeting")]
 	public partial class Meeting_SpecialMeeting : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -292932,6 +297104,8 @@ namespace Model
 		
 		private System.Nullable<bool> _IsCardNoOK;
 		
+		private System.Nullable<bool> _IsSafetyMonitoring;
+		
 		private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
 		
 		private EntitySet<Accident_AccidentReportOtherItem> _Accident_AccidentReportOtherItem;
@@ -293106,6 +297280,8 @@ namespace Model
     partial void OnRealNameUpdateTimeChanged();
     partial void OnIsCardNoOKChanging(System.Nullable<bool> value);
     partial void OnIsCardNoOKChanged();
+    partial void OnIsSafetyMonitoringChanging(System.Nullable<bool> value);
+    partial void OnIsSafetyMonitoringChanged();
     #endregion
 		
 		public SitePerson_Person()
@@ -294351,6 +298527,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSafetyMonitoring", DbType="Bit")]
+		public System.Nullable<bool> IsSafetyMonitoring
+		{
+			get
+			{
+				return this._IsSafetyMonitoring;
+			}
+			set
+			{
+				if ((this._IsSafetyMonitoring != value))
+				{
+					this.OnIsSafetyMonitoringChanging(value);
+					this.SendPropertyChanging();
+					this._IsSafetyMonitoring = value;
+					this.SendPropertyChanged("IsSafetyMonitoring");
+					this.OnIsSafetyMonitoringChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentPersonRecord_SitePerson_Person", Storage="_Accident_AccidentPersonRecord", ThisKey="PersonId", OtherKey="PersonId", DeleteRule="NO ACTION")]
 		public EntitySet<Accident_AccidentPersonRecord> Accident_AccidentPersonRecord
 		{
@@ -300759,6 +304955,10 @@ namespace Model
 		
 		private string _Descriptions;
 		
+		private System.Nullable<bool> _IsSuperLargerHazard;
+		
+		private System.Nullable<int> _TrainPersonNum;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Sys_User> _Sys_User;
@@ -300791,6 +304991,10 @@ namespace Model
     partial void OnStatesChanged();
     partial void OnDescriptionsChanging(string value);
     partial void OnDescriptionsChanged();
+    partial void OnIsSuperLargerHazardChanging(System.Nullable<bool> value);
+    partial void OnIsSuperLargerHazardChanged();
+    partial void OnTrainPersonNumChanging(System.Nullable<int> value);
+    partial void OnTrainPersonNumChanged();
     #endregion
 		
 		public Solution_LargerHazard()
@@ -301048,6 +305252,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSuperLargerHazard", DbType="Bit")]
+		public System.Nullable<bool> IsSuperLargerHazard
+		{
+			get
+			{
+				return this._IsSuperLargerHazard;
+			}
+			set
+			{
+				if ((this._IsSuperLargerHazard != value))
+				{
+					this.OnIsSuperLargerHazardChanging(value);
+					this.SendPropertyChanging();
+					this._IsSuperLargerHazard = value;
+					this.SendPropertyChanged("IsSuperLargerHazard");
+					this.OnIsSuperLargerHazardChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainPersonNum", DbType="Int")]
+		public System.Nullable<int> TrainPersonNum
+		{
+			get
+			{
+				return this._TrainPersonNum;
+			}
+			set
+			{
+				if ((this._TrainPersonNum != value))
+				{
+					this.OnTrainPersonNumChanging(value);
+					this.SendPropertyChanging();
+					this._TrainPersonNum = value;
+					this.SendPropertyChanged("TrainPersonNum");
+					this.OnTrainPersonNumChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_LargerSolution_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{