From 1836f816cfaeedbc36cf0af2ef63f8b3f5835125 Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Sat, 10 Jun 2023 10:55:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=81=E4=B8=9A=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/DataShow/Accident.aspx           |  6 +++---
 SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs        |  3 ++-
 SGGL/FineUIPro.Web/DataShow/Check.aspx              |  2 +-
 SGGL/FineUIPro.Web/DataShow/Check.aspx.cs           |  1 +
 SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx      |  2 +-
 SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs   |  3 ++-
 .../DataShow/ConstructionEquipment.aspx             |  4 ++--
 .../DataShow/ConstructionEquipment.aspx.cs          |  1 +
 SGGL/FineUIPro.Web/DataShow/EduTrain.aspx           |  2 +-
 SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs        |  1 +
 SGGL/FineUIPro.Web/DataShow/Emergency.aspx          |  2 +-
 SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs       |  1 +
 SGGL/FineUIPro.Web/DataShow/Environmental.aspx      |  6 +++---
 SGGL/FineUIPro.Web/DataShow/Environmental.aspx.cs   |  9 +++++----
 SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx         |  2 +-
 SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs      |  1 +
 SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx         |  2 +-
 SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs      |  1 +
 SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx        |  2 +-
 SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs     |  1 +
 SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx    |  2 +-
 SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.cs |  1 +
 .../FineUIPro.Web/DataShow/HiddenRectification.aspx |  2 +-
 .../DataShow/HiddenRectification.aspx.cs            |  1 +
 .../DataShow/HiddenRectificationItem.aspx           |  2 +-
 .../DataShow/HiddenRectificationItem.aspx.cs        |  1 +
 SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx   |  2 +-
 .../FineUIPro.Web/DataShow/LargeEngineering.aspx.cs |  1 +
 .../DataShow/LargeEngineeringItem.aspx              |  2 +-
 .../DataShow/LargeEngineeringItem.aspx.cs           |  1 +
 SGGL/FineUIPro.Web/DataShow/License.aspx            |  2 +-
 SGGL/FineUIPro.Web/DataShow/License.aspx.cs         |  1 +
 SGGL/FineUIPro.Web/DataShow/Meeting.aspx            |  4 ++--
 SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs         |  1 +
 SGGL/FineUIPro.Web/DataShow/Project.aspx            |  2 +-
 SGGL/FineUIPro.Web/DataShow/Project.aspx.cs         |  1 +
 SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx    |  2 +-
 SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs |  1 +
 SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx      |  2 +-
 SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs   |  1 +
 .../DataShow/QualityAcceptance.aspx.cs              |  4 ++--
 .../FineUIPro.Web/DataShow/QualityControlPoint.aspx |  2 +-
 .../DataShow/QualityControlPoint.aspx.cs            |  1 +
 SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx |  2 +-
 .../DataShow/QualityInstruments.aspx.cs             |  1 +
 .../DataShow/QualityInstrumentsItem.aspx            |  2 +-
 .../DataShow/QualityInstrumentsItem.aspx.cs         |  1 +
 SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx      |  2 +-
 SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs   |  3 ++-
 SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx     |  2 +-
 SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs  |  1 +
 SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx |  2 +-
 .../DataShow/QualityProblemItem.aspx.cs             |  1 +
 SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx    |  2 +-
 SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs |  1 +
 .../DataShow/QualityTrainingItem1.aspx              |  2 +-
 .../DataShow/QualityTrainingItem1.aspx.cs           |  1 +
 .../DataShow/QualityTrainingItem2.aspx              |  2 +-
 .../DataShow/QualityTrainingItem2.aspx.cs           |  1 +
 SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx       |  2 +-
 SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs    |  1 +
 SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx       |  4 ++--
 SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs    |  1 +
 SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx   |  2 +-
 .../FineUIPro.Web/DataShow/SecurityRiskItem.aspx.cs |  3 ++-
 SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx       |  2 +-
 SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs    | 13 +++++++------
 SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx   |  2 +-
 .../FineUIPro.Web/DataShow/WorkingHoursItem.aspx.cs |  1 +
 69 files changed, 91 insertions(+), 57 deletions(-)

