From 8f471923bf316ef4cfa5d585d0e1e134905ba0c0 Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Tue, 18 Feb 2025 15:05:47 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=E7=A7=BB=E6=88=90=E8=BE=BE=E5=9F=B9?=
 =?UTF-8?q?=E8=AE=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SGGLDB_V2025-02-17-geh.sql  |  38 +++
 SGGL/BLL/API/APIPersonService.cs              | 196 ++++++++++-----
 SGGL/BLL/Common/Const.cs                      |   4 +
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |   5 +-
 .../HSSE/EduTrain/CompanyTraining.aspx        |   4 +-
 .../EduTrain/CompanyTrainingItemSave.aspx     |  61 +++++
 .../EduTrain/CompanyTrainingItemSave.aspx.cs  |  70 +++++-
 .../CompanyTrainingItemSave.aspx.designer.cs  |  67 ++++--
 .../FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx |  23 +-
 .../HSSE/EduTrain/PlanEdit.aspx.cs            |  26 +-
 .../HSSE/EduTrain/PlanEdit.aspx.designer.cs   |   9 +
 SGGL/FineUIPro.Web/HSSE/EduTrain/Task.aspx.cs |  10 +-
 .../FineUIPro.Web/HSSE/EduTrain/TaskView.aspx |  25 +-
 .../HSSE/EduTrain/TaskView.aspx.cs            |  68 +++---
 .../HSSE/EduTrain/TaskView.aspx.designer.cs   |  48 ++--
 .../HSSE/EduTrain/TestRecord.aspx             |   8 +-
 .../HSSE/EduTrain/TestRecord.aspx.cs          |  22 +-
 .../HSSE/EduTrain/TestRecord.aspx.designer.cs |  65 ++---
 .../HSSE/EduTrain/TestStatistics.aspx         |   6 +-
 .../HSSE/EduTrain/TestStatistics.aspx.cs      |  21 +-
 .../EduTrain/TestStatistics.aspx.designer.cs  |  48 ++--
 .../HSSE/EduTrain/TrainRecord.aspx            | 208 ++++++++--------
 .../HSSE/EduTrain/TrainRecord.aspx.cs         | 227 ++++++++++++++++--
 .../EduTrain/TrainRecord.aspx.designer.cs     | 111 ++++++---
 .../HSSE/EduTrain/TrainRecordEdit.aspx.cs     |   5 +
 .../HSSE/EduTrain/Trainingrecords.aspx        | 137 +++++++++++
 .../HSSE/EduTrain/Trainingrecords.aspx.cs     | 216 +++++++++++++++++
 .../EduTrain/Trainingrecords.aspx.designer.cs | 179 ++++++++++++++
 SGGL/Model/Model.cs                           | 120 +++++++++
 SGGL/WebAPI/Controllers/PersonController.cs   |   4 +-
 30 files changed, 1678 insertions(+), 353 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_V2025-02-17-geh.sql
 create mode 100644 SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx
 create mode 100644 SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx.designer.cs

diff --git a/DataBase/版本日志/SGGLDB_V2025-02-17-geh.sql b/DataBase/版本日志/SGGLDB_V2025-02-17-geh.sql
new file mode 100644
index 0000000..fae4d11
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2025-02-17-geh.sql
@@ -0,0 +1,38 @@
+alter table dbo.Training_TestPlan add TrainTypeId nvarchar(50);
+go
+
+
+alter TABLE [dbo].[Training_CompanyTrainingItem]add
+	[TestTrainingIds] [nvarchar](max) NULL ;
+
+alter TABLE [dbo].[Training_CompanyTrainingItem]add
+	[LearningTime] [int] NULL ;
+	
+alter TABLE [dbo].[Training_CompanyTrainingItem]add
+	[Durations] [float](53) NULL ;
+
+alter TABLE [dbo].[Training_TestRecord]add
+	[CompanyTrainingItemId] [nvarchar](50) NULL ;
+
+update sys_menu set IsUsed=0 where menuid='EF99E038-5A12-4E02-B925-6671F9AE16CA';
+update sys_menu set IsUsed=0 where menuid='10736CAC-A343-4D73-9D03-E6A3D1909A7B';
+update sys_menu set IsUsed=0 where menuid='6C314522-AF62-4476-893E-5F42C09C3077';
+update sys_menu set menuname='��ѵ��¼����' where menuid='1182E353-FAB9-4DB1-A1EC-F41A00892128';
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('ACF2CAB1-CE56-4CED-B252-692558F9E36F','��ѵ��¼','HSSE/EduTrain/Trainingrecords.aspx',50,'6A0506EB-05CE-4BB3-9BA9-866389F01E1C','Menu_HSSE',0,1,1);
+go
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SGGL/BLL/API/APIPersonService.cs b/SGGL/BLL/API/APIPersonService.cs
index 6ad72c7..971e790 100644
--- a/SGGL/BLL/API/APIPersonService.cs
+++ b/SGGL/BLL/API/APIPersonService.cs
@@ -476,73 +476,159 @@ namespace BLL
         /// <param name="workPostIds">培训岗位ID</param>
         /// <param name="trainTypeId">培训类型ID</param>
         /// <returns></returns>
-        public static List<Model.PersonItem> getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId)
+        public static List<Model.PersonItem> getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string departIds, string trainTypeId,string InTime,string strParam)
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
+                DateTime inDateTime=DateTime.Now;
+                if (!string.IsNullOrEmpty(InTime)&&!"null".Equals(InTime))
+                {
+                    inDateTime = DateTime.Parse(InTime);
+                }
+                
                 List<string> unitIdList = Funs.GetStrListByStr(unitIds, ',');
-                var getPersons = from x in db.View_SitePerson_Person
-                                 where x.ProjectId == projectId && unitIdList.Contains(x.UnitId) && x.IsUsed == true
+                var getPersons = (from x in db.View_SitePerson_Person
+                                 where x.ProjectId == projectId && unitIdList.Contains(x.UnitId) && x.IsUsed == true &&(string.IsNullOrEmpty(strParam)||x.PersonName.Contains(strParam)) && (string.IsNullOrEmpty(InTime) || x.InTime < inDateTime)
                                  && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime >= DateTime.Now)
                                  select new Model.PersonItem
-                                 {
-                                     PersonId = x.PersonId,
-                                     CardNo = x.CardNo,
-                                     PersonName = x.PersonName,
-                                     SexName = x.SexName,
-                                     IdentityCard = x.IdentityCard,
-                                     Address = x.Address,
-                                     ProjectId = x.ProjectId,
-                                     ProjectCode = x.ProjectCode,
-                                     ProjectName = x.ProjectName,
-                                     UnitId = x.UnitId,
-                                     UnitCode = x.UnitCode,
-                                     UnitName = x.UnitName,
-                                     TeamGroupId = x.TeamGroupId,
-                                     TeamGroupName = x.TeamGroupName,
-                                     WorkPostId = x.WorkPostId,
-                                     WorkPostName = x.WorkPostName,
-                                     InTime = string.Format("{0:yyyy-MM-dd}", x.InTime),
-                                     OutTime = string.Format("{0:yyyy-MM-dd}", x.OutTime),
-                                     OutResult = x.OutResult,
-                                     Telephone = x.Telephone,
-                                     PhotoUrl = x.PhotoUrl,
-                                     DepartName = x.DepartName,
-                                 };
+								 {
+									 PersonId = x.PersonId,
+									 CardNo = x.CardNo,
+									 PersonName = x.PersonName,
+									 SexName = x.SexName,
+									 IdentityCard = x.IdentityCard,
+									 Address = x.Address,
+									 ProjectId = x.ProjectId,
+									 ProjectCode = x.ProjectCode,
+									 ProjectName = x.ProjectName,
+									 UnitId = x.UnitId,
+									 UnitCode = x.UnitCode,
+									 UnitName = x.UnitName,
+									 TeamGroupId = x.TeamGroupId,
+									 TeamGroupName = x.TeamGroupName,
+									 WorkPostId = x.WorkPostId,
+									 WorkPostName = x.WorkPostName,
+									 InTime = string.Format("{0:yyyy-MM-dd}", x.InTime),									 
+									 OutTime = string.Format("{0:yyyy-MM-dd}", x.OutTime),									 
+									 OutResult = x.OutResult,
+									 Telephone = x.Telephone,
+									 PhotoUrl = x.PhotoUrl,
+									 DepartName = x.DepartName,
+								 }).ToList();
+
+
+
+				 
                 if (!string.IsNullOrEmpty(workPostIds))
                 {
                     List<string> workPostIdList = Funs.GetStrListByStr(workPostIds, ',');
-                    getPersons = getPersons.Where(x => workPostIdList.Contains(x.WorkPostId));
+                    getPersons = getPersons.Where(x => workPostIdList.Contains(x.WorkPostId)).ToList();
+                }
+                if (!string.IsNullOrEmpty(trainTypeId) &&trainTypeId == Const.SpecialSafeTrainId)//专项安全培训
+                {
+                    var ids = db.Base_WorkPost.Where(x => x.PostType == "2").Select(x => x.WorkPostId).ToList();
+                    getPersons = getPersons.Where(x => ids.Contains(x.WorkPostId)).ToList();
                 }
-
                 List<Model.PersonItem> getTrainPersonList = new List<Model.PersonItem>();
                 var getTrainType = TrainTypeService.GetTrainTypeById(trainTypeId);
-                if (getTrainType != null && (!getTrainType.IsRepeat.HasValue || getTrainType.IsRepeat == false))
-                {
-                    foreach (var item in getPersons)
-                    {
-                        var getTrainPersonIdList1 = (from x in db.EduTrain_TrainRecordDetail
-                                                     join y in db.EduTrain_TrainRecord on x.TrainingId equals y.TrainingId
-                                                     where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && x.CheckResult == true && x.PersonId == item.PersonId
-                                                     select x).FirstOrDefault();
-                        if (getTrainPersonIdList1 == null)
-                        {
-                            var getTrainPersonIdList2 = (from x in db.Training_Task
-                                                         join y in db.Training_Plan on x.PlanId equals y.PlanId
-                                                         where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.UserId == item.PersonId
-                                                         select x).FirstOrDefault();
-                            if (getTrainPersonIdList2 == null)
-                            {
-                                getTrainPersonList.Add(item);
-                            }
-                        }
-                    }
-                    return getTrainPersonList;
-                }
-                else
-                {
-                    return getPersons.ToList();
-                }
+				if (getTrainType != null && (!getTrainType.IsRepeat.HasValue || getTrainType.IsRepeat.Value == false))
+				{
+					int score = 80;
+					var sysTestRule = db.Sys_TestRule.FirstOrDefault();
+					if (sysTestRule != null)
+					{
+						if (sysTestRule.PassingScore > 0)
+						{
+							score = sysTestRule.PassingScore;
+						}
+					}
+					foreach (var item in getPersons)
+					{
+						var getTrainPersonIdList3 = (from x in db.Training_TestRecord
+													 join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId
+													 where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.TestManId == item.PersonId
+													 where x.TestScores > score
+													 select x).FirstOrDefault();
+						if (getTrainPersonIdList3 != null)
+						{
+							continue;
+						}
+						var getTrainPersonIdList1 = (from x in db.EduTrain_TrainRecordDetail
+													 join y in db.EduTrain_TrainRecord on x.TrainingId equals y.TrainingId
+													 where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && x.CheckResult == true && x.PersonId == item.PersonId 
+													 select x).FirstOrDefault();
+						if (getTrainPersonIdList1 == null)
+						{
+							var getTrainPersonIdList2 = (from x in db.Training_Task
+														 join y in db.Training_Plan on x.PlanId equals y.PlanId
+														 where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.UserId == item.PersonId
+														
+														 select x).FirstOrDefault();
+							if (getTrainPersonIdList2 == null)
+							{
+								getTrainPersonList.Add(item);
+							}
+						}
+					}
+					return getTrainPersonList;
+				}
+				else if (getTrainType != null && getTrainType.IsRepeat.HasValue && getTrainType.IsRepeat.Value == true)//重复的  过滤人员
+				{
+					foreach (var item in getPersons)
+					{
+						//int score = 80;
+						//var sysTestRule = db.Sys_TestRule.FirstOrDefault();
+						//if (sysTestRule != null)
+						//{
+						//	if (sysTestRule.PassingScore > 0)
+						//	{
+						//		score = sysTestRule.PassingScore;
+						//	}
+						//}
+						//var getTrainPersonIdList2 = (from x in db.Training_TestRecord
+						//							 join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId
+						//							 where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.TestManId == item.PersonId
+						//							 where x.TestScores > score
+						//							 select x).FirstOrDefault();
+						//if (getTrainPersonIdList2 != null)
+						//{
+						//	continue;
+						//}
+						getTrainPersonList.Add(item);
+					}
+					return getTrainPersonList;
+				}
+				//else if (getTrainType != null && (!getTrainType.IsRepeat.HasValue || getTrainType.IsRepeat == false))//重复的  过滤人员
+				//{
+				//	int score = 80;
+				//	var sysTestRule = db.Sys_TestRule.FirstOrDefault();
+				//	if (sysTestRule != null)
+				//	{
+				//		if (sysTestRule.PassingScore > 0)
+				//		{
+				//			score = sysTestRule.PassingScore;
+				//		}
+				//	}
+				//	foreach (var item in getPersons)
+				//	{
+						
+				//		var getTrainPersonIdList2 = (from x in db.Training_TestRecord
+				//									 join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId
+				//									 where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.TestManId == item.PersonId
+				//									 where x.TestScores > score
+				//									 select x).FirstOrDefault();
+				//		if (getTrainPersonIdList2 != null)
+				//		{
+				//			continue;
+				//		}
+				//		getTrainPersonList.Add(item);
+				//	}
+				//	return getTrainPersonList;
+				//}
+				else
+				{
+					return getPersons.ToList();
+				}
             }
         }
         #endregion
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 5175135..8504eaf 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -6233,6 +6233,10 @@ namespace BLL
         public const string InterFaceSetMenuId = "FFD221D7-AE05-447F-8727-80058A04F401";
         public const string InterFaceTaskMenuId = "FFD221D7-AE05-447F-8727-80058A04F402";
         public const string IFLogListMenuId = "FFD221D7-AE05-447F-8727-80058A04F404";
+        /// <summary>
+        /// 专项安全培训 id
+        /// </summary>
+        public static string SpecialSafeTrainId = "0e7fdf78-eaa0-4d00-a60b-490040bbea18";
         #endregion
 
         #region 数据同步状态
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 6477a1e..f4b84e4 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1875,6 +1875,7 @@
     <Content Include="HSSE\EduTrain\PlanEdit.aspx" />
     <Content Include="HSSE\EduTrain\TaskNotice.aspx" />
     <Content Include="HSSE\EduTrain\TaskNoticeEdit.aspx" />
+    <Content Include="HSSE\EduTrain\Trainingrecords.aspx" />
     <Content Include="HSSE\EduTrain\TrainTestRecordEdit.aspx" />
     <Content Include="HSSE\EduTrain\CompanyTraining.aspx" />
     <Content Include="HSSE\EduTrain\CompanyTrainingItemSave.aspx" />
@@ -12733,6 +12734,8 @@
     <Compile Include="HSSE\EduTrain\TaskNoticeEdit.aspx.designer.cs">
       <DependentUpon>TaskNoticeEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HSSE\EduTrain\Trainingrecords.aspx.cs" />
+    <Compile Include="HSSE\EduTrain\Trainingrecords.aspx.designer.cs" />
     <Compile Include="HSSE\EduTrain\TrainTestRecordEdit.aspx.cs">
       <DependentUpon>TrainTestRecordEdit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -19573,7 +19576,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx
index 7296d97..e47296d 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx
@@ -124,11 +124,11 @@
     </f:Panel>
     <f:Window ID="Window1" Title="类别" Hidden="true" EnableIFrame="true" EnableMaximize="true"
         Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
-        Width="600px" Height="400px">
+        Width="700px" Height="600px">
     </f:Window>
     <f:Window ID="Window2" Title="详情" Hidden="true" EnableIFrame="true" EnableMaximize="true"
         Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="true"
-        Width="600px" Height="400px">
+        Width="700px" Height="600px">
     </f:Window>
     <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
         Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx
index f223b70..b01b50f 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx
@@ -39,6 +39,25 @@
                     </f:DatePicker>
                 </Items>
             </f:FormRow>
+             <f:FormRow>
+                <Items>
+                      <f:NumberBox ID="txtLearningTime" Label="时长（分钟）" runat="server"  DecimalPrecision="0"  NoDecimal="true" NoNegative="true" ></f:NumberBox>
+                </Items>
+            </f:FormRow>
+             <f:FormRow>
+                <Items> 
+                     <f:DropDownBox runat="server" ID="ddTestTraining"   Label="考试题库" EnableMultiSelect="true"  CustomData="true">
+                        <PopPanel>
+                            <f:Tree ID="treeTestTraining" ShowHeader="false" Hidden="true" runat="server" EnableCheckBox="true" CascadeCheck="true">
+                           
+                            </f:Tree>
+                        </PopPanel>
+                    <Listeners>
+                        <f:Listener Event="poppanelshow" Handler="onPopPanelShow" />
+                    </Listeners>
+                </f:DropDownBox>
+                </Items>
+            </f:FormRow>
         </Rows>
         <Toolbars>
             <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
@@ -67,4 +86,46 @@
     </f:Window>
     </form>
 </body>
+     <script>
+         var ddTestTraining = '<%= ddTestTraining.ClientID %>';
+         var treeTestTraining = '<%= treeTestTraining.ClientID %>';
+ 
+        function onPopPanelShow(event) {
+            var nodes = this.getValue();
+ 
+            F.noEvent(function () {
+                // 第二个参数true：是否递归调用子节点
+                F(treeTestTraining).checkNodes(nodes, true);
+ 
+                // 启用树控件的级联选择时，确保把树控件的选中值全部同步到下拉框
+                syncToDropDownBox();
+            });
+ 
+        }
+ 
+        // 将树控件的选中值同步到下拉框
+        function syncToDropDownBox() {
+            var values = [], texts = [];
+            var checkedNodes = F(treeTestTraining).getCheckedNodes(true);
+            $.each(checkedNodes, function (index, node) {
+                debugger;
+                values.push(node.id);
+                texts.push(node.text);
+            });
+           
+            F(ddTestTraining).setValue(values, texts);
+        }
+ 
+        F.ready(function () {
+             
+            F(treeTestTraining).on('nodecheck', function (event, nodeId, checked) {
+                // 加个延迟，等待复选框的级联选择完成
+                window.setTimeout(function () {
+                    syncToDropDownBox();
+                });
+            });
+ 
+        });
+ 
+     </script>
 </html>
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx.cs
index 8af4d38..89134c6 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx.cs
@@ -2,6 +2,8 @@
 using System.Linq;
 using Model;
 using BLL;
+using System.Collections.Generic;
+using Microsoft.Office.Interop.Excel;
 
 namespace FineUIPro.Web.HSSE.EduTrain
 {
@@ -46,7 +48,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
             {
                 this.GetButtonPower();
                 btnClose.OnClientClick = ActiveWindow.GetHideReference();
-
+                BoundTree(treeTestTraining.Nodes, "0");
                 this.CompanyTrainingItemId = Request.QueryString["CompanyTrainingItemId"];
                 this.CompanyTrainingId = Request.QueryString["CompanyTrainingId"];
                 if (!string.IsNullOrEmpty(this.CompanyTrainingItemId))
@@ -59,6 +61,25 @@ namespace FineUIPro.Web.HSSE.EduTrain
                         txtCompanyTrainingItemName.Text = q.CompanyTrainingItemName;
                         txtCompileMan.Text = q.CompileMan;
                         hdCompileMan.Text = q.CompileMan;
+                        if (!string.IsNullOrEmpty(q.TestTrainingIds))
+                        {
+                            ddTestTraining.Values = q.TestTrainingIds.Split(',');
+                            string text = "";
+                            var trains = Funs.DB.Training_TestTraining.ToList();
+                            foreach (var ids in ddTestTraining.Values)
+                            {
+                                var t = trains.FirstOrDefault(x => x.TrainingId == ids);
+                                if (t != null)
+                                {
+                                    text += "[" + t.TrainingCode + "]" + t.TrainingName + ",";
+                                }
+                            }
+                            ddTestTraining.Text = text.TrimEnd(new char[] { ',' });
+                        }
+						if (q.LearningTime.HasValue)
+						{
+							txtLearningTime.Text = (q.LearningTime.Value/60).ToString();
+						}
                         if (q.CompileDate != null)
                         {
                             txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", q.CompileDate);
@@ -77,10 +98,49 @@ namespace FineUIPro.Web.HSSE.EduTrain
                         txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
                     }
                 }
+
+              
             }
         }
         #endregion
+        private List<Model.Training_TestTraining> GetNewTraining(string parentId)
+        {
+            return (from x in Funs.DB.Training_TestTraining
+                    where x.SupTrainingId == parentId
+                    orderby x.TrainingCode
+                    select x).ToList();
+        }
+        private void BoundTree(TreeNodeCollection nodes, string parentId)
+        {
+            var dt = GetNewTraining(parentId);
+            if (dt.Count() > 0)
+            {
+                TreeNode tn = null;
+                foreach (var dr in dt)
+                {
+                    string name = dr.TrainingName;
+                    if (!string.IsNullOrEmpty(dr.TrainingCode))
+                    {
+                        name = "[" + dr.TrainingCode + "]" + dr.TrainingName;
+                    }
+                    tn = new TreeNode
+                    {
 
+                        Text = name,
+                        NodeID = dr.TrainingId,
+                        EnableClickEvent = true, 
+                        ToolTip = dr.TrainingName
+                    };
+                    nodes.Add(tn);
+                    ///是否存在下级节点
+                    var sup = Funs.DB.Training_TestTraining.FirstOrDefault(x => x.SupTrainingId == tn.NodeID);
+                    if (sup != null)
+                    {
+                        BoundTree(tn.Nodes, tn.NodeID);
+                    }
+                }
+            }
+        }
         #region 保存
         /// <summary>
         /// 保存数据
@@ -93,6 +153,14 @@ namespace FineUIPro.Web.HSSE.EduTrain
                 CompanyTrainingItemName = this.txtCompanyTrainingItemName.Text.Trim(),
                 CompileMan = hdCompileMan.Text.Trim()
             };
+            if (ddTestTraining.Values != null && ddTestTraining.Values.Length > 0)
+            {
+                newCompanyTrainItem.TestTrainingIds = string.Join(",", ddTestTraining.Values);
+            }
+            if (!string.IsNullOrEmpty(txtLearningTime.Text))
+			{
+				newCompanyTrainItem.LearningTime = int.Parse(txtLearningTime.Text)*60;
+			}
             if (!string.IsNullOrEmpty(txtCompileDate.Text.Trim()))
             {
                 newCompanyTrainItem.CompileDate = Convert.ToDateTime(txtCompileDate.Text.Trim());
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx.designer.cs
index 676b7c1..0cba024 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.EduTrain {
-    
-    
-    public partial class CompanyTrainingItemSave {
-        
+namespace FineUIPro.Web.HSSE.EduTrain
+{
+
+
+    public partial class CompanyTrainingItemSave
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtCompanyTrainingItemCode 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCompanyTrainingItemCode;
-        
+
         /// <summary>
         /// txtCompanyTrainingItemName 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCompanyTrainingItemName;
-        
+
         /// <summary>
         /// txtCompileMan 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCompileMan;
-        
+
         /// <summary>
         /// txtCompileDate 控件。
         /// </summary>
@@ -74,7 +76,34 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtCompileDate;
-        
+
+        /// <summary>
+        /// txtLearningTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtLearningTime;
+
+        /// <summary>
+        /// ddTestTraining 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownBox ddTestTraining;
+
+        /// <summary>
+        /// treeTestTraining 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree treeTestTraining;
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -83,7 +112,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// lbTemp 控件。
         /// </summary>
@@ -92,7 +121,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lbTemp;
-        
+
         /// <summary>
         /// btnAttachUrl 控件。
         /// </summary>
@@ -101,7 +130,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -110,7 +139,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -119,7 +148,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -128,7 +157,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// hdCompileMan 控件。
         /// </summary>
@@ -137,7 +166,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdCompileMan;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx
index 5224f5f..572097c 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx
@@ -5,7 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <title>编辑专项检查</title>
-    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />   
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />  
 
     <style type="text/css">
         .labcenter
@@ -33,24 +33,33 @@
         <Rows>
             <f:FormRow>
                 <Items>
+                     <f:TextBox ID="txtPlanCode" runat="server" Label="编号"  Required="true" ShowRedStar="true">
+                    </f:TextBox> 
                     <f:TextBox ID="txtPlanName" runat="server" Label="标题"  Required="true" ShowRedStar="true">
                     </f:TextBox>                            
-                     <f:DropDownList ID="drpTrainType" runat="server" Label="培训类型"   Required="true" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpTrainType_SelectedIndexChanged"
-                         EnableEdit="true">
-                    </f:DropDownList>
+                    
                  </Items>
             </f:FormRow>
             <f:FormRow>
                 <Items>
+                    <f:DropDownList ID="drpTrainType" runat="server" Label="培训类型"   Required="true" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpTrainType_SelectedIndexChanged"
+                         EnableEdit="true">
+                    </f:DropDownList>
                      <f:DropDownList ID="drpTrainLevel" runat="server" Label="培训级别"   Required="true" ShowRedStar="true"
                         EnableEdit="true">
-                    </f:DropDownList>
-                     <f:TextBox ID="txtTrainContent" runat="server" Label="培训内容"  Required="true" ShowRedStar="true">
-                    </f:TextBox>   
+                    </f:DropDownList> 
                        </Items>
+            </f:FormRow>
+             <f:FormRow>
+                <Items>
+
+                      <f:TextBox ID="txtTrainContent" runat="server" Label="培训内容"  Required="true" ShowRedStar="true">
+                    </f:TextBox>
+                </Items>
             </f:FormRow>
             <f:FormRow>
                 <Items>
+                    
                     <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd HH:mm" Label="培训日期"  ShowTime="true"  Required="true" ShowRedStar="true"  ID="dpTrainStartDate" EnableEdit="false">
                     </f:DatePicker>
                      <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd HH:mm" Label="培训日期" ShowTime="true"  Required="true" ShowRedStar="true"   ID="dpTrainEndDate" EnableEdit="false">
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx.cs
index 06f5752..7371ef1 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx.cs
@@ -64,8 +64,9 @@ namespace FineUIPro.Web.HSSE.EduTrain
                     if (trainingPlan != null)
                     {
 
-                        this.txtPlanName.Text = trainingPlan.PlanName;
-                        this.txtTrainContent.Text = trainingPlan.TrainContent;
+						this.txtPlanCode.Text = trainingPlan.PlanCode;
+						this.txtPlanName.Text = trainingPlan.PlanName;
+						this.txtTrainContent.Text = trainingPlan.TrainContent;
                         this.txtTeachMan.Text = trainingPlan.TeachMan;
                         if (trainingPlan.TeachHour.HasValue)
                             this.txtTeachHour.Text = trainingPlan.TeachHour.Value.ToString("0.##");
@@ -90,7 +91,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
                         {
                             dpCompanyTraining.SelectedValueArray = planItem;
                         }
-                        var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(this.CurrUser.LoginProjectId, trainingPlan.UnitIds, trainingPlan.WorkPostId, trainingPlan.TrainTypeId).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
+                        var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(this.CurrUser.LoginProjectId, trainingPlan.UnitIds, trainingPlan.WorkPostId,"", trainingPlan.TrainTypeId,"","").OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
                         dpSysUser.DataTextField = "PersonName";
                         dpSysUser.DataValueField = "PersonId";
                         dpSysUser.DataSource = getDataList;
@@ -102,7 +103,12 @@ namespace FineUIPro.Web.HSSE.EduTrain
                             dpSysUser.SelectedValueArray = userids;
                         }
                     }
-                }
+				}
+				else
+				{
+					string code = ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectCode + "-";
+					txtPlanCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.Training_Plan", "PlanCode", this.CurrUser.LoginProjectId, code);
+				}
             }
         }
         #endregion
@@ -259,8 +265,9 @@ namespace FineUIPro.Web.HSSE.EduTrain
 
             Model.Training_Plan trainingPlan = new Model.Training_Plan();
             trainingPlan.ProjectId = this.CurrUser.LoginProjectId;
-            trainingPlan.PlanName = this.txtPlanName.Text;
-            trainingPlan.TrainContent = this.txtTrainContent.Text;
+			trainingPlan.PlanName = this.txtPlanName.Text;
+			trainingPlan.PlanCode = this.txtPlanCode.Text;
+			trainingPlan.TrainContent = this.txtTrainContent.Text;
             trainingPlan.TeachMan = this.txtTeachMan.Text;
             trainingPlan.TeachHour =decimal.Parse( this.txtTeachHour.Text);
             trainingPlan.TrainStartDate = this.dpTrainStartDate.SelectedDate;
@@ -280,7 +287,10 @@ namespace FineUIPro.Web.HSSE.EduTrain
             }
             if (string.IsNullOrEmpty(PlanId))
             {
-                trainingPlan.PlanCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectTrainingPlanMenuId, CurrUser.LoginProjectId, CurrUser.UnitId);
+				//string code = ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectCode + "-";
+				//trainingPlan.PlanCode = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.Training_Plan", "PlanCode", this.CurrUser.LoginProjectId, code);
+
+				//trainingPlan.PlanCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectTrainingPlanMenuId, CurrUser.LoginProjectId, CurrUser.UnitId);
                 trainingPlan.PlanId = SQLHelper.GetNewID();
                 TrainingPlanService.AddPlan(trainingPlan);
                 CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.ProjectTrainingPlanMenuId, trainingPlan.ProjectId, null, trainingPlan.PlanId, trainingPlan.DesignerDate);
@@ -431,7 +441,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
                 dpSysUser.Items.Clear();
                 string unitIds=string.Join(",",dpUnit.SelectedValue);
                 string workPostIds = string.Join(",", dpWorkPost.SelectedValue);
-                var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(this.CurrUser.LoginProjectId, unitIds, workPostIds, drpTrainType.SelectedValue).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
+                var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(this.CurrUser.LoginProjectId, unitIds, workPostIds,"", drpTrainType.SelectedValue,"","").OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
                 dpSysUser.DataTextField = "PersonName";
                 dpSysUser.DataValueField = "PersonId";
                 dpSysUser.DataSource = getDataList;
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx.designer.cs
index ea0349d..0cc6a25 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx.designer.cs
@@ -41,6 +41,15 @@ namespace FineUIPro.Web.HSSE.EduTrain
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
 
+        /// <summary>
+        /// txtPlanCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPlanCode;
+
         /// <summary>
         /// txtPlanName 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/Task.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/Task.aspx.cs
index 4abddc6..211c93c 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/Task.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/Task.aspx.cs
@@ -39,11 +39,11 @@ namespace FineUIPro.Web.HSSE.EduTrain
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"SELECT Task.TaskId,Task.PlanId,Task.UserId,Task.TaskDate,(CASE Task.States WHEN '0' THEN '未响应' WHEN '1' THEN '已响应' WHEN '2' THEN '已完成' ELSE '' END) AS States,Plans.PlanName,Person.PersonName"
-                          + @" FROM dbo.Training_Task AS Task "
-                          + @" LEFT JOIN dbo.Training_Plan AS Plans ON Plans.PlanId=Task.PlanId"
-                          + @" LEFT JOIN dbo.SitePerson_Person AS Person ON Person.PersonId = Task.UserId "
-                          + @" WHERE Task.ProjectId='" + this.CurrUser.LoginProjectId + "'";
+            string strSql = @"SELECT Task.TaskId,Task.PlanId,Task.UserId,Task.TaskDate,(CASE Task.States WHEN '0' THEN '未响应' WHEN '1' THEN '已响应' WHEN '2' THEN '已完成' ELSE '' END) AS States,Plans.PlanName,Person.PersonName
+								FROM dbo.Training_Task AS Task 
+								LEFT JOIN dbo.Training_Plan AS Plans ON Plans.PlanId=Task.PlanId
+								LEFT JOIN dbo.SitePerson_Person AS Person ON Person.PersonId = Task.UserId 
+								WHERE Task.ProjectId='" + this.CurrUser.LoginProjectId + "'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))
             {
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TaskView.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/TaskView.aspx
index 71e8776..1eb8a7d 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TaskView.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TaskView.aspx
@@ -23,10 +23,10 @@
                         <Columns>
                             <f:RowNumberField ColumnID="rbNumber" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
                                 TextAlign="Center" />  
-                            <f:RenderField Width="120px" ColumnID="TrainingCode" DataField="TrainingCode"
+                            <f:RenderField Width="120px" ColumnID="TrainingCode" DataField="TrainingCode" Hidden="true"
                                 FieldType="String" HeaderText="类型编号" HeaderTextAlign="Center" TextAlign="Left">
                             </f:RenderField>
-                             <f:RenderField Width="120px" ColumnID="TrainingName" DataField="TrainingName"
+                             <f:RenderField Width="120px" ColumnID="TrainingName" DataField="TrainingName" Hidden="true"
                                 FieldType="String" HeaderText="教材类型" HeaderTextAlign="Center" TextAlign="Left">
                             </f:RenderField>
                             <f:RenderField Width="100px" ColumnID="TrainingItemCode" DataField="TrainingItemCode"
@@ -38,6 +38,27 @@
                             <%--<f:RenderField Width="350px" ColumnID="Summary" DataField="Summary" FieldType="String"
                                 HeaderText="教材内容" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
                             </f:RenderField>--%>
+                           <%--  <f:RenderField Width="200px" ColumnID="LearnTime" DataField="LearnTime" FieldType="String"
+                                HeaderText="教材时长(分钟)" HeaderTextAlign="Center" TextAlign="Left">
+                            </f:RenderField>--%>
+                              <f:TemplateField ColumnID="tfLearnTime" Width="350px" HeaderText="教材时长(分钟)" HeaderTextAlign="Center" 
+                            TextAlign="left">
+                            <ItemTemplate>
+                                <asp:Label ID="lblLearnTime" runat="server" Text='<%# ConvertTime(Eval("LearnTime")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+
+                            <f:TemplateField ColumnID="tfVideoProgress" Width="200px" HeaderText="学习时长(分钟)" HeaderTextAlign="Center" 
+                            TextAlign="left">
+                            <ItemTemplate>
+                                <asp:Label ID="lblVideoProgress" runat="server" Text='<%# ConvertTime(Eval("VideoProgress")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+
+
+                          <%--  <f:RenderField Width="200px" ColumnID="VideoProgress" DataField="VideoProgress" FieldType="String"
+                                HeaderText="学习时长(分钟)" HeaderTextAlign="Center" TextAlign="Left">
+                            </f:RenderField>--%>
                         </Columns>
                         <Listeners>
                             <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TaskView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TaskView.aspx.cs
index 1e1069f..2394d70 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TaskView.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TaskView.aspx.cs
@@ -96,39 +96,16 @@ namespace FineUIPro.Web.HSSE.EduTrain
         /// </summary>
         private void BindGrid()
         {
-            var task = BLL.TrainingTaskService.GetTaskById(this.TaskId);
-            if (task != null)
-            {
-                string strSql = @"SELECT PlanItem.PlanItemId,PlanItem.PlanId,PlanItem.TrainingEduId,Training.TrainingCode,Training.TrainingId,Training.TrainingName
-                                ,TrainingItem.TrainingItemId,TrainingItem.TrainingItemCode,TrainingItem.TrainingItemName
-                                 FROM Training_PlanItem AS PlanItem
-                                 LEFT JOIN Training_TrainingItem AS TrainingItem ON PlanItem.TrainingEduItemId =TrainingItem.TrainingItemId
-                                 LEFT JOIN Training_Training AS Training ON TrainingItem.TrainingId =Training.TrainingId
-                                 WHERE  PlanItem.TrainingEduItemId is not null and PlanItem.PlanId=@PlanId
-                                 union all
-                                SELECT PlanItem.PlanItemId,PlanItem.PlanId,PlanItem.TrainingEduId,Training.CompanyTrainingCode,Training.CompanyTrainingId,Training.CompanyTrainingName
-                                ,TrainingItem.CompanyTrainingItemId,TrainingItem.CompanyTrainingItemCode,TrainingItem.CompanyTrainingItemName
-                                 FROM Training_PlanItem AS PlanItem								  
-                                 LEFT JOIN Training_CompanyTrainingItem AS TrainingItem ON PlanItem.CompanyTrainingId =TrainingItem.CompanyTrainingId
-                                 LEFT JOIN Training_CompanyTraining AS Training ON TrainingItem.CompanyTrainingId =Training.CompanyTrainingId
-                                 WHERE  PlanItem.CompanyTrainingId is not null and PlanItem.PlanId=@PlanId";
+            
+                string strSql = @"select TrainingItemId,d.TrainingCode,c.TrainingId,d.TrainingName, b.[TrainingItemCode],b.[TrainingItemName],b.LearnTime,b.VideoProgress,b.[AttachUrl], c.TrainingItemCode,c.TrainingItemName from 
+								 [dbo].[Training_Task] a 
+								 left join [dbo].[Training_TaskItem] b on a.[TaskId]=b.[TaskId]
+								 left join Training_TrainingItem c on b.TrainingItemCode=c.TrainingItemCode
+								   LEFT JOIN Training_Training AS d ON c.TrainingId =d.TrainingId
+                        where b.[TaskId] = @TaskId          ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
-                listStr.Add(new SqlParameter("@PlanId", task.PlanId));
-                //var user = BLL.UserService.GetUserByUserId(task.UserId);
-                //if (user != null && !string.IsNullOrEmpty(user.InstallationId))
-                //{
-                //    List<string> installs = Funs.GetStrListByStr(user.InstallationId, ',');
-                //    if (installs.Count > 0)
-                //    {
-                //        int i = 0;
-                //        foreach (var item in installs)
-                //        {
-                //            strSql += " AND (TrainingEduItem.InstallationIds LIKE @InstallationId" + i.ToString() + " OR TrainingEduItem.InstallationIds IS NULL)";
-                //            listStr.Add(new SqlParameter("@InstallationId" + i.ToString(), item));
-                //            i++;
-                //        }
-                //    }
-                //}
+                listStr.Add(new SqlParameter("@TaskId", this.TaskId));
+              
 
                 SqlParameter[] parameter = listStr.ToArray();
                 DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -136,7 +113,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
                 var table = this.GetPagedDataTable(Grid1, tb);
                 Grid1.DataSource = table;
                 Grid1.DataBind();
-            }
+             
         }
         #endregion
 
@@ -174,5 +151,30 @@ namespace FineUIPro.Web.HSSE.EduTrain
             PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TaskRecordView.aspx?TrainingEduItemId={0}", Grid1.SelectedRowID, "编辑 - ")));
         }
         #endregion
+
+        #region 格式化字符串
+        /// <summary>
+        /// 获取单位名称
+        /// </summary>
+        /// <param name="unitIds"></param>
+        /// <returns></returns>
+        protected string ConvertTime(object time)
+        {
+            string hours = "0";
+            if (time != null)
+            {
+                if (!string.IsNullOrEmpty(time.ToString()))
+                {
+                    return (Convert.ToInt32(time) / 60).ToString();
+                }
+                else
+                {
+                    return hours;
+                }
+
+            }
+            return hours;
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TaskView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TaskView.aspx.designer.cs
index a2fa80e..09b138a 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TaskView.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TaskView.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.EduTrain {
-    
-    
-    public partial class TaskView {
-        
+namespace FineUIPro.Web.HSSE.EduTrain
+{
+
+
+    public partial class TaskView
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,25 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
+        /// <summary>
+        /// lblLearnTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblLearnTime;
+
+        /// <summary>
+        /// lblVideoProgress 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblVideoProgress;
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -56,7 +76,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -65,7 +85,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -74,7 +94,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -83,7 +103,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -92,7 +112,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuView 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx
index ae3bd83..dff6058 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx
@@ -29,13 +29,13 @@
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="考试记录" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="TestRecordId" EnableColumnLines="true" DataIDField="TestRecordId" AllowSorting="true"
                     SortField="TestStartTime" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" ForceFit="true"
-                    IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
+                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server">
                             <Items>
-                                <f:TextBox ID="txtName" runat="server" Label="查询" EmptyText="输入查询条件" AutoPostBack="true"
-                                    OnTextChanged="TextBox_TextChanged" Width="180px" LabelWidth="60px" LabelAlign="Right">
+                                <f:TextBox ID="txtName" runat="server" Label="查询" EmptyText="输入姓名、公司名称、考试计划名称或培训名称" AutoPostBack="true"
+                                    OnTextChanged="TextBox_TextChanged" Width="400px" LabelWidth="60px" LabelAlign="Right">
                                 </f:TextBox>
                                 <f:NumberBox runat="server" ID="txtMinScores" Label="分值范围" AutoPostBack="true" NoNegative="true"
                                     OnTextChanged="TextBox_TextChanged" Width="180px" LabelWidth="80px" LabelAlign="Right">
@@ -55,7 +55,7 @@
                                 <f:CheckBox runat="server" Label="时间空" ID="ckIsNULL" AutoPostBack="true"
                                     OnCheckedChanged="IsTemp_CheckedChanged" LabelWidth="70px" Width="80px">
                                 </f:CheckBox>
-                                <f:Label runat="server" Text="红色表示分数低于80分。"  CssClass="LabelColor"></f:Label>
+                                <f:Label runat="server" ID="lbPassScore" Text="红色表示分数低于80分。"  CssClass="LabelColor"></f:Label>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnOut" OnClick="btnMenuOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
                                     EnableAjax="false" DisableControlBeforePostBack="false">
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs
index e7a84a8..e7160e0 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.IO;
+using System.Linq;
 using System.Text;
 namespace FineUIPro.Web.HSSE.EduTrain
 {
@@ -24,7 +25,24 @@ namespace FineUIPro.Web.HSSE.EduTrain
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 GetButtonPower();
 
+                var sysTestRule = Funs.DB.Sys_TestRule.FirstOrDefault();
+                if (sysTestRule != null)
+                {
+                    if (sysTestRule.PassingScore > 0)
+                    {
+                        this.lbPassScore.Text = "红色表示分数低于" + sysTestRule.PassingScore.ToString() + "分。";
+                    }
+                    else
+                    {
+                        this.lbPassScore.Text = "红色表示分数低于80分。";
+                    }
+                }
+                else
+                {
+                    this.lbPassScore.Text = "红色表示分数低于80分。";
 
+                    
+                }
 
                 ///更新没有结束时间且超时的考试记录
                 GetDataService.UpdateTestPlanStates();
@@ -56,11 +74,11 @@ namespace FineUIPro.Web.HSSE.EduTrain
                          + @" LEFT JOIN dbo.Training_TestTraining AS Training ON Training.TrainingId = TestRecord.TestType"
                          + @" LEFT JOIN dbo.SitePerson_Person AS Person ON Person.PersonId = TestRecord.TestManId "
                          + @" LEFT JOIN dbo.Base_Unit AS Unit ON Person.UnitId=Unit.UnitId"
-                         + @" WHERE (isFiled IS NULL OR isFiled = 0) and TestRecord.ProjectId = '" + this.CurrUser.LoginProjectId+"'";
+                         + @" WHERE TestRecord.TestStartTime is not null and  (isFiled IS NULL OR isFiled = 0) and TestRecord.ProjectId = '" + this.CurrUser.LoginProjectId+"'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))
             {
-                strSql += " AND (Person.PersonName LIKE @name OR TestPlan.PlanName LIKE @name OR Training.TrainingName LIKE @name)";
+                strSql += " AND (Person.PersonName LIKE @name OR TestPlan.PlanName LIKE @name OR Training.TrainingName LIKE @name OR Unit.UnitName  like @name)";
                 listStr.Add(new SqlParameter("@name", "%" + this.txtName.Text.Trim() + "%"));
             }
             if (!string.IsNullOrEmpty(this.txtMinScores.Text.Trim()))
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.designer.cs
index 5c89180..4dfae80 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.EduTrain {
-    
-    
-    public partial class TestRecord {
-        
+namespace FineUIPro.Web.HSSE.EduTrain
+{
+
+
+    public partial class TestRecord
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// txtName 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtName;
-        
+
         /// <summary>
         /// txtMinScores 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtMinScores;
-        
+
         /// <summary>
         /// txtMaxScores 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtMaxScores;
-        
+
         /// <summary>
         /// IsTemp 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox IsTemp;
-        
+
         /// <summary>
         /// txtStartDate 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartDate;
-        
+
         /// <summary>
         /// txtEndDate 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndDate;
-        
+
         /// <summary>
         /// ckIsNULL 控件。
         /// </summary>
@@ -119,7 +121,16 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckIsNULL;
-        
+
+        /// <summary>
+        /// lbPassScore 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lbPassScore;
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// labNumber 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuView 控件。
         /// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuView;
-        
+
         /// <summary>
         /// btnPrinter 控件。
         /// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnPrinter;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx
index 86df27a..83ffc22 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx
@@ -24,6 +24,8 @@
                             <f:TextBox ID="txtName" runat="server" Label="查询" EmptyText="输入查询条件" AutoPostBack="true"
                                 OnTextChanged="TextBox_TextChanged" Width="350px" LabelWidth="80px" LabelAlign="Right">
                             </f:TextBox>
+
+                            <f:CheckBox ID="cbNoPass" Text="<70"></f:CheckBox>
                             <f:ToolbarFill ID="ToolbarFill1" runat="server">
                             </f:ToolbarFill>                           
                         </Items>
@@ -50,8 +52,8 @@
                     <f:RenderField Width="120px" ColumnID="TestCount" DataField="TestCount" SortField="TestCount"
                         HeaderText="参加次数" HeaderTextAlign="Center" TextAlign="Left">
                     </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="TestQualifyCount" DataField="TestQualifyCount" SortField="TestQualifyCount"
-                        HeaderText="60分以上" HeaderTextAlign="Center" TextAlign="Left">
+                    <f:RenderField Width="120px" ID="TestQualifyCount" ColumnID="TestQualifyCount" DataField="TestQualifyCount" SortField="TestQualifyCount"
+                        HeaderText="70分以上" HeaderTextAlign="Center" TextAlign="Left">
                     </f:RenderField>
                 </Columns>
                 <Listeners>
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx.cs
index 8dde887..160545a 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx.cs
@@ -1,8 +1,10 @@
 using BLL;
+using Model;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.Linq;
 
 namespace FineUIPro.Web.HSSE.EduTrain
 {
@@ -20,6 +22,13 @@ namespace FineUIPro.Web.HSSE.EduTrain
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                var sysTestRule = Funs.DB.Sys_TestRule.FirstOrDefault();
+                var passingScore = "60";
+                if (sysTestRule != null)
+                {
+                    passingScore = sysTestRule.PassingScore.ToString();
+                }
+                TestQualifyCount.HeaderText = passingScore + "分以上";
                 // 绑定表格
                 this.BindGrid();
             }
@@ -37,6 +46,12 @@ namespace FineUIPro.Web.HSSE.EduTrain
         /// </summary>
         private void BindGrid()
         {
+            var sysTestRule = Funs.DB.Sys_TestRule.FirstOrDefault();
+            var passingScore = "60"; 
+            if (sysTestRule != null)
+            {
+                passingScore = sysTestRule.PassingScore.ToString();
+            }
             string strSql = @"SELECT PersonId,CardNo,PersonName,person.UnitId,Unit.UnitCode,Unit.UnitName,person.DepartId,Depart.DepartCode,Depart.DepartName"
                         + @",WorkPostName,ISNULL(TestCount,0) AS TestCount,ISNULL(TestQualifyCount,0) AS TestQualifyCount "
                         + @" FROM SitePerson_Person AS person "
@@ -45,7 +60,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
                         + @" LEFT JOIN Base_Depart AS Depart ON person.DepartId=Depart.DepartId"
                         + @" LEFT JOIN (SELECT COUNT(TestRecordId) AS TestCount,TestManId  FROM Training_TestRecord GROUP BY TestManId) AS TestCount"
                         + @" ON person.PersonId=TestCount.TestManId"
-                        + @" LEFT JOIN (SELECT COUNT(TestRecordId) AS TestQualifyCount,TestManId  FROM Training_TestRecord WHERE TestScores>= 60 GROUP BY TestManId) AS TestQualifyCount"
+                        + @" LEFT JOIN (SELECT COUNT(TestRecordId) AS TestQualifyCount,TestManId  FROM Training_TestRecord WHERE TestScores>= "+ passingScore + " GROUP BY TestManId) AS TestQualifyCount"
                         + @" ON person.PersonId=TestQualifyCount.TestManId"
                         + @" WHERE PersonId <> '" + BLL.Const.sysglyId + "' and person.projectid='" + this.CurrUser.LoginProjectId + "'";
             List<SqlParameter> listStr = new List<SqlParameter>();
@@ -54,7 +69,11 @@ namespace FineUIPro.Web.HSSE.EduTrain
                 strSql += " AND (PersonName LIKE @name OR CardNo LIKE @name OR Unit.UnitName LIKE @name OR Depart.DepartName LIKE @name OR WorkPostName LIKE @name)";
                 listStr.Add(new SqlParameter("@name", "%" + this.txtName.Text.Trim() + "%"));
             }
+            if (cbNoPass.Checked)
+            {
+                strSql += " AND TestScores < "+ passingScore;
 
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx.designer.cs
index 14830fe..90a580a 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.EduTrain {
-    
-    
-    public partial class TestStatistics {
-        
+namespace FineUIPro.Web.HSSE.EduTrain
+{
+
+
+    public partial class TestStatistics
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// txtName 控件。
         /// </summary>
@@ -65,7 +67,16 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtName;
-        
+
+        /// <summary>
+        /// cbNoPass 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox cbNoPass;
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -74,7 +85,16 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
+        /// <summary>
+        /// TestQualifyCount 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RenderField TestQualifyCount;
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -83,7 +103,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -92,7 +112,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx
index 7cc4768..14c32d1 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx
@@ -1,5 +1,6 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TrainRecord.aspx.cs" Inherits="FineUIPro.Web.HSSE.EduTrain.TrainRecord" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -9,113 +10,124 @@
 <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">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="培训记录" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="TrainingId" EnableColumnLines="true" DataIDField="TrainingId" AllowSorting="true"
-                    SortField="TrainingCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" ForceFit="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
-                    EnableTextSelection="True" EnableSummary="true" SummaryPosition="Flow">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
-                            <Items>
-                                <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="Text_TextChanged"
-                                    LabelAlign="Right" LabelWidth="50px" Width="260px">
-                                </f:DropDownList>
-                                <f:DropDownList ID="drpTrainType" runat="server" Label="培训类别" Width="210px" LabelWidth="80px" LabelAlign="Right"
-                                    AutoPostBack="true" OnSelectedIndexChanged="Text_TextChanged">
-                                </f:DropDownList>
-                                <f:DropDownList ID="drpTrainLevel" runat="server" Label="培训级别" Width="180px" LabelWidth="80px" LabelAlign="Right"
-                                    AutoPostBack="true" OnSelectedIndexChanged="Text_TextChanged">
-                                </f:DropDownList>
-                                <f:DatePicker ID="txtStartDate" runat="server" Label="日期" Width="160px" LabelWidth="60px" LabelAlign="Right"
-                                    AutoPostBack="true" OnTextChanged="Text_TextChanged">
-                                </f:DatePicker>
-                                <f:Label ID="lblTo" runat="server" Text="至" Width="20px">
-                                </f:Label>
-                                <f:DatePicker ID="txtEndDate" runat="server" Width="100px" AutoPostBack="true" OnTextChanged="Text_TextChanged">
-                                </f:DatePicker>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnNew" ToolTip="增加" Icon="Add" runat="server" Hidden="true" OnClick="btnNew_Click">
-                                </f:Button>
-                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
-                                   <f:Button ID="btnRefresh" ToolTip="刷明细" Icon="ArrowRefresh" runat="server" Hidden="true" OnClick="btnRefresh_Click">
-                                </f:Button>
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                      <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <%--<f:RenderField Width="120px" ColumnID="TrainingCode" DataField="TrainingCode" SortField="TrainingCode"
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="培训记录" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="TrainingId" EnableColumnLines="true" DataIDField="TrainingId" AllowSorting="true"
+                            SortField="TrainingCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" ForceFit="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
+                            EnableTextSelection="True" EnableSummary="true" SummaryPosition="Flow">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                                    <Items>
+                                         <f:TextBox ID="txtName" runat="server" Label="查询" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="Text_TextChanged" Width="180px" LabelWidth="60px" LabelAlign="Right">
+                                        </f:TextBox>
+
+                                        <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="Text_TextChanged"
+                                            LabelAlign="Right" LabelWidth="50px" Width="260px">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpTrainType" runat="server" Label="培训类别" Width="210px" LabelWidth="80px" LabelAlign="Right"
+                                            AutoPostBack="true" OnSelectedIndexChanged="Text_TextChanged">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpTrainLevel" runat="server" Label="培训级别" Width="180px" LabelWidth="80px" LabelAlign="Right"
+                                            AutoPostBack="true" OnSelectedIndexChanged="Text_TextChanged">
+                                        </f:DropDownList>
+                                        <f:DatePicker ID="txtStartDate" runat="server" Label="日期" Width="160px" LabelWidth="60px" LabelAlign="Right"
+                                            AutoPostBack="true" OnTextChanged="Text_TextChanged">
+                                        </f:DatePicker>
+                                        <f:Label ID="lblTo" runat="server" Text="至" Width="20px">
+                                        </f:Label>
+                                        <f:DatePicker ID="txtEndDate" runat="server" Width="100px" AutoPostBack="true" OnTextChanged="Text_TextChanged">
+                                        </f:DatePicker>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server" Hidden="true" OnClick="btnNew_Click" Text="新增">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                        <f:Button ID="btnRefresh" ToolTip="刷明细" Icon="ArrowRefresh" runat="server" Hidden="true" OnClick="btnRefresh_Click" Text="刷新明细">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <%--<f:RenderField Width="120px" ColumnID="TrainingCode" DataField="TrainingCode" SortField="TrainingCode"
                         FieldType="String" HeaderText="培训编号" HeaderTextAlign="Center" TextAlign="Left">                        
                     </f:RenderField>--%>
-                        <f:TemplateField ColumnID="tfTrainingCode" Width="100px" HeaderText="培训编号" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                            <ItemTemplate>
-                                <asp:Label ID="lblTrainingCode" runat="server" Text='<%# Bind("TrainingCode") %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="150px" ColumnID="TrainTitle" DataField="TrainTitle" SortField="TrainTitle"
-                            FieldType="String" HeaderText="标题" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="tfUnitIds" Width="300px" HeaderText="单位名称" HeaderTextAlign="Center" 
-                            TextAlign="left">
-                            <ItemTemplate>
-                                <asp:Label ID="lblUnitId" runat="server" Text='<%# ConvertUnitName(Eval("UnitIds")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="110px" ColumnID="TrainTypeName" DataField="TrainTypeName" SortField="TrainTypeName"
-                            FieldType="String" HeaderText="培训类型" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <%--<f:RenderField Width="120px" ColumnID="TrainLevelName" DataField="TrainLevelName" SortField="TrainLevelName"
+                                <f:TemplateField ColumnID="tfTrainingCode" Width="100px" HeaderText="培训编号" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblTrainingCode" runat="server" Text='<%# Bind("TrainingCode") %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="150px" ColumnID="TrainTitle" DataField="TrainTitle" SortField="TrainTitle"
+                                    FieldType="String" HeaderText="标题" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="tfUnitIds" Width="300px" HeaderText="单位名称" HeaderTextAlign="Center"
+                                    TextAlign="left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblUnitId" runat="server" Text='<%# ConvertUnitName(Eval("UnitIds")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="110px" ColumnID="TrainTypeName" DataField="TrainTypeName" SortField="TrainTypeName"
+                                    FieldType="String" HeaderText="培训类型" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <%--<f:RenderField Width="120px" ColumnID="TrainLevelName" DataField="TrainLevelName" SortField="TrainLevelName"
                             FieldType="String" HeaderText="培训级别" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>--%>
-                        <f:RenderField Width="100px" ColumnID="TrainStartDate" DataField="TrainStartDate"
-                            SortField="TrainStartDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                            HeaderText="培训日期" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <%--  <f:RenderField Width="65px" ColumnID="TeachHour" DataField="TeachHour" SortField="TeachHour"
+                                <f:RenderField Width="100px" ColumnID="TrainStartDate" DataField="TrainStartDate"
+                                    SortField="TrainStartDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="培训日期" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <%--  <f:RenderField Width="65px" ColumnID="TeachHour" DataField="TeachHour" SortField="TeachHour"
                         FieldType="Float" HeaderText="学时" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>
                     <f:RenderField Width="90px" ColumnID="TeachMan" DataField="TeachMan" SortField="TeachMan"
                         FieldType="String" HeaderText="授课人" HeaderTextAlign="Center" TextAlign="Left">
                     </f:RenderField>--%>
-                        <f:RenderField Width="80px" ColumnID="TeachMan" DataField="TeachMan"
-                            SortField="TeachMan" FieldType="String" HeaderText="授课人" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="80px" ColumnID="TrainPersonNum" DataField="TrainPersonNum"
-                            SortField="TrainPersonNum" FieldType="String" HeaderText="人数" HeaderTextAlign="Center"
-                            TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="140px" ColumnID="FlowOperateName" DataField="FlowOperateName"
-                            SortField="FlowOperateName" 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>
+                                <f:RenderField Width="80px" ColumnID="TrainPersonNum" DataField="TrainPersonNum"
+                                    SortField="TrainPersonNum" 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>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="编制培训记录" Hidden="true" EnableIFrame="true" EnableMaximize="true"
@@ -127,7 +139,7 @@
             Height="768px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
-             <f:MenuButton ID="btnMenuView" OnClick="btnMenuView_Click" Icon="Find" EnablePostBack="true"
+            <f:MenuButton ID="btnMenuView" OnClick="btnMenuView_Click" Icon="Find" EnablePostBack="true"
                 runat="server" Text="查看">
             </f:MenuButton>
             <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.cs
index b08f2fd..c46d5db 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.cs
@@ -12,6 +12,8 @@ namespace FineUIPro.Web.HSSE.EduTrain
 {
     public partial class TrainRecord : PageBase
     {
+        private static string trainType;
+
         #region 定义项
         /// <summary>
         /// 培训记录主键
@@ -27,6 +29,29 @@ namespace FineUIPro.Web.HSSE.EduTrain
                 ViewState["TrainingId"] = value;
             }
         }
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+
+        public string UnitId
+        {
+            get
+            {
+                return (string)ViewState["UnitId"];
+            }
+            set
+            {
+                ViewState["UnitId"] = value;
+            }
+        }
         #endregion
 
         #region 加载页面
@@ -39,6 +64,15 @@ namespace FineUIPro.Web.HSSE.EduTrain
         {
             if (!IsPostBack)
             {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ////权限按钮方法
                 this.GetButtonPower();
@@ -48,6 +82,11 @@ namespace FineUIPro.Web.HSSE.EduTrain
                 BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
                 //培训类型
                 BLL.TrainTypeService.InitTrainTypeDropDownList(this.drpTrainType, true);
+                trainType = Request.Params["trainType"];
+                if (!string.IsNullOrEmpty(trainType))
+                {
+                    this.drpTrainType.Items.FindByText(trainType).Selected = true;
+                }
                 //培训级别;
                 BLL.TrainLevelService.InitTrainLevelDropDownList(this.drpTrainLevel, true);
 
@@ -58,21 +97,44 @@ namespace FineUIPro.Web.HSSE.EduTrain
                 {
                     this.btnRefresh.Hidden = false;
                 }
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    //   this.Grid1.Columns[0].Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
+            }
+        }
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            //新增UnitId
+            this.UnitId = this.ucTree.UnitId;
+            //判断 当有projectId的时候单位id为空
+            if (!string.IsNullOrEmpty(this.ProjectId))
+            {
+                this.UnitId = "";
+            }
+            this.BindGrid(); 
+            this.GetButtonPower();
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
             }
         }
-
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
-            string projectId = this.CurrUser.LoginProjectId;
-            if (!string.IsNullOrEmpty(Request.Params["projectId"]))  ///是否文件柜查看页面传项目值
+            if (string.IsNullOrEmpty(this.ProjectId))
             {
-                projectId = Request.Params["projectId"];
+                return;
             }
-            if (!string.IsNullOrEmpty(projectId))
+            if (!string.IsNullOrEmpty(this.ProjectId) || !string.IsNullOrEmpty(this.UnitId)) //项目数据
             {
+
                 string strSql = "select TrainRecord.TrainingId"
                           + @",TrainRecord.TrainTitle"
                           + @",TrainType.TrainTypeName,TrainLevel.TrainLevelName"
@@ -92,8 +154,25 @@ namespace FineUIPro.Web.HSSE.EduTrain
                           + @" LEFT JOIN Base_TrainLevel AS TrainLevel ON TrainRecord.TrainLevelId=TrainLevel.TrainLevelId "
                           + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON TrainRecord.TrainingId=CodeRecords.DataId WHERE 1=1 ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
-                strSql += " AND TrainRecord.ProjectId = @ProjectId";
-                listStr.Add(new SqlParameter("@ProjectId", projectId));
+                if (!string.IsNullOrEmpty(txtName.Text))
+                {
+                    strSql += " AND TrainRecord.TrainTitle LIKE @TrainTitle";
+                    listStr.Add(new SqlParameter("@TrainTitle", "%" + this.txtName.Text + "%"));
+                }
+                     
+
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    strSql += " AND TrainRecord.ProjectId = @ProjectId";
+                    listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+                }
+
+                if (!string.IsNullOrEmpty(UnitId))
+                {
+                    strSql += " AND TrainRecord.UnitId = @UnitId";
+                    listStr.Add(new SqlParameter("@UnitId", UnitId));
+                }
+
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]))  ///是否文件柜查看页面传项目值
                 {
                     strSql += " AND TrainRecord.States = @States";  ///状态为已完成
@@ -119,16 +198,18 @@ namespace FineUIPro.Web.HSSE.EduTrain
                     strSql += " AND TrainRecord.TrainStartDate <= @EndDate ";
                     listStr.Add(new SqlParameter("@EndDate", this.txtEndDate.Text.Trim()));
                 }
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.CurrUser.LoginProjectId, this.CurrUser.UnitId))
+                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
                 {
                     strSql += " AND TrainRecord.UnitIds LIKE @UnitId1";
                     listStr.Add(new SqlParameter("@UnitId1", "%" + this.CurrUser.UnitId + "%"));
                 }
                 if (this.drpUnitId.SelectedValue != BLL.Const._Null)
                 {
-                    strSql += " AND TrainRecord.UnitIds LIKE @UnitId";
-                    listStr.Add(new SqlParameter("@UnitId", "%" + this.drpUnitId.SelectedValue.Trim() + "%"));
+                    strSql += " AND TrainRecord.UnitIds LIKE @UnitIds";
+                    listStr.Add(new SqlParameter("@UnitIds", "%" + this.drpUnitId.SelectedValue.Trim() + "%"));
                 }
+
+
                 SqlParameter[] parameter = listStr.ToArray();
                 DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
                 Grid1.RecordCount = tb.Rows.Count;
@@ -144,12 +225,101 @@ namespace FineUIPro.Web.HSSE.EduTrain
                 }
 
                 JObject summary = new JObject
-            {
-                { "TeachMan", "合计：" },
-                { "TrainPersonNum", totalPersonNum }
-            };
+                    {
+                        { "TeachMan", "合计：" },
+                        { "TrainPersonNum", totalPersonNum }
+                    };
 
                 Grid1.SummaryData = summary;
+
+
+            }
+            #region 2023-6-27 15:03:28修改废弃代码
+            //else //公司级数据
+            //{
+
+            //    string strSql = "select TrainRecord.TrainingId"
+            //              + @",TrainRecord.TrainTitle"
+            //              + @",TrainType.TrainTypeName,TrainLevel.TrainLevelName"
+            //              + @",TrainRecord.TrainStartDate"
+            //              + @",TrainRecord.TrainEndDate"
+            //              + @",TrainRecord.TeachHour"
+            //              + @",TrainRecord.TeachMan"
+            //              + @",TrainRecord.TrainPersonNum"
+            //               + @",TrainingCode"
+            //              // + @",CodeRecords.Code AS TrainingCode"                         
+            //              + @",(CASE WHEN TrainRecord.States = " + BLL.Const.State_0 + " OR TrainRecord.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN TrainRecord.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
+            //              + @",TrainRecord.UnitIds"
+            //              + @" from EduTrain_TrainRecord AS TrainRecord "
+            //              + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON TrainRecord.TrainingId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
+            //              + @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId "
+            //              + @" LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId "
+            //              + @" LEFT JOIN Base_TrainLevel AS TrainLevel ON TrainRecord.TrainLevelId=TrainLevel.TrainLevelId "
+            //              + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON TrainRecord.TrainingId=CodeRecords.DataId WHERE 1=1 ";
+            //    List<SqlParameter> listStr = new List<SqlParameter>();
+
+            //    if (!string.IsNullOrEmpty(ProjectId))
+            //    {
+            //        strSql += " AND (TrainRecord.ProjectId = '' or TrainRecord.ProjectId is null) ";
+            //        //listStr.Add(new SqlParameter("@ProjectId", ProjectId));
+            //    }
+
+
+            //    if (this.drpTrainType.SelectedValue != BLL.Const._Null)
+            //    {
+            //        strSql += " AND TrainRecord.TrainTypeId = @TrainType";
+            //        listStr.Add(new SqlParameter("@TrainType", this.drpTrainType.SelectedValue));
+            //    }
+            //    if (this.drpTrainLevel.SelectedValue != BLL.Const._Null)
+            //    {
+            //        strSql += " AND TrainRecord.TrainLevelId = @TrainLevel";
+            //        listStr.Add(new SqlParameter("@TrainLevel", this.drpTrainLevel.SelectedValue));
+            //    }
+            //    if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim()))
+            //    {
+            //        strSql += " AND TrainRecord.TrainStartDate >= @StartDate ";
+            //        listStr.Add(new SqlParameter("@StartDate", this.txtStartDate.Text.Trim()));
+            //    }
+            //    if (!string.IsNullOrEmpty(this.txtEndDate.Text.Trim()))
+            //    {
+            //        strSql += " AND TrainRecord.TrainStartDate <= @EndDate ";
+            //        listStr.Add(new SqlParameter("@EndDate", this.txtEndDate.Text.Trim()));
+            //    }
+            //    if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.CurrUser.LoginProjectId, this.CurrUser.UnitId))
+            //    {
+            //        strSql += " AND TrainRecord.UnitIds LIKE @UnitId1";
+            //        listStr.Add(new SqlParameter("@UnitId1", "%" + this.CurrUser.UnitId + "%"));
+            //    } 
+            //    strSql += " AND TrainRecord.UnitIds LIKE @UnitId";
+            //    listStr.Add(new SqlParameter("@UnitId", "%" + this.ucTree.UnitId.Trim() + "%"));
+
+            //    SqlParameter[] parameter = listStr.ToArray();
+            //    DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            //    Grid1.RecordCount = tb.Rows.Count;
+            //    //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            //    var table = this.GetPagedDataTable(Grid1, tb);
+
+            //    Grid1.DataSource = table;
+            //    Grid1.DataBind();
+            //    int totalPersonNum = 0;
+            //    for (int i = 0; i < tb.Rows.Count; i++)
+            //    {
+            //        totalPersonNum += Funs.GetNewIntOrZero(tb.Rows[i][8].ToString());
+            //    }
+
+            //    JObject summary = new JObject
+            //        {
+            //            { "TeachMan", "合计：" },
+            //            { "TrainPersonNum", totalPersonNum }
+            //        };
+
+            //    Grid1.SummaryData = summary;
+            //}
+            #endregion
+            string projectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrEmpty(Request.Params["projectId"]))  ///是否文件柜查看页面传项目值
+            {
+                projectId = Request.Params["projectId"];
             }
         }
         #endregion
@@ -186,7 +356,6 @@ namespace FineUIPro.Web.HSSE.EduTrain
         /// <param name="e"></param>
         protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
         {
-            this.Grid1.PageSize = Funs.GetNewIntOrZero(this.ddlPageSize.SelectedValue);
             BindGrid();
         }
         #endregion
@@ -199,7 +368,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
         /// <param name="e"></param>
         protected void btnNew_Click(object sender, EventArgs e)
         {
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TrainRecordEdit.aspx", "编辑 - ")));
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TrainRecordEdit.aspx?trainType={0}", trainType, "编辑 - ")));
         }
         #endregion
 
@@ -238,7 +407,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
             var trainRecord = EduTrain_TrainRecordService.GetTrainingByTrainingId(TrainingId);
             if (trainRecord != null)
             {
-                if (this.btnMenuEdit.Hidden || trainRecord.States == BLL.Const.State_2)   ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
+                if (this.btnMenuEdit.Hidden)   ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
                 {
                     PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TrainRecordView.aspx?TrainingId={0}", TrainingId, "查看 - ")));
                 }
@@ -288,6 +457,8 @@ namespace FineUIPro.Web.HSSE.EduTrain
                         }
                     }
                 }
+                // Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.EducationAndTraining);
+
             }
         }
 