diff --git a/SGGL/FineUIPro.Web/DataShow/Accident.aspx b/SGGL/FineUIPro.Web/DataShow/Accident.aspx
index ae1532fc..b0d1a4d5 100644
--- a/SGGL/FineUIPro.Web/DataShow/Accident.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/Accident.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全事故" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"
@@ -66,8 +66,8 @@
                             SortField="UnitName" FieldType="String" HeaderText="责任单位" HeaderTextAlign="Center"
                             TextAlign="Left">
                         </f:RenderField>
-                         <f:RenderField Width="100px" ColumnID="IdentityCard" DataField="IdentityCard"
-                            SortField="IdentityCard" FieldType="String" HeaderText="人数" HeaderTextAlign="Center"
+                         <f:RenderField Width="100px" ColumnID="PeopleNum" DataField="PeopleNum"
+                            SortField="PeopleNum" FieldType="String" HeaderText="人数" HeaderTextAlign="Center"
                             TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="200px" ColumnID="Info" DataField="Info"
diff --git a/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
index 3278df13..79c38559 100644
--- a/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
@@ -27,6 +27,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "事故事件数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
@@ -60,7 +61,7 @@ namespace FineUIPro.Web.DataShow
             {
                 strSql = @"SELECT Record.AccidentReportId AS ID,Record.ProjectId,Project.ProjectCode,Project.ProjectName,
                                 Record.AccidentTypeId,ConstText AS AccidentTypeName,Record.AccidentDate
-                                ,Unit.UnitId,Unit.UnitName,Record.States, 1 AS PeopleNum
+                                ,Unit.UnitId,Unit.UnitName,Record.States, Record.PeopleNum
                                 , Record.Abstract AS Info
                                 FROM Accident_AccidentReport AS Record
                                  LEFT JOIN Sys_Const AS AccidentType ON AccidentType.ConstValue = Record.AccidentTypeId AND GroupId='AccidentReportRegistration'
diff --git a/SGGL/FineUIPro.Web/DataShow/Check.aspx b/SGGL/FineUIPro.Web/DataShow/Check.aspx
index 9a68b38d..60ec2cd0 100644
--- a/SGGL/FineUIPro.Web/DataShow/Check.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/Check.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全监督检查" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
index 0114067e..89228f57 100644
--- a/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
@@ -28,6 +28,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "安全监督检查数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx
index 1e738c86..41853985 100644
--- a/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="企业总部人员" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="CompanyBranchPersonId" DataIDField="CompanyBranchPersonId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
index 89fd70c3..62a279c8 100644
--- a/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
@@ -21,8 +21,9 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                // 绑定表格t
+                // 绑定表格
                 BindGrid();
+                this.Panel1.Title = "企业总部/分支机构安全人员（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx
index ad869f82..adebe498 100644
--- a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="施工机具" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"
@@ -62,7 +62,7 @@
                                FieldType="String" HeaderText="单位" HeaderTextAlign="Center"
                             TextAlign="Left">
                         </f:RenderField>
-                           <f:RenderField Width="150px" ColumnID="EquipmentName" DataField="EquipmentName" 
+                           <f:RenderField Width="150px" ColumnID="SpecialEquipmentName" DataField="SpecialEquipmentName" 
                                FieldType="String" HeaderText="设备" HeaderTextAlign="Center"
                             TextAlign="Left">
                         </f:RenderField>
diff --git a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs
index 4895b81f..579caa73 100644
--- a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs
@@ -26,6 +26,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "施工机具设备（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx
index f2e3f055..70b9c3a5 100644
--- a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="教育培训" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="TrainingId" DataIDField="TrainingId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
index 065d83b0..53311175 100644
--- a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
@@ -23,6 +23,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "安全教育（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/Emergency.aspx b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx
index 61b6967a..bdaa7d11 100644
--- a/SGGL/FineUIPro.Web/DataShow/Emergency.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="750px" ShowBorder="true"
                     TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server"
diff --git a/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs
index 262fd200..c2cb4d0f 100644
--- a/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs
@@ -27,6 +27,7 @@ namespace FineUIPro.Web.DataShow
                 // 绑定表格t
                 BindGrid();
                 BindGrid2();
+                this.Panel1.Title = "应急管理数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
         #endregion
diff --git a/SGGL/FineUIPro.Web/DataShow/Environmental.aspx b/SGGL/FineUIPro.Web/DataShow/Environmental.aspx
index 54f5ac7a..0e23bead 100644
--- a/SGGL/FineUIPro.Web/DataShow/Environmental.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/Environmental.aspx
@@ -12,7 +12,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="环保数据" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"
@@ -64,8 +64,8 @@
                         <f:RenderField Width="150px" ColumnID="IncomeComprehensiveEnergyConsumption" DataField="IncomeComprehensiveEnergyConsumption"
                             FieldType="Double" HeaderText="万元营业收入综合能耗(吨标准煤/万元)" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="TotalEnergyConsumption" DataField="TotalEnergyConsumption"
-                            FieldType="Double" HeaderText="用新水量(万吨)" HeaderTextAlign="Center" TextAlign="Left">
+                        <f:RenderField Width="150px" ColumnID="CO2" DataField="CO2"
+                            FieldType="Double" HeaderText="二氧化碳(万吨)" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                          <f:RenderField Width="100px" ColumnID="FillingDate" DataField="FillingDate"
                             FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM" HeaderText="填报日期"
diff --git a/SGGL/FineUIPro.Web/DataShow/Environmental.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Environmental.aspx.cs
index 25bf4e16..68a01c86 100644
--- a/SGGL/FineUIPro.Web/DataShow/Environmental.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/Environmental.aspx.cs
@@ -24,6 +24,7 @@ namespace FineUIPro.Web.DataShow
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "环保数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
@@ -40,8 +41,8 @@ namespace FineUIPro.Web.DataShow
                 ,(SELECT ThisYearValue FROM Environmental_ChemicalReportItem WHERE SortIndex='01' 
 	                AND ChemicalReportId=Report.ChemicalReportId) AS TotalEnergyConsumption 
                 ,0 AS IncomeComprehensiveEnergyConsumption
-                ,(SELECT ThisYearValue FROM Environmental_ChemicalReportItem WHERE SortIndex='25' 
-	                AND ChemicalReportId=Report.ChemicalReportId) AS TotalEnergyConsumption 
+                ,(SELECT ThisYearValue FROM Environmental_ChemicalReportItem WHERE SortIndex='70' 
+	                AND ChemicalReportId=Report.ChemicalReportId) AS CO2 
                 FROM Environmental_ChemicalReport AS Report";
             }
             else