@@ -335,11 +506,15 @@ namespace FineUIPro.Web.HSSE.EduTrain
         /// <returns></returns>
         private void GetButtonPower()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             if (Request.Params["value"] == "0")
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectTrainRecordMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectTrainRecordMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
@@ -506,8 +681,12 @@ namespace FineUIPro.Web.HSSE.EduTrain
         /// <param name="e"></param>
         protected void btnRefresh_Click(object sender, EventArgs e)
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             var getTrainRecords = from x in Funs.DB.EduTrain_TrainRecord
-                                  where x.ProjectId == this.CurrUser.LoginProjectId && x.PlanId != null
+                                  where x.ProjectId == this.ProjectId && x.PlanId != null
                                   select x;
             if (getTrainRecords.Count() > 0)
             {
@@ -515,7 +694,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
                 {
                     var getTrainRecordDetail = Funs.DB.EduTrain_TrainRecordDetail.Where(x => x.TrainingId == itemRecord.TrainingId);
                     if (itemRecord.TrainPersonNum > getTrainRecordDetail.Count())
-                    {                      
+                    {
                         var getTrainingTasks = from x in Funs.DB.Training_Task
                                                where x.PlanId == itemRecord.PlanId
                                                select x;
@@ -596,13 +775,13 @@ namespace FineUIPro.Web.HSSE.EduTrain
             }
 
             var getTestPlanStates = from x in Funs.DB.Training_TestPlan
-                              join y in Funs.DB.Training_Plan on x.PlanId equals y.PlanId
-                              where x.States == Const.State_3 && y.States == Const.State_2
-                              select x;
+                                    join y in Funs.DB.Training_Plan on x.PlanId equals y.PlanId
+                                    where x.States == Const.State_3 && y.States == Const.State_2
+                                    select x;
             foreach (var item in getTestPlanStates)
             {
                 ////TODO 讲培训计划 考试记录 写入到培训记录
-               BLL. APITrainRecordService.InsertTrainRecord(item); 
+                BLL.APITrainRecordService.InsertTrainRecord(item);
             }
         }
     }
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.designer.cs
index d5473c4..437c2b0 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.EduTrain {
-    
-    
-    public partial class TrainRecord {
-        
+namespace FineUIPro.Web.HSSE.EduTrain
+{
+
+
+    public partial class TrainRecord
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,16 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
+        /// <summary>
+        /// txtName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtName;
+
         /// <summary>
         /// drpUnitId 控件。
         /// </summary>
@@ -65,7 +112,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitId;
-        
+
         /// <summary>
         /// drpTrainType 控件。
         /// </summary>
@@ -74,7 +121,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpTrainType;
-        
+
         /// <summary>
         /// drpTrainLevel 控件。
         /// </summary>
@@ -83,7 +130,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpTrainLevel;
-        
+
         /// <summary>
         /// txtStartDate 控件。
         /// </summary>
@@ -92,7 +139,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartDate;
-        
+
         /// <summary>
         /// lblTo 控件。
         /// </summary>
@@ -101,7 +148,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lblTo;
-        
+
         /// <summary>
         /// txtEndDate 控件。
         /// </summary>
@@ -110,7 +157,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndDate;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -119,7 +166,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -128,7 +175,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -137,7 +184,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// btnRefresh 控件。
         /// </summary>
@@ -146,7 +193,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnRefresh;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -155,7 +202,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// lblTrainingCode 控件。
         /// </summary>
@@ -164,7 +211,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblTrainingCode;
-        
+
         /// <summary>
         /// lblUnitId 控件。
         /// </summary>
@@ -173,7 +220,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblUnitId;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -182,7 +229,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -191,7 +238,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -200,7 +247,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -209,7 +256,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -218,7 +265,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -227,7 +274,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuView 控件。
         /// </summary>
@@ -236,7 +283,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuView;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -245,7 +292,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnPrint 控件。
         /// </summary>
@@ -254,7 +301,7 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnPrint;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordEdit.aspx.cs
index 3fe17ec..9dcbce9 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordEdit.aspx.cs
@@ -189,6 +189,11 @@ namespace FineUIPro.Web.HSSE.EduTrain
         {
             //培训类型
             TrainTypeService.InitTrainTypeDropDownList(this.drpTrainType, true);
+            string trainType = Request.Params["trainType"];
+            if (!string.IsNullOrWhiteSpace(trainType))
+            {
+                this.drpTrainType.Items.FindByText(trainType).Selected = true;
+            }
             //培训级别
             TrainLevelService.InitTrainLevelDropDownList(this.drpTrainLevel, true);
             //培训单位
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx
new file mode 100644
index 0000000..7ba2fda
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx
@@ -0,0 +1,137 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Trainingrecords.aspx.cs" Inherits="FineUIPro.Web.HSSE.EduTrain.Trainingrecords" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>培训记录</title>
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="培训记录" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="TaskItemId" EnableColumnLines="true" DataIDField="TaskItemId" AllowSorting="true"
+                    AllowPaging="true" ForceFit="true"
+                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableRowDoubleClickEvent="true" 
+                    EnableTextSelection="True" EnableSummary="true" SummaryPosition="Flow">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                            <Items>
+                               <f:TextBox ID="txtName" runat="server" Label="姓名" LabelAlign="Right" LabelWidth="80px" AutoPostBack="true" OnTextChanged="Text_TextChanged"></f:TextBox>
+
+                                <f:DatePicker ID="txtStartDate" runat="server" Label="培训日期" Width="300px" LabelWidth="100px" LabelAlign="Right"
+                                    AutoPostBack="true" OnTextChanged="Text_TextChanged">
+                                </f:DatePicker>
+                                <f:Label ID="lblTo" runat="server" Text="至" Width="20px">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndDate" runat="server" Width="200px" AutoPostBack="true" OnTextChanged="Text_TextChanged">
+                                </f:DatePicker>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                               
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                               
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                      <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                      
+                         <f:RenderField Width="200px" ColumnID="TrainContent" DataField="TrainContent"
+                           FieldType="String" HeaderText="培训内容" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                        </f:RenderField>
+
+                          <f:RenderField Width="100px" ColumnID="TrainStartDate" DataField="TrainStartDate"
+                            SortField="TrainStartDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                            HeaderText="培训时间" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+
+                        <f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName"
+                           FieldType="String" HeaderText="单位" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                        </f:RenderField>
+
+                        <f:RenderField Width="100px" ColumnID="PersonName" DataField="PersonName"
+                           FieldType="String" HeaderText="姓名" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                        </f:RenderField>
+
+                        <f:RenderField Width="120px" ColumnID="TrainTypeName" DataField="TrainTypeName"
+                           FieldType="String" HeaderText="培训类型" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                        </f:RenderField>
+
+                        <f:RenderField Width="120px" ColumnID="TrainLevelName" DataField="TrainLevelName"
+                           FieldType="String" HeaderText="培训级别" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                        </f:RenderField>
+
+                        <f:RenderField Width="120px" ColumnID="TrainingItemName" DataField="TrainingItemName"
+                           FieldType="String" HeaderText="培训教材" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                        </f:RenderField>
+
+                        <f:TemplateField ColumnID="tfLearnTime" Width="120px" HeaderText="资源时长(分钟)" HeaderTextAlign="Center" 
+                            TextAlign="left">
+                            <ItemTemplate>
+                                <asp:Label ID="lblLearnTime" runat="server" Text='<%# ConvertTime(Eval("LearnTime")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                      
+                       <f:TemplateField ColumnID="tfVideoProgress" Width="120px" HeaderText="学习时长(分钟)" HeaderTextAlign="Center" 
+                            TextAlign="left">
+                            <ItemTemplate>
+                                <asp:Label ID="lblVideoProgress" runat="server" Text='<%# ConvertTime(Eval("VideoProgress")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    
+                         <f:RenderField Width="80px" ColumnID="TeachHour" DataField="TeachHour"
+                           FieldType="String" HeaderText="学时" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                        </f:RenderField>
+
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Menu ID="Menu1" runat="server">
+            
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx.cs
new file mode 100644
index 0000000..79b4d9b
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx.cs
@@ -0,0 +1,216 @@
+using BLL;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using AspNet = System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HSSE.EduTrain
+{
+    public partial class Trainingrecords : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+               
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                BindGrid();
+               
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string projectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrEmpty(Request.Params["projectId"]))  ///是否文件柜查看页面传项目值
+            {
+                projectId = Request.Params["projectId"];
+            }
+            if (!string.IsNullOrEmpty(projectId))
+            {
+                string strSql = @"select tp.TrainContent,tp.TrainStartDate,u.UnitName,bt.TrainTypeName,btl.TrainLevelName,tp.TeachHour,tp.ProjectId,
+                                     f.*,p.PersonName From Training_TaskItem f
+                                    left join SitePerson_Person p on f.PersonId = p.PersonId
+                                    left join Training_Plan tp on f.PlanId = tp.PlanId
+                                    left join Base_TrainType bt on tp.TrainTypeId = bt.TrainTypeId
+                                    left join Base_TrainLevel btl on tp.TrainLevelId = btl.TrainLevelId
+                                    left join Base_Unit u on p.UnitId = u.UnitId WHERE 1=1 ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                strSql += " AND tp.ProjectId = @ProjectId";
+                listStr.Add(new SqlParameter("@ProjectId", projectId));
+               
+                if (!string.IsNullOrEmpty(txtName.Text.Trim()))
+                {
+                    strSql += " AND p.PersonName like '%"+ txtName.Text.Trim() + "%'";
+                }
+                if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim()))
+                {
+                    strSql += " AND tp.TrainStartDate >= @StartDate ";
+                    listStr.Add(new SqlParameter("@StartDate", this.txtStartDate.Text.Trim()));
+                }
+                if (!string.IsNullOrEmpty(this.txtEndDate.Text.Trim()))
+                {
+                    strSql += " AND tp.TrainStartDate <= @EndDate ";
+                    listStr.Add(new SqlParameter("@EndDate", this.txtEndDate.Text.Trim()));
+                }
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                Grid1.RecordCount = tb.Rows.Count;
+                //tb = GetFilteredTable(Grid1.FilteredData, tb);
+                var table = this.GetPagedDataTable(Grid1, tb);
+
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+            }
+        }
+
+        #region 查询事件
+        /// <summary>
+        /// 查询事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Text_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 页索引改变事件
+        /// <summary>
+        /// 页索引改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 排序
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 分页选择下拉改变事件
+        /// <summary>
+        /// 分页选择下拉改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("培训记录" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = this.Grid1.Rows.Count();
+            BindGrid();
+            Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+#pragma warning disable CS0108 // “TrainRecord.GetGridTableHtml(Grid)”隐藏继承的成员“PageBase.GetGridTableHtml(Grid)”。如果是有意隐藏，请使用关键字 new。
+        /// <summary>
+        /// 导出方法
+        /// </summary>
+        /// <param name="grid"></param>
+        /// <returns></returns>
+        private string GetGridTableHtml(Grid grid)
+#pragma warning restore CS0108 // “TrainRecord.GetGridTableHtml(Grid)”隐藏继承的成员“PageBase.GetGridTableHtml(Grid)”。如果是有意隐藏，请使用关键字 new。
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
+            sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
+            sb.Append("<tr>");
+            foreach (GridColumn column in grid.Columns)
+            {
+                sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+            }
+            sb.Append("</tr>");
+            foreach (GridRow row in grid.Rows)
+            {
+                sb.Append("<tr>");
+                foreach (GridColumn column in grid.Columns)
+                {
+                    string html = row.Values[column.ColumnIndex].ToString();
+                    if (column.ColumnID == "tfNumber")
+                    {
+                        html = (row.FindControl("lblNumber") as AspNet.Label).Text;
+                    }
+                    if (column.ColumnID == "tfLearnTime")
+                    {
+                        html = (row.FindControl("lblLearnTime") as AspNet.Label).Text;
+                    }
+                    if (column.ColumnID == "tfVideoProgress")
+                    {
+                        html = (row.FindControl("lblVideoProgress") as AspNet.Label).Text;
+                    }
+                   
+                    //sb.AppendFormat("<td>{0}</td>", html);
+                    sb.AppendFormat("<td style='vnd.ms-excel.numberformat:@;width:140px;'>{0}</td>", html);
+                }
+
+                sb.Append("</tr>");
+            }
+
+            sb.Append("</table>");
+
+            return sb.ToString();
+        }
+        #endregion
+
+        #region 格式化字符串
+        /// <summary>
+        /// 获取单位名称
+        /// </summary>
+        /// <param name="unitIds"></param>
+        /// <returns></returns>
+        protected string ConvertTime(object time)
+        {
+            string hours = "0";
+            if (time != null)
+            {
+                if (!string.IsNullOrEmpty(time.ToString()))
+                {
+                    return (Convert.ToInt32(time) / 60).ToString();
+                }
+                else {
+                    return hours;
+                }
+                
+            }
+            return hours;
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx.designer.cs
new file mode 100644
index 0000000..96cec61
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/Trainingrecords.aspx.designer.cs
@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.EduTrain
+{
+
+
+    public partial class Trainingrecords
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtName;
+
+        /// <summary>
+        /// txtStartDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartDate;
+
+        /// <summary>
+        /// lblTo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lblTo;
+
+        /// <summary>
+        /// txtEndDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndDate;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
+        /// <summary>
+        /// lblNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblNumber;
+
+        /// <summary>
+        /// lblLearnTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblLearnTime;
+
+        /// <summary>
+        /// lblVideoProgress 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblVideoProgress;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+    }
+}
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 237002a..b92bba9 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -398995,6 +398995,12 @@ namespace Model
 		
 		private string _WorkPostIds;
 		
+		private string _TestTrainingIds;
+		
+		private System.Nullable<int> _LearningTime;
+		
+		private System.Nullable<double> _Durations;
+		
 		private EntitySet<Person_TrainingTask> _Person_TrainingTask;
 		
 		private EntityRef<Training_CompanyTraining> _Training_CompanyTraining;
@@ -399019,6 +399025,12 @@ namespace Model
     partial void OnCompileDateChanged();
     partial void OnWorkPostIdsChanging(string value);
     partial void OnWorkPostIdsChanged();
+    partial void OnTestTrainingIdsChanging(string value);
+    partial void OnTestTrainingIdsChanged();
+    partial void OnLearningTimeChanging(System.Nullable<int> value);
+    partial void OnLearningTimeChanged();
+    partial void OnDurationsChanging(System.Nullable<double> value);
+    partial void OnDurationsChanged();
     #endregion
 		
 		public Training_CompanyTrainingItem()
@@ -399192,6 +399204,66 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestTrainingIds", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string TestTrainingIds
+		{
+			get
+			{
+				return this._TestTrainingIds;
+			}
+			set
+			{
+				if ((this._TestTrainingIds != value))
+				{
+					this.OnTestTrainingIdsChanging(value);
+					this.SendPropertyChanging();
+					this._TestTrainingIds = value;
+					this.SendPropertyChanged("TestTrainingIds");
+					this.OnTestTrainingIdsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LearningTime", DbType="Int")]
+		public System.Nullable<int> LearningTime
+		{
+			get
+			{
+				return this._LearningTime;
+			}
+			set
+			{
+				if ((this._LearningTime != value))
+				{
+					this.OnLearningTimeChanging(value);
+					this.SendPropertyChanging();
+					this._LearningTime = value;
+					this.SendPropertyChanged("LearningTime");
+					this.OnLearningTimeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Durations", DbType="Float")]
+		public System.Nullable<double> Durations
+		{
+			get
+			{
+				return this._Durations;
+			}
+			set
+			{
+				if ((this._Durations != value))
+				{
+					this.OnDurationsChanging(value);
+					this.SendPropertyChanging();
+					this._Durations = value;
+					this.SendPropertyChanged("Durations");
+					this.OnDurationsChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Person_TrainingTask_Training_CompanyTrainingItem", Storage="_Person_TrainingTask", ThisKey="CompanyTrainingItemId", OtherKey="CompanyTrainingItemId", DeleteRule="NO ACTION")]
 		public EntitySet<Person_TrainingTask> Person_TrainingTask
 		{
@@ -401894,6 +401966,8 @@ namespace Model
 		
 		private int _JValue;
 		
+		private string _TrainTypeId;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Sys_User> _Sys_User;
@@ -401956,6 +402030,8 @@ namespace Model
     partial void OnMValueChanged();
     partial void OnJValueChanging(int value);
     partial void OnJValueChanged();
+    partial void OnTrainTypeIdChanging(string value);
+    partial void OnTrainTypeIdChanged();
     #endregion
 		
 		public Training_TestPlan()
@@ -402460,6 +402536,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainTypeId", DbType="NVarChar(50)")]
+		public string TrainTypeId
+		{
+			get
+			{
+				return this._TrainTypeId;
+			}
+			set
+			{
+				if ((this._TrainTypeId != value))
+				{
+					this.OnTrainTypeIdChanging(value);
+					this.SendPropertyChanging();
+					this._TrainTypeId = value;
+					this.SendPropertyChanged("TrainTypeId");
+					this.OnTrainTypeIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TestPlan_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -402925,6 +403021,8 @@ namespace Model
 		
 		private int _Duration;
 		
+		private string _CompanyTrainingItemId;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<SitePerson_Person> _SitePerson_Person;
@@ -402959,6 +403057,8 @@ namespace Model
     partial void OnIsFiledChanged();
     partial void OnDurationChanging(int value);
     partial void OnDurationChanged();
+    partial void OnCompanyTrainingItemIdChanging(string value);
+    partial void OnCompanyTrainingItemIdChanged();
     #endregion
 		
 		public Training_TestRecord()
@@ -403202,6 +403302,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanyTrainingItemId", DbType="NVarChar(50)")]
+		public string CompanyTrainingItemId
+		{
+			get
+			{
+				return this._CompanyTrainingItemId;
+			}
+			set
+			{
+				if ((this._CompanyTrainingItemId != value))
+				{
+					this.OnCompanyTrainingItemIdChanging(value);
+					this.SendPropertyChanging();
+					this._CompanyTrainingItemId = value;
+					this.SendPropertyChanged("CompanyTrainingItemId");
+					this.OnCompanyTrainingItemIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Training_TestRecord_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
diff --git a/SGGL/WebAPI/Controllers/PersonController.cs b/SGGL/WebAPI/Controllers/PersonController.cs
index 2aea622..077d3b6 100644
--- a/SGGL/WebAPI/Controllers/PersonController.cs
+++ b/SGGL/WebAPI/Controllers/PersonController.cs
@@ -353,12 +353,12 @@ namespace WebAPI.Controllers
         /// <param name="trainTypeId">培训类型ID(可为空)</param>
         /// <param name="pageIndex">分页</param>
         /// <returns></returns>
-        public Model.ResponeData getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId, int pageIndex)
+        public Model.ResponeData getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds,string departIds, string trainTypeId, int pageIndex,string strParam,string InTime)
         {
             var responeData = new Model.ResponeData();
             try
             {
-                var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(projectId, unitIds, workPostIds, trainTypeId).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
+                var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(projectId, unitIds, workPostIds, departIds, trainTypeId, InTime, strParam).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
                 int pageCount = getDataList.Count;
                 if (pageCount > 0 && pageIndex > 0)
                 {

From 0a70ab9af7cad8fe894612d26bc09d2a4b8fc15c Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Wed, 19 Feb 2025 15:09:13 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SGGLDB_V2025-02-19-geh.sql  |  334 ++++
 SGGL/BLL/BLL.csproj                           |    5 +
 SGGL/BLL/Common/Const.cs                      |   19 +
 .../HSSE/Technique/AwardStandardsService.cs   |   96 ++
 .../Technique/ConstructionStandardsService.cs |   96 ++
 .../Technique/ProtectionStandardsService.cs   |   95 ++
 .../SafetyResponsibilitiesService.cs          |   97 ++
 .../App_GlobalResources/Lan.en-US.resx        |    2 +-
 .../App_GlobalResources/Lan.resx              |    2 +-
 .../App_GlobalResources/Lan.zh-CN.resx        |    2 +-
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |   68 +-
 .../HSSE/Technique/AwardStandards.aspx        |  108 ++
 .../HSSE/Technique/AwardStandards.aspx.cs     |  319 ++++
 .../Technique/AwardStandards.aspx.designer.cs |  170 +++
 .../HSSE/Technique/AwardStandardsEdit.aspx    |   72 +
 .../HSSE/Technique/AwardStandardsEdit.aspx.cs |  221 +++
 .../AwardStandardsEdit.aspx.designer.cs       |  152 ++
 .../HSSE/Technique/ConstructionStandards.aspx |  108 ++
 .../Technique/ConstructionStandards.aspx.cs   |  319 ++++
 .../ConstructionStandards.aspx.designer.cs    |  170 +++
 .../Technique/ConstructionStandardsEdit.aspx  |   72 +
 .../ConstructionStandardsEdit.aspx.cs         |  221 +++
 ...ConstructionStandardsEdit.aspx.designer.cs |  152 ++
 .../HSSE/Technique/ProtectionStandards.aspx   |  108 ++
 .../Technique/ProtectionStandards.aspx.cs     |  319 ++++
 .../ProtectionStandards.aspx.designer.cs      |  170 +++
 .../Technique/ProtectionStandardsEdit.aspx    |   73 +
 .../Technique/ProtectionStandardsEdit.aspx.cs |  223 +++
 .../ProtectionStandardsEdit.aspx.designer.cs  |  152 ++
 .../Technique/SafetyResponsibilities.aspx     |  108 ++
 .../Technique/SafetyResponsibilities.aspx.cs  |  319 ++++
 .../SafetyResponsibilities.aspx.designer.cs   |  170 +++
 .../Technique/SafetyResponsibilitiesEdit.aspx |   72 +
 .../SafetyResponsibilitiesEdit.aspx.cs        |  221 +++
 ...afetyResponsibilitiesEdit.aspx.designer.cs |  152 ++
 SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx  |   33 +-
 .../common/mainMenu_HSSE.aspx.cs              |  179 ++-
 .../common/mainMenu_HSSE.aspx.designer.cs     |   58 +-
 SGGL/Model/Model.cs                           | 1348 +++++++++++++++++
 39 files changed, 6541 insertions(+), 64 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_V2025-02-19-geh.sql
 create mode 100644 SGGL/BLL/HSSE/Technique/AwardStandardsService.cs
 create mode 100644 SGGL/BLL/HSSE/Technique/ConstructionStandardsService.cs
 create mode 100644 SGGL/BLL/HSSE/Technique/ProtectionStandardsService.cs
 create mode 100644 SGGL/BLL/HSSE/Technique/SafetyResponsibilitiesService.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/AwardStandards.aspx
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/AwardStandards.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/AwardStandards.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/AwardStandardsEdit.aspx
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/AwardStandardsEdit.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/AwardStandardsEdit.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandards.aspx
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandards.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandards.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandardsEdit.aspx
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandardsEdit.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandardsEdit.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandards.aspx
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandards.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandards.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandardsEdit.aspx
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandardsEdit.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandardsEdit.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilities.aspx
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilities.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilities.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilitiesEdit.aspx
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilitiesEdit.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilitiesEdit.aspx.designer.cs

diff --git a/DataBase/版本日志/SGGLDB_V2025-02-19-geh.sql b/DataBase/版本日志/SGGLDB_V2025-02-19-geh.sql
new file mode 100644
index 0000000..3590e0d
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2025-02-19-geh.sql
@@ -0,0 +1,334 @@
+CREATE TABLE [dbo].[Technique_ProtectionStandards] (
+  [ProtectionStandardsId] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NOT NULL,
+  [ProtectionStandardsCode] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [ProtectionStandardsName] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
+  [CompileMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [CompileDate] datetime  NULL,
+  [AttachUrl] nvarchar(2000) COLLATE Chinese_PRC_CI_AS  NULL,
+  [AuditMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [AuditDate] datetime  NULL,
+  [IsPass] bit  NULL,
+  [IsBuild] bit  NULL,
+  [UpState] char(1) COLLATE Chinese_PRC_CI_AS  NULL,
+  CONSTRAINT [PK_Technique_ProtectionStandards] PRIMARY KEY CLUSTERED ([ProtectionStandardsId])
+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].[Technique_ProtectionStandards] SET (LOCK_ESCALATION = TABLE)
+GO
+
+
+EXEC sp_addextendedproperty
+'MS_Description', N'编号',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_ProtectionStandards',
+'COLUMN', N'ProtectionStandardsCode'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'名称',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_ProtectionStandards',
+'COLUMN', N'ProtectionStandardsName'
+GO
+
+
+EXEC sp_addextendedproperty
+'MS_Description', N'编制人',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_ProtectionStandards',
+'COLUMN', N'CompileMan'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'编制日期',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_ProtectionStandards',
+'COLUMN', N'CompileDate'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'附件',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_ProtectionStandards',
+'COLUMN', N'AttachUrl'
+GO
+
+
+EXEC sp_addextendedproperty
+'MS_Description', N'防护标准表',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_ProtectionStandards'
+
+INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) 
+VALUES (N'8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201', N'防护标准', NULL, N'HSSE/Technique/ProtectionStandards.aspx', 90, N'D70D9BF5-C72E-414D-941B-CF9B4065F6BA', N'Menu_DigData', '1', '1', '1', NULL);
+
+
+
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201', N'增加', 1);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201', N'修改', 2);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201', N'删除', 3);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201', N'保存', 4);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201', N'导出', 5);
+
+
+
+CREATE TABLE [dbo].[Technique_SafetyResponsibilities] (
+  [SafetyResponsibilitiesId] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NOT NULL,
+  [SafetyResponsibilitiesCode] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [SafetyResponsibilitiesName] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
+  [CompileMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [CompileDate] datetime  NULL,
+  [AttachUrl] nvarchar(2000) COLLATE Chinese_PRC_CI_AS  NULL,
+  [AuditMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [AuditDate] datetime  NULL,
+  [IsPass] bit  NULL,
+  [IsBuild] bit  NULL,
+  [UpState] char(1) COLLATE Chinese_PRC_CI_AS  NULL,
+  CONSTRAINT [PK_Technique_SafetyResponsibilities] PRIMARY KEY CLUSTERED ([SafetyResponsibilitiesId])
+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].[Technique_SafetyResponsibilities] SET (LOCK_ESCALATION = TABLE)
+GO
+
+
+EXEC sp_addextendedproperty
+'MS_Description', N'编号',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_SafetyResponsibilities',
+'COLUMN', N'SafetyResponsibilitiesCode'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'名称',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_SafetyResponsibilities',
+'COLUMN', N'SafetyResponsibilitiesName'
+GO
+
+
+EXEC sp_addextendedproperty
+'MS_Description', N'编制人',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_SafetyResponsibilities',
+'COLUMN', N'CompileMan'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'编制日期',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_SafetyResponsibilities',
+'COLUMN', N'CompileDate'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'附件',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_SafetyResponsibilities',
+'COLUMN', N'AttachUrl'
+GO
+
+
+EXEC sp_addextendedproperty
+'MS_Description', N'安全职责表',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_SafetyResponsibilities'
+
+INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) 
+VALUES (N'6D75EA6C-0E49-4B04-850B-930B628EE1DF', N'安全职责', NULL, N'HSSE/Technique/SafetyResponsibilities.aspx', 100, N'D70D9BF5-C72E-414D-941B-CF9B4065F6BA', N'Menu_DigData', '1', '1', '1', NULL);
+
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'6D75EA6C-0E49-4B04-850B-930B628EE1DF', N'增加', 1);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'6D75EA6C-0E49-4B04-850B-930B628EE1DF', N'修改', 2);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'6D75EA6C-0E49-4B04-850B-930B628EE1DF', N'删除', 3);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'6D75EA6C-0E49-4B04-850B-930B628EE1DF', N'保存', 4);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'6D75EA6C-0E49-4B04-850B-930B628EE1DF', N'导出', 5);
+
+
+
+CREATE TABLE [dbo].[Technique_ConstructionStandards] (
+  [ConstructionStandardsId] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NOT NULL,
+  [ConstructionStandardsCode] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [ConstructionStandardsName] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
+  [CompileMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [CompileDate] datetime  NULL,
+  [AttachUrl] nvarchar(2000) COLLATE Chinese_PRC_CI_AS  NULL,
+  [AuditMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [AuditDate] datetime  NULL,
+  [IsPass] bit  NULL,
+  [IsBuild] bit  NULL,
+  [UpState] char(1) COLLATE Chinese_PRC_CI_AS  NULL,
+  CONSTRAINT [PK_Technique_ConstructionStandards] PRIMARY KEY CLUSTERED ([ConstructionStandardsId])
+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].[Technique_ConstructionStandards] SET (LOCK_ESCALATION = TABLE)
+GO
+
+
+EXEC sp_addextendedproperty
+'MS_Description', N'编号',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_ConstructionStandards',
+'COLUMN', N'ConstructionStandardsCode'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'名称',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_ConstructionStandards',
+'COLUMN', N'ConstructionStandardsName'
+GO
+
+
+EXEC sp_addextendedproperty
+'MS_Description', N'编制人',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_ConstructionStandards',
+'COLUMN', N'CompileMan'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'编制日期',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_ConstructionStandards',
+'COLUMN', N'CompileDate'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'附件',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_ConstructionStandards',
+'COLUMN', N'AttachUrl'
+GO
+
+
+EXEC sp_addextendedproperty
+'MS_Description', N'队伍文明施工标准表',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_ConstructionStandards'
+
+
+INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) 
+VALUES (N'23ACEE2E-0E56-4136-9DFB-C971B3C4EA60', N'队伍文明施工标准', NULL, N'HSSE/Technique/ConstructionStandards.aspx', 110, N'D70D9BF5-C72E-414D-941B-CF9B4065F6BA', N'Menu_DigData', '1', '1', '1', NULL);
+
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'23ACEE2E-0E56-4136-9DFB-C971B3C4EA60', N'增加', 1);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'23ACEE2E-0E56-4136-9DFB-C971B3C4EA60', N'修改', 2);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'23ACEE2E-0E56-4136-9DFB-C971B3C4EA60', N'删除', 3);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'23ACEE2E-0E56-4136-9DFB-C971B3C4EA60', N'保存', 4);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'23ACEE2E-0E56-4136-9DFB-C971B3C4EA60', N'导出', 5);
+
+
+
+CREATE TABLE [dbo].[Technique_AwardStandards] (
+  [AwardStandardsId] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NOT NULL,
+  [AwardStandardsCode] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [AwardStandardsName] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
+  [CompileMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [CompileDate] datetime  NULL,
+  [AttachUrl] nvarchar(2000) COLLATE Chinese_PRC_CI_AS  NULL,
+  [AuditMan] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [AuditDate] datetime  NULL,
+  [IsPass] bit  NULL,
+  [IsBuild] bit  NULL,
+  [UpState] char(1) COLLATE Chinese_PRC_CI_AS  NULL,
+  CONSTRAINT [PK_Technique_AwardStandards] PRIMARY KEY CLUSTERED ([AwardStandardsId])
+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].[Technique_AwardStandards] SET (LOCK_ESCALATION = TABLE)
+GO
+
+
+EXEC sp_addextendedproperty
+'MS_Description', N'编号',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_AwardStandards',
+'COLUMN', N'AwardStandardsCode'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'名称',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_AwardStandards',
+'COLUMN', N'AwardStandardsName'
+GO
+
+
+EXEC sp_addextendedproperty
+'MS_Description', N'编制人',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_AwardStandards',
+'COLUMN', N'CompileMan'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'编制日期',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_AwardStandards',
+'COLUMN', N'CompileDate'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'附件',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_AwardStandards',
+'COLUMN', N'AttachUrl'
+GO
+
+
+EXEC sp_addextendedproperty
+'MS_Description', N'奖罚标准表',
+'SCHEMA', N'dbo',
+'TABLE', N'Technique_AwardStandards'
+
+INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed], [MenuEnName]) 
+VALUES (N'E4FD28A8-9715-452F-BB16-5FF87BE7D32B', N'奖罚标准', NULL, N'HSSE/Technique/AwardStandards.aspx', 120, N'D70D9BF5-C72E-414D-941B-CF9B4065F6BA', N'Menu_DigData', '1', '1', '1', NULL);
+
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'E4FD28A8-9715-452F-BB16-5FF87BE7D32B', N'增加', 1);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'E4FD28A8-9715-452F-BB16-5FF87BE7D32B', N'修改', 2);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'E4FD28A8-9715-452F-BB16-5FF87BE7D32B', N'删除', 3);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'E4FD28A8-9715-452F-BB16-5FF87BE7D32B', N'保存', 4);
+INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) 
+VALUES (NewID(), N'E4FD28A8-9715-452F-BB16-5FF87BE7D32B', N'导出', 5);
+
+
+alter table dbo.Technique_ProtectionStandards add Remark nvarchar(500);
+alter table dbo.Technique_SafetyResponsibilities add Remark nvarchar(500);
+alter table dbo.Technique_ConstructionStandards add Remark nvarchar(500);
+alter table dbo.Technique_AwardStandards add Remark nvarchar(500);
\ No newline at end of file
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 63e2e63..eb4f501 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -81,6 +81,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Lib\Microsoft.SQLServer.ManagedDTS.dll</HintPath>
     </Reference>
+    <Reference Include="mscorlib" />
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -715,13 +716,17 @@
     <Compile Include="HSSE\Solution\ExpertArgumentService.cs" />
     <Compile Include="HSSE\Solution\LargerHazardService.cs" />
     <Compile Include="HSSE\Solution\SolutionTemplateService.cs" />
+    <Compile Include="HSSE\Technique\AwardStandardsService.cs" />
+    <Compile Include="HSSE\Technique\ConstructionStandardsService.cs" />
     <Compile Include="HSSE\Technique\EmergencyService.cs" />
     <Compile Include="HSSE\Technique\HazardListService.cs" />
     <Compile Include="HSSE\Technique\HazardListTypeService.cs" />
     <Compile Include="HSSE\Technique\EnvironmentalService.cs" />
+    <Compile Include="HSSE\Technique\ProtectionStandardsService.cs" />
     <Compile Include="HSSE\Technique\RectifyItemService.cs" />
     <Compile Include="HSSE\Technique\RectifyService.cs" />
     <Compile Include="HSSE\Technique\RiskEvaluationRecordService.cs" />
+    <Compile Include="HSSE\Technique\SafetyResponsibilitiesService.cs" />
     <Compile Include="HSSE\Technique\SpecialSchemeService.cs" />
     <Compile Include="HSSE\Technique\Technique_CheckItemDetailService.cs" />
     <Compile Include="HSSE\Technique\Technique_CheckItemSetService.cs" />
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 8504eaf..6679842 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -1877,6 +1877,25 @@ namespace BLL
         /// 施工方案
         /// </summary>
         public const string SpecialSchemeMenuId = "3E2F2FFD-ED2E-4914-8370-D97A68398814";
+        
+        /// <summary>
+        /// 防护标准
+        /// </summary>
+        public const string ProtectionStandardsMenuId = "8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201";
+        
+        /// <summary>
+        /// 安全职责
+        /// </summary>
+        public const string SafetyResponsibilitiesMenuId = "6D75EA6C-0E49-4B04-850B-930B628EE1DF";
+        /// <summary>
+        /// 队伍文明施工标准
+        /// </summary>
+        public const string ConstructionStandardsMenuId = "23ACEE2E-0E56-4136-9DFB-C971B3C4EA60";
+        /// <summary>
+        /// 奖罚标准
+        /// </summary>
+        public const string AwardStandardsMenuId = "E4FD28A8-9715-452F-BB16-5FF87BE7D32B";
+        
         #endregion
 
         #region 标牌管理
diff --git a/SGGL/BLL/HSSE/Technique/AwardStandardsService.cs b/SGGL/BLL/HSSE/Technique/AwardStandardsService.cs
new file mode 100644
index 0000000..c00ddf7
--- /dev/null
+++ b/SGGL/BLL/HSSE/Technique/AwardStandardsService.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+namespace BLL;
+
+public class AwardStandardsService
+{
+    public static Model.SGGLDB db = Funs.DB;
+
+    /// <summary>
+    /// 根据主键获取
+    /// </summary>
+    /// <param name="AwardStandardsId"></param>
+    /// <returns></returns>
+    public static Model.Technique_AwardStandards GetAwardStandardsListById(string AwardStandardsId)
+    {
+        return Funs.DB.Technique_AwardStandards.FirstOrDefault(e =>
+            e.AwardStandardsId == AwardStandardsId);
+    }
+
+   
+
+    /// <summary>
+    /// 添加
+    /// </summary>
+    /// <param name="AwardStandardsList"></param>
+    public static void AddAwardStandardsList(Model.Technique_AwardStandards AwardStandardsList)
+    {
+        Model.SGGLDB db = Funs.DB;
+        Model.Technique_AwardStandards newAwardStandardsList = new Model.Technique_AwardStandards
+        {
+            AwardStandardsId = AwardStandardsList.AwardStandardsId,
+            AwardStandardsCode = AwardStandardsList.AwardStandardsCode,
+            AwardStandardsName = AwardStandardsList.AwardStandardsName,
+            AttachUrl = AwardStandardsList.AttachUrl,
+            CompileMan = AwardStandardsList.CompileMan,
+            CompileDate = AwardStandardsList.CompileDate,
+        };
+        newAwardStandardsList.CompileMan = AwardStandardsList.CompileMan;
+        newAwardStandardsList.CompileDate = AwardStandardsList.CompileDate;
+        newAwardStandardsList.IsPass = AwardStandardsList.IsPass;
+        newAwardStandardsList.UpState = AwardStandardsList.UpState;
+        newAwardStandardsList.Remark = AwardStandardsList.Remark;
+        db.Technique_AwardStandards.InsertOnSubmit(newAwardStandardsList);
+        db.SubmitChanges();
+    }
+
+    /// <summary>
+    /// 修改
+    /// </summary>
+    /// <param name="AwardStandardsList"></param>
+    public static void UpdateAwardStandardsList(Model.Technique_AwardStandards AwardStandardsList)
+    {
+        Model.SGGLDB db = Funs.DB;
+        Model.Technique_AwardStandards newAwardStandardsList =
+            db.Technique_AwardStandards.FirstOrDefault(e =>
+                e.AwardStandardsId == AwardStandardsList.AwardStandardsId);
+        if (newAwardStandardsList != null)
+        {
+            newAwardStandardsList.AwardStandardsCode = AwardStandardsList.AwardStandardsCode;
+            newAwardStandardsList.AwardStandardsName = AwardStandardsList.AwardStandardsName;
+            newAwardStandardsList.AttachUrl = AwardStandardsList.AttachUrl;
+            newAwardStandardsList.CompileMan = AwardStandardsList.CompileMan;
+            newAwardStandardsList.CompileDate = AwardStandardsList.CompileDate;
+            newAwardStandardsList.UpState = AwardStandardsList.UpState;
+            newAwardStandardsList.Remark = AwardStandardsList.Remark;
+            db.SubmitChanges();
+        }
+    }
+
+   
+    /// <summary>
+    ///根据主键删除
+    /// </summary>
+    /// <param name="AwardStandardsId"></param>
+    public static void DeleteAwardStandardsListById(string AwardStandardsId)
+    {
+        Model.SGGLDB db = Funs.DB;
+        Model.Technique_AwardStandards AwardStandardsList =
+            db.Technique_AwardStandards.FirstOrDefault(e => e.AwardStandardsId == AwardStandardsId);
+        if (AwardStandardsList != null)
+        {
+            if (!string.IsNullOrEmpty(AwardStandardsList.AttachUrl))
+            {
+                BLL.UploadFileService.DeleteFile(Funs.RootPath, AwardStandardsList.AttachUrl);
+            }
+
+            ////删除附件表
+            BLL.CommonService.DeleteAttachFileById(AwardStandardsList.AwardStandardsId);
+
+            db.Technique_AwardStandards.DeleteOnSubmit(AwardStandardsList);
+            db.SubmitChanges();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/BLL/HSSE/Technique/ConstructionStandardsService.cs b/SGGL/BLL/HSSE/Technique/ConstructionStandardsService.cs
new file mode 100644
index 0000000..2bc3497
--- /dev/null
+++ b/SGGL/BLL/HSSE/Technique/ConstructionStandardsService.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+namespace BLL;
+
+public class ConstructionStandardsService
+{
+    public static Model.SGGLDB db = Funs.DB;
+
+    /// <summary>
+    /// 根据主键获取
+    /// </summary>
+    /// <param name="ConstructionStandardsId"></param>
+    /// <returns></returns>
+    public static Model.Technique_ConstructionStandards GetConstructionStandardsListById(string ConstructionStandardsId)
+    {
+        return Funs.DB.Technique_ConstructionStandards.FirstOrDefault(e =>
+            e.ConstructionStandardsId == ConstructionStandardsId);
+    }
+
+    
+    /// <summary>
+    /// 添加
+    /// </summary>
+    /// <param name="ConstructionStandardsList"></param>
+    public static void AddConstructionStandardsList(Model.Technique_ConstructionStandards ConstructionStandardsList)
+    {
+        Model.SGGLDB db = Funs.DB;
+        Model.Technique_ConstructionStandards newConstructionStandardsList = new Model.Technique_ConstructionStandards
+        {
+            ConstructionStandardsId = ConstructionStandardsList.ConstructionStandardsId,
+            ConstructionStandardsCode = ConstructionStandardsList.ConstructionStandardsCode,
+            ConstructionStandardsName = ConstructionStandardsList.ConstructionStandardsName,
+            AttachUrl = ConstructionStandardsList.AttachUrl,
+            CompileMan = ConstructionStandardsList.CompileMan,
+            CompileDate = ConstructionStandardsList.CompileDate,
+        };
+        newConstructionStandardsList.CompileMan = ConstructionStandardsList.CompileMan;
+        newConstructionStandardsList.CompileDate = ConstructionStandardsList.CompileDate;
+        newConstructionStandardsList.IsPass = ConstructionStandardsList.IsPass;
+        newConstructionStandardsList.UpState = ConstructionStandardsList.UpState;
+        newConstructionStandardsList.Remark = ConstructionStandardsList.Remark;
+        db.Technique_ConstructionStandards.InsertOnSubmit(newConstructionStandardsList);
+        db.SubmitChanges();
+    }
+
+    /// <summary>
+    /// 修改
+    /// </summary>
+    /// <param name="ConstructionStandardsList"></param>
+    public static void UpdateConstructionStandardsList(Model.Technique_ConstructionStandards ConstructionStandardsList)
+    {
+        Model.SGGLDB db = Funs.DB;
+        Model.Technique_ConstructionStandards newConstructionStandardsList =
+            db.Technique_ConstructionStandards.FirstOrDefault(e =>
+                e.ConstructionStandardsId == ConstructionStandardsList.ConstructionStandardsId);
+        if (newConstructionStandardsList != null)
+        {
+            newConstructionStandardsList.ConstructionStandardsCode = ConstructionStandardsList.ConstructionStandardsCode;
+            newConstructionStandardsList.ConstructionStandardsName = ConstructionStandardsList.ConstructionStandardsName;
+            newConstructionStandardsList.AttachUrl = ConstructionStandardsList.AttachUrl;
+            newConstructionStandardsList.CompileMan = ConstructionStandardsList.CompileMan;
+            newConstructionStandardsList.CompileDate = ConstructionStandardsList.CompileDate;
+            newConstructionStandardsList.UpState = ConstructionStandardsList.UpState;
+            newConstructionStandardsList.Remark = ConstructionStandardsList.Remark;
+            db.SubmitChanges();
+        }
+    }
+
+   
+
+    /// <summary>
+    ///根据主键删除
+    /// </summary>
+    /// <param name="ConstructionStandardsId"></param>
+    public static void DeleteConstructionStandardsListById(string ConstructionStandardsId)
+    {
+        Model.SGGLDB db = Funs.DB;
+        Model.Technique_ConstructionStandards ConstructionStandardsList =
+            db.Technique_ConstructionStandards.FirstOrDefault(e => e.ConstructionStandardsId == ConstructionStandardsId);
+        if (ConstructionStandardsList != null)
+        {
+            if (!string.IsNullOrEmpty(ConstructionStandardsList.AttachUrl))
+            {
+                BLL.UploadFileService.DeleteFile(Funs.RootPath, ConstructionStandardsList.AttachUrl);
+            }
+
+            ////删除附件表
+            BLL.CommonService.DeleteAttachFileById(ConstructionStandardsList.ConstructionStandardsId);
+
+            db.Technique_ConstructionStandards.DeleteOnSubmit(ConstructionStandardsList);
+            db.SubmitChanges();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/BLL/HSSE/Technique/ProtectionStandardsService.cs b/SGGL/BLL/HSSE/Technique/ProtectionStandardsService.cs
new file mode 100644
index 0000000..c15290d
--- /dev/null
+++ b/SGGL/BLL/HSSE/Technique/ProtectionStandardsService.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BLL;
+
+public class ProtectionStandardsService
+{
+    public static Model.SGGLDB db = Funs.DB;
+
+    /// <summary>
+    /// 根据主键获取
+    /// </summary>
+    /// <param name="ProtectionStandardsId"></param>
+    /// <returns></returns>
+    public static Model.Technique_ProtectionStandards GetProtectionStandardsListById(string ProtectionStandardsId)
+    {
+        return Funs.DB.Technique_ProtectionStandards.FirstOrDefault(e =>
+            e.ProtectionStandardsId == ProtectionStandardsId);
+    }
+
+    /// <summary>
+    /// 添加
+    /// </summary>
+    /// <param name="ProtectionStandardsList"></param>
+    public static void AddProtectionStandardsList(Model.Technique_ProtectionStandards ProtectionStandardsList)
+    {
+        Model.SGGLDB db = Funs.DB;
+        Model.Technique_ProtectionStandards newProtectionStandardsList = new Model.Technique_ProtectionStandards
+        {
+            ProtectionStandardsId = ProtectionStandardsList.ProtectionStandardsId,
+            ProtectionStandardsCode = ProtectionStandardsList.ProtectionStandardsCode,
+            ProtectionStandardsName = ProtectionStandardsList.ProtectionStandardsName,
+            AttachUrl = ProtectionStandardsList.AttachUrl,
+            CompileMan = ProtectionStandardsList.CompileMan,
+            CompileDate = ProtectionStandardsList.CompileDate,
+        };
+        newProtectionStandardsList.CompileMan = ProtectionStandardsList.CompileMan;
+        newProtectionStandardsList.CompileDate = ProtectionStandardsList.CompileDate;
+        newProtectionStandardsList.IsPass = ProtectionStandardsList.IsPass;
+        newProtectionStandardsList.UpState = ProtectionStandardsList.UpState;
+        newProtectionStandardsList.Remark = ProtectionStandardsList.Remark;
+        db.Technique_ProtectionStandards.InsertOnSubmit(newProtectionStandardsList);
+        db.SubmitChanges();
+    }
+
+    /// <summary>
+    /// 修改
+    /// </summary>
+    /// <param name="ProtectionStandardsList"></param>
+    public static void UpdateProtectionStandardsList(Model.Technique_ProtectionStandards ProtectionStandardsList)
+    {
+        Model.SGGLDB db = Funs.DB;
+        Model.Technique_ProtectionStandards newProtectionStandardsList =
+            db.Technique_ProtectionStandards.FirstOrDefault(e =>
+                e.ProtectionStandardsId == ProtectionStandardsList.ProtectionStandardsId);
+        if (newProtectionStandardsList != null)
+        {
+            newProtectionStandardsList.ProtectionStandardsCode = ProtectionStandardsList.ProtectionStandardsCode;
+            newProtectionStandardsList.ProtectionStandardsName = ProtectionStandardsList.ProtectionStandardsName;
+            newProtectionStandardsList.AttachUrl = ProtectionStandardsList.AttachUrl;
+            newProtectionStandardsList.CompileMan = ProtectionStandardsList.CompileMan;
+            newProtectionStandardsList.CompileDate = ProtectionStandardsList.CompileDate;
+            newProtectionStandardsList.UpState = ProtectionStandardsList.UpState;
+            newProtectionStandardsList.Remark = ProtectionStandardsList.Remark;
+            db.SubmitChanges();
+        }
+    }
+    
+
+    /// <summary>
+    ///根据主键删除
+    /// </summary>
+    /// <param name="ProtectionStandardsId"></param>
+    public static void DeleteProtectionStandardsListById(string ProtectionStandardsId)
+    {
+        Model.SGGLDB db = Funs.DB;
+        Model.Technique_ProtectionStandards ProtectionStandardsList =
+            db.Technique_ProtectionStandards.FirstOrDefault(e => e.ProtectionStandardsId == ProtectionStandardsId);
+        if (ProtectionStandardsList != null)
+        {
+            if (!string.IsNullOrEmpty(ProtectionStandardsList.AttachUrl))
+            {
+                BLL.UploadFileService.DeleteFile(Funs.RootPath, ProtectionStandardsList.AttachUrl);
+            }
+
+            ////删除附件表
+            BLL.CommonService.DeleteAttachFileById(ProtectionStandardsList.ProtectionStandardsId);
+
+            db.Technique_ProtectionStandards.DeleteOnSubmit(ProtectionStandardsList);
+            db.SubmitChanges();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/BLL/HSSE/Technique/SafetyResponsibilitiesService.cs b/SGGL/BLL/HSSE/Technique/SafetyResponsibilitiesService.cs
new file mode 100644
index 0000000..622f11c
--- /dev/null
+++ b/SGGL/BLL/HSSE/Technique/SafetyResponsibilitiesService.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+namespace BLL;
+
+public class SafetyResponsibilitiesService
+{
+    public static Model.SGGLDB db = Funs.DB;
+
+    /// <summary>
+    /// 根据主键
+    /// </summary>
+    /// <param name="SafetyResponsibilitiesId"></param>
+    /// <returns></returns>
+    public static Model.Technique_SafetyResponsibilities GetSafetyResponsibilitiesListById(string SafetyResponsibilitiesId)
+    {
+        return Funs.DB.Technique_SafetyResponsibilities.FirstOrDefault(e =>
+            e.SafetyResponsibilitiesId == SafetyResponsibilitiesId);
+    }
+
+    
+
+    /// <summary>
+    /// 添加专项方案
+    /// </summary>
+    /// <param name="SafetyResponsibilitiesList"></param>
+    public static void AddSafetyResponsibilitiesList(Model.Technique_SafetyResponsibilities SafetyResponsibilitiesList)
+    {
+        Model.SGGLDB db = Funs.DB;
+        Model.Technique_SafetyResponsibilities newSafetyResponsibilitiesList = new Model.Technique_SafetyResponsibilities
+        {
+            SafetyResponsibilitiesId = SafetyResponsibilitiesList.SafetyResponsibilitiesId,
+            SafetyResponsibilitiesCode = SafetyResponsibilitiesList.SafetyResponsibilitiesCode,
+            SafetyResponsibilitiesName = SafetyResponsibilitiesList.SafetyResponsibilitiesName,
+            AttachUrl = SafetyResponsibilitiesList.AttachUrl,
+            CompileMan = SafetyResponsibilitiesList.CompileMan,
+            CompileDate = SafetyResponsibilitiesList.CompileDate,
+        };
+        newSafetyResponsibilitiesList.CompileMan = SafetyResponsibilitiesList.CompileMan;
+        newSafetyResponsibilitiesList.CompileDate = SafetyResponsibilitiesList.CompileDate;
+        newSafetyResponsibilitiesList.IsPass = SafetyResponsibilitiesList.IsPass;
+        newSafetyResponsibilitiesList.UpState = SafetyResponsibilitiesList.UpState;
+        newSafetyResponsibilitiesList.Remark = SafetyResponsibilitiesList.Remark;
+        db.Technique_SafetyResponsibilities.InsertOnSubmit(newSafetyResponsibilitiesList);
+        db.SubmitChanges();
+    }
+
+    /// <summary>
+    /// 修改
+    /// </summary>
+    /// <param name="SafetyResponsibilitiesList"></param>
+    public static void UpdateSafetyResponsibilitiesList(Model.Technique_SafetyResponsibilities SafetyResponsibilitiesList)
+    {
+        Model.SGGLDB db = Funs.DB;
+        Model.Technique_SafetyResponsibilities newSafetyResponsibilitiesList =
+            db.Technique_SafetyResponsibilities.FirstOrDefault(e =>
+                e.SafetyResponsibilitiesId == SafetyResponsibilitiesList.SafetyResponsibilitiesId);
+        if (newSafetyResponsibilitiesList != null)
+        {
+            newSafetyResponsibilitiesList.SafetyResponsibilitiesCode = SafetyResponsibilitiesList.SafetyResponsibilitiesCode;
+            newSafetyResponsibilitiesList.SafetyResponsibilitiesName = SafetyResponsibilitiesList.SafetyResponsibilitiesName;
+            newSafetyResponsibilitiesList.AttachUrl = SafetyResponsibilitiesList.AttachUrl;
+            newSafetyResponsibilitiesList.CompileMan = SafetyResponsibilitiesList.CompileMan;
+            newSafetyResponsibilitiesList.CompileDate = SafetyResponsibilitiesList.CompileDate;
+            newSafetyResponsibilitiesList.UpState = SafetyResponsibilitiesList.UpState;
+            newSafetyResponsibilitiesList.Remark = SafetyResponsibilitiesList.Remark;
+            db.SubmitChanges();
+        }
+    }
+
+   
+
+    /// <summary>
+    ///根据主键删
+    /// </summary>
+    /// <param name="SafetyResponsibilitiesId"></param>
+    public static void DeleteSafetyResponsibilitiesListById(string SafetyResponsibilitiesId)
+    {
+        Model.SGGLDB db = Funs.DB;
+        Model.Technique_SafetyResponsibilities SafetyResponsibilitiesList =
+            db.Technique_SafetyResponsibilities.FirstOrDefault(e => e.SafetyResponsibilitiesId == SafetyResponsibilitiesId);
+        if (SafetyResponsibilitiesList != null)
+        {
+            if (!string.IsNullOrEmpty(SafetyResponsibilitiesList.AttachUrl))
+            {
+                BLL.UploadFileService.DeleteFile(Funs.RootPath, SafetyResponsibilitiesList.AttachUrl);
+            }
+
+            ////删除附件表
+            BLL.CommonService.DeleteAttachFileById(SafetyResponsibilitiesList.SafetyResponsibilitiesId);
+
+            db.Technique_SafetyResponsibilities.DeleteOnSubmit(SafetyResponsibilitiesList);
+            db.SubmitChanges();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx
index 82cb308..55e1f44 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx
@@ -175,7 +175,7 @@
   </data>
   <data name="ScheduleManage" xml:space="preserve">
     <value>Schedule manage</value>
-    <comment>进度管理</comment>
+    <comment>工程管理</comment>
   </data>
   <data name="SelectLanguage" xml:space="preserve">
     <value>Choice language</value>
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
index 79978a1..49eb719 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
@@ -160,7 +160,7 @@
     <value>刷新本页</value>
   </data>
   <data name="ScheduleManage" xml:space="preserve">
-    <value>进度管理</value>
+    <value>工程管理</value>
   </data>
   <data name="SelectLanguage" xml:space="preserve">
     <value>选择语言</value>
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx
index 9b48139..63324e0 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx
@@ -160,7 +160,7 @@
     <value>刷新本页</value>
   </data>
   <data name="ScheduleManage" xml:space="preserve">
-    <value>进度管理</value>
+    <value>工程管理</value>
   </data>
   <data name="SelectLanguage" xml:space="preserve">
     <value>选择语言</value>
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index f4b84e4..5f29de3 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -2290,11 +2290,15 @@
     <Content Include="HSSE\Solution\SolutionTemplate.aspx" />
     <Content Include="HSSE\Solution\SolutionTemplateEdit.aspx" />
     <Content Include="HSSE\Solution\SolutionTemplateView.aspx" />
+    <Content Include="HSSE\Technique\AwardStandards.aspx" />
+    <Content Include="HSSE\Technique\AwardStandardsEdit.aspx" />
     <Content Include="HSSE\Technique\CheckItemDetailEdit.aspx" />
     <Content Include="HSSE\Technique\CheckItemEdit.aspx" />
     <Content Include="HSSE\Technique\CheckItemSet.aspx" />
     <Content Include="HSSE\Technique\CompanyEnvironmental.aspx" />
     <Content Include="HSSE\Technique\CompanyHazardList.aspx" />
+    <Content Include="HSSE\Technique\ConstructionStandards.aspx" />
+    <Content Include="HSSE\Technique\ConstructionStandardsEdit.aspx" />
     <Content Include="HSSE\Technique\Emergency.aspx" />
     <Content Include="HSSE\Technique\EmergencyEdit.aspx" />
     <Content Include="HSSE\Technique\EmergencySelectCloumn.aspx" />
@@ -2308,10 +2312,14 @@
     <Content Include="HSSE\Technique\HazardListIn.aspx" />
     <Content Include="HSSE\Technique\HazardListOut.aspx" />
     <Content Include="HSSE\Technique\HazardListTypeEdit.aspx" />
+    <Content Include="HSSE\Technique\ProtectionStandards.aspx" />
+    <Content Include="HSSE\Technique\ProtectionStandardsEdit.aspx" />
     <Content Include="HSSE\Technique\Rectify.aspx" />
     <Content Include="HSSE\Technique\RectifyEdit.aspx" />
     <Content Include="HSSE\Technique\RectifyItemEdit.aspx" />
     <Content Include="HSSE\Technique\RectifySelectCloumn.aspx" />
+    <Content Include="HSSE\Technique\SafetyResponsibilities.aspx" />
+    <Content Include="HSSE\Technique\SafetyResponsibilitiesEdit.aspx" />
     <Content Include="HSSE\Technique\SpecialScheme.aspx" />
     <Content Include="HSSE\Technique\SpecialSchemeEdit.aspx" />
     <Content Include="HSSE\Technique\SpecialSchemeSelectCloumn.aspx" />
@@ -12734,7 +12742,9 @@
     <Compile Include="HSSE\EduTrain\TaskNoticeEdit.aspx.designer.cs">
       <DependentUpon>TaskNoticeEdit.aspx</DependentUpon>
     </Compile>
-    <Compile Include="HSSE\EduTrain\Trainingrecords.aspx.cs" />
+    <Compile Include="HSSE\EduTrain\Trainingrecords.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="HSSE\EduTrain\Trainingrecords.aspx.designer.cs" />
     <Compile Include="HSSE\EduTrain\TrainTestRecordEdit.aspx.cs">
       <DependentUpon>TrainTestRecordEdit.aspx</DependentUpon>
@@ -15634,6 +15644,20 @@
     <Compile Include="HSSE\Solution\SolutionTemplateView.aspx.designer.cs">
       <DependentUpon>SolutionTemplateView.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HSSE\Technique\AwardStandards.aspx.cs">
+      <DependentUpon>AwardStandards.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\Technique\AwardStandards.aspx.designer.cs">
+      <DependentUpon>AwardStandards.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\Technique\AwardStandardsEdit.aspx.cs">
+      <DependentUpon>AwardStandardsEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\Technique\AwardStandardsEdit.aspx.designer.cs">
+      <DependentUpon>AwardStandardsEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HSSE\Technique\CheckItemDetailEdit.aspx.cs">
       <DependentUpon>CheckItemDetailEdit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -15669,6 +15693,20 @@
     <Compile Include="HSSE\Technique\CompanyHazardList.aspx.designer.cs">
       <DependentUpon>CompanyHazardList.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HSSE\Technique\ConstructionStandards.aspx.cs">
+      <DependentUpon>ConstructionStandards.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\Technique\ConstructionStandards.aspx.designer.cs">
+      <DependentUpon>ConstructionStandards.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\Technique\ConstructionStandardsEdit.aspx.cs">
+      <DependentUpon>ConstructionStandardsEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\Technique\ConstructionStandardsEdit.aspx.designer.cs">
+      <DependentUpon>ConstructionStandardsEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HSSE\Technique\Emergency.aspx.cs">
       <DependentUpon>Emergency.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -15760,6 +15798,20 @@
     <Compile Include="HSSE\Technique\HazardListTypeEdit.aspx.designer.cs">
       <DependentUpon>HazardListTypeEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HSSE\Technique\ProtectionStandards.aspx.cs">
+      <DependentUpon>ProtectionStandards.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\Technique\ProtectionStandards.aspx.designer.cs">
+      <DependentUpon>ProtectionStandards.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\Technique\ProtectionStandardsEdit.aspx.cs">
+      <DependentUpon>ProtectionStandardsEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\Technique\ProtectionStandardsEdit.aspx.designer.cs">
+      <DependentUpon>ProtectionStandardsEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HSSE\Technique\Rectify.aspx.cs">
       <DependentUpon>Rectify.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -15788,6 +15840,20 @@
     <Compile Include="HSSE\Technique\RectifySelectCloumn.aspx.designer.cs">
       <DependentUpon>RectifySelectCloumn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HSSE\Technique\SafetyResponsibilities.aspx.cs">
+      <DependentUpon>SafetyResponsibilities.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\Technique\SafetyResponsibilities.aspx.designer.cs">
+      <DependentUpon>SafetyResponsibilities.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HSSE\Technique\SafetyResponsibilitiesEdit.aspx.cs">
+      <DependentUpon>SafetyResponsibilitiesEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\Technique\SafetyResponsibilitiesEdit.aspx.designer.cs">
+      <DependentUpon>SafetyResponsibilitiesEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HSSE\Technique\SpecialScheme.aspx.cs">
       <DependentUpon>SpecialScheme.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandards.aspx b/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandards.aspx
new file mode 100644
index 0000000..045d655
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandards.aspx
@@ -0,0 +1,108 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AwardStandards.aspx.cs" Inherits="FineUIPro.Web.HSSE.Technique.AwardStandards" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>奖罚标准</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />    
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <Items>
+            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="防护标准" EnableCollapse="true"
+                runat="server" BoxFlex="1" DataKeyNames="AwardStandardsId" EnableColumnLines="true"
+                DataIDField="AwardStandardsId" AllowSorting="true" SortField="AwardStandardsCode" ForceFit="true"
+                SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" 
+                PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
+                OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                <Toolbars>
+                    <f:Toolbar ID="Toolbar3" Position="Top" runat="server">
+                        <Items>
+                            
+                            <f:TextBox ID="AwardStandardsName" runat="server" Label="名称" EmptyText="输入查询名称" 
+                                Width="250px" LabelWidth="70px">
+                            </f:TextBox>
+                            <f:ToolbarFill runat="server"></f:ToolbarFill>
+                            
+                            <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" 	
+                                OnClick="TextBox_TextChanged" runat="server" >
+                            </f:Button>
+                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server"
+                                Hidden="true">
+                            </f:Button>
+                            <%-- <f:Button ID="btnSelectColumns" runat="server" ToolTip="导出" Icon="FolderUp" EnablePostBack="false" Hidden="true"> --%>
+                            <%-- </f:Button> --%>
+                        </Items>
+                    </f:Toolbar>
+                </Toolbars>                
+                <Columns>
+                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />                    
+                     <f:RenderField Width="160px" ColumnID="AwardStandardsCode" DataField="AwardStandardsCode" SortField="AwardStandardsCode"
+                        FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField> 
+                     <f:RenderField Width="220px" ColumnID="AwardStandardsName" DataField="AwardStandardsName" SortField="AwardStandardsName"
+                        FieldType="String" HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="110px" ColumnID="CompileMan" DataField="CompileMan" SortField="CompileMan"
+                                   FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="250px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                                   FieldType="String" HeaderText="编制时间" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>  
+                    <f:WindowField TextAlign="Left" Width="70px" WindowID="WindowAtt" Text="详细"
+                        ToolTip="上传查看" DataIFrameUrlFields="AwardStandardsId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/AwardStandards&menuId=8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201"/>             
+                </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" OnClose="Window1_Close" IsModal="true"
+        Width="750px" Height="420px">
+    </f:Window>
+    <f:Window ID="Window4" Title="选择需要导出的列" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="false" runat="server" OnClose="Window4_Close" IsModal="true"
+        Width="450px" Height="250px" EnableAjax="false">
+    </f:Window>
+    <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Self" EnableResize="false" runat="server" IsModal="true" Width="700px"
+        Height="500px">
+    </f:Window>
+    <f:Menu ID="Menu1" runat="server">
+        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
+            Hidden="true" runat="server" Text="编辑" Icon="Pencil">
+        </f:MenuButton>
+        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Icon="Delete"
+            Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
+        </f:MenuButton>
+    </f:Menu>
+    </form>
+    <script type="text/jscript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandards.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandards.aspx.cs
new file mode 100644
index 0000000..6ed1667
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandards.aspx.cs
@@ -0,0 +1,319 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Web.UI;
+
+namespace FineUIPro.Web.HSSE.Technique
+{
+    public partial class AwardStandards : 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);
+                ////权限按钮方法
+                this.GetButtonPower();
+                btnNew.OnClientClick = Window1.GetShowReference("AwardStandardsEdit.aspx") + "return false;";           
+                // btnSelectColumns.OnClientClick = Window4.GetShowReference("AwardStandardsSelectCloumn.aspx");
+
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT AwardStandardsId,AwardStandardsCode,AwardStandardsName,CompileMan,CompileDate,AttachUrl,AuditMan,AuditDate,IsPass,IsBuild,UpState
+                                            FROM dbo.Technique_AwardStandards
+                                            WHERE 1 =1 ";
+
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            
+            if (!string.IsNullOrEmpty(this.AwardStandardsName.Text.Trim()))
+            {
+                strSql += " AND AwardStandardsName LIKE @AwardStandardsName";
+                listStr.Add(new SqlParameter("@AwardStandardsName", "%" + this.AwardStandardsName.Text.Trim() + "%"));
+            }
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion        
+        
+        #region 分页、排序、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            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 Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 右键删除事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDelete_Click(object sender, EventArgs e)
+        {
+            this.DeleteData();
+        }
+
+        /// <summary>
+        /// 删除方法
+        /// </summary>
+        private void DeleteData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    var getV = BLL.AwardStandardsService.GetAwardStandardsListById(rowID);
+                    if (getV != null)
+                    {
+                        BLL.LogService.AddSys_Log(this.CurrUser, getV.AwardStandardsCode, getV.AwardStandardsId, BLL.Const.AwardStandardsMenuId, Const.BtnDelete);
+
+                        BLL.AwardStandardsService.DeleteAwardStandardsListById(rowID);
+                    }
+                }
+                BindGrid();
+                ShowNotify("删除数据成功!");
+            }
+        }
+        #endregion        
+
+        #region 编辑
+        /// <summary>
+        /// 右键编辑事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuEdit_Click(object sender, EventArgs e)
+        {
+            this.EditData();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditData()
+        {
+
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string AwardStandardsId = Grid1.SelectedRowID;
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("AwardStandardsEdit.aspx?AwardStandardsId={0}", AwardStandardsId, "编辑 - ")));
+
+        }
+        #endregion
+
+        #region Grid行双击事件
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditData();
+        }
+        #endregion        
+
+        #region 输入框查询事件
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+            BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, string.Empty, BLL.Const.AwardStandardsMenuId, Const.BtnQuery);
+
+        }
+        #endregion
+
+        #region 导出
+        /// <summary>
+        /// 关闭导出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window4_Close(object sender, WindowCloseEventArgs e)
+        {
+            Response.ClearContent();
+            Response.AddHeader("content-disposition", "attachment; filename=MyExcelFile.xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            Response.Write(GetGridTableHtml(Grid1, e.CloseArgument.Split('#')));
+            Response.End();
+        }
+
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="grid"></param>
+        /// <param name="columns"></param>
+        /// <returns></returns>
+        private string GetGridTableHtml(Grid grid, string[] columns)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
+            List<string> columnHeaderTexts = new List<string>(columns);
+            List<int> columnIndexs = new List<int>();
+            sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
+            sb.Append("<tr>");
+            foreach (GridColumn column in grid.Columns)
+            {
+                if (columnHeaderTexts.Contains(column.HeaderText))
+                {
+                    sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+                    columnIndexs.Add(column.ColumnIndex);
+                }
+            }
+            sb.Append("</tr>");
+            foreach (GridRow row in grid.Rows)
+            {
+                sb.Append("<tr>");
+                int columnIndex = 0;
+                foreach (object value in row.Values)
+                {
+                    if (columnIndexs.Contains(columnIndex))
+                    {
+                        string html = value.ToString();
+                        if (html.StartsWith(Grid.TEMPLATE_PLACEHOLDER_PREFIX))
+                        {
+                            // 模板列                            
+                            string templateID = html.Substring(Grid.TEMPLATE_PLACEHOLDER_PREFIX.Length);
+                            Control templateCtrl = row.FindControl(templateID);
+                            html = GetRenderedHtmlSource(templateCtrl);
+                        }
+                        sb.AppendFormat("<td>{0}</td>", html);
+                    }
+                    columnIndex++;
+                }
+                sb.Append("</tr>");
+            }
+            sb.Append("</table>");
+            return sb.ToString();
+        }
+
+        /// <summary>        
+        /// 获取控件渲染后的HTML源代码        
+        /// </summary>        
+        /// <param name="ctrl"></param>        
+        /// <returns></returns>        
+        private string GetRenderedHtmlSource(Control ctrl)
+        {
+            if (ctrl != null)
+            {
+                using (StringWriter sw = new StringWriter())
+                {
+                    using (HtmlTextWriter htw = new HtmlTextWriter(sw))
+                    {
+                        ctrl.RenderControl(htw);
+                        return sw.ToString();
+                    }
+                }
+            }
+            return String.Empty;
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.AwardStandardsMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    this.btnNew.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuEdit.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDelete.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnOut))
+                {
+                    // this.btnSelectColumns.Hidden = false;
+                }
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandards.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandards.aspx.designer.cs
new file mode 100644
index 0000000..abfd62a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandards.aspx.designer.cs
@@ -0,0 +1,170 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.Technique
+{
+
+
+    public partial class AwardStandards
+    {
+
+        /// <summary>
+        /// form1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar3 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+
+        /// <summary>
+        /// AwardStandardsName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.TextBox AwardStandardsName;
+
+        /// <summary>
+        /// btnQuery control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+
+        /// <summary>
+        /// btnNew control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// ToolbarSeparator1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Window4 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Window Window4;
+
+        /// <summary>
+        /// WindowAtt control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+
+        /// <summary>
+        /// Menu1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuEdit control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+
+        /// <summary>
+        /// btnMenuDelete control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandardsEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandardsEdit.aspx
new file mode 100644
index 0000000..86cc5dc
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandardsEdit.aspx
@@ -0,0 +1,72 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AwardStandardsEdit.aspx.cs" Inherits="FineUIPro.Web.HSSE.Technique.AwardStandardsEdit" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>编辑奖罚标准</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="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="txtAwardStandardsCode" runat="server" Label="编号" Required="true"
+                        MaxLength="50" ShowRedStar="true" FocusOnPageLoad="true" AutoPostBack="true"
+                        OnTextChanged="TextBox_TextChanged">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextBox ID="txtAwardStandardsName" runat="server" Label="名称" Required="true"
+                        MaxLength="500" ShowRedStar="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DropDownList ID="ddlCompileMan" runat="server" Label="编制人">
+                    </f:DropDownList>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DatePicker runat="server" Label="编制日期" ID="dpkCompileDate">
+                    </f:DatePicker>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelAlign="Right" ></f:TextArea>
+                </Items>
+            </f:FormRow>
+        </Rows>
+        <Toolbars>
+            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                <Items>
+                    <f:Label runat="server" ID="lbTemp"></f:Label>
+                     <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server" OnClick="btnUploadResources_Click"
+                        ValidateForms="SimpleForm1">
+                    </f:Button>
+                    <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                    <f:Button ID="btnSave" Icon="SystemSave" runat="server"  ValidateForms="SimpleForm1"
+                        Hidden="true" OnClick="btnSave_Click">
+                    </f:Button>
+                    <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
+                    </f:Button>
+                </Items>
+            </f:Toolbar>
+        </Toolbars>
+    </f:Form>
+    </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>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandardsEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandardsEdit.aspx.cs
new file mode 100644
index 0000000..14c135e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandardsEdit.aspx.cs
@@ -0,0 +1,221 @@
+using BLL;
+using System;
+using System.Linq;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HSSE.Technique
+{
+    public partial class AwardStandardsEdit : PageBase
+    {
+        #region 定义变量
+        /// <summary>
+        /// 防护标准ID
+        /// </summary>
+        public string AwardStandardsId
+        {
+            get
+            {
+                return (string)ViewState["AwardStandardsId"];
+            }
+            set
+            {
+                ViewState["AwardStandardsId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                ////权限按钮方法
+                this.GetButtonPower();
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                //人员              
+                UserService.InitUserDropDownList(this.ddlCompileMan, string.Empty, true);
+
+                //加载默认整理人、整理日期
+                this.ddlCompileMan.SelectedValue = this.CurrUser.UserId;
+                this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+
+                this.AwardStandardsId = Request.Params["AwardStandardsId"];
+                if (!string.IsNullOrEmpty(this.AwardStandardsId))
+                {
+                    var AwardStandards = BLL.AwardStandardsService.GetAwardStandardsListById(this.AwardStandardsId);
+                    if (AwardStandards != null)
+                    {
+                        this.txtAwardStandardsCode.Text = AwardStandards.AwardStandardsCode;
+                        this.txtAwardStandardsName.Text = AwardStandards.AwardStandardsName;
+                        this.txtRemark.Text = AwardStandards.Remark;
+                        this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", AwardStandards.CompileDate);
+                        
+                        if (!string.IsNullOrEmpty(AwardStandards.CompileMan))
+                        {
+                            this.ddlCompileMan.SelectedItem.Text = AwardStandards.CompileMan;
+                        }
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            SaveData();
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+        
+        /// <summary>
+        /// 保存数据
+        /// </summary>
+        private void SaveData()
+        {
+            Model.Technique_AwardStandards AwardStandards = new Model.Technique_AwardStandards();           
+            if (!string.IsNullOrEmpty(this.txtAwardStandardsCode.Text.Trim()))
+            {
+                AwardStandards.AwardStandardsCode = this.txtAwardStandardsCode.Text.Trim();
+            }
+            else
+            {
+                ShowNotify("请输入编号", MessageBoxIcon.Warning);
+                return;
+            }
+            if (!string.IsNullOrEmpty(this.txtAwardStandardsName.Text.Trim()))
+            {
+                AwardStandards.AwardStandardsName = this.txtAwardStandardsName.Text.Trim();
+            }
+            else
+            {
+                ShowNotify("请输入名称", MessageBoxIcon.Warning);
+                return;
+            }
+            
+            if (this.ddlCompileMan.SelectedValue != null)
+            {
+                AwardStandards.CompileMan = this.ddlCompileMan.SelectedItem.Text;
+            }
+            else
+            {
+                AwardStandards.CompileMan = this.CurrUser.UserName;
+            }
+            if (!string.IsNullOrEmpty(this.dpkCompileDate.Text))
+            {
+                AwardStandards.CompileDate = Convert.ToDateTime(this.dpkCompileDate.Text);
+            }
+            else
+            {
+                AwardStandards.CompileDate = DateTime.Now;
+            }
+            if (txtRemark.Text.Trim() != string.Empty)
+            {
+                AwardStandards.Remark = txtRemark.Text.Trim();
+            }
+            if (string.IsNullOrEmpty(this.AwardStandardsId))
+            {
+                AwardStandards.IsPass = true;
+                this.AwardStandardsId = AwardStandards.AwardStandardsId = SQLHelper.GetNewID(typeof(Model.Technique_AwardStandards));
+                BLL.AwardStandardsService.AddAwardStandardsList(AwardStandards);
+
+                BLL.LogService.AddSys_Log(this.CurrUser, AwardStandards.AwardStandardsCode, AwardStandards.AwardStandardsId, BLL.Const.AwardStandardsMenuId, Const.BtnAdd);
+            }
+            else
+            {
+                AwardStandards.AwardStandardsId = this.AwardStandardsId;
+                BLL.AwardStandardsService.UpdateAwardStandardsList(AwardStandards);
+                BLL.LogService.AddSys_Log(this.CurrUser, AwardStandards.AwardStandardsCode, AwardStandards.AwardStandardsId, BLL.Const.AwardStandardsMenuId, Const.BtnModify);                
+            }
+        }
+        #endregion
+        
+        #region 附件上传
+        /// <summary>
+        /// 上传附件资源
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnUploadResources_Click(object sender, EventArgs e)
+        {
+            if (this.btnSave.Hidden)
+            {
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/AwardStandards&type=-1", this.AwardStandardsId)));
+            }
+            else
+            {
+                if (string.IsNullOrEmpty(this.txtAwardStandardsCode.Text.Trim()))
+                {
+                    ShowNotify("请输入方案编号", MessageBoxIcon.Warning);
+                    return;
+                }
+                if (string.IsNullOrEmpty(this.txtAwardStandardsName.Text.Trim()))
+                {
+                    ShowNotify("请输入方案名称", MessageBoxIcon.Warning);
+                    return;
+                }
+                
+                if (string.IsNullOrEmpty(this.AwardStandardsId))
+                {
+                    SaveData();
+                }
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/AwardStandards&menuId={1}", this.AwardStandardsId, BLL.Const.AwardStandardsMenuId)));
+            }
+        }
+        #endregion
+
+        #region 验证方案编号、名称是否存在
+        /// <summary>
+        /// 验证方案编号、名称是否存在
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            var q = Funs.DB.Technique_AwardStandards.FirstOrDefault(x => x.IsPass == true && x.AwardStandardsCode == this.txtAwardStandardsCode.Text.Trim() && (x.AwardStandardsId != this.AwardStandardsId || (this.AwardStandardsId == null && x.AwardStandardsId != null)));
+            if (q != null)
+            {
+                ShowNotify("输入的方案编号已存在！", MessageBoxIcon.Warning);
+            }
+            var q2 = Funs.DB.Technique_AwardStandards.FirstOrDefault(x => x.IsPass == true && x.AwardStandardsName == this.txtAwardStandardsName.Text.Trim() && (x.AwardStandardsId != this.AwardStandardsId || (this.AwardStandardsId == null && x.AwardStandardsId != null)));
+            if (q2 != null)
+            {
+                ShowNotify("输入的方案名称已存在！", MessageBoxIcon.Warning);
+            }
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.AwardStandardsMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnSave.Hidden = false;
+                }
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandardsEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandardsEdit.aspx.designer.cs
new file mode 100644
index 0000000..41cc450
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/AwardStandardsEdit.aspx.designer.cs
@@ -0,0 +1,152 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.Technique
+{
+
+
+    public partial class AwardStandardsEdit
+    {
+
+        /// <summary>
+        /// form1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// txtAwardStandardsCode control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtAwardStandardsCode;
+
+        /// <summary>
+        /// txtAwardStandardsName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtAwardStandardsName;
+
+        /// <summary>
+        /// ddlCompileMan control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlCompileMan;
+
+        /// <summary>
+        /// dpkCompileDate control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.DatePicker dpkCompileDate;
+
+        /// <summary>
+        /// txtRemark control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemark;
+
+        /// <summary>
+        /// Toolbar1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// lbTemp control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Label lbTemp;
+
+        /// <summary>
+        /// btnAttachUrl control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttachUrl;
+
+        /// <summary>
+        /// ToolbarFill1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnSave control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// btnClose control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// WindowAtt control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandards.aspx b/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandards.aspx
new file mode 100644
index 0000000..c2f4414
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandards.aspx
@@ -0,0 +1,108 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ConstructionStandards.aspx.cs" Inherits="FineUIPro.Web.HSSE.Technique.ConstructionStandards" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>队伍文明施工标准</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />    
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <Items>
+            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="防护标准" EnableCollapse="true"
+                runat="server" BoxFlex="1" DataKeyNames="ConstructionStandardsId" EnableColumnLines="true"
+                DataIDField="ConstructionStandardsId" AllowSorting="true" SortField="ConstructionStandardsCode" ForceFit="true"
+                SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" 
+                PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
+                OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                <Toolbars>
+                    <f:Toolbar ID="Toolbar3" Position="Top" runat="server">
+                        <Items>
+                            
+                            <f:TextBox ID="ConstructionStandardsName" runat="server" Label="名称" EmptyText="输入查询名称" 
+                                Width="250px" LabelWidth="70px">
+                            </f:TextBox>
+                            <f:ToolbarFill runat="server"></f:ToolbarFill>
+                            
+                            <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" 	
+                                OnClick="TextBox_TextChanged" runat="server" >
+                            </f:Button>
+                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server"
+                                Hidden="true">
+                            </f:Button>
+                            <%-- <f:Button ID="btnSelectColumns" runat="server" ToolTip="导出" Icon="FolderUp" EnablePostBack="false" Hidden="true"> --%>
+                            <%-- </f:Button> --%>
+                        </Items>
+                    </f:Toolbar>
+                </Toolbars>                
+                <Columns>
+                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />                    
+                     <f:RenderField Width="160px" ColumnID="ConstructionStandardsCode" DataField="ConstructionStandardsCode" SortField="ConstructionStandardsCode"
+                        FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField> 
+                     <f:RenderField Width="220px" ColumnID="ConstructionStandardsName" DataField="ConstructionStandardsName" SortField="ConstructionStandardsName"
+                        FieldType="String" HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="110px" ColumnID="CompileMan" DataField="CompileMan" SortField="CompileMan"
+                                   FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="250px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                                   FieldType="String" HeaderText="编制时间" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>  
+                    <f:WindowField TextAlign="Left" Width="70px" WindowID="WindowAtt" Text="详细"
+                        ToolTip="上传查看" DataIFrameUrlFields="ConstructionStandardsId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ConstructionStandards&menuId=8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201"/>             
+                </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" OnClose="Window1_Close" IsModal="true"
+        Width="750px" Height="420px">
+    </f:Window>
+    <f:Window ID="Window4" Title="选择需要导出的列" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="false" runat="server" OnClose="Window4_Close" IsModal="true"
+        Width="450px" Height="250px" EnableAjax="false">
+    </f:Window>
+    <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Self" EnableResize="false" runat="server" IsModal="true" Width="700px"
+        Height="500px">
+    </f:Window>
+    <f:Menu ID="Menu1" runat="server">
+        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
+            Hidden="true" runat="server" Text="编辑" Icon="Pencil">
+        </f:MenuButton>
+        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Icon="Delete"
+            Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
+        </f:MenuButton>
+    </f:Menu>
+    </form>
+    <script type="text/jscript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandards.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandards.aspx.cs
new file mode 100644
index 0000000..6e3f621
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandards.aspx.cs
@@ -0,0 +1,319 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Web.UI;
+
+namespace FineUIPro.Web.HSSE.Technique
+{
+    public partial class ConstructionStandards : 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);
+                ////权限按钮方法
+                this.GetButtonPower();
+                btnNew.OnClientClick = Window1.GetShowReference("ConstructionStandardsEdit.aspx") + "return false;";           
+                // btnSelectColumns.OnClientClick = Window4.GetShowReference("ConstructionStandardsSelectCloumn.aspx");
+
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT ConstructionStandardsId,ConstructionStandardsCode,ConstructionStandardsName,CompileMan,CompileDate,AttachUrl,AuditMan,AuditDate,IsPass,IsBuild,UpState
+                                            FROM dbo.Technique_ConstructionStandards
+                                            WHERE 1 =1 ";
+
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            
+            if (!string.IsNullOrEmpty(this.ConstructionStandardsName.Text.Trim()))
+            {
+                strSql += " AND ConstructionStandardsName LIKE @ConstructionStandardsName";
+                listStr.Add(new SqlParameter("@ConstructionStandardsName", "%" + this.ConstructionStandardsName.Text.Trim() + "%"));
+            }
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion        
+        
+        #region 分页、排序、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            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 Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 右键删除事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDelete_Click(object sender, EventArgs e)
+        {
+            this.DeleteData();
+        }
+
+        /// <summary>
+        /// 删除方法
+        /// </summary>
+        private void DeleteData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    var getV = BLL.ConstructionStandardsService.GetConstructionStandardsListById(rowID);
+                    if (getV != null)
+                    {
+                        BLL.LogService.AddSys_Log(this.CurrUser, getV.ConstructionStandardsCode, getV.ConstructionStandardsId, BLL.Const.ConstructionStandardsMenuId, Const.BtnDelete);
+
+                        BLL.ConstructionStandardsService.DeleteConstructionStandardsListById(rowID);
+                    }
+                }
+                BindGrid();
+                ShowNotify("删除数据成功!");
+            }
+        }
+        #endregion        
+
+        #region 编辑
+        /// <summary>
+        /// 右键编辑事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuEdit_Click(object sender, EventArgs e)
+        {
+            this.EditData();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditData()
+        {
+
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string ConstructionStandardsId = Grid1.SelectedRowID;
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConstructionStandardsEdit.aspx?ConstructionStandardsId={0}", ConstructionStandardsId, "编辑 - ")));
+
+        }
+        #endregion
+
+        #region Grid行双击事件
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditData();
+        }
+        #endregion        
+
+        #region 输入框查询事件
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+            BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, string.Empty, BLL.Const.ConstructionStandardsMenuId, Const.BtnQuery);
+
+        }
+        #endregion
+
+        #region 导出
+        /// <summary>
+        /// 关闭导出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window4_Close(object sender, WindowCloseEventArgs e)
+        {
+            Response.ClearContent();
+            Response.AddHeader("content-disposition", "attachment; filename=MyExcelFile.xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            Response.Write(GetGridTableHtml(Grid1, e.CloseArgument.Split('#')));
+            Response.End();
+        }
+
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="grid"></param>
+        /// <param name="columns"></param>
+        /// <returns></returns>
+        private string GetGridTableHtml(Grid grid, string[] columns)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
+            List<string> columnHeaderTexts = new List<string>(columns);
+            List<int> columnIndexs = new List<int>();
+            sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
+            sb.Append("<tr>");
+            foreach (GridColumn column in grid.Columns)
+            {
+                if (columnHeaderTexts.Contains(column.HeaderText))
+                {
+                    sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+                    columnIndexs.Add(column.ColumnIndex);
+                }
+            }
+            sb.Append("</tr>");
+            foreach (GridRow row in grid.Rows)
+            {
+                sb.Append("<tr>");
+                int columnIndex = 0;
+                foreach (object value in row.Values)
+                {
+                    if (columnIndexs.Contains(columnIndex))
+                    {
+                        string html = value.ToString();
+                        if (html.StartsWith(Grid.TEMPLATE_PLACEHOLDER_PREFIX))
+                        {
+                            // 模板列                            
+                            string templateID = html.Substring(Grid.TEMPLATE_PLACEHOLDER_PREFIX.Length);
+                            Control templateCtrl = row.FindControl(templateID);
+                            html = GetRenderedHtmlSource(templateCtrl);
+                        }
+                        sb.AppendFormat("<td>{0}</td>", html);
+                    }
+                    columnIndex++;
+                }
+                sb.Append("</tr>");
+            }
+            sb.Append("</table>");
+            return sb.ToString();
+        }
+
+        /// <summary>        
+        /// 获取控件渲染后的HTML源代码        
+        /// </summary>        
+        /// <param name="ctrl"></param>        
+        /// <returns></returns>        
+        private string GetRenderedHtmlSource(Control ctrl)
+        {
+            if (ctrl != null)
+            {
+                using (StringWriter sw = new StringWriter())
+                {
+                    using (HtmlTextWriter htw = new HtmlTextWriter(sw))
+                    {
+                        ctrl.RenderControl(htw);
+                        return sw.ToString();
+                    }
+                }
+            }
+            return String.Empty;
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ConstructionStandardsMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    this.btnNew.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuEdit.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDelete.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnOut))
+                {
+                    // this.btnSelectColumns.Hidden = false;
+                }
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandards.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandards.aspx.designer.cs
new file mode 100644
index 0000000..a37007c
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandards.aspx.designer.cs
@@ -0,0 +1,170 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.Technique
+{
+
+
+    public partial class ConstructionStandards
+    {
+
+        /// <summary>
+        /// form1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar3 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+
+        /// <summary>
+        /// ConstructionStandardsName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.TextBox ConstructionStandardsName;
+
+        /// <summary>
+        /// btnQuery control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+
+        /// <summary>
+        /// btnNew control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// ToolbarSeparator1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Window4 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Window Window4;
+
+        /// <summary>
+        /// WindowAtt control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+
+        /// <summary>
+        /// Menu1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuEdit control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+
+        /// <summary>
+        /// btnMenuDelete control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandardsEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandardsEdit.aspx
new file mode 100644
index 0000000..dfbecd8
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandardsEdit.aspx
@@ -0,0 +1,72 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ConstructionStandardsEdit.aspx.cs" Inherits="FineUIPro.Web.HSSE.Technique.ConstructionStandardsEdit" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>编辑队伍文明施工标准</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="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="txtConstructionStandardsCode" runat="server" Label="编号" Required="true"
+                        MaxLength="50" ShowRedStar="true" FocusOnPageLoad="true" AutoPostBack="true"
+                        OnTextChanged="TextBox_TextChanged">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextBox ID="txtConstructionStandardsName" runat="server" Label="名称" Required="true"
+                        MaxLength="500" ShowRedStar="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DropDownList ID="ddlCompileMan" runat="server" Label="编制人">
+                    </f:DropDownList>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DatePicker runat="server" Label="编制日期" ID="dpkCompileDate">
+                    </f:DatePicker>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelAlign="Right" ></f:TextArea>
+                </Items>
+            </f:FormRow>
+        </Rows>
+        <Toolbars>
+            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                <Items>
+                    <f:Label runat="server" ID="lbTemp"></f:Label>
+                     <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server" OnClick="btnUploadResources_Click"
+                        ValidateForms="SimpleForm1">
+                    </f:Button>
+                    <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                    <f:Button ID="btnSave" Icon="SystemSave" runat="server"  ValidateForms="SimpleForm1"
+                        Hidden="true" OnClick="btnSave_Click">
+                    </f:Button>
+                    <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
+                    </f:Button>
+                </Items>
+            </f:Toolbar>
+        </Toolbars>
+    </f:Form>
+    </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>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandardsEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandardsEdit.aspx.cs
new file mode 100644
index 0000000..7e60ba8
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandardsEdit.aspx.cs
@@ -0,0 +1,221 @@
+using BLL;
+using System;
+using System.Linq;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HSSE.Technique
+{
+    public partial class ConstructionStandardsEdit : PageBase
+    {
+        #region 定义变量
+        /// <summary>
+        /// 防护标准ID
+        /// </summary>
+        public string ConstructionStandardsId
+        {
+            get
+            {
+                return (string)ViewState["ConstructionStandardsId"];
+            }
+            set
+            {
+                ViewState["ConstructionStandardsId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                ////权限按钮方法
+                this.GetButtonPower();
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                //人员              
+                UserService.InitUserDropDownList(this.ddlCompileMan, string.Empty, true);
+
+                //加载默认整理人、整理日期
+                this.ddlCompileMan.SelectedValue = this.CurrUser.UserId;
+                this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+
+                this.ConstructionStandardsId = Request.Params["ConstructionStandardsId"];
+                if (!string.IsNullOrEmpty(this.ConstructionStandardsId))
+                {
+                    var ConstructionStandards = BLL.ConstructionStandardsService.GetConstructionStandardsListById(this.ConstructionStandardsId);
+                    if (ConstructionStandards != null)
+                    {
+                        this.txtConstructionStandardsCode.Text = ConstructionStandards.ConstructionStandardsCode;
+                        this.txtConstructionStandardsName.Text = ConstructionStandards.ConstructionStandardsName;
+                        this.txtRemark.Text = ConstructionStandards.Remark;
+                        this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", ConstructionStandards.CompileDate);
+                        
+                        if (!string.IsNullOrEmpty(ConstructionStandards.CompileMan))
+                        {
+                            this.ddlCompileMan.SelectedItem.Text = ConstructionStandards.CompileMan;
+                        }
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            SaveData();
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+        
+        /// <summary>
+        /// 保存数据
+        /// </summary>
+        private void SaveData()
+        {
+            Model.Technique_ConstructionStandards ConstructionStandards = new Model.Technique_ConstructionStandards();           
+            if (!string.IsNullOrEmpty(this.txtConstructionStandardsCode.Text.Trim()))
+            {
+                ConstructionStandards.ConstructionStandardsCode = this.txtConstructionStandardsCode.Text.Trim();
+            }
+            else
+            {
+                ShowNotify("请输入编号", MessageBoxIcon.Warning);
+                return;
+            }
+            if (!string.IsNullOrEmpty(this.txtConstructionStandardsName.Text.Trim()))
+            {
+                ConstructionStandards.ConstructionStandardsName = this.txtConstructionStandardsName.Text.Trim();
+            }
+            else
+            {
+                ShowNotify("请输入名称", MessageBoxIcon.Warning);
+                return;
+            }
+            
+            if (this.ddlCompileMan.SelectedValue != null)
+            {
+                ConstructionStandards.CompileMan = this.ddlCompileMan.SelectedItem.Text;
+            }
+            else
+            {
+                ConstructionStandards.CompileMan = this.CurrUser.UserName;
+            }
+            if (!string.IsNullOrEmpty(this.dpkCompileDate.Text))
+            {
+                ConstructionStandards.CompileDate = Convert.ToDateTime(this.dpkCompileDate.Text);
+            }
+            else
+            {
+                ConstructionStandards.CompileDate = DateTime.Now;
+            }
+            if (txtRemark.Text.Trim() != string.Empty)
+            {
+                ConstructionStandards.Remark = txtRemark.Text.Trim();
+            }
+            if (string.IsNullOrEmpty(this.ConstructionStandardsId))
+            {
+                ConstructionStandards.IsPass = true;
+                this.ConstructionStandardsId = ConstructionStandards.ConstructionStandardsId = SQLHelper.GetNewID(typeof(Model.Technique_ConstructionStandards));
+                BLL.ConstructionStandardsService.AddConstructionStandardsList(ConstructionStandards);
+
+                BLL.LogService.AddSys_Log(this.CurrUser, ConstructionStandards.ConstructionStandardsCode, ConstructionStandards.ConstructionStandardsId, BLL.Const.ConstructionStandardsMenuId, Const.BtnAdd);
+            }
+            else
+            {
+                ConstructionStandards.ConstructionStandardsId = this.ConstructionStandardsId;
+                BLL.ConstructionStandardsService.UpdateConstructionStandardsList(ConstructionStandards);
+                BLL.LogService.AddSys_Log(this.CurrUser, ConstructionStandards.ConstructionStandardsCode, ConstructionStandards.ConstructionStandardsId, BLL.Const.ConstructionStandardsMenuId, Const.BtnModify);                
+            }
+        }
+        #endregion
+        
+        #region 附件上传
+        /// <summary>
+        /// 上传附件资源
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnUploadResources_Click(object sender, EventArgs e)
+        {
+            if (this.btnSave.Hidden)
+            {
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ConstructionStandards&type=-1", this.ConstructionStandardsId)));
+            }
+            else
+            {
+                if (string.IsNullOrEmpty(this.txtConstructionStandardsCode.Text.Trim()))
+                {
+                    ShowNotify("请输入方案编号", MessageBoxIcon.Warning);
+                    return;
+                }
+                if (string.IsNullOrEmpty(this.txtConstructionStandardsName.Text.Trim()))
+                {
+                    ShowNotify("请输入方案名称", MessageBoxIcon.Warning);
+                    return;
+                }
+                
+                if (string.IsNullOrEmpty(this.ConstructionStandardsId))
+                {
+                    SaveData();
+                }
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ConstructionStandards&menuId={1}", this.ConstructionStandardsId, BLL.Const.ConstructionStandardsMenuId)));
+            }
+        }
+        #endregion
+
+        #region 验证方案编号、名称是否存在
+        /// <summary>
+        /// 验证方案编号、名称是否存在
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            var q = Funs.DB.Technique_ConstructionStandards.FirstOrDefault(x => x.IsPass == true && x.ConstructionStandardsCode == this.txtConstructionStandardsCode.Text.Trim() && (x.ConstructionStandardsId != this.ConstructionStandardsId || (this.ConstructionStandardsId == null && x.ConstructionStandardsId != null)));
+            if (q != null)
+            {
+                ShowNotify("输入的方案编号已存在！", MessageBoxIcon.Warning);
+            }
+            var q2 = Funs.DB.Technique_ConstructionStandards.FirstOrDefault(x => x.IsPass == true && x.ConstructionStandardsName == this.txtConstructionStandardsName.Text.Trim() && (x.ConstructionStandardsId != this.ConstructionStandardsId || (this.ConstructionStandardsId == null && x.ConstructionStandardsId != null)));
+            if (q2 != null)
+            {
+                ShowNotify("输入的方案名称已存在！", MessageBoxIcon.Warning);
+            }
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ConstructionStandardsMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnSave.Hidden = false;
+                }
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandardsEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandardsEdit.aspx.designer.cs
new file mode 100644
index 0000000..ab61c82
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/ConstructionStandardsEdit.aspx.designer.cs
@@ -0,0 +1,152 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.Technique
+{
+
+
+    public partial class ConstructionStandardsEdit
+    {
+
+        /// <summary>
+        /// form1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// txtConstructionStandardsCode control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtConstructionStandardsCode;
+
+        /// <summary>
+        /// txtConstructionStandardsName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtConstructionStandardsName;
+
+        /// <summary>
+        /// ddlCompileMan control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlCompileMan;
+
+        /// <summary>
+        /// dpkCompileDate control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.DatePicker dpkCompileDate;
+
+        /// <summary>
+        /// txtRemark control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemark;
+
+        /// <summary>
+        /// Toolbar1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// lbTemp control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Label lbTemp;
+
+        /// <summary>
+        /// btnAttachUrl control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttachUrl;
+
+        /// <summary>
+        /// ToolbarFill1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnSave control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// btnClose control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// WindowAtt control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandards.aspx b/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandards.aspx
new file mode 100644
index 0000000..d3c4e7c
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandards.aspx
@@ -0,0 +1,108 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProtectionStandards.aspx.cs" Inherits="FineUIPro.Web.HSSE.Technique.ProtectionStandards" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>防护标准</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />    
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <Items>
+            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="防护标准" EnableCollapse="true"
+                runat="server" BoxFlex="1" DataKeyNames="ProtectionStandardsId" EnableColumnLines="true"
+                DataIDField="ProtectionStandardsId" AllowSorting="true" SortField="ProtectionStandardsCode" ForceFit="true"
+                SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" 
+                PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
+                OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                <Toolbars>
+                    <f:Toolbar ID="Toolbar3" Position="Top" runat="server">
+                        <Items>
+                            
+                            <f:TextBox ID="ProtectionStandardsName" runat="server" Label="名称" EmptyText="输入查询名称" 
+                                Width="250px" LabelWidth="70px">
+                            </f:TextBox>
+                            <f:ToolbarFill runat="server"></f:ToolbarFill>
+                            
+                            <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" 	
+                                OnClick="TextBox_TextChanged" runat="server" >
+                            </f:Button>
+                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server"
+                                Hidden="true">
+                            </f:Button>
+                            <%-- <f:Button ID="btnSelectColumns" runat="server" ToolTip="导出" Icon="FolderUp" EnablePostBack="false" Hidden="true"> --%>
+                            <%-- </f:Button> --%>
+                        </Items>
+                    </f:Toolbar>
+                </Toolbars>                
+                <Columns>
+                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />                    
+                     <f:RenderField Width="160px" ColumnID="ProtectionStandardsCode" DataField="ProtectionStandardsCode" SortField="ProtectionStandardsCode"
+                        FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField> 
+                     <f:RenderField Width="220px" ColumnID="ProtectionStandardsName" DataField="ProtectionStandardsName" SortField="ProtectionStandardsName"
+                        FieldType="String" HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="110px" ColumnID="CompileMan" DataField="CompileMan" SortField="CompileMan"
+                                   FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="250px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                                   FieldType="String" HeaderText="编制时间" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>  
+                    <f:WindowField TextAlign="Left" Width="70px" WindowID="WindowAtt" Text="详细"
+                        ToolTip="上传查看" DataIFrameUrlFields="ProtectionStandardsId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ProtectionStandards&menuId=8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201"/>             
+                </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" OnClose="Window1_Close" IsModal="true"
+        Width="750px" Height="420px">
+    </f:Window>
+    <f:Window ID="Window4" Title="选择需要导出的列" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="false" runat="server" OnClose="Window4_Close" IsModal="true"
+        Width="450px" Height="250px" EnableAjax="false">
+    </f:Window>
+    <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Self" EnableResize="false" runat="server" IsModal="true" Width="700px"
+        Height="500px">
+    </f:Window>
+    <f:Menu ID="Menu1" runat="server">
+        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
+            Hidden="true" runat="server" Text="编辑" Icon="Pencil">
+        </f:MenuButton>
+        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Icon="Delete"
+            Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
+        </f:MenuButton>
+    </f:Menu>
+    </form>
+    <script type="text/jscript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandards.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandards.aspx.cs
new file mode 100644
index 0000000..ec8bf46
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandards.aspx.cs
@@ -0,0 +1,319 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Web.UI;
+
+namespace FineUIPro.Web.HSSE.Technique
+{
+    public partial class ProtectionStandards : 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);
+                ////权限按钮方法
+                this.GetButtonPower();
+                btnNew.OnClientClick = Window1.GetShowReference("ProtectionStandardsEdit.aspx") + "return false;";           
+                // btnSelectColumns.OnClientClick = Window4.GetShowReference("ProtectionStandardsSelectCloumn.aspx");
+
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT ProtectionStandardsId,ProtectionStandardsCode,ProtectionStandardsName,CompileMan,CompileDate,AttachUrl,AuditMan,AuditDate,IsPass,IsBuild,UpState
+                                            FROM dbo.Technique_ProtectionStandards
+                                            WHERE 1 =1 ";
+
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            
+            if (!string.IsNullOrEmpty(this.ProtectionStandardsName.Text.Trim()))
+            {
+                strSql += " AND ProtectionStandardsName LIKE @ProtectionStandardsName";
+                listStr.Add(new SqlParameter("@ProtectionStandardsName", "%" + this.ProtectionStandardsName.Text.Trim() + "%"));
+            }
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion        
+        
+        #region 分页、排序、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            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 Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 右键删除事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDelete_Click(object sender, EventArgs e)
+        {
+            this.DeleteData();
+        }
+
+        /// <summary>
+        /// 删除方法
+        /// </summary>
+        private void DeleteData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    var getV = BLL.ProtectionStandardsService.GetProtectionStandardsListById(rowID);
+                    if (getV != null)
+                    {
+                        BLL.LogService.AddSys_Log(this.CurrUser, getV.ProtectionStandardsCode, getV.ProtectionStandardsId, BLL.Const.ProtectionStandardsMenuId, Const.BtnDelete);
+
+                        BLL.ProtectionStandardsService.DeleteProtectionStandardsListById(rowID);
+                    }
+                }
+                BindGrid();
+                ShowNotify("删除数据成功!");
+            }
+        }
+        #endregion        
+
+        #region 编辑
+        /// <summary>
+        /// 右键编辑事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuEdit_Click(object sender, EventArgs e)
+        {
+            this.EditData();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditData()
+        {
+
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string ProtectionStandardsId = Grid1.SelectedRowID;
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProtectionStandardsEdit.aspx?ProtectionStandardsId={0}", ProtectionStandardsId, "编辑 - ")));
+
+        }
+        #endregion
+
+        #region Grid行双击事件
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditData();
+        }
+        #endregion        
+
+        #region 输入框查询事件
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+            BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, string.Empty, BLL.Const.ProtectionStandardsMenuId, Const.BtnQuery);
+
+        }
+        #endregion
+
+        #region 导出
+        /// <summary>
+        /// 关闭导出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window4_Close(object sender, WindowCloseEventArgs e)
+        {
+            Response.ClearContent();
+            Response.AddHeader("content-disposition", "attachment; filename=MyExcelFile.xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            Response.Write(GetGridTableHtml(Grid1, e.CloseArgument.Split('#')));
+            Response.End();
+        }
+
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="grid"></param>
+        /// <param name="columns"></param>
+        /// <returns></returns>
+        private string GetGridTableHtml(Grid grid, string[] columns)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
+            List<string> columnHeaderTexts = new List<string>(columns);
+            List<int> columnIndexs = new List<int>();
+            sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
+            sb.Append("<tr>");
+            foreach (GridColumn column in grid.Columns)
+            {
+                if (columnHeaderTexts.Contains(column.HeaderText))
+                {
+                    sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+                    columnIndexs.Add(column.ColumnIndex);
+                }
+            }
+            sb.Append("</tr>");
+            foreach (GridRow row in grid.Rows)
+            {
+                sb.Append("<tr>");
+                int columnIndex = 0;
+                foreach (object value in row.Values)
+                {
+                    if (columnIndexs.Contains(columnIndex))
+                    {
+                        string html = value.ToString();
+                        if (html.StartsWith(Grid.TEMPLATE_PLACEHOLDER_PREFIX))
+                        {
+                            // 模板列                            
+                            string templateID = html.Substring(Grid.TEMPLATE_PLACEHOLDER_PREFIX.Length);
+                            Control templateCtrl = row.FindControl(templateID);
+                            html = GetRenderedHtmlSource(templateCtrl);
+                        }
+                        sb.AppendFormat("<td>{0}</td>", html);
+                    }
+                    columnIndex++;
+                }
+                sb.Append("</tr>");
+            }
+            sb.Append("</table>");
+            return sb.ToString();
+        }
+
+        /// <summary>        
+        /// 获取控件渲染后的HTML源代码        
+        /// </summary>        
+        /// <param name="ctrl"></param>        
+        /// <returns></returns>        
+        private string GetRenderedHtmlSource(Control ctrl)
+        {
+            if (ctrl != null)
+            {
+                using (StringWriter sw = new StringWriter())
+                {
+                    using (HtmlTextWriter htw = new HtmlTextWriter(sw))
+                    {
+                        ctrl.RenderControl(htw);
+                        return sw.ToString();
+                    }
+                }
+            }
+            return String.Empty;
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProtectionStandardsMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    this.btnNew.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuEdit.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDelete.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnOut))
+                {
+                    // this.btnSelectColumns.Hidden = false;
+                }
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandards.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandards.aspx.designer.cs
new file mode 100644
index 0000000..e98fb59
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandards.aspx.designer.cs
@@ -0,0 +1,170 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.Technique
+{
+
+
+    public partial class ProtectionStandards
+    {
+
+        /// <summary>
+        /// form1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar3 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+
+        /// <summary>
+        /// ProtectionStandardsName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.TextBox ProtectionStandardsName;
+
+        /// <summary>
+        /// btnQuery control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+
+        /// <summary>
+        /// btnNew control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// ToolbarSeparator1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Window4 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Window Window4;
+
+        /// <summary>
+        /// WindowAtt control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+
+        /// <summary>
+        /// Menu1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuEdit control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+
+        /// <summary>
+        /// btnMenuDelete control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandardsEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandardsEdit.aspx
new file mode 100644
index 0000000..2cee9cf
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandardsEdit.aspx
@@ -0,0 +1,73 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProtectionStandardsEdit.aspx.cs" Inherits="FineUIPro.Web.HSSE.Technique.ProtectionStandardsEdit" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>编辑防护标准</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="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="txtProtectionStandardsCode" runat="server" Label="编号" Required="true"
+                        MaxLength="50" ShowRedStar="true" FocusOnPageLoad="true" AutoPostBack="true"
+                        OnTextChanged="TextBox_TextChanged">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextBox ID="txtProtectionStandardsName" runat="server" Label="名称" Required="true"
+                        MaxLength="500" ShowRedStar="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DropDownList ID="ddlCompileMan" runat="server" Label="编制人">
+                    </f:DropDownList>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DatePicker runat="server" Label="编制日期" ID="dpkCompileDate">
+                    </f:DatePicker>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelAlign="Right" ></f:TextArea>
+                </Items>
+            </f:FormRow>
+            
+        </Rows>
+        <Toolbars>
+            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                <Items>
+                    <f:Label runat="server" ID="lbTemp"></f:Label>
+                     <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server" OnClick="btnUploadResources_Click"
+                        ValidateForms="SimpleForm1">
+                    </f:Button>
+                    <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                    <f:Button ID="btnSave" Icon="SystemSave" runat="server"  ValidateForms="SimpleForm1"
+                        Hidden="true" OnClick="btnSave_Click">
+                    </f:Button>
+                    <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
+                    </f:Button>
+                </Items>
+            </f:Toolbar>
+        </Toolbars>
+    </f:Form>
+    </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>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandardsEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandardsEdit.aspx.cs
new file mode 100644
index 0000000..d1c3f66
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandardsEdit.aspx.cs
@@ -0,0 +1,223 @@
+using BLL;
+using System;
+using System.Linq;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HSSE.Technique
+{
+    public partial class ProtectionStandardsEdit : PageBase
+    {
+         #region 定义变量
+        /// <summary>
+        /// 防护标准ID
+        /// </summary>
+        public string ProtectionStandardsId
+        {
+            get
+            {
+                return (string)ViewState["ProtectionStandardsId"];
+            }
+            set
+            {
+                ViewState["ProtectionStandardsId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                ////权限按钮方法
+                this.GetButtonPower();
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                //人员              
+                UserService.InitUserDropDownList(this.ddlCompileMan, string.Empty, true);
+
+                //加载默认整理人、整理日期
+                this.ddlCompileMan.SelectedValue = this.CurrUser.UserId;
+                this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+
+                this.ProtectionStandardsId = Request.Params["ProtectionStandardsId"];
+                if (!string.IsNullOrEmpty(this.ProtectionStandardsId))
+                {
+                    var ProtectionStandards = BLL.ProtectionStandardsService.GetProtectionStandardsListById(this.ProtectionStandardsId);
+                    if (ProtectionStandards != null)
+                    {
+                        this.txtProtectionStandardsCode.Text = ProtectionStandards.ProtectionStandardsCode;
+                        this.txtProtectionStandardsName.Text = ProtectionStandards.ProtectionStandardsName;
+                        this.txtRemark.Text = ProtectionStandards.Remark;
+                        this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", ProtectionStandards.CompileDate);
+                        
+                        if (!string.IsNullOrEmpty(ProtectionStandards.CompileMan))
+                        {
+                            this.ddlCompileMan.SelectedItem.Text = ProtectionStandards.CompileMan;
+                        }
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            SaveData();
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+        
+        /// <summary>
+        /// 保存数据
+        /// </summary>
+        private void SaveData()
+        {
+            Model.Technique_ProtectionStandards ProtectionStandards = new Model.Technique_ProtectionStandards();           
+            if (!string.IsNullOrEmpty(this.txtProtectionStandardsCode.Text.Trim()))
+            {
+                ProtectionStandards.ProtectionStandardsCode = this.txtProtectionStandardsCode.Text.Trim();
+            }
+            else
+            {
+                ShowNotify("请输入编号", MessageBoxIcon.Warning);
+                return;
+            }
+            if (!string.IsNullOrEmpty(this.txtProtectionStandardsName.Text.Trim()))
+            {
+                ProtectionStandards.ProtectionStandardsName = this.txtProtectionStandardsName.Text.Trim();
+            }
+            else
+            {
+                ShowNotify("请输入名称", MessageBoxIcon.Warning);
+                return;
+            }
+            
+            if (this.ddlCompileMan.SelectedValue != null)
+            {
+                ProtectionStandards.CompileMan = this.ddlCompileMan.SelectedItem.Text;
+            }
+            else
+            {
+                ProtectionStandards.CompileMan = this.CurrUser.UserName;
+            }
+            if (!string.IsNullOrEmpty(this.dpkCompileDate.Text))
+            {
+                ProtectionStandards.CompileDate = Convert.ToDateTime(this.dpkCompileDate.Text);
+            }
+            else
+            {
+                ProtectionStandards.CompileDate = DateTime.Now;
+            }
+
+            if (txtRemark.Text.Trim() != string.Empty)
+            {
+                ProtectionStandards.Remark = txtRemark.Text.Trim();
+            }
+
+            if (string.IsNullOrEmpty(this.ProtectionStandardsId))
+            {
+                ProtectionStandards.IsPass = true;
+                this.ProtectionStandardsId = ProtectionStandards.ProtectionStandardsId = SQLHelper.GetNewID(typeof(Model.Technique_ProtectionStandards));
+                BLL.ProtectionStandardsService.AddProtectionStandardsList(ProtectionStandards);
+
+                BLL.LogService.AddSys_Log(this.CurrUser, ProtectionStandards.ProtectionStandardsCode, ProtectionStandards.ProtectionStandardsId, BLL.Const.ProtectionStandardsMenuId, Const.BtnAdd);
+            }
+            else
+            {
+                ProtectionStandards.ProtectionStandardsId = this.ProtectionStandardsId;
+                BLL.ProtectionStandardsService.UpdateProtectionStandardsList(ProtectionStandards);
+                BLL.LogService.AddSys_Log(this.CurrUser, ProtectionStandards.ProtectionStandardsCode, ProtectionStandards.ProtectionStandardsId, BLL.Const.ProtectionStandardsMenuId, Const.BtnModify);                
+            }
+        }
+        #endregion
+        
+        #region 附件上传
+        /// <summary>
+        /// 上传附件资源
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnUploadResources_Click(object sender, EventArgs e)
+        {
+            if (this.btnSave.Hidden)
+            {
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ProtectionStandards&type=-1", this.ProtectionStandardsId)));
+            }
+            else
+            {
+                if (string.IsNullOrEmpty(this.txtProtectionStandardsCode.Text.Trim()))
+                {
+                    ShowNotify("请输入方案编号", MessageBoxIcon.Warning);
+                    return;
+                }
+                if (string.IsNullOrEmpty(this.txtProtectionStandardsName.Text.Trim()))
+                {
+                    ShowNotify("请输入方案名称", MessageBoxIcon.Warning);
+                    return;
+                }
+                
+                if (string.IsNullOrEmpty(this.ProtectionStandardsId))
+                {
+                    SaveData();
+                }
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ProtectionStandards&menuId={1}", this.ProtectionStandardsId, BLL.Const.ProtectionStandardsMenuId)));
+            }
+        }
+        #endregion
+
+        #region 验证方案编号、名称是否存在
+        /// <summary>
+        /// 验证方案编号、名称是否存在
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            var q = Funs.DB.Technique_ProtectionStandards.FirstOrDefault(x => x.IsPass == true && x.ProtectionStandardsCode == this.txtProtectionStandardsCode.Text.Trim() && (x.ProtectionStandardsId != this.ProtectionStandardsId || (this.ProtectionStandardsId == null && x.ProtectionStandardsId != null)));
+            if (q != null)
+            {
+                ShowNotify("输入的方案编号已存在！", MessageBoxIcon.Warning);
+            }
+            var q2 = Funs.DB.Technique_ProtectionStandards.FirstOrDefault(x => x.IsPass == true && x.ProtectionStandardsName == this.txtProtectionStandardsName.Text.Trim() && (x.ProtectionStandardsId != this.ProtectionStandardsId || (this.ProtectionStandardsId == null && x.ProtectionStandardsId != null)));
+            if (q2 != null)
+            {
+                ShowNotify("输入的方案名称已存在！", MessageBoxIcon.Warning);
+            }
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProtectionStandardsMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnSave.Hidden = false;
+                }
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandardsEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandardsEdit.aspx.designer.cs
new file mode 100644
index 0000000..2e274dc
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/ProtectionStandardsEdit.aspx.designer.cs
@@ -0,0 +1,152 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.Technique
+{
+
+
+    public partial class ProtectionStandardsEdit
+    {
+
+        /// <summary>
+        /// form1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// txtProtectionStandardsCode control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProtectionStandardsCode;
+
+        /// <summary>
+        /// txtProtectionStandardsName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProtectionStandardsName;
+
+        /// <summary>
+        /// ddlCompileMan control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlCompileMan;
+
+        /// <summary>
+        /// dpkCompileDate control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.DatePicker dpkCompileDate;
+
+        /// <summary>
+        /// txtRemark control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemark;
+
+        /// <summary>
+        /// Toolbar1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// lbTemp control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Label lbTemp;
+
+        /// <summary>
+        /// btnAttachUrl control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttachUrl;
+
+        /// <summary>
+        /// ToolbarFill1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnSave control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// btnClose control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// WindowAtt control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilities.aspx b/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilities.aspx
new file mode 100644
index 0000000..120857f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilities.aspx
@@ -0,0 +1,108 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SafetyResponsibilities.aspx.cs" Inherits="FineUIPro.Web.HSSE.Technique.SafetyResponsibilities" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>安全职责</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />    
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <Items>
+            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全职责" EnableCollapse="true"
+                runat="server" BoxFlex="1" DataKeyNames="SafetyResponsibilitiesId" EnableColumnLines="true"
+                DataIDField="SafetyResponsibilitiesId" AllowSorting="true" SortField="SafetyResponsibilitiesCode" ForceFit="true"
+                SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" 
+                PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
+                OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                <Toolbars>
+                    <f:Toolbar ID="Toolbar3" Position="Top" runat="server">
+                        <Items>
+                            
+                            <f:TextBox ID="SafetyResponsibilitiesName" runat="server" Label="名称" EmptyText="输入查询名称" 
+                                Width="250px" LabelWidth="70px">
+                            </f:TextBox>
+                            <f:ToolbarFill runat="server"></f:ToolbarFill>
+                            
+                            <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" 	
+                                OnClick="TextBox_TextChanged" runat="server" >
+                            </f:Button>
+                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server"
+                                Hidden="true">
+                            </f:Button>
+                            <%-- <f:Button ID="btnSelectColumns" runat="server" ToolTip="导出" Icon="FolderUp" EnablePostBack="false" Hidden="true"> --%>
+                            <%-- </f:Button> --%>
+                        </Items>
+                    </f:Toolbar>
+                </Toolbars>                
+                <Columns>
+                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />                    
+                     <f:RenderField Width="160px" ColumnID="SafetyResponsibilitiesCode" DataField="SafetyResponsibilitiesCode" SortField="SafetyResponsibilitiesCode"
+                        FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField> 
+                     <f:RenderField Width="220px" ColumnID="SafetyResponsibilitiesName" DataField="SafetyResponsibilitiesName" SortField="SafetyResponsibilitiesName"
+                        FieldType="String" HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="110px" ColumnID="CompileMan" DataField="CompileMan" SortField="CompileMan"
+                                   FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="250px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                                   FieldType="String" HeaderText="编制时间" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>  
+                    <f:WindowField TextAlign="Left" Width="70px" WindowID="WindowAtt" Text="详细"
+                        ToolTip="上传查看" DataIFrameUrlFields="SafetyResponsibilitiesId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SafetyResponsibilities&menuId=8E3A5EDC-62CA-4F64-A4E7-CD3D473A6201"/>             
+                </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" OnClose="Window1_Close" IsModal="true"
+        Width="750px" Height="420px">
+    </f:Window>
+    <f:Window ID="Window4" Title="选择需要导出的列" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="false" runat="server" OnClose="Window4_Close" IsModal="true"
+        Width="450px" Height="250px" EnableAjax="false">
+    </f:Window>
+    <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Self" EnableResize="false" runat="server" IsModal="true" Width="700px"
+        Height="500px">
+    </f:Window>
+    <f:Menu ID="Menu1" runat="server">
+        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
+            Hidden="true" runat="server" Text="编辑" Icon="Pencil">
+        </f:MenuButton>
+        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Icon="Delete"
+            Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
+        </f:MenuButton>
+    </f:Menu>
+    </form>
+    <script type="text/jscript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilities.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilities.aspx.cs
new file mode 100644
index 0000000..2b5bed7
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilities.aspx.cs
@@ -0,0 +1,319 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Web.UI;
+
+namespace FineUIPro.Web.HSSE.Technique
+{
+    public partial class SafetyResponsibilities : 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);
+                ////权限按钮方法
+                this.GetButtonPower();
+                btnNew.OnClientClick = Window1.GetShowReference("SafetyResponsibilitiesEdit.aspx") + "return false;";           
+                // btnSelectColumns.OnClientClick = Window4.GetShowReference("SafetyResponsibilitiesSelectCloumn.aspx");
+
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT SafetyResponsibilitiesId,SafetyResponsibilitiesCode,SafetyResponsibilitiesName,CompileMan,CompileDate,AttachUrl,AuditMan,AuditDate,IsPass,IsBuild,UpState
+                                            FROM dbo.Technique_SafetyResponsibilities
+                                            WHERE 1 =1 ";
+
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            
+            if (!string.IsNullOrEmpty(this.SafetyResponsibilitiesName.Text.Trim()))
+            {
+                strSql += " AND SafetyResponsibilitiesName LIKE @SafetyResponsibilitiesName";
+                listStr.Add(new SqlParameter("@SafetyResponsibilitiesName", "%" + this.SafetyResponsibilitiesName.Text.Trim() + "%"));
+            }
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion        
+        
+        #region 分页、排序、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            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 Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 右键删除事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDelete_Click(object sender, EventArgs e)
+        {
+            this.DeleteData();
+        }
+
+        /// <summary>
+        /// 删除方法
+        /// </summary>
+        private void DeleteData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    var getV = BLL.SafetyResponsibilitiesService.GetSafetyResponsibilitiesListById(rowID);
+                    if (getV != null)
+                    {
+                        BLL.LogService.AddSys_Log(this.CurrUser, getV.SafetyResponsibilitiesCode, getV.SafetyResponsibilitiesId, BLL.Const.SafetyResponsibilitiesMenuId, Const.BtnDelete);
+
+                        BLL.SafetyResponsibilitiesService.DeleteSafetyResponsibilitiesListById(rowID);
+                    }
+                }
+                BindGrid();
+                ShowNotify("删除数据成功!");
+            }
+        }
+        #endregion        
+
+        #region 编辑
+        /// <summary>
+        /// 右键编辑事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuEdit_Click(object sender, EventArgs e)
+        {
+            this.EditData();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditData()
+        {
+
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string SafetyResponsibilitiesId = Grid1.SelectedRowID;
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SafetyResponsibilitiesEdit.aspx?SafetyResponsibilitiesId={0}", SafetyResponsibilitiesId, "编辑 - ")));
+
+        }
+        #endregion
+
+        #region Grid行双击事件
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditData();
+        }
+        #endregion        
+
+        #region 输入框查询事件
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+            BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, string.Empty, BLL.Const.SafetyResponsibilitiesMenuId, Const.BtnQuery);
+
+        }
+        #endregion
+
+        #region 导出
+        /// <summary>
+        /// 关闭导出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window4_Close(object sender, WindowCloseEventArgs e)
+        {
+            Response.ClearContent();
+            Response.AddHeader("content-disposition", "attachment; filename=MyExcelFile.xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            Response.Write(GetGridTableHtml(Grid1, e.CloseArgument.Split('#')));
+            Response.End();
+        }
+
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="grid"></param>
+        /// <param name="columns"></param>
+        /// <returns></returns>
+        private string GetGridTableHtml(Grid grid, string[] columns)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
+            List<string> columnHeaderTexts = new List<string>(columns);
+            List<int> columnIndexs = new List<int>();
+            sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
+            sb.Append("<tr>");
+            foreach (GridColumn column in grid.Columns)
+            {
+                if (columnHeaderTexts.Contains(column.HeaderText))
+                {
+                    sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+                    columnIndexs.Add(column.ColumnIndex);
+                }
+            }
+            sb.Append("</tr>");
+            foreach (GridRow row in grid.Rows)
+            {
+                sb.Append("<tr>");
+                int columnIndex = 0;
+                foreach (object value in row.Values)
+                {
+                    if (columnIndexs.Contains(columnIndex))
+                    {
+                        string html = value.ToString();
+                        if (html.StartsWith(Grid.TEMPLATE_PLACEHOLDER_PREFIX))
+                        {
+                            // 模板列                            
+                            string templateID = html.Substring(Grid.TEMPLATE_PLACEHOLDER_PREFIX.Length);
+                            Control templateCtrl = row.FindControl(templateID);
+                            html = GetRenderedHtmlSource(templateCtrl);
+                        }
+                        sb.AppendFormat("<td>{0}</td>", html);
+                    }
+                    columnIndex++;
+                }
+                sb.Append("</tr>");
+            }
+            sb.Append("</table>");
+            return sb.ToString();
+        }
+
+        /// <summary>        
+        /// 获取控件渲染后的HTML源代码        
+        /// </summary>        
+        /// <param name="ctrl"></param>        
+        /// <returns></returns>        
+        private string GetRenderedHtmlSource(Control ctrl)
+        {
+            if (ctrl != null)
+            {
+                using (StringWriter sw = new StringWriter())
+                {
+                    using (HtmlTextWriter htw = new HtmlTextWriter(sw))
+                    {
+                        ctrl.RenderControl(htw);
+                        return sw.ToString();
+                    }
+                }
+            }
+            return String.Empty;
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.SafetyResponsibilitiesMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    this.btnNew.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuEdit.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDelete.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnOut))
+                {
+                    // this.btnSelectColumns.Hidden = false;
+                }
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilities.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilities.aspx.designer.cs
new file mode 100644
index 0000000..3e27611
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilities.aspx.designer.cs
@@ -0,0 +1,170 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.Technique
+{
+
+
+    public partial class SafetyResponsibilities
+    {
+
+        /// <summary>
+        /// form1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar3 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+
+        /// <summary>
+        /// SafetyResponsibilitiesName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.TextBox SafetyResponsibilitiesName;
+
+        /// <summary>
+        /// btnQuery control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+
+        /// <summary>
+        /// btnNew control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// ToolbarSeparator1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Window4 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Window Window4;
+
+        /// <summary>
+        /// WindowAtt control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+
+        /// <summary>
+        /// Menu1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuEdit control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+
+        /// <summary>
+        /// btnMenuDelete control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilitiesEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilitiesEdit.aspx
new file mode 100644
index 0000000..ce130f9
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilitiesEdit.aspx
@@ -0,0 +1,72 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SafetyResponsibilitiesEdit.aspx.cs" Inherits="FineUIPro.Web.HSSE.Technique.SafetyResponsibilitiesEdit" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>编辑安全职责</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="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="txtSafetyResponsibilitiesCode" runat="server" Label="编号" Required="true"
+                        MaxLength="50" ShowRedStar="true" FocusOnPageLoad="true" AutoPostBack="true"
+                        OnTextChanged="TextBox_TextChanged">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextBox ID="txtSafetyResponsibilitiesName" runat="server" Label="名称" Required="true"
+                        MaxLength="500" ShowRedStar="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DropDownList ID="ddlCompileMan" runat="server" Label="编制人">
+                    </f:DropDownList>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DatePicker runat="server" Label="编制日期" ID="dpkCompileDate">
+                    </f:DatePicker>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelAlign="Right"></f:TextArea>
+                </Items>
+            </f:FormRow>
+        </Rows>
+        <Toolbars>
+            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                <Items>
+                    <f:Label runat="server" ID="lbTemp"></f:Label>
+                     <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server" OnClick="btnUploadResources_Click"
+                        ValidateForms="SimpleForm1">
+                    </f:Button>
+                    <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                    <f:Button ID="btnSave" Icon="SystemSave" runat="server"  ValidateForms="SimpleForm1"
+                        Hidden="true" OnClick="btnSave_Click">
+                    </f:Button>
+                    <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
+                    </f:Button>
+                </Items>
+            </f:Toolbar>
+        </Toolbars>
+    </f:Form>
+    </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>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilitiesEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilitiesEdit.aspx.cs
new file mode 100644
index 0000000..b2e9f34
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilitiesEdit.aspx.cs
@@ -0,0 +1,221 @@
+using BLL;
+using System;
+using System.Linq;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HSSE.Technique
+{
+    public partial class SafetyResponsibilitiesEdit : PageBase
+    {
+        #region 定义变量
+        /// <summary>
+        /// 防护标准ID
+        /// </summary>
+        public string SafetyResponsibilitiesId
+        {
+            get
+            {
+                return (string)ViewState["SafetyResponsibilitiesId"];
+            }
+            set
+            {
+                ViewState["SafetyResponsibilitiesId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                ////权限按钮方法
+                this.GetButtonPower();
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                //人员              
+                UserService.InitUserDropDownList(this.ddlCompileMan, string.Empty, true);
+
+                //加载默认整理人、整理日期
+                this.ddlCompileMan.SelectedValue = this.CurrUser.UserId;
+                this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+
+                this.SafetyResponsibilitiesId = Request.Params["SafetyResponsibilitiesId"];
+                if (!string.IsNullOrEmpty(this.SafetyResponsibilitiesId))
+                {
+                    var SafetyResponsibilities = BLL.SafetyResponsibilitiesService.GetSafetyResponsibilitiesListById(this.SafetyResponsibilitiesId);
+                    if (SafetyResponsibilities != null)
+                    {
+                        this.txtSafetyResponsibilitiesCode.Text = SafetyResponsibilities.SafetyResponsibilitiesCode;
+                        this.txtSafetyResponsibilitiesName.Text = SafetyResponsibilities.SafetyResponsibilitiesName;
+                        this.txtRemark.Text = SafetyResponsibilities.Remark;
+                        this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", SafetyResponsibilities.CompileDate);
+                        
+                        if (!string.IsNullOrEmpty(SafetyResponsibilities.CompileMan))
+                        {
+                            this.ddlCompileMan.SelectedItem.Text = SafetyResponsibilities.CompileMan;
+                        }
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            SaveData();
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+        
+        /// <summary>
+        /// 保存数据
+        /// </summary>
+        private void SaveData()
+        {
+            Model.Technique_SafetyResponsibilities SafetyResponsibilities = new Model.Technique_SafetyResponsibilities();           
+            if (!string.IsNullOrEmpty(this.txtSafetyResponsibilitiesCode.Text.Trim()))
+            {
+                SafetyResponsibilities.SafetyResponsibilitiesCode = this.txtSafetyResponsibilitiesCode.Text.Trim();
+            }
+            else
+            {
+                ShowNotify("请输入编号", MessageBoxIcon.Warning);
+                return;
+            }
+            if (!string.IsNullOrEmpty(this.txtSafetyResponsibilitiesName.Text.Trim()))
+            {
+                SafetyResponsibilities.SafetyResponsibilitiesName = this.txtSafetyResponsibilitiesName.Text.Trim();
+            }
+            else
+            {
+                ShowNotify("请输入名称", MessageBoxIcon.Warning);
+                return;
+            }
+            
+            if (this.ddlCompileMan.SelectedValue != null)
+            {
+                SafetyResponsibilities.CompileMan = this.ddlCompileMan.SelectedItem.Text;
+            }
+            else
+            {
+                SafetyResponsibilities.CompileMan = this.CurrUser.UserName;
+            }
+            if (!string.IsNullOrEmpty(this.dpkCompileDate.Text))
+            {
+                SafetyResponsibilities.CompileDate = Convert.ToDateTime(this.dpkCompileDate.Text);
+            }
+            else
+            {
+                SafetyResponsibilities.CompileDate = DateTime.Now;
+            }
+            if (txtRemark.Text.Trim() != string.Empty)
+            {
+                SafetyResponsibilities.Remark = txtRemark.Text.Trim();
+            }
+            if (string.IsNullOrEmpty(this.SafetyResponsibilitiesId))
+            {
+                SafetyResponsibilities.IsPass = true;
+                this.SafetyResponsibilitiesId = SafetyResponsibilities.SafetyResponsibilitiesId = SQLHelper.GetNewID(typeof(Model.Technique_SafetyResponsibilities));
+                BLL.SafetyResponsibilitiesService.AddSafetyResponsibilitiesList(SafetyResponsibilities);
+
+                BLL.LogService.AddSys_Log(this.CurrUser, SafetyResponsibilities.SafetyResponsibilitiesCode, SafetyResponsibilities.SafetyResponsibilitiesId, BLL.Const.SafetyResponsibilitiesMenuId, Const.BtnAdd);
+            }
+            else
+            {
+                SafetyResponsibilities.SafetyResponsibilitiesId = this.SafetyResponsibilitiesId;
+                BLL.SafetyResponsibilitiesService.UpdateSafetyResponsibilitiesList(SafetyResponsibilities);
+                BLL.LogService.AddSys_Log(this.CurrUser, SafetyResponsibilities.SafetyResponsibilitiesCode, SafetyResponsibilities.SafetyResponsibilitiesId, BLL.Const.SafetyResponsibilitiesMenuId, Const.BtnModify);                
+            }
+        }
+        #endregion
+        
+        #region 附件上传
+        /// <summary>
+        /// 上传附件资源
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnUploadResources_Click(object sender, EventArgs e)
+        {
+            if (this.btnSave.Hidden)
+            {
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SafetyResponsibilities&type=-1", this.SafetyResponsibilitiesId)));
+            }
+            else
+            {
+                if (string.IsNullOrEmpty(this.txtSafetyResponsibilitiesCode.Text.Trim()))
+                {
+                    ShowNotify("请输入方案编号", MessageBoxIcon.Warning);
+                    return;
+                }
+                if (string.IsNullOrEmpty(this.txtSafetyResponsibilitiesName.Text.Trim()))
+                {
+                    ShowNotify("请输入方案名称", MessageBoxIcon.Warning);
+                    return;
+                }
+                
+                if (string.IsNullOrEmpty(this.SafetyResponsibilitiesId))
+                {
+                    SaveData();
+                }
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SafetyResponsibilities&menuId={1}", this.SafetyResponsibilitiesId, BLL.Const.SafetyResponsibilitiesMenuId)));
+            }
+        }
+        #endregion
+
+        #region 验证方案编号、名称是否存在
+        /// <summary>
+        /// 验证方案编号、名称是否存在
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            var q = Funs.DB.Technique_SafetyResponsibilities.FirstOrDefault(x => x.IsPass == true && x.SafetyResponsibilitiesCode == this.txtSafetyResponsibilitiesCode.Text.Trim() && (x.SafetyResponsibilitiesId != this.SafetyResponsibilitiesId || (this.SafetyResponsibilitiesId == null && x.SafetyResponsibilitiesId != null)));
+            if (q != null)
+            {
+                ShowNotify("输入的方案编号已存在！", MessageBoxIcon.Warning);
+            }
+            var q2 = Funs.DB.Technique_SafetyResponsibilities.FirstOrDefault(x => x.IsPass == true && x.SafetyResponsibilitiesName == this.txtSafetyResponsibilitiesName.Text.Trim() && (x.SafetyResponsibilitiesId != this.SafetyResponsibilitiesId || (this.SafetyResponsibilitiesId == null && x.SafetyResponsibilitiesId != null)));
+            if (q2 != null)
+            {
+                ShowNotify("输入的方案名称已存在！", MessageBoxIcon.Warning);
+            }
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.SafetyResponsibilitiesMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnSave.Hidden = false;
+                }
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilitiesEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilitiesEdit.aspx.designer.cs
new file mode 100644
index 0000000..0dccb8e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/HSSE/Technique/SafetyResponsibilitiesEdit.aspx.designer.cs
@@ -0,0 +1,152 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.Technique
+{
+
+
+    public partial class SafetyResponsibilitiesEdit
+    {
+
+        /// <summary>
+        /// form1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// txtSafetyResponsibilitiesCode control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSafetyResponsibilitiesCode;
+
+        /// <summary>
+        /// txtSafetyResponsibilitiesName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSafetyResponsibilitiesName;
+
+        /// <summary>
+        /// ddlCompileMan control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlCompileMan;
+
+        /// <summary>
+        /// dpkCompileDate control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.DatePicker dpkCompileDate;
+
+        /// <summary>
+        /// txtRemark control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemark;
+
+        /// <summary>
+        /// Toolbar1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// lbTemp control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Label lbTemp;
+
+        /// <summary>
+        /// btnAttachUrl control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttachUrl;
+
+        /// <summary>
+        /// ToolbarFill1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnSave control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// btnClose control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// WindowAtt control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx
index 41b8b01..ef680bc 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx
+++ b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx
@@ -250,13 +250,20 @@
                         <div class="bw-b-bottom-up">
                             <div class="bw-item-content pd0">
                                 <div class="base-wrap flex flexV">
-                                     <div class="base-tit">当前现场总人数</div>
-                                     <div class="base-txt-wrap  flex flex1">
-                                        <div class="num-1 specialNum" runat="server"  id="divperson">0</div>
-                                        <div class="num-1 specialNum" runat="server"  id="person00">0</div>
-                                        <div class="num-1 specialNum" runat="server"  id="person01">0</div>
-                                        <div class="num-1 specialNum" runat="server"  id="person02">0</div>
-                                     </div>
+                                    <div class="base-tit">当日现场人数</div>
+                                    <div class="base-txt-wrap  flex flex1">
+                                        <div class="num-1 specialNum" runat="server" id="divperson">0</div>
+                                        <div class="num-1 specialNum" runat="server" id="person00">0</div>
+                                        <div class="num-1 specialNum" runat="server" id="person01">0</div>
+                                        <div class="num-1 specialNum" runat="server" id="person02">0</div>
+                                    </div>
+                                    <div class="base-tit">当月现场人数</div>
+                                    <div class="base-txt-wrap  flex flex1">
+                                        <div class="num-1 specialNum" runat="server" id="divperson1">0</div>
+                                        <div class="num-1 specialNum" runat="server" id="person001">0</div>
+                                        <div class="num-1 specialNum" runat="server" id="person011">0</div>
+                                        <div class="num-1 specialNum" runat="server" id="person021">0</div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -315,9 +322,9 @@
                     <div class="bw-b-bottom-up">
                         <div class="tab-wrap">
                             <div class="tab" data-value="4">
-                                <div class="t-item active">施工分包商</div>
+                                <%-- <div class="t-item">施工分包商</div> --%>
                                 <div class="spline"></div>
-                                <div class="t-item">问题类别</div>
+                                <div class="t-item active ">问题类别</div>
                             </div>
                         </div>
                         <div class="bw-item-content">
@@ -686,20 +693,20 @@ var basePath = '<%= ResolveUrl("~/") %>';
         // 使用刚指定的配置项和数据显示图表。
         myChart.setOption(option)
     }
-    var four1 =<%=Four1 %>;
-    var xArr = four1.categories
+    var four2 =<%=Four2 %>;
+    var xArr = four2.categories
     var series = [{
         name: '待整改',
         type: 'bar',
          barWidth: 20,
          barGap:0.05,
-        data: four1.series[0].data,
+        data: four2.series[0].data,
         itemStyle: { normal: { color: '#88cc00' } }
     }, {
         name: '全部',
             type: 'bar',    
          barWidth: 20,
-        data: four1.series[0].data2,
+        data: four2.series[0].data2,
         itemStyle: { normal: { color: '#AE4B23' } }
     }];
     category_Four('four', xArr, series)
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs
index 247bcab..41d3c40 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs
@@ -5,6 +5,8 @@ using System;
 using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
+using System.Data;
+using System.Data.SqlClient;
 
 namespace FineUIPro.Web
 {
@@ -43,48 +45,151 @@ namespace FineUIPro.Web
         /// </summary>
         private void getSitePerson()
         {
-            int AllCount = 0;
-             //var getallin = APIPageDataService.getPersonInOutNum(this.ProjectId, DateTime.Now.AddDays(-1));
-            DateTime dateValue = DateTime.Now.AddDays(-1);
-            List<Model.PageDataPersonInOutItem> getallin = new List<Model.PageDataPersonInOutItem>();
-            var getInMaxs = from x in Funs.DB.SitePerson_Person
-                            join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
-                            where x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true
-                            select new Model.PageDataPersonInOutItem
-                            {
-                                PersonId = x.PersonId,
-                                PostType = y.PostType,
-                                WorkPostId = x.WorkPostId,
-                            };
-            if (getInMaxs.Count() > 0)
+            // int AllCount = 0;
+            //  //var getallin = APIPageDataService.getPersonInOutNum(this.ProjectId, DateTime.Now.AddDays(-1));
+            // DateTime dateValue = DateTime.Now.AddDays(-1);
+            // List<Model.PageDataPersonInOutItem> getallin = new List<Model.PageDataPersonInOutItem>();
+            // var getInMaxs = from x in Funs.DB.SitePerson_Person
+            //                 join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+            //                 where x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true
+            //                 select new Model.PageDataPersonInOutItem
+            //                 {
+            //                     PersonId = x.PersonId,
+            //                     PostType = y.PostType,
+            //                     WorkPostId = x.WorkPostId,
+            //                 };
+            // if (getInMaxs.Count() > 0)
+            // {
+            //     getallin = getInMaxs.Distinct().ToList();
+            // }
+            // //AllCount = getallin.Count();
+            //  var getEmployInOutRecords = (from x in Funs.DB.T_d_EmployInOutRecord
+            //                               join y in Funs.DB.SitePerson_Person on new { ss1 = x.ProjectId, ss = x.IDCardNo } equals new { ss1 = y.ProjectId, ss = y.IdentityCard }
+            //                               where y.ProjectId == this.CurrUser.LoginProjectId && y.IsUsed == true && x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date
+            //                               select x.IDCardNo).Distinct();
+            //
+            // //if (AllCount > 0)
+            // //{
+            // //    ////总人数
+            // //    this.divperson.InnerHtml = ((AllCount % 10000) / 1000).ToString();
+            // //    this.person00.InnerHtml = ((AllCount % 1000) / 100).ToString();
+            // //    this.person01.InnerHtml = ((AllCount % 100) / 10).ToString();
+            // //    this.person02.InnerHtml = (AllCount % 10).ToString();
+            // //}
+            //
+            //
+            // AllCount = getEmployInOutRecords.Count();
+            // if (AllCount > 0)
+            // {
+            //     ////总人数
+            //     this.divperson.InnerHtml = ((AllCount % 10000) / 1000).ToString();
+            //     this.person00.InnerHtml = ((AllCount % 1000) / 100).ToString();
+            //     this.person01.InnerHtml = ((AllCount % 100) / 10).ToString();
+            //     this.person02.InnerHtml = (AllCount % 10).ToString();
+            // }
+            
+            string strSql = @"SELECT DISTINCT ProjectUser.ProjectUserId,ProjectUser.ProjectId,ProjectUser.UserId,ProjectUser.WorkAreaId,Users.UserCode,Users.UserName,ProjectUser.UnitId,Unit.UnitCode,Unit.UnitName,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUser.RoleId,ProjectUser.IsPost,(CASE WHEN ProjectUser.IsPost = 1 THEN '在岗' ELSE '离岗' END) AS IsPostName,WorkPost.WorkPostName,UnitCode"
+                                + @" ,RoleName= STUFF(( SELECT ',' + RoleName FROM dbo.Sys_Role where PATINDEX('%,' + RTRIM(RoleId) + ',%',',' +ProjectUser.RoleId + ',')>0 FOR XML PATH('')), 1, 1,'')"
+                                + @" FROM Project_ProjectUser AS ProjectUser "
+                                + @" LEFT JOIN Base_Project AS Project ON ProjectUser.ProjectId = Project.ProjectId "
+                                + @" LEFT JOIN Sys_User AS Users ON ProjectUser.UserId = Users.UserId "
+                                + @" LEFT JOIN Sys_Role AS Role ON ProjectUser.RoleId = Role.RoleId "
+                                + @" LEFT JOIN Project_ProjectUnit AS ProjectUnit ON ProjectUser.UnitId = ProjectUnit.UnitId AND ProjectUser.ProjectId= ProjectUnit.ProjectId "
+                                + @" LEFT JOIN Base_Unit AS Unit ON ProjectUser.UnitId = Unit.UnitId "
+                                + @" LEFT JOIN SitePerson_Person AS Person ON ProjectUser.ProjectId =Person.ProjectId AND Users.IdentityCard = Person.IdentityCard "
+                                + @" LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId "
+                                + @" LEFT JOIN Sys_Const AS sysConst ON sysConst.GroupId = '" + BLL.ConstValue.Group_ProjectUnitType + "' AND ProjectUnit.UnitType=sysConst.ConstValue "
+                                + @" WHERE 1=1 ";
+            
+            
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            strSql += " AND ProjectUser.ProjectId = @ProjectId";
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            var projectPeople = tb.Rows.Count;
+            
+            
+            //当前日
+            // 获取当前日期的00点
+            DateTime now = DateTime.Now;
+            DateTime StartDate = DateTime.Now.Date;
+            
+            DateTime EndDate = new DateTime(now.Year, now.Month, now.Day, 23, 59, 59);
+            //当前月
+            // 获取当前年份和月份
+            int year = DateTime.Now.Year;
+            int month = DateTime.Now.Month;
+            // 获取当前月份的开始00点
+            DateTime startOfMonth = new DateTime(year, month, 1);
+            DateTime startOfNextMonth = startOfMonth.AddMonths(1);
+            // 如果你需要当前月份的最后一天的23:59:59
+            DateTime endOfMonth = startOfNextMonth.AddSeconds(-1);
+            
+            string strSql1 = "SELECT ClassMeeting.ClassMeetingId,ClassMeeting.ProjectId,CodeRecords.Code AS   ClassMeetingCode,Unit.UnitId,Unit.UnitName,ClassMeeting.ClassMeetingName,ClassMeeting.ClassMeetingDate,ClassMeeting.CompileMan,ClassMeeting.ClassMeetingContents,ClassMeeting.CompileDate,ClassMeeting.States "
+                            + @" ,(CASE WHEN ClassMeeting.States = " + BLL.Const.State_0 + " OR ClassMeeting.States IS NULL THEN '待['+ISNULL(OperateUser.UserName,Users.UserName)+']提交' WHEN ClassMeeting.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
+                            + @" FROM Meeting_ClassMeeting AS ClassMeeting "
+                            + @"  LEFT JOIN Sys_CodeRecords AS CodeRecords ON ClassMeeting.ClassMeetingId = CodeRecords.DataId "
+                            + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON ClassMeeting.ClassMeetingId = FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
+                            + @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId"
+                            + @" LEFT JOIN Sys_User AS Users ON ClassMeeting.CompileMan = Users.UserId"
+                            + @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Users.UnitId WHERE 1=1 ";
+            List<SqlParameter> listStr1 = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
             {
-                getallin = getInMaxs.Distinct().ToList();
+                strSql1 += " AND ClassMeeting.ProjectId = @ProjectId";
+                listStr1.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             }
-            //AllCount = getallin.Count();
-             var getEmployInOutRecords = (from x in Funs.DB.T_d_EmployInOutRecord
-                                          join y in Funs.DB.SitePerson_Person on new { ss1 = x.ProjectId, ss = x.IDCardNo } equals new { ss1 = y.ProjectId, ss = y.IdentityCard }
-                                          where y.ProjectId == this.CurrUser.LoginProjectId && y.IsUsed == true && x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date
-                                          select x.IDCardNo).Distinct();
-
-            //if (AllCount > 0)
-            //{
-            //    ////总人数
-            //    this.divperson.InnerHtml = ((AllCount % 10000) / 1000).ToString();
-            //    this.person00.InnerHtml = ((AllCount % 1000) / 100).ToString();
-            //    this.person01.InnerHtml = ((AllCount % 100) / 10).ToString();
-            //    this.person02.InnerHtml = (AllCount % 10).ToString();
-            //}
-
-
-            AllCount = getEmployInOutRecords.Count();
-            if (AllCount > 0)
+            strSql1 += " AND ClassMeeting.ClassMeetingDate BETWEEN @StartDate AND @EndDate";
+            listStr1.Add(new SqlParameter("@StartDate", StartDate));
+            listStr1.Add(new SqlParameter("@EndDate", EndDate));
+            SqlParameter[] parameter1 = listStr1.ToArray();
+            DataTable tb1 = SQLHelper.GetDataTableRunText(strSql1, parameter1);
+            var dr = tb1.Rows.Count;
+            
+            
+            string strSql2 = "SELECT ClassMeeting.ClassMeetingId,ClassMeeting.ProjectId,CodeRecords.Code AS   ClassMeetingCode,Unit.UnitId,Unit.UnitName,ClassMeeting.ClassMeetingName,ClassMeeting.ClassMeetingDate,ClassMeeting.CompileMan,ClassMeeting.ClassMeetingContents,ClassMeeting.CompileDate,ClassMeeting.States "
+                            + @" ,(CASE WHEN ClassMeeting.States = " + BLL.Const.State_0 + " OR ClassMeeting.States IS NULL THEN '待['+ISNULL(OperateUser.UserName,Users.UserName)+']提交' WHEN ClassMeeting.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
+                            + @" FROM Meeting_ClassMeeting AS ClassMeeting "
+                            + @"  LEFT JOIN Sys_CodeRecords AS CodeRecords ON ClassMeeting.ClassMeetingId = CodeRecords.DataId "
+                            + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON ClassMeeting.ClassMeetingId = FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
+                            + @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId"
+                            + @" LEFT JOIN Sys_User AS Users ON ClassMeeting.CompileMan = Users.UserId"
+                            + @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Users.UnitId WHERE 1=1 ";
+            List<SqlParameter> listStr2 = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                strSql2 += " AND ClassMeeting.ProjectId = @ProjectId";
+                listStr2.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            }
+            strSql2 += " AND ClassMeeting.ClassMeetingDate BETWEEN @StartDate AND @EndDate";
+            listStr2.Add(new SqlParameter("@StartDate", startOfMonth));
+            listStr2.Add(new SqlParameter("@EndDate", endOfMonth));
+            SqlParameter[] parameter2 = listStr2.ToArray();
+            DataTable tb2 = SQLHelper.GetDataTableRunText(strSql2, parameter2);
+            
+            var dy = tb2.Rows.Count;
+            
+            var count1 = projectPeople + dr;
+            var count2 = projectPeople + dy;
+            if (count1 > 0)
             {
                 ////总人数
-                this.divperson.InnerHtml = ((AllCount % 10000) / 1000).ToString();
-                this.person00.InnerHtml = ((AllCount % 1000) / 100).ToString();
-                this.person01.InnerHtml = ((AllCount % 100) / 10).ToString();
-                this.person02.InnerHtml = (AllCount % 10).ToString();
+                this.divperson.InnerHtml = ((count1 % 10000) / 1000).ToString();
+                this.person00.InnerHtml = ((count1 % 1000) / 100).ToString();
+                this.person01.InnerHtml = ((count1 % 100) / 10).ToString();
+                this.person02.InnerHtml = (count1 % 10).ToString();
             }
+            
+            if (count2 > 0)
+            {
+                ////总人数
+                this.divperson1.InnerHtml = ((count2 % 10000) / 1000).ToString();
+                this.person001.InnerHtml = ((count2 % 1000) / 100).ToString();
+                this.person011.InnerHtml = ((count2 % 100) / 10).ToString();
+                this.person021.InnerHtml = (count2 % 10).ToString();
+            }
+
         }
         #endregion
 
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.designer.cs b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.designer.cs
index f61efdb..c86f1b2 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web {
-    
-    
-    public partial class mainMenu_HSSE {
-        
+namespace FineUIPro.Web
+{
+
+
+    public partial class mainMenu_HSSE
+    {
+
         /// <summary>
         /// Head1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-        
+
         /// <summary>
         /// divperson 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divperson;
-        
+
         /// <summary>
         /// person00 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl person00;
-        
+
         /// <summary>
         /// person01 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl person01;
-        
+
         /// <summary>
         /// person02 控件。
         /// </summary>
@@ -56,7 +58,43 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl person02;
-        
+
+        /// <summary>
+        /// divperson1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divperson1;
+
+        /// <summary>
+        /// person001 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl person001;
+
+        /// <summary>
+        /// person011 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl person011;
+
+        /// <summary>
+        /// person021 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl person021;
+
         /// <summary>
         /// xmb 控件。
         /// </summary>
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index b92bba9..affdc5a 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -2414,12 +2414,18 @@ namespace Model
     partial void InsertTechnique_Appraise(Technique_Appraise instance);
     partial void UpdateTechnique_Appraise(Technique_Appraise instance);
     partial void DeleteTechnique_Appraise(Technique_Appraise instance);
+    partial void InsertTechnique_AwardStandards(Technique_AwardStandards instance);
+    partial void UpdateTechnique_AwardStandards(Technique_AwardStandards instance);
+    partial void DeleteTechnique_AwardStandards(Technique_AwardStandards instance);
     partial void InsertTechnique_CheckItemDetail(Technique_CheckItemDetail instance);
     partial void UpdateTechnique_CheckItemDetail(Technique_CheckItemDetail instance);
     partial void DeleteTechnique_CheckItemDetail(Technique_CheckItemDetail instance);
     partial void InsertTechnique_CheckItemSet(Technique_CheckItemSet instance);
     partial void UpdateTechnique_CheckItemSet(Technique_CheckItemSet instance);
     partial void DeleteTechnique_CheckItemSet(Technique_CheckItemSet instance);
+    partial void InsertTechnique_ConstructionStandards(Technique_ConstructionStandards instance);
+    partial void UpdateTechnique_ConstructionStandards(Technique_ConstructionStandards instance);
+    partial void DeleteTechnique_ConstructionStandards(Technique_ConstructionStandards instance);
     partial void InsertTechnique_Emergency(Technique_Emergency instance);
     partial void UpdateTechnique_Emergency(Technique_Emergency instance);
     partial void DeleteTechnique_Emergency(Technique_Emergency instance);
@@ -2441,12 +2447,18 @@ namespace Model
     partial void InsertTechnique_ProjectSolutionTemplete(Technique_ProjectSolutionTemplete instance);
     partial void UpdateTechnique_ProjectSolutionTemplete(Technique_ProjectSolutionTemplete instance);
     partial void DeleteTechnique_ProjectSolutionTemplete(Technique_ProjectSolutionTemplete instance);
+    partial void InsertTechnique_ProtectionStandards(Technique_ProtectionStandards instance);
+    partial void UpdateTechnique_ProtectionStandards(Technique_ProtectionStandards instance);
+    partial void DeleteTechnique_ProtectionStandards(Technique_ProtectionStandards instance);
     partial void InsertTechnique_Rectify(Technique_Rectify instance);
     partial void UpdateTechnique_Rectify(Technique_Rectify instance);
     partial void DeleteTechnique_Rectify(Technique_Rectify instance);
     partial void InsertTechnique_RectifyItem(Technique_RectifyItem instance);
     partial void UpdateTechnique_RectifyItem(Technique_RectifyItem instance);
     partial void DeleteTechnique_RectifyItem(Technique_RectifyItem instance);
+    partial void InsertTechnique_SafetyResponsibilities(Technique_SafetyResponsibilities instance);
+    partial void UpdateTechnique_SafetyResponsibilities(Technique_SafetyResponsibilities instance);
+    partial void DeleteTechnique_SafetyResponsibilities(Technique_SafetyResponsibilities instance);
     partial void InsertTechnique_SpecialScheme(Technique_SpecialScheme instance);
     partial void UpdateTechnique_SpecialScheme(Technique_SpecialScheme instance);
     partial void DeleteTechnique_SpecialScheme(Technique_SpecialScheme instance);
@@ -9110,6 +9122,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Technique_AwardStandards> Technique_AwardStandards
+		{
+			get
+			{
+				return this.GetTable<Technique_AwardStandards>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Technique_CheckItemDetail> Technique_CheckItemDetail
 		{
 			get
@@ -9126,6 +9146,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Technique_ConstructionStandards> Technique_ConstructionStandards
+		{
+			get
+			{
+				return this.GetTable<Technique_ConstructionStandards>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Technique_Emergency> Technique_Emergency
 		{
 			get
@@ -9182,6 +9210,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Technique_ProtectionStandards> Technique_ProtectionStandards
+		{
+			get
+			{
+				return this.GetTable<Technique_ProtectionStandards>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Technique_Rectify> Technique_Rectify
 		{
 			get
@@ -9198,6 +9234,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Technique_SafetyResponsibilities> Technique_SafetyResponsibilities
+		{
+			get
+			{
+				return this.GetTable<Technique_SafetyResponsibilities>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Technique_SpecialScheme> Technique_SpecialScheme
 		{
 			get
@@ -388947,6 +388991,332 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Technique_AwardStandards")]
+	public partial class Technique_AwardStandards : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _AwardStandardsId;
+		
+		private string _AwardStandardsCode;
+		
+		private string _AwardStandardsName;
+		
+		private string _CompileMan;
+		
+		private System.Nullable<System.DateTime> _CompileDate;
+		
+		private string _AttachUrl;
+		
+		private string _AuditMan;
+		
+		private System.Nullable<System.DateTime> _AuditDate;
+		
+		private System.Nullable<bool> _IsPass;
+		
+		private System.Nullable<bool> _IsBuild;
+		
+		private string _UpState;
+		
+		private string _Remark;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnAwardStandardsIdChanging(string value);
+    partial void OnAwardStandardsIdChanged();
+    partial void OnAwardStandardsCodeChanging(string value);
+    partial void OnAwardStandardsCodeChanged();
+    partial void OnAwardStandardsNameChanging(string value);
+    partial void OnAwardStandardsNameChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompileDateChanged();
+    partial void OnAttachUrlChanging(string value);
+    partial void OnAttachUrlChanged();
+    partial void OnAuditManChanging(string value);
+    partial void OnAuditManChanged();
+    partial void OnAuditDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnAuditDateChanged();
+    partial void OnIsPassChanging(System.Nullable<bool> value);
+    partial void OnIsPassChanged();
+    partial void OnIsBuildChanging(System.Nullable<bool> value);
+    partial void OnIsBuildChanged();
+    partial void OnUpStateChanging(string value);
+    partial void OnUpStateChanged();
+    partial void OnRemarkChanging(string value);
+    partial void OnRemarkChanged();
+    #endregion
+		
+		public Technique_AwardStandards()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AwardStandardsId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string AwardStandardsId
+		{
+			get
+			{
+				return this._AwardStandardsId;
+			}
+			set
+			{
+				if ((this._AwardStandardsId != value))
+				{
+					this.OnAwardStandardsIdChanging(value);
+					this.SendPropertyChanging();
+					this._AwardStandardsId = value;
+					this.SendPropertyChanged("AwardStandardsId");
+					this.OnAwardStandardsIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AwardStandardsCode", DbType="NVarChar(50)")]
+		public string AwardStandardsCode
+		{
+			get
+			{
+				return this._AwardStandardsCode;
+			}
+			set
+			{
+				if ((this._AwardStandardsCode != value))
+				{
+					this.OnAwardStandardsCodeChanging(value);
+					this.SendPropertyChanging();
+					this._AwardStandardsCode = value;
+					this.SendPropertyChanged("AwardStandardsCode");
+					this.OnAwardStandardsCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AwardStandardsName", DbType="NVarChar(500)")]
+		public string AwardStandardsName
+		{
+			get
+			{
+				return this._AwardStandardsName;
+			}
+			set
+			{
+				if ((this._AwardStandardsName != value))
+				{
+					this.OnAwardStandardsNameChanging(value);
+					this.SendPropertyChanging();
+					this._AwardStandardsName = value;
+					this.SendPropertyChanged("AwardStandardsName");
+					this.OnAwardStandardsNameChanged();
+				}
+			}
+		}
+		
+		[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="_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="_AuditDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> AuditDate
+		{
+			get
+			{
+				return this._AuditDate;
+			}
+			set
+			{
+				if ((this._AuditDate != value))
+				{
+					this.OnAuditDateChanging(value);
+					this.SendPropertyChanging();
+					this._AuditDate = value;
+					this.SendPropertyChanged("AuditDate");
+					this.OnAuditDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsPass", DbType="Bit")]
+		public System.Nullable<bool> IsPass
+		{
+			get
+			{
+				return this._IsPass;
+			}
+			set
+			{
+				if ((this._IsPass != value))
+				{
+					this.OnIsPassChanging(value);
+					this.SendPropertyChanging();
+					this._IsPass = value;
+					this.SendPropertyChanged("IsPass");
+					this.OnIsPassChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsBuild", DbType="Bit")]
+		public System.Nullable<bool> IsBuild
+		{
+			get
+			{
+				return this._IsBuild;
+			}
+			set
+			{
+				if ((this._IsBuild != value))
+				{
+					this.OnIsBuildChanging(value);
+					this.SendPropertyChanging();
+					this._IsBuild = value;
+					this.SendPropertyChanged("IsBuild");
+					this.OnIsBuildChanged();
+				}
+			}
+		}
+		
+		[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.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")]
+		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.Technique_CheckItemDetail")]
 	public partial class Technique_CheckItemDetail : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -389432,6 +389802,332 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Technique_ConstructionStandards")]
+	public partial class Technique_ConstructionStandards : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _ConstructionStandardsId;
+		
+		private string _ConstructionStandardsCode;
+		
+		private string _ConstructionStandardsName;
+		
+		private string _CompileMan;
+		
+		private System.Nullable<System.DateTime> _CompileDate;
+		
+		private string _AttachUrl;
+		
+		private string _AuditMan;
+		
+		private System.Nullable<System.DateTime> _AuditDate;
+		
+		private System.Nullable<bool> _IsPass;
+		
+		private System.Nullable<bool> _IsBuild;
+		
+		private string _UpState;
+		
+		private string _Remark;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnConstructionStandardsIdChanging(string value);
+    partial void OnConstructionStandardsIdChanged();
+    partial void OnConstructionStandardsCodeChanging(string value);
+    partial void OnConstructionStandardsCodeChanged();
+    partial void OnConstructionStandardsNameChanging(string value);
+    partial void OnConstructionStandardsNameChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompileDateChanged();
+    partial void OnAttachUrlChanging(string value);
+    partial void OnAttachUrlChanged();
+    partial void OnAuditManChanging(string value);
+    partial void OnAuditManChanged();
+    partial void OnAuditDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnAuditDateChanged();
+    partial void OnIsPassChanging(System.Nullable<bool> value);
+    partial void OnIsPassChanged();
+    partial void OnIsBuildChanging(System.Nullable<bool> value);
+    partial void OnIsBuildChanged();
+    partial void OnUpStateChanging(string value);
+    partial void OnUpStateChanged();
+    partial void OnRemarkChanging(string value);
+    partial void OnRemarkChanged();
+    #endregion
+		
+		public Technique_ConstructionStandards()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionStandardsId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string ConstructionStandardsId
+		{
+			get
+			{
+				return this._ConstructionStandardsId;
+			}
+			set
+			{
+				if ((this._ConstructionStandardsId != value))
+				{
+					this.OnConstructionStandardsIdChanging(value);
+					this.SendPropertyChanging();
+					this._ConstructionStandardsId = value;
+					this.SendPropertyChanged("ConstructionStandardsId");
+					this.OnConstructionStandardsIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionStandardsCode", DbType="NVarChar(50)")]
+		public string ConstructionStandardsCode
+		{
+			get
+			{
+				return this._ConstructionStandardsCode;
+			}
+			set
+			{
+				if ((this._ConstructionStandardsCode != value))
+				{
+					this.OnConstructionStandardsCodeChanging(value);
+					this.SendPropertyChanging();
+					this._ConstructionStandardsCode = value;
+					this.SendPropertyChanged("ConstructionStandardsCode");
+					this.OnConstructionStandardsCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionStandardsName", DbType="NVarChar(500)")]
+		public string ConstructionStandardsName
+		{
+			get
+			{
+				return this._ConstructionStandardsName;
+			}
+			set
+			{
+				if ((this._ConstructionStandardsName != value))
+				{
+					this.OnConstructionStandardsNameChanging(value);
+					this.SendPropertyChanging();
+					this._ConstructionStandardsName = value;
+					this.SendPropertyChanged("ConstructionStandardsName");
+					this.OnConstructionStandardsNameChanged();
+				}
+			}
+		}
+		
+		[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="_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="_AuditDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> AuditDate
+		{
+			get
+			{
+				return this._AuditDate;
+			}
+			set
+			{
+				if ((this._AuditDate != value))
+				{
+					this.OnAuditDateChanging(value);
+					this.SendPropertyChanging();
+					this._AuditDate = value;
+					this.SendPropertyChanged("AuditDate");
+					this.OnAuditDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsPass", DbType="Bit")]
+		public System.Nullable<bool> IsPass
+		{
+			get
+			{
+				return this._IsPass;
+			}
+			set
+			{
+				if ((this._IsPass != value))
+				{
+					this.OnIsPassChanging(value);
+					this.SendPropertyChanging();
+					this._IsPass = value;
+					this.SendPropertyChanged("IsPass");
+					this.OnIsPassChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsBuild", DbType="Bit")]
+		public System.Nullable<bool> IsBuild
+		{
+			get
+			{
+				return this._IsBuild;
+			}
+			set
+			{
+				if ((this._IsBuild != value))
+				{
+					this.OnIsBuildChanging(value);
+					this.SendPropertyChanging();
+					this._IsBuild = value;
+					this.SendPropertyChanged("IsBuild");
+					this.OnIsBuildChanged();
+				}
+			}
+		}
+		
+		[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.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")]
+		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.Technique_Emergency")]
 	public partial class Technique_Emergency : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -392869,6 +393565,332 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Technique_ProtectionStandards")]
+	public partial class Technique_ProtectionStandards : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _ProtectionStandardsId;
+		
+		private string _ProtectionStandardsCode;
+		
+		private string _ProtectionStandardsName;
+		
+		private string _CompileMan;
+		
+		private System.Nullable<System.DateTime> _CompileDate;
+		
+		private string _AttachUrl;
+		
+		private string _AuditMan;
+		
+		private System.Nullable<System.DateTime> _AuditDate;
+		
+		private System.Nullable<bool> _IsPass;
+		
+		private System.Nullable<bool> _IsBuild;
+		
+		private string _UpState;
+		
+		private string _Remark;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnProtectionStandardsIdChanging(string value);
+    partial void OnProtectionStandardsIdChanged();
+    partial void OnProtectionStandardsCodeChanging(string value);
+    partial void OnProtectionStandardsCodeChanged();
+    partial void OnProtectionStandardsNameChanging(string value);
+    partial void OnProtectionStandardsNameChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompileDateChanged();
+    partial void OnAttachUrlChanging(string value);
+    partial void OnAttachUrlChanged();
+    partial void OnAuditManChanging(string value);
+    partial void OnAuditManChanged();
+    partial void OnAuditDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnAuditDateChanged();
+    partial void OnIsPassChanging(System.Nullable<bool> value);
+    partial void OnIsPassChanged();
+    partial void OnIsBuildChanging(System.Nullable<bool> value);
+    partial void OnIsBuildChanged();
+    partial void OnUpStateChanging(string value);
+    partial void OnUpStateChanged();
+    partial void OnRemarkChanging(string value);
+    partial void OnRemarkChanged();
+    #endregion
+		
+		public Technique_ProtectionStandards()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProtectionStandardsId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string ProtectionStandardsId
+		{
+			get
+			{
+				return this._ProtectionStandardsId;
+			}
+			set
+			{
+				if ((this._ProtectionStandardsId != value))
+				{
+					this.OnProtectionStandardsIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProtectionStandardsId = value;
+					this.SendPropertyChanged("ProtectionStandardsId");
+					this.OnProtectionStandardsIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProtectionStandardsCode", DbType="NVarChar(50)")]
+		public string ProtectionStandardsCode
+		{
+			get
+			{
+				return this._ProtectionStandardsCode;
+			}
+			set
+			{
+				if ((this._ProtectionStandardsCode != value))
+				{
+					this.OnProtectionStandardsCodeChanging(value);
+					this.SendPropertyChanging();
+					this._ProtectionStandardsCode = value;
+					this.SendPropertyChanged("ProtectionStandardsCode");
+					this.OnProtectionStandardsCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProtectionStandardsName", DbType="NVarChar(500)")]
+		public string ProtectionStandardsName
+		{
+			get
+			{
+				return this._ProtectionStandardsName;
+			}
+			set
+			{
+				if ((this._ProtectionStandardsName != value))
+				{
+					this.OnProtectionStandardsNameChanging(value);
+					this.SendPropertyChanging();
+					this._ProtectionStandardsName = value;
+					this.SendPropertyChanged("ProtectionStandardsName");
+					this.OnProtectionStandardsNameChanged();
+				}
+			}
+		}
+		
+		[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="_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="_AuditDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> AuditDate
+		{
+			get
+			{
+				return this._AuditDate;
+			}
+			set
+			{
+				if ((this._AuditDate != value))
+				{
+					this.OnAuditDateChanging(value);
+					this.SendPropertyChanging();
+					this._AuditDate = value;
+					this.SendPropertyChanged("AuditDate");
+					this.OnAuditDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsPass", DbType="Bit")]
+		public System.Nullable<bool> IsPass
+		{
+			get
+			{
+				return this._IsPass;
+			}
+			set
+			{
+				if ((this._IsPass != value))
+				{
+					this.OnIsPassChanging(value);
+					this.SendPropertyChanging();
+					this._IsPass = value;
+					this.SendPropertyChanged("IsPass");
+					this.OnIsPassChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsBuild", DbType="Bit")]
+		public System.Nullable<bool> IsBuild
+		{
+			get
+			{
+				return this._IsBuild;
+			}
+			set
+			{
+				if ((this._IsBuild != value))
+				{
+					this.OnIsBuildChanging(value);
+					this.SendPropertyChanging();
+					this._IsBuild = value;
+					this.SendPropertyChanged("IsBuild");
+					this.OnIsBuildChanged();
+				}
+			}
+		}
+		
+		[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.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")]
+		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.Technique_Rectify")]
 	public partial class Technique_Rectify : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -393563,6 +394585,332 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Technique_SafetyResponsibilities")]
+	public partial class Technique_SafetyResponsibilities : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _SafetyResponsibilitiesId;
+		
+		private string _SafetyResponsibilitiesCode;
+		
+		private string _SafetyResponsibilitiesName;
+		
+		private string _CompileMan;
+		
+		private System.Nullable<System.DateTime> _CompileDate;
+		
+		private string _AttachUrl;
+		
+		private string _AuditMan;
+		
+		private System.Nullable<System.DateTime> _AuditDate;
+		
+		private System.Nullable<bool> _IsPass;
+		
+		private System.Nullable<bool> _IsBuild;
+		
+		private string _UpState;
+		
+		private string _Remark;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnSafetyResponsibilitiesIdChanging(string value);
+    partial void OnSafetyResponsibilitiesIdChanged();
+    partial void OnSafetyResponsibilitiesCodeChanging(string value);
+    partial void OnSafetyResponsibilitiesCodeChanged();
+    partial void OnSafetyResponsibilitiesNameChanging(string value);
+    partial void OnSafetyResponsibilitiesNameChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompileDateChanged();
+    partial void OnAttachUrlChanging(string value);
+    partial void OnAttachUrlChanged();
+    partial void OnAuditManChanging(string value);
+    partial void OnAuditManChanged();
+    partial void OnAuditDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnAuditDateChanged();
+    partial void OnIsPassChanging(System.Nullable<bool> value);
+    partial void OnIsPassChanged();
+    partial void OnIsBuildChanging(System.Nullable<bool> value);
+    partial void OnIsBuildChanged();
+    partial void OnUpStateChanging(string value);
+    partial void OnUpStateChanged();
+    partial void OnRemarkChanging(string value);
+    partial void OnRemarkChanged();
+    #endregion
+		
+		public Technique_SafetyResponsibilities()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyResponsibilitiesId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string SafetyResponsibilitiesId
+		{
+			get
+			{
+				return this._SafetyResponsibilitiesId;
+			}
+			set
+			{
+				if ((this._SafetyResponsibilitiesId != value))
+				{
+					this.OnSafetyResponsibilitiesIdChanging(value);
+					this.SendPropertyChanging();
+					this._SafetyResponsibilitiesId = value;
+					this.SendPropertyChanged("SafetyResponsibilitiesId");
+					this.OnSafetyResponsibilitiesIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyResponsibilitiesCode", DbType="NVarChar(50)")]
+		public string SafetyResponsibilitiesCode
+		{
+			get
+			{
+				return this._SafetyResponsibilitiesCode;
+			}
+			set
+			{
+				if ((this._SafetyResponsibilitiesCode != value))
+				{
+					this.OnSafetyResponsibilitiesCodeChanging(value);
+					this.SendPropertyChanging();
+					this._SafetyResponsibilitiesCode = value;
+					this.SendPropertyChanged("SafetyResponsibilitiesCode");
+					this.OnSafetyResponsibilitiesCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyResponsibilitiesName", DbType="NVarChar(500)")]
+		public string SafetyResponsibilitiesName
+		{
+			get
+			{
+				return this._SafetyResponsibilitiesName;
+			}
+			set
+			{
+				if ((this._SafetyResponsibilitiesName != value))
+				{
+					this.OnSafetyResponsibilitiesNameChanging(value);
+					this.SendPropertyChanging();
+					this._SafetyResponsibilitiesName = value;
+					this.SendPropertyChanged("SafetyResponsibilitiesName");
+					this.OnSafetyResponsibilitiesNameChanged();
+				}
+			}
+		}
+		
+		[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="_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="_AuditDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> AuditDate
+		{
+			get
+			{
+				return this._AuditDate;
+			}
+			set
+			{
+				if ((this._AuditDate != value))
+				{
+					this.OnAuditDateChanging(value);
+					this.SendPropertyChanging();
+					this._AuditDate = value;
+					this.SendPropertyChanged("AuditDate");
+					this.OnAuditDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsPass", DbType="Bit")]
+		public System.Nullable<bool> IsPass
+		{
+			get
+			{
+				return this._IsPass;
+			}
+			set
+			{
+				if ((this._IsPass != value))
+				{
+					this.OnIsPassChanging(value);
+					this.SendPropertyChanging();
+					this._IsPass = value;
+					this.SendPropertyChanged("IsPass");
+					this.OnIsPassChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsBuild", DbType="Bit")]
+		public System.Nullable<bool> IsBuild
+		{
+			get
+			{
+				return this._IsBuild;
+			}
+			set
+			{
+				if ((this._IsBuild != value))
+				{
+					this.OnIsBuildChanging(value);
+					this.SendPropertyChanging();
+					this._IsBuild = value;
+					this.SendPropertyChanged("IsBuild");
+					this.OnIsBuildChanged();
+				}
+			}
+		}
+		
+		[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.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")]
+		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.Technique_SpecialScheme")]
 	public partial class Technique_SpecialScheme : INotifyPropertyChanging, INotifyPropertyChanged
 	{

From edda376377a57b72bf2c5dcb1bc626e6e5f929ed Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Thu, 20 Feb 2025 17:21:35 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HSSE/Technique/AwardStandardsService.cs   |  83 ++++++++++-
 .../Technique/ConstructionStandardsService.cs |  81 +++++++++++
 .../Technique/ProtectionStandardsService.cs   |  85 +++++++++++
 .../SafetyResponsibilitiesService.cs          |  83 ++++++++++-
 .../HSSE/AwardStandardsController.cs          |  55 +++++++
 .../HSSE/ConstructionStandardsController.cs   |  55 +++++++
 .../HSSE/ImageRecognitionController.cs        | 135 ++++++++++++++++++
 .../HSSE/ProtectionStandardsController.cs     |  54 +++++++
 .../Controllers/HSSE/RectifyController.cs     |  53 +++++++
 .../HSSE/SafetyResponsibilitiesController.cs  |  55 +++++++
 SGGL/WebAPI/Filter/TestPermissionAttribute.cs |  10 ++
 SGGL/WebAPI/WebAPI.csproj                     |  67 ++++-----
 12 files changed, 778 insertions(+), 38 deletions(-)
 create mode 100644 SGGL/WebAPI/Controllers/HSSE/AwardStandardsController.cs
 create mode 100644 SGGL/WebAPI/Controllers/HSSE/ConstructionStandardsController.cs
 create mode 100644 SGGL/WebAPI/Controllers/HSSE/ImageRecognitionController.cs
 create mode 100644 SGGL/WebAPI/Controllers/HSSE/ProtectionStandardsController.cs
 create mode 100644 SGGL/WebAPI/Controllers/HSSE/RectifyController.cs
 create mode 100644 SGGL/WebAPI/Controllers/HSSE/SafetyResponsibilitiesController.cs

diff --git a/SGGL/BLL/HSSE/Technique/AwardStandardsService.cs b/SGGL/BLL/HSSE/Technique/AwardStandardsService.cs
index c00ddf7..3441ce2 100644
--- a/SGGL/BLL/HSSE/Technique/AwardStandardsService.cs
+++ b/SGGL/BLL/HSSE/Technique/AwardStandardsService.cs
@@ -19,7 +19,28 @@ public class AwardStandardsService
             e.AwardStandardsId == AwardStandardsId);
     }
 
-   
+    /// <summary>
+    /// 获取集合
+    /// </summary>
+    /// <param name="AwardStandardsId"></param>
+    /// <returns></returns>
+    public static List<AwardStandardsItem> GetAwardStandardsList()
+    {
+        List<AwardStandardsItem> getDataLists = (from x in Funs.DB.Technique_AwardStandards
+            select new AwardStandardsItem
+            {
+                AwardStandardsId = x.AwardStandardsId,
+                AwardStandardsCode = x.AwardStandardsCode,
+                AwardStandardsName = x.AwardStandardsName,
+                AttachUrl = x.AttachUrl,
+                CompileMan = x.CompileMan,
+                CompileDate = x.CompileDate,
+                IsPass = x.IsPass,
+                UpState = x.UpState,
+                Remark = x.Remark
+            }).ToList();
+        return getDataLists;
+    }
 
     /// <summary>
     /// 添加
@@ -93,4 +114,64 @@ public class AwardStandardsService
             db.SubmitChanges();
         }
     }
+    
+    public class AwardStandardsItem
+    {
+        
+        public string AwardStandardsId
+        {
+            get;
+            set;
+        }
+       
+        public string AwardStandardsCode
+        {
+            get;
+            set;
+        }
+       
+        public string AwardStandardsName
+        {
+            get;
+            set;
+        }
+       
+        public string AttachUrl
+        {
+            get;
+            set;
+        }
+       
+        public string CompileMan
+        {
+            get;
+            set;
+        }
+        
+        public System.Nullable<System.DateTime> CompileDate
+        {
+            get;
+            set;
+        }
+        
+        public System.Nullable<bool> IsPass
+        {
+            get;
+            set;
+        }
+        
+        public string UpState
+        {
+            get;
+            set;
+        }
+       
+        public string Remark
+        {
+            get;
+            set;
+        }
+        
+    }
+    
 }
\ No newline at end of file
diff --git a/SGGL/BLL/HSSE/Technique/ConstructionStandardsService.cs b/SGGL/BLL/HSSE/Technique/ConstructionStandardsService.cs
index 2bc3497..5cdf7da 100644
--- a/SGGL/BLL/HSSE/Technique/ConstructionStandardsService.cs
+++ b/SGGL/BLL/HSSE/Technique/ConstructionStandardsService.cs
@@ -19,6 +19,28 @@ public class ConstructionStandardsService
             e.ConstructionStandardsId == ConstructionStandardsId);
     }
 
+    /// <summary>
+    /// 获取集合
+    /// </summary>
+    /// <param name="ConstructionStandardsId"></param>
+    /// <returns></returns>
+    public static List<ConstructionStandardsItem> GetConstructionStandardsList()
+    {
+        List<ConstructionStandardsItem> getDataLists = (from x in Funs.DB.Technique_ConstructionStandards
+            select new ConstructionStandardsItem
+            {
+                ConstructionStandardsId = x.ConstructionStandardsId,
+                ConstructionStandardsCode = x.ConstructionStandardsCode,
+                ConstructionStandardsName = x.ConstructionStandardsName,
+                AttachUrl = x.AttachUrl,
+                CompileMan = x.CompileMan,
+                CompileDate = x.CompileDate,
+                IsPass = x.IsPass,
+                UpState = x.UpState,
+                Remark = x.Remark
+            }).ToList();
+        return getDataLists;
+    }
     
     /// <summary>
     /// 添加
@@ -93,4 +115,63 @@ public class ConstructionStandardsService
             db.SubmitChanges();
         }
     }
+    public class ConstructionStandardsItem
+    {
+        
+        public string ConstructionStandardsId
+        {
+            get;
+            set;
+        }
+       
+        public string ConstructionStandardsCode
+        {
+            get;
+            set;
+        }
+       
+        public string ConstructionStandardsName
+        {
+            get;
+            set;
+        }
+       
+        public string AttachUrl
+        {
+            get;
+            set;
+        }
+       
+        public string CompileMan
+        {
+            get;
+            set;
+        }
+        
+        public System.Nullable<System.DateTime> CompileDate
+        {
+            get;
+            set;
+        }
+        
+        public System.Nullable<bool> IsPass
+        {
+            get;
+            set;
+        }
+        
+        public string UpState
+        {
+            get;
+            set;
+        }
+       
+        public string Remark
+        {
+            get;
+            set;
+        }
+        
+    }
+    
 }
\ No newline at end of file
diff --git a/SGGL/BLL/HSSE/Technique/ProtectionStandardsService.cs b/SGGL/BLL/HSSE/Technique/ProtectionStandardsService.cs
index c15290d..d9a1479 100644
--- a/SGGL/BLL/HSSE/Technique/ProtectionStandardsService.cs
+++ b/SGGL/BLL/HSSE/Technique/ProtectionStandardsService.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Model;
 
 namespace BLL;
 
@@ -19,6 +20,29 @@ public class ProtectionStandardsService
         return Funs.DB.Technique_ProtectionStandards.FirstOrDefault(e =>
             e.ProtectionStandardsId == ProtectionStandardsId);
     }
+    
+    /// <summary>
+    /// 获取集合
+    /// </summary>
+    /// <param name="ProtectionStandardsId"></param>
+    /// <returns></returns>
+    public static List<ProtectionStandardsItem> GetProtectionStandardsList()
+    {
+        List<ProtectionStandardsItem> getDataLists = (from x in Funs.DB.Technique_ProtectionStandards
+            select new ProtectionStandardsItem
+            {
+                ProtectionStandardsId = x.ProtectionStandardsId,
+                ProtectionStandardsCode = x.ProtectionStandardsCode,
+                ProtectionStandardsName = x.ProtectionStandardsName,
+                AttachUrl = x.AttachUrl,
+                CompileMan = x.CompileMan,
+                CompileDate = x.CompileDate,
+                IsPass = x.IsPass,
+                UpState = x.UpState,
+                Remark = x.Remark
+            }).ToList();
+        return getDataLists;
+    }
 
     /// <summary>
     /// 添加
@@ -92,4 +116,65 @@ public class ProtectionStandardsService
             db.SubmitChanges();
         }
     }
+    
+    
+    public class ProtectionStandardsItem
+    {
+        
+        public string ProtectionStandardsId
+        {
+            get;
+            set;
+        }
+       
+        public string ProtectionStandardsCode
+        {
+            get;
+            set;
+        }
+       
+        public string ProtectionStandardsName
+        {
+            get;
+            set;
+        }
+       
+        public string AttachUrl
+        {
+            get;
+            set;
+        }
+       
+        public string CompileMan
+        {
+            get;
+            set;
+        }
+        
+        public System.Nullable<System.DateTime> CompileDate
+        {
+            get;
+            set;
+        }
+        
+        public System.Nullable<bool> IsPass
+        {
+            get;
+            set;
+        }
+        
+        public string UpState
+        {
+            get;
+            set;
+        }
+       
+        public string Remark
+        {
+            get;
+            set;
+        }
+        
+    }
+    
 }
\ No newline at end of file
diff --git a/SGGL/BLL/HSSE/Technique/SafetyResponsibilitiesService.cs b/SGGL/BLL/HSSE/Technique/SafetyResponsibilitiesService.cs
index 622f11c..e7c33f8 100644
--- a/SGGL/BLL/HSSE/Technique/SafetyResponsibilitiesService.cs
+++ b/SGGL/BLL/HSSE/Technique/SafetyResponsibilitiesService.cs
@@ -19,7 +19,28 @@ public class SafetyResponsibilitiesService
             e.SafetyResponsibilitiesId == SafetyResponsibilitiesId);
     }
 
-    
+    /// <summary>
+    /// 获取集合
+    /// </summary>
+    /// <param name="SafetyResponsibilitiesId"></param>
+    /// <returns></returns>
+    public static List<SafetyResponsibilitiesItem> GetSafetyResponsibilitiesList()
+    {
+        List<SafetyResponsibilitiesItem> getDataLists = (from x in Funs.DB.Technique_SafetyResponsibilities
+            select new SafetyResponsibilitiesItem
+            {
+                SafetyResponsibilitiesId = x.SafetyResponsibilitiesId,
+                SafetyResponsibilitiesCode = x.SafetyResponsibilitiesCode,
+                SafetyResponsibilitiesName = x.SafetyResponsibilitiesName,
+                AttachUrl = x.AttachUrl,
+                CompileMan = x.CompileMan,
+                CompileDate = x.CompileDate,
+                IsPass = x.IsPass,
+                UpState = x.UpState,
+                Remark = x.Remark
+            }).ToList();
+        return getDataLists;
+    }
 
     /// <summary>
     /// 添加专项方案
@@ -94,4 +115,64 @@ public class SafetyResponsibilitiesService
             db.SubmitChanges();
         }
     }
+    
+    public class SafetyResponsibilitiesItem
+    {
+        
+        public string SafetyResponsibilitiesId
+        {
+            get;
+            set;
+        }
+       
+        public string SafetyResponsibilitiesCode
+        {
+            get;
+            set;
+        }
+       
+        public string SafetyResponsibilitiesName
+        {
+            get;
+            set;
+        }
+       
+        public string AttachUrl
+        {
+            get;
+            set;
+        }
+       
+        public string CompileMan
+        {
+            get;
+            set;
+        }
+        
+        public System.Nullable<System.DateTime> CompileDate
+        {
+            get;
+            set;
+        }
+        
+        public System.Nullable<bool> IsPass
+        {
+            get;
+            set;
+        }
+        
+        public string UpState
+        {
+            get;
+            set;
+        }
+       
+        public string Remark
+        {
+            get;
+            set;
+        }
+        
+    }
+    
 }
\ No newline at end of file
diff --git a/SGGL/WebAPI/Controllers/HSSE/AwardStandardsController.cs b/SGGL/WebAPI/Controllers/HSSE/AwardStandardsController.cs
new file mode 100644
index 0000000..93c0408
--- /dev/null
+++ b/SGGL/WebAPI/Controllers/HSSE/AwardStandardsController.cs
@@ -0,0 +1,55 @@
+using BLL;
+using System;
+using System.Linq;
+using System.Web.Http;
+
+namespace WebAPI.Controllers.HSSE
+{
+    public class AwardStandardsController : ApiController
+    {
+        #region 获取集合
+        /// <summary>
+        ///  获取集合
+        /// </summary>
+        /// <returns></returns>
+        public Model.ResponeData getAwardStandardsList()
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = AwardStandardsService.GetAwardStandardsList();
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+        
+        
+        #region 根据id获取
+        /// <summary>
+        ///  根据id获取
+        /// </summary>
+        /// <returns></returns>
+        public Model.ResponeData getAwardStandardsListById(string AwardStandardsId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = AwardStandardsService.GetAwardStandardsListById(AwardStandardsId);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/WebAPI/Controllers/HSSE/ConstructionStandardsController.cs b/SGGL/WebAPI/Controllers/HSSE/ConstructionStandardsController.cs
new file mode 100644
index 0000000..8db5021
--- /dev/null
+++ b/SGGL/WebAPI/Controllers/HSSE/ConstructionStandardsController.cs
@@ -0,0 +1,55 @@
+using BLL;
+using System;
+using System.Linq;
+using System.Web.Http;
+
+namespace WebAPI.Controllers.HSSE
+{
+    public class ConstructionStandardsController : ApiController
+    {
+        #region 获取集合
+        /// <summary>
+        ///  获取集合
+        /// </summary>
+        /// <returns></returns>
+        public Model.ResponeData getConstructionStandardsList()
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = ConstructionStandardsService.GetConstructionStandardsList();
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+        
+        
+        #region 根据id获取
+        /// <summary>
+        ///  根据id获取
+        /// </summary>
+        /// <returns></returns>
+        public Model.ResponeData getConstructionStandardsListById(string ConstructionStandardsId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = ConstructionStandardsService.GetConstructionStandardsListById(ConstructionStandardsId);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/WebAPI/Controllers/HSSE/ImageRecognitionController.cs b/SGGL/WebAPI/Controllers/HSSE/ImageRecognitionController.cs
new file mode 100644
index 0000000..ea36e6d
--- /dev/null
+++ b/SGGL/WebAPI/Controllers/HSSE/ImageRecognitionController.cs
@@ -0,0 +1,135 @@
+using System;
+using System.IO;
+using RestSharp; //依赖版本106.15.0 https://www.nuget.org/packages/RestSharp/106.15.0
+using Newtonsoft.Json; //https://www.nuget.org/packages/Newtonsoft.Json
+using System.Web.Http;
+using System.Collections.Generic;
+
+namespace WebAPI.Controllers.HSSE
+{
+    public class ImageRecognitionController : ApiController
+    {
+        const string API_KEY = "2pHOZ7ff76vYgYoIwQnTIB31";
+        const string SECRET_KEY = "8q4Oa8wLi6xorfYQgUlEBqM4OOHqFXL7";
+
+
+        [HttpPost]
+        public Model.ResponeData getImageContent([FromBody] ImageRequest imageRequest)
+        {
+            var responeData = new Model.ResponeData();
+            
+            try
+            {
+                var client = new RestClient($"https://aip.baidubce.com/rest/2.0/face/v3/detect?access_token={GetAccessToken()}");
+                client.Timeout = -1;
+                var request = new RestRequest(Method.POST);
+                request.AddHeader("Content-Type", "application/json");
+                string image = imageRequest.Image;
+                var body = $@"{{""image"":""{image}"",""image_type"":""BASE64"",""max_face_num"":30}}";
+                request.AddParameter("application/json", body, ParameterType.RequestBody);
+                IRestResponse response = client.Execute(request);
+                Console.WriteLine(response.Content);
+                string json = response.Content;
+                var responseData = JsonConvert.DeserializeObject<ResponseData>(json);
+                int errorCode = responseData.error_code;
+                if (errorCode != 0)
+                {
+                    responeData.message = responseData.error_msg;
+                }
+                else
+                {
+                    int faceNum = responseData.result.face_num;
+                    responeData.data = faceNum;
+                }
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+            }
+
+            return responeData;
+            
+        }
+
+        /**
+        * 获取文件base64编码
+        * @param path 文件路径
+        * @return base64编码信息，不带文件头
+        */
+        public string GetFileContentAsBase64(string path)
+        {
+            using (FileStream filestream = new FileStream(path, FileMode.Open))
+            {
+                byte[] arr = new byte[filestream.Length];
+                filestream.Read(arr, 0, (int)filestream.Length);
+                string base64 = Convert.ToBase64String(arr);
+                return base64;
+            }
+        }
+
+
+        /**
+        * 使用 AK，SK 生成鉴权签名（Access Token）
+        * @return 鉴权签名信息（Access Token）
+        */
+        public string GetAccessToken()
+        {
+            var client = new RestClient($"https://aip.baidubce.com/oauth/2.0/token");
+            client.Timeout = -1;
+            var request = new RestRequest(Method.POST);
+            request.AddParameter("grant_type", "client_credentials");
+            request.AddParameter("client_id", API_KEY);
+            request.AddParameter("client_secret", SECRET_KEY);
+            IRestResponse response = client.Execute(request);
+            Console.WriteLine(response.Content);
+            var result = JsonConvert.DeserializeObject<dynamic>(response.Content);
+            return result.access_token.ToString();
+        }
+        
+        public class ImageRequest
+        {
+            public string Image { get; set; }
+        }
+        
+        public class Location
+        {
+            public double left { get; set; }
+            public double top { get; set; }
+            public double width { get; set; }
+            public double height { get; set; }
+            public double rotation { get; set; }
+        }
+
+        public class Angle
+        {
+            public double yaw { get; set; }
+            public double pitch { get; set; }
+            public double roll { get; set; }
+        }
+
+        public class Face
+        {
+            public string face_token { get; set; }
+            public Location location { get; set; }
+            public double face_probability { get; set; }
+            public Angle angle { get; set; }
+        }
+
+        public class Result
+        {
+            public int face_num { get; set; }
+            public List<Face> face_list { get; set; }
+        }
+
+        public class ResponseData
+        {
+            public int error_code { get; set; }
+            public string error_msg { get; set; }
+            public long log_id { get; set; }
+            public long timestamp { get; set; }
+            public int cached { get; set; }
+            public Result result { get; set; }
+        }
+        
+    }
+}
\ No newline at end of file
diff --git a/SGGL/WebAPI/Controllers/HSSE/ProtectionStandardsController.cs b/SGGL/WebAPI/Controllers/HSSE/ProtectionStandardsController.cs
new file mode 100644
index 0000000..bbd251a
--- /dev/null
+++ b/SGGL/WebAPI/Controllers/HSSE/ProtectionStandardsController.cs
@@ -0,0 +1,54 @@
+using BLL;
+using System;
+using System.Linq;
+using System.Web.Http;
+namespace WebAPI.Controllers.HSSE
+{
+    public class ProtectionStandardsController : ApiController
+    {
+        #region 获取集合
+        /// <summary>
+        ///  获取集合
+        /// </summary>
+        /// <returns></returns>
+        public Model.ResponeData getProtectionStandardsList()
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = ProtectionStandardsService.GetProtectionStandardsList();
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+        
+        
+        #region 根据id获取
+        /// <summary>
+        ///  根据id获取
+        /// </summary>
+        /// <returns></returns>
+        public Model.ResponeData getProtectionStandardsListById(string ProtectionStandardsId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = ProtectionStandardsService.GetProtectionStandardsListById(ProtectionStandardsId);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/WebAPI/Controllers/HSSE/RectifyController.cs b/SGGL/WebAPI/Controllers/HSSE/RectifyController.cs
new file mode 100644
index 0000000..6455c80
--- /dev/null
+++ b/SGGL/WebAPI/Controllers/HSSE/RectifyController.cs
@@ -0,0 +1,53 @@
+using BLL;
+using System;
+using System.Linq;
+using System.Web.Http;
+
+namespace WebAPI.Controllers.HSSE
+{
+    public class RectifyController : ApiController
+    {
+        #region 获取集合
+        /// <summary>
+        ///  获取集合
+        /// </summary>
+        /// <returns></returns>
+        public Model.ResponeData getRectifyList(string RectifyName, int PageNumber, int PageSize)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var query = (from x in Funs.DB.Technique_RectifyItem
+                    join y in Funs.DB.Technique_Rectify
+                        on x.RectifyId equals y.RectifyId
+                    select new
+                    {
+                        y.RectifyId,
+                        y.RectifyName,
+                        x.HazardSourcePoint,
+                        x.RiskAnalysis,
+                        x.RiskPrevention
+                    }).ToList();
+                if (!string.IsNullOrEmpty(RectifyName))
+                {
+                    query = query.Where(x => x.RectifyName.Contains(RectifyName)).ToList();
+                }
+                
+                var paginatedQuery = query
+                    .Skip((PageNumber - 1) * PageSize)  
+                    .Take(PageSize)                     
+                    .ToList();  
+                
+                responeData.data = paginatedQuery;
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/WebAPI/Controllers/HSSE/SafetyResponsibilitiesController.cs b/SGGL/WebAPI/Controllers/HSSE/SafetyResponsibilitiesController.cs
new file mode 100644
index 0000000..edb25d8
--- /dev/null
+++ b/SGGL/WebAPI/Controllers/HSSE/SafetyResponsibilitiesController.cs
@@ -0,0 +1,55 @@
+using BLL;
+using System;
+using System.Linq;
+using System.Web.Http;
+
+namespace WebAPI.Controllers.HSSE
+{
+    public class SafetyResponsibilitiesController : ApiController
+    {
+        #region 获取集合
+        /// <summary>
+        ///  获取集合
+        /// </summary>
+        /// <returns></returns>
+        public Model.ResponeData getSafetyResponsibilitiesList()
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = SafetyResponsibilitiesService.GetSafetyResponsibilitiesList();
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+        
+        
+        #region 根据id获取
+        /// <summary>
+        ///  根据id获取
+        /// </summary>
+        /// <returns></returns>
+        public Model.ResponeData getSafetyResponsibilitiesListById(string SafetyResponsibilitiesId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = SafetyResponsibilitiesService.GetSafetyResponsibilitiesListById(SafetyResponsibilitiesId);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/WebAPI/Filter/TestPermissionAttribute.cs b/SGGL/WebAPI/Filter/TestPermissionAttribute.cs
index 4b80cef..86bd99e 100644
--- a/SGGL/WebAPI/Filter/TestPermissionAttribute.cs
+++ b/SGGL/WebAPI/Filter/TestPermissionAttribute.cs
@@ -168,6 +168,16 @@ namespace WebAPI.Filter
             "Environmental*SaveEnvironmentData",
             "Environmental*PushEnvironmentalCheckData",
             "Project*pushProject",
+            "ProtectionStandards*getProtectionStandardsList",
+            "ProtectionStandards*getProtectionStandardsListById",
+            "SafetyResponsibilities*getSafetyResponsibilitiesList",
+            "SafetyResponsibilities*getSafetyResponsibilitiesListById",
+            "ConstructionStandards*getConstructionStandardsList",
+            "ConstructionStandards*getConstructionStandardsListById",
+            "AwardStandards*getAwardStandardsList",
+            "AwardStandards*getAwardStandardsListById",
+            "Rectify*getRectifyList",
+            "ImageRecognition*getImageContent",
 
         };
 
diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj
index 56604eb..dcb217e 100644
--- a/SGGL/WebAPI/WebAPI.csproj
+++ b/SGGL/WebAPI/WebAPI.csproj
@@ -62,6 +62,9 @@
     <Reference Include="FineUIPro, Version=6.3.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a">
       <HintPath>..\FineUIPro\FineUIPro.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
@@ -71,8 +74,14 @@
       <HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -92,67 +101,47 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Abstractions" />
     <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.Helpers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Http.Cors, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Cors.5.2.7\lib\net45\System.Web.Http.Cors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http">
-    </Reference>
-    <Reference Include="System.Net.Http.WebRequest">
-    </Reference>
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
     <Reference Include="System.Web.Http.WebHost, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.4\lib\net45\System.Web.Http.WebHost.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Mvc, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
       <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.4\lib\net45\System.Web.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Optimization">
+    <Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
       <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.4\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
+    <Reference Include="System.Web.Routing" />
     <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
       <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
       <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
       <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Net.Http">
+    </Reference>
+    <Reference Include="System.Net.Http.WebRequest">
+    </Reference>
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="WebGrease">
-      <Private>True</Private>
-      <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
-    </Reference>
-    <Reference Include="Antlr3.Runtime">
-      <Private>True</Private>
-      <HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform">
-      <HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    <Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -172,10 +161,16 @@
     <Compile Include="Controllers\DoorProject\getController.cs" />
     <Compile Include="Controllers\HJGL\ElectrodeRecoveryController.cs" />
     <Compile Include="Controllers\HJGL\PersonEntranceController.cs" />
+    <Compile Include="Controllers\HSSE\AwardStandardsController.cs" />
+    <Compile Include="Controllers\HSSE\ConstructionStandardsController.cs" />
     <Compile Include="Controllers\HSSE\GeneralEquipmentQualityController.cs" />
     <Compile Include="Controllers\HSSE\GoodsManageController.cs" />
     <Compile Include="Controllers\HSSE\HazardRealTimeController.cs" />
+    <Compile Include="Controllers\HSSE\ImageRecognitionController.cs" />
     <Compile Include="Controllers\HSSE\MaterialController.cs" />
+    <Compile Include="Controllers\HSSE\ProtectionStandardsController.cs" />
+    <Compile Include="Controllers\HSSE\RectifyController.cs" />
+    <Compile Include="Controllers\HSSE\SafetyResponsibilitiesController.cs" />
     <Compile Include="Controllers\HSSE\TrainTestRecordController.cs" />
     <Compile Include="Controllers\Person\PersonCheckController.cs" />
     <Compile Include="Controllers\CQMS\CheckEquipmentController.cs" />

From 557c867b562cc4e7356d0d276f2a76fa3d58c1d3 Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Thu, 20 Feb 2025 17:55:00 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/HSSE/Technique/AwardStandardsService.cs           | 7 ++++++-
 SGGL/BLL/HSSE/Technique/ConstructionStandardsService.cs    | 6 +++++-
 SGGL/BLL/HSSE/Technique/ProtectionStandardsService.cs      | 6 +++++-
 SGGL/BLL/HSSE/Technique/SafetyResponsibilitiesService.cs   | 6 +++++-
 SGGL/WebAPI/Controllers/HSSE/AwardStandardsController.cs   | 4 ++--
 .../Controllers/HSSE/ConstructionStandardsController.cs    | 4 ++--
 .../Controllers/HSSE/ProtectionStandardsController.cs      | 4 ++--
 .../Controllers/HSSE/SafetyResponsibilitiesController.cs   | 4 ++--
 8 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/SGGL/BLL/HSSE/Technique/AwardStandardsService.cs b/SGGL/BLL/HSSE/Technique/AwardStandardsService.cs
index 3441ce2..fc19e82 100644
--- a/SGGL/BLL/HSSE/Technique/AwardStandardsService.cs
+++ b/SGGL/BLL/HSSE/Technique/AwardStandardsService.cs
@@ -24,7 +24,7 @@ public class AwardStandardsService
     /// </summary>
     /// <param name="AwardStandardsId"></param>
     /// <returns></returns>
-    public static List<AwardStandardsItem> GetAwardStandardsList()
+    public static List<AwardStandardsItem> GetAwardStandardsList(int PageNumber, int PageSize)
     {
         List<AwardStandardsItem> getDataLists = (from x in Funs.DB.Technique_AwardStandards
             select new AwardStandardsItem
@@ -39,6 +39,11 @@ public class AwardStandardsService
                 UpState = x.UpState,
                 Remark = x.Remark
             }).ToList();
+        if (PageNumber > 0 && PageSize > 0)
+        {
+            getDataLists = getDataLists.Skip((PageNumber - 1) * PageSize).Take(PageSize).ToList();
+        }
+        
         return getDataLists;
     }
 
diff --git a/SGGL/BLL/HSSE/Technique/ConstructionStandardsService.cs b/SGGL/BLL/HSSE/Technique/ConstructionStandardsService.cs
index 5cdf7da..001c5b3 100644
--- a/SGGL/BLL/HSSE/Technique/ConstructionStandardsService.cs
+++ b/SGGL/BLL/HSSE/Technique/ConstructionStandardsService.cs
@@ -24,7 +24,7 @@ public class ConstructionStandardsService
     /// </summary>
     /// <param name="ConstructionStandardsId"></param>
     /// <returns></returns>
-    public static List<ConstructionStandardsItem> GetConstructionStandardsList()
+    public static List<ConstructionStandardsItem> GetConstructionStandardsList(int PageNumber, int PageSize)
     {
         List<ConstructionStandardsItem> getDataLists = (from x in Funs.DB.Technique_ConstructionStandards
             select new ConstructionStandardsItem
@@ -39,6 +39,10 @@ public class ConstructionStandardsService
                 UpState = x.UpState,
                 Remark = x.Remark
             }).ToList();
+        if (PageNumber > 0 && PageSize > 0)
+        {
+            getDataLists = getDataLists.Skip((PageNumber - 1) * PageSize).Take(PageSize).ToList();
+        }
         return getDataLists;
     }
     
diff --git a/SGGL/BLL/HSSE/Technique/ProtectionStandardsService.cs b/SGGL/BLL/HSSE/Technique/ProtectionStandardsService.cs
index d9a1479..6c48948 100644
--- a/SGGL/BLL/HSSE/Technique/ProtectionStandardsService.cs
+++ b/SGGL/BLL/HSSE/Technique/ProtectionStandardsService.cs
@@ -26,7 +26,7 @@ public class ProtectionStandardsService
     /// </summary>
     /// <param name="ProtectionStandardsId"></param>
     /// <returns></returns>
-    public static List<ProtectionStandardsItem> GetProtectionStandardsList()
+    public static List<ProtectionStandardsItem> GetProtectionStandardsList(int PageNumber, int PageSize)
     {
         List<ProtectionStandardsItem> getDataLists = (from x in Funs.DB.Technique_ProtectionStandards
             select new ProtectionStandardsItem
@@ -41,6 +41,10 @@ public class ProtectionStandardsService
                 UpState = x.UpState,
                 Remark = x.Remark
             }).ToList();
+        if (PageNumber > 0 && PageSize > 0)
+        {
+            getDataLists = getDataLists.Skip((PageNumber - 1) * PageSize).Take(PageSize).ToList();
+        }
         return getDataLists;
     }
 
diff --git a/SGGL/BLL/HSSE/Technique/SafetyResponsibilitiesService.cs b/SGGL/BLL/HSSE/Technique/SafetyResponsibilitiesService.cs
index e7c33f8..5fb65b5 100644
--- a/SGGL/BLL/HSSE/Technique/SafetyResponsibilitiesService.cs
+++ b/SGGL/BLL/HSSE/Technique/SafetyResponsibilitiesService.cs
@@ -24,7 +24,7 @@ public class SafetyResponsibilitiesService
     /// </summary>
     /// <param name="SafetyResponsibilitiesId"></param>
     /// <returns></returns>
-    public static List<SafetyResponsibilitiesItem> GetSafetyResponsibilitiesList()
+    public static List<SafetyResponsibilitiesItem> GetSafetyResponsibilitiesList(int PageNumber, int PageSize)
     {
         List<SafetyResponsibilitiesItem> getDataLists = (from x in Funs.DB.Technique_SafetyResponsibilities
             select new SafetyResponsibilitiesItem
@@ -39,6 +39,10 @@ public class SafetyResponsibilitiesService
                 UpState = x.UpState,
                 Remark = x.Remark
             }).ToList();
+        if (PageNumber > 0 && PageSize > 0)
+        {
+            getDataLists = getDataLists.Skip((PageNumber - 1) * PageSize).Take(PageSize).ToList();
+        }
         return getDataLists;
     }
 
diff --git a/SGGL/WebAPI/Controllers/HSSE/AwardStandardsController.cs b/SGGL/WebAPI/Controllers/HSSE/AwardStandardsController.cs
index 93c0408..d72e85b 100644
--- a/SGGL/WebAPI/Controllers/HSSE/AwardStandardsController.cs
+++ b/SGGL/WebAPI/Controllers/HSSE/AwardStandardsController.cs
@@ -12,12 +12,12 @@ namespace WebAPI.Controllers.HSSE
         ///  获取集合
         /// </summary>
         /// <returns></returns>
-        public Model.ResponeData getAwardStandardsList()
+        public Model.ResponeData getAwardStandardsList(int PageNumber, int PageSize)
         {
             var responeData = new Model.ResponeData();
             try
             {
-                responeData.data = AwardStandardsService.GetAwardStandardsList();
+                responeData.data = AwardStandardsService.GetAwardStandardsList(PageNumber,PageSize);
             }
             catch (Exception ex)
             {
diff --git a/SGGL/WebAPI/Controllers/HSSE/ConstructionStandardsController.cs b/SGGL/WebAPI/Controllers/HSSE/ConstructionStandardsController.cs
index 8db5021..df49c1b 100644
--- a/SGGL/WebAPI/Controllers/HSSE/ConstructionStandardsController.cs
+++ b/SGGL/WebAPI/Controllers/HSSE/ConstructionStandardsController.cs
@@ -12,12 +12,12 @@ namespace WebAPI.Controllers.HSSE
         ///  获取集合
         /// </summary>
         /// <returns></returns>
-        public Model.ResponeData getConstructionStandardsList()
+        public Model.ResponeData getConstructionStandardsList(int PageNumber, int PageSize)
         {
             var responeData = new Model.ResponeData();
             try
             {
-                responeData.data = ConstructionStandardsService.GetConstructionStandardsList();
+                responeData.data = ConstructionStandardsService.GetConstructionStandardsList(PageNumber, PageSize);
             }
             catch (Exception ex)
             {
diff --git a/SGGL/WebAPI/Controllers/HSSE/ProtectionStandardsController.cs b/SGGL/WebAPI/Controllers/HSSE/ProtectionStandardsController.cs
index bbd251a..3b6029e 100644
--- a/SGGL/WebAPI/Controllers/HSSE/ProtectionStandardsController.cs
+++ b/SGGL/WebAPI/Controllers/HSSE/ProtectionStandardsController.cs
@@ -11,12 +11,12 @@ namespace WebAPI.Controllers.HSSE
         ///  获取集合
         /// </summary>
         /// <returns></returns>
-        public Model.ResponeData getProtectionStandardsList()
+        public Model.ResponeData getProtectionStandardsList(int PageNumber, int PageSize)
         {
             var responeData = new Model.ResponeData();
             try
             {
-                responeData.data = ProtectionStandardsService.GetProtectionStandardsList();
+                responeData.data = ProtectionStandardsService.GetProtectionStandardsList(PageNumber, PageSize);
             }
             catch (Exception ex)
             {
diff --git a/SGGL/WebAPI/Controllers/HSSE/SafetyResponsibilitiesController.cs b/SGGL/WebAPI/Controllers/HSSE/SafetyResponsibilitiesController.cs
index edb25d8..3154c8b 100644
--- a/SGGL/WebAPI/Controllers/HSSE/SafetyResponsibilitiesController.cs
+++ b/SGGL/WebAPI/Controllers/HSSE/SafetyResponsibilitiesController.cs
@@ -12,12 +12,12 @@ namespace WebAPI.Controllers.HSSE
         ///  获取集合
         /// </summary>
         /// <returns></returns>
-        public Model.ResponeData getSafetyResponsibilitiesList()
+        public Model.ResponeData getSafetyResponsibilitiesList(int PageNumber, int PageSize)
         {
             var responeData = new Model.ResponeData();
             try
             {
-                responeData.data = SafetyResponsibilitiesService.GetSafetyResponsibilitiesList();
+                responeData.data = SafetyResponsibilitiesService.GetSafetyResponsibilitiesList(PageNumber, PageSize);
             }
             catch (Exception ex)
             {