@@ -51,8 +52,8 @@ namespace FineUIPro.Web.DataShow
 	                AND ArchitectureReportId=Report.ArchitectureReportId) AS TotalEnergyConsumption 
                 ,(SELECT ThisYearValue FROM Environmental_ArchitectureReportItem WHERE SortIndex='15' 
 	                AND ArchitectureReportId=Report.ArchitectureReportId)  AS IncomeComprehensiveEnergyConsumption
-                ,(SELECT ThisYearValue FROM Environmental_ArchitectureReportItem WHERE SortIndex='24' 
-	                AND ArchitectureReportId=Report.ArchitectureReportId) AS TotalEnergyConsumption 
+                ,(SELECT ThisYearValue FROM Environmental_ArchitectureReportItem WHERE SortIndex='38' 
+	                AND ArchitectureReportId=Report.ArchitectureReportId) AS CO2 
                 FROM Environmental_ArchitectureReport AS Report
                 WHERE 1=1 ";
             }
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx
index bcfa4311..c688b99f 100644
--- a/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="缺陷分析" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs
index 91e9cd40..3dc5de4b 100644
--- a/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "焊接缺陷数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
         #endregion
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx
index a5a4c52e..6a20de24 100644
--- a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊工" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="WED_ID" DataIDField="WED_ID" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs
index 9056aff7..04f75d5e 100644
--- a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs
@@ -24,6 +24,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "焊工数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx
index 5fd5207f..130abdcf 100644
--- a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接数据" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
index c8e610a6..2c8fffb2 100644
--- a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "焊接数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx b/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx
index 47dd5a13..6cc99158 100644
--- a/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接数据" EnableCollapse="true" 
                     runat="server" BoxFlex="1" DataKeyNames="JOT_ID" DataIDField="JOT_ID" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.cs
index ce4c8754..1eab1a3f 100644
--- a/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.cs
@@ -27,6 +27,7 @@ namespace FineUIPro.Web.DataShow
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 BindGrid();
+                this.Panel1.Title = "焊接数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx
index a1ecc9b5..7709b046 100644
--- a/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="隐患排查" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
index 42bc6869..7204a978 100644
--- a/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "隐患排查治理数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx b/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx
index e76686f5..04f633e1 100644
--- a/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="隐患排查" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="HazardRegisterId" DataIDField="HazardRegisterId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs
index 95f7dd72..98ccf094 100644
--- a/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs
@@ -55,6 +55,7 @@ namespace FineUIPro.Web.DataShow
 
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "隐患排查治理数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx
index 9f1df1d1..852d10e2 100644
--- a/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="危大工程" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs
index fa4c4f63..8de1230b 100644
--- a/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs
@@ -33,6 +33,7 @@ namespace FineUIPro.Web.DataShow
                                select x).ToList();
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "危大工程数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx b/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx
index 9b6187cd..c23f013d 100644
--- a/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="危大工程" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="HazardId" DataIDField="HazardId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx.cs
index 463a6b9a..ebce4a3f 100644
--- a/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx.cs
@@ -31,6 +31,7 @@ namespace FineUIPro.Web.DataShow
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "危大工程数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/License.aspx b/SGGL/FineUIPro.Web/DataShow/License.aspx
index 10a43a58..03520b1e 100644
--- a/SGGL/FineUIPro.Web/DataShow/License.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/License.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="施工机具" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="LicenseManagerId" DataIDField="LicenseManagerId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/License.aspx.cs b/SGGL/FineUIPro.Web/DataShow/License.aspx.cs
index 53daa911..efefd5f8 100644
--- a/SGGL/FineUIPro.Web/DataShow/License.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/License.aspx.cs
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "作业许可（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/Meeting.aspx b/SGGL/FineUIPro.Web/DataShow/Meeting.aspx
index ab5e01a3..87d091a0 100644
--- a/SGGL/FineUIPro.Web/DataShow/Meeting.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/Meeting.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="会议" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"
@@ -61,7 +61,7 @@
                         <f:RenderField Width="150px" ColumnID="MeetingName" DataField="MeetingName" FieldType="String"
                             HeaderText="标题" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="MeetingDate" DataField="MeetingDate" FieldType="String"
+                          <f:RenderField Width="150px" ColumnID="MeetingDate" DataField="MeetingDate" FieldType="Date" Renderer="Date"
                             HeaderText="日期" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
                           <f:RenderField Width="100px" ColumnID="HostMan" DataField="HostMan" FieldType="String"
diff --git a/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs
index ef10572d..51b88a62 100644
--- a/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs
@@ -28,6 +28,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "安全会议（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/Project.aspx b/SGGL/FineUIPro.Web/DataShow/Project.aspx
index 9d9bafcd..8013df32 100644
--- a/SGGL/FineUIPro.Web/DataShow/Project.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/Project.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs
index 80554519..9c39ca65 100644
--- a/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs
@@ -23,6 +23,7 @@ namespace FineUIPro.Web.DataShow
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "项目信息（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx b/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx
index eda71a1a..c2370ebe 100644
--- a/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工程划分" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs
index 7fc1e75f..efe47ecf 100644
--- a/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "工程划分数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
         #endregion
diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx
index 3043435d..0a523a85 100644
--- a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目人员" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="PersonId" DataIDField="PersonId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs
index 573dd821..16e56230 100644
--- a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs
@@ -24,6 +24,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "项目现场人员（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs
index 75d68fcd..61130c61 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs
@@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
-                this.Panel1.Title = "质量验收数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CD) + "）";
+                this.Panel1.Title = "质量验收数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
         #endregion
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0)";
             List<SqlParameter> listStr = new List<SqlParameter>();
             string cpara = string.Empty;
             if (this.drpProject.SelectedValue != Const._Null)
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx b/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx
index 4c7f65b7..59875c1f 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量控制点" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs
index d88e21cc..ac0f76e5 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "质量控制点数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
         #endregion
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx b/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx
index 46c5e71d..e40542b6 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="计量器具" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs
index 612b9602..35227a8e 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "计量器具数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx b/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx
index f87ebe4a..035ae039 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="计量器具" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="InspectionMachineId" DataIDField="InspectionMachineId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx.cs
index 4a4bd54e..9e97d806 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx.cs
@@ -27,6 +27,7 @@ namespace FineUIPro.Web.DataShow
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 BindGrid();
+                this.Panel1.Title = "计量器具数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx
index f65375f3..e41b526b 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量人员" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
index 41817452..5ef61917 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
@@ -24,6 +24,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "质量管理人员数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
@@ -56,7 +57,7 @@ namespace FineUIPro.Web.DataShow
             }
             else
             {
-                strSql = @"SELECT Person.PersonId AS ID,Unit.UnitName,Project.ProjectName,Person.PersonName,case Person.Sex when '1' then '男' else '女' end as SexStr,Person.IdentityCard,WorkPost.WorkPostName,Person.Telephone,Person.Remark 
+                strSql = @"SELECT Person.PersonId AS ID,Unit.UnitName,Project.ProjectName,Person.PersonName,case Person.Sex when '1' then '男' when '2' then '女' else '男' end as SexStr,Person.IdentityCard,WorkPost.WorkPostName,Person.Telephone,Person.Remark 
                  FROM SitePerson_Person AS Person 
                 LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId 
                 LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId 
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx b/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx
index 03ef5aa7..bad0f3fc 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量问题" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs
index d0e9f3ba..e358b11d 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "质量问题治理数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx b/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx
index 194ea691..614e6d6c 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量问题" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="CheckControlCode" DataIDField="CheckControlCode" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx.cs
index 4c5c3773..e8150738 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx.cs
@@ -31,6 +31,7 @@ namespace FineUIPro.Web.DataShow
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "质量问题治理数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx b/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx
index 69161753..3e3a4487 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量培训" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs
index 31331a99..4dd5927a 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "质量培训数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx
index 8802be55..069e643e 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量培训" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="InspectionPersonId" DataIDField="InspectionPersonId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx.cs
index c3a38788..8c39359f 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx.cs
@@ -27,6 +27,7 @@ namespace FineUIPro.Web.DataShow
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 BindGrid();
+                this.Panel1.Title = "人员报验数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx
index 4af1b43b..38caca38 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量培训" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="DesignDetailsId" DataIDField="DesignDetailsId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx.cs
index c79981bc..d3804e28 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx.cs
@@ -27,6 +27,7 @@ namespace FineUIPro.Web.DataShow
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 BindGrid();
+                this.Panel1.Title = "设计交底数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx b/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx
index 1c9f63d1..a2a29f6e 100644
--- a/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全费用" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="CostSmallDetailId" DataIDField="CostSmallDetailId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs b/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs
index d1dfc6e8..6f206c27 100644
--- a/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "安全费用（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx
index 135eb840..263a3878 100644
--- a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全风险" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
@@ -68,7 +68,7 @@
                                 <asp:Label ID="Label4" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                         <f:TemplateField ColumnID="Count3" Width="120px" HeaderText="重大风险" HeaderTextAlign="Center" TextAlign="Right">
+                         <f:TemplateField ColumnID="Count4" Width="120px" HeaderText="重大风险" HeaderTextAlign="Center" TextAlign="Right">
                             <ItemTemplate>
                                 <asp:Label ID="Label5" runat="server" Text='<%# Count4(Eval("ProjectId")) %>'></asp:Label>
                             </ItemTemplate>
diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
index c3d996eb..bd8da050 100644
--- a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "安全风险数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
         #endregion
diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx b/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx
index 719a7784..4988a343 100644
--- a/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全工时" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="HazardSelectedItemId" DataIDField="HazardSelectedItemId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.cs
index 8831ee44..3ca9ecac 100644
--- a/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.cs
@@ -33,6 +33,7 @@ namespace FineUIPro.Web.DataShow
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 BindGrid();
+                this.Panel1.Title = "安全风险数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
@@ -43,7 +44,7 @@ namespace FineUIPro.Web.DataShow
         {
             string strSql = @"select Item.HazardSelectedItemId,Item.HazardListId,List.IdentificationDate,List.WorkAreaName,Item.WorkStage,Item.HazardListTypeId
                     , Item.HazardListTypeId,Item.HazardId,Item.HazardItems,Item.DefectsType,Item.MayLeadAccidents
-                    ,Item.HelperMethod,Item.HazardJudge_L,Item.HazardJudge_E,Item.HazardJudge_C,Item.HazardJudge_E
+                    ,Item.HelperMethod,Item.HazardJudge_L,Item.HazardJudge_E,Item.HazardJudge_C,HazardJudge_D,Item.HazardJudge_E
                     ,level.RiskLevelName,Item.ControlMeasures
                     from Hazard_HazardSelectedItem AS Item
                     LEFT JOIN Hazard_HazardList AS List on List.HazardListId = Item.HazardListId
diff --git a/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx b/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx
index e65b871a..15b9bc4f 100644
--- a/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全工时" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs b/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs
index b12448b7..fbf85d84 100644
--- a/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
+                this.Panel1.Title = "工时数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }
 
@@ -170,7 +171,7 @@ namespace FineUIPro.Web.DataShow
                 var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
                 var getD1 = from x in Funs.DB.SitePerson_DayReport
                             join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
-                            where y.ProjectState == Const.ProjectState_1
+                            where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
                             select x; 
                 if (datetime1.HasValue)
                 {
@@ -206,11 +207,11 @@ namespace FineUIPro.Web.DataShow
                 var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
                 var getD1 = from x in Funs.DB.Accident_AccidentHandle
                             join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
-                            where y.ProjectState == Const.ProjectState_1
+                            where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
                             select x; 
                 var getD2 = from x in Funs.DB.Accident_AccidentReport
                             join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
-                            where y.ProjectState == Const.ProjectState_1
+                            where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
                             select x;
                 if (datetime1.HasValue)
                 {
@@ -248,16 +249,16 @@ namespace FineUIPro.Web.DataShow
                 var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
                 var getC1 = from x in Funs.DB.SitePerson_DayReport
                             join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
-                            where y.ProjectState == Const.ProjectState_1
+                            where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
                             select x;
 
                 var getD1 = from x in Funs.DB.Accident_AccidentHandle
                             join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
-                            where y.ProjectState == Const.ProjectState_1
+                            where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
                             select x;
                 var getD2 = from x in Funs.DB.Accident_AccidentReport
                             join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
-                            where y.ProjectState == Const.ProjectState_1
+                            where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
                             select x;
 
                 if (datetime1.HasValue)
diff --git a/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx b/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx
index 54435244..635a6fd0 100644
--- a/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx
@@ -13,7 +13,7 @@
     <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">
+            ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全工时" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="DayReportId" DataIDField="DayReportId" AllowSorting="true"
diff --git a/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx.cs
index 22fdd1bb..ee757905 100644
--- a/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx.cs
@@ -27,6 +27,7 @@ namespace FineUIPro.Web.DataShow
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 BindGrid();
+                this.Panel1.Title = "工时数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + "）";
             }
         }