From 8514fb0156a17709b8c0a04b9e9703d967384c0f Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Wed, 9 Apr 2025 14:29:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=85=AC=E5=8F=B8=E7=BA=A7?=
 =?UTF-8?q?=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HSSE/EduTrain/TaskNotice.aspx             | 173 +++++++-------
 .../HSSE/EduTrain/TaskNotice.aspx.designer.cs |   9 -
 .../HSSE/Material/MaterialList.aspx           | 190 ++++++++-------
 .../HSSE/Material/MaterialList.aspx.cs        |  37 ++-
 .../Material/MaterialList.aspx.designer.cs    |  40 +++-
 .../HSSE/QualityAudit/PersonQuality.aspx      | 219 +++++++++---------
 .../PersonQuality.aspx.designer.cs            |   9 -
 .../HSSE/SitePerson/DayReport.aspx            | 193 ++++++++-------
 .../SitePerson/DayReport.aspx.designer.cs     |   9 -
 .../HSSE/SitePerson/PersonStatistic.aspx      | 136 ++++++-----
 .../PersonStatistic.aspx.designer.cs          |   9 -
 .../ProjectWorkPersonStatistic.aspx           | 123 +++++-----
 ...rojectWorkPersonStatistic.aspx.designer.cs |   9 -
 .../HSSE/SitePerson/WorkPostStatistic.aspx    | 125 +++++-----
 .../WorkPostStatistic.aspx.designer.cs        |   9 -
 15 files changed, 643 insertions(+), 647 deletions(-)

diff --git a/SUBQHSE/FineUIPro.Web/HSSE/EduTrain/TaskNotice.aspx b/SUBQHSE/FineUIPro.Web/HSSE/EduTrain/TaskNotice.aspx
index 8386a6c..6964a63 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/EduTrain/TaskNotice.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/EduTrain/TaskNotice.aspx
@@ -27,96 +27,91 @@
                 <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
                     Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
                     <Items>
-                        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" MinHeight="700px"
-                            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-                            <Items>
-                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="培训记录" EnableCollapse="true"
-                                    runat="server" BoxFlex="1" DataKeyNames="TaskNoticeId" EnableColumnLines="true" DataIDField="TaskNoticeId" AllowSorting="true"
-                                    SortField="TrainStartDate" 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="drpTrainType" runat="server" Label="培训类别" Width="210px" LabelWidth="80px" LabelAlign="Right"
-                                                    AutoPostBack="true" OnSelectedIndexChanged="Text_TextChanged">
-                                                </f:DropDownList>
-                                                <%--  <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="Text_TextChanged"
-                                    LabelAlign="Right" LabelWidth="50px" Width="260px">
-                                </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>
-                                            </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:RenderField Width="150px" ColumnID="TrainTitle" DataField="TrainTitle" SortField="TrainTitle"
-                                            FieldType="String" HeaderText="标题" HeaderTextAlign="Center" TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="110px" ColumnID="TrainTypeName" DataField="TrainTypeName" SortField="TrainTypeName"
-                                            FieldType="String" HeaderText="培训类型" HeaderTextAlign="Center" TextAlign="Left">
-                                        </f:RenderField>
-
-                                        <f:RenderField Width="65px" ColumnID="TeachHour" DataField="TeachHour" SortField="TeachHour"
-                                            FieldType="Float" HeaderText="学时" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="65px" ColumnID="DayOfWeek" DataField="DayOfWeek" SortField="DayOfWeek"
-                                            FieldType="Float" HeaderText="周几" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="65px" ColumnID="WeekOfMonth" DataField="WeekOfMonth" SortField="WeekOfMonth"
-                                            FieldType="Float" HeaderText="每月第几周" HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:TemplateField ColumnID="tfTeachMan" Width="65px" HeaderText="授课人" HeaderTextAlign="Center"
-                                            TextAlign="left">
-                                            <ItemTemplate>
-                                                <asp:Label ID="lblTeachMan" runat="server" Text='<%# ConvertUserName(Eval("TeachMan")) %>'></asp:Label>
-                                            </ItemTemplate>
-                                        </f:TemplateField>
-                                        <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:TemplateField ColumnID="State" Width="65px" HeaderText="状态" HeaderTextAlign="Center"
-                                            TextAlign="left">
-                                            <ItemTemplate>
-                                                <asp:Label ID="Label1" runat="server" Text='<%# ConvertState(Eval("State")) %>'></asp:Label>
-                                            </ItemTemplate>
-                                        </f:TemplateField>
-                                    </Columns>
-                                    <Listeners>
-                                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                                    </Listeners>
-                                    <PageItems>
-                                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                                        </f:ToolbarSeparator>
-                                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                                        </f:ToolbarText>
-                                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="培训记录" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="TaskNoticeId" EnableColumnLines="true" DataIDField="TaskNoticeId" AllowSorting="true"
+                            SortField="TrainStartDate" 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="drpTrainType" runat="server" Label="培训类别" Width="210px" LabelWidth="80px" LabelAlign="Right"
+                                            AutoPostBack="true" OnSelectedIndexChanged="Text_TextChanged">
                                         </f:DropDownList>
-                                    </PageItems>
-                                </f:Grid>
-                            </Items>
-                        </f:Panel>
+                                        <%--  <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="Text_TextChanged"
+                LabelAlign="Right" LabelWidth="50px" Width="260px">
+            </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>
+                                    </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:RenderField Width="150px" ColumnID="TrainTitle" DataField="TrainTitle" SortField="TrainTitle"
+                                    FieldType="String" HeaderText="标题" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="TrainTypeName" DataField="TrainTypeName" SortField="TrainTypeName"
+                                    FieldType="String" HeaderText="培训类型" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+
+                                <f:RenderField Width="65px" ColumnID="TeachHour" DataField="TeachHour" SortField="TeachHour"
+                                    FieldType="Float" HeaderText="学时" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="65px" ColumnID="DayOfWeek" DataField="DayOfWeek" SortField="DayOfWeek"
+                                    FieldType="Float" HeaderText="周几" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="65px" ColumnID="WeekOfMonth" DataField="WeekOfMonth" SortField="WeekOfMonth"
+                                    FieldType="Float" HeaderText="每月第几周" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="tfTeachMan" Width="65px" HeaderText="授课人" HeaderTextAlign="Center"
+                                    TextAlign="left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblTeachMan" runat="server" Text='<%# ConvertUserName(Eval("TeachMan")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <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:TemplateField ColumnID="State" Width="65px" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label1" runat="server" Text='<%# ConvertState(Eval("State")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
                     </Items>
                 </f:Panel>
             </Items>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/EduTrain/TaskNotice.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/EduTrain/TaskNotice.aspx.designer.cs
index 03d353a..91c949c 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/EduTrain/TaskNotice.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/EduTrain/TaskNotice.aspx.designer.cs
@@ -77,15 +77,6 @@ namespace FineUIPro.Web.HSSE.EduTrain
         /// </remarks>
         protected global::FineUIPro.Panel panelCenterRegion;
 
-        /// <summary>
-        /// Panel1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Panel Panel1;
-
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Material/MaterialList.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Material/MaterialList.aspx
index 6883c7e..974dec2 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Material/MaterialList.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Material/MaterialList.aspx
@@ -1,103 +1,119 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MaterialList.aspx.cs" Inherits="FineUIPro.Web.HSSE.Material.MaterialList" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!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" EnableColumnLines="true" DataKeyNames="MaterialId"
-                DataIDField="MaterialId" AllowSorting="true" SortField="PublishDate" 
-                SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items>
-                            <f:TextBox runat="server" Label="文件名称" ID="txtName" EmptyText="输入查询条件"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" 
-                                LabelAlign="right">
-                            </f:TextBox>
-                   
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </f:Button>
-                             
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>                
-                   <f:TemplateField ColumnID="tfNumber" Width="50px" 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="140px" ColumnID="Name" DataField="Name"
-                        SortField="Name" FieldType="String" HeaderText="文件名称" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="PublishManName" DataField="PublishManName"
-                        SortField="PublishManName" FieldType="String" HeaderText="发布人" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="PublishDate" DataField="PublishDate"
-                        SortField="PublishDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="发布日期" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                     
-                    <f:RenderField Width="240px" ColumnID="Remark" DataField="Remark" SortField="Remark"
-                         RendererArgument="yyyy-MM-dd" HeaderText="备注"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-              <%--      <f:WindowField TextAlign="Left" Width="90px" WindowID="WindowAtt" HeaderText="附件"
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel2" runat="server" />
+        <f:Panel ID="Panel2" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <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" EnableColumnLines="true" DataKeyNames="MaterialId"
+                            DataIDField="MaterialId" AllowSorting="true" SortField="PublishDate"
+                            SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:TextBox runat="server" Label="文件名称" ID="txtName" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </f:Button>
+
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfNumber" Width="50px" 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="140px" ColumnID="Name" DataField="Name"
+                                    SortField="Name" FieldType="String" HeaderText="文件名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="PublishManName" DataField="PublishManName"
+                                    SortField="PublishManName" FieldType="String" HeaderText="发布人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="PublishDate" DataField="PublishDate"
+                                    SortField="PublishDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="发布日期" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+
+                                <f:RenderField Width="240px" ColumnID="Remark" DataField="Remark" SortField="Remark"
+                                    RendererArgument="yyyy-MM-dd" HeaderText="备注"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <%--      <f:WindowField TextAlign="Left" Width="90px" WindowID="WindowAtt" HeaderText="附件"
                         Text="附件查看" ToolTip="附件上传查看" DataIFrameUrlFields="GeneralEquipmentQualityId" DataIFrameUrlFormatString="~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/GeneralEquipmentQualityAttachUrl&menuId=BFD62699-47F0-49FA-AD39-FAEE8A6C3313"
                         HeaderTextAlign="Center" />--%>
-                </Columns>
-                <Listeners>
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
-                <PageItems>
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarSeparator>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                    </f:ToolbarText>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="资源维护" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="800px"  OnClose="Window1_Close"
-        Height="400px">
-    </f:Window>
-    <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>
-      
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
-            Hidden="true" runat="server" Text="编辑">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
-            Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
-            Text="删除">
-        </f:MenuButton>
-    </f:Menu>
+                            </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"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="800px" OnClose="Window1_Close"
+            Height="400px">
+        </f:Window>
+        <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>
+
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="Pencil" EnablePostBack="true"
+                Hidden="true" runat="server" Text="编辑">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
+                Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
+                Text="删除">
+            </f:MenuButton>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         function renderIsQualified(value) {
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Material/MaterialList.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Material/MaterialList.aspx.cs
index 3da88c3..fd9d90d 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Material/MaterialList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Material/MaterialList.aspx.cs
@@ -37,13 +37,19 @@ namespace FineUIPro.Web.HSSE.Material
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                ////权限按钮方法
-                this.GetButtonPower();
                 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;
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("MaterialEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -54,11 +60,34 @@ namespace FineUIPro.Web.HSSE.Material
                 this.BindGrid();
             }
         }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.BindGrid();
+
+            this.GetButtonPower();
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+        }
+
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = @"  SELECT a.MaterialId
                               ,a.Name
                               ,a.PublishMan
@@ -71,7 +100,7 @@ namespace FineUIPro.Web.HSSE.Material
                           FROM dbo.HSSE_Material a left join Sys_User b on a.PublishMan = b.UserId WHERE a.ProjectId = @ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
 
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))
             {
                 strSql += " AND a.Name LIKE @Name";
@@ -209,7 +238,7 @@ namespace FineUIPro.Web.HSSE.Material
         /// <returns></returns>
         private void GetButtonPower()
         {
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HSSEMaterialMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HSSEMaterialMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Material/MaterialList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Material/MaterialList.aspx.designer.cs
index 487be4e..2e159c4 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Material/MaterialList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Material/MaterialList.aspx.designer.cs
@@ -33,13 +33,49 @@ namespace FineUIPro.Web.HSSE.Material
         protected global::FineUIPro.PageManager PageManager1;
 
         /// <summary>
-        /// Panel1 控件。
+        /// Panel2 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Panel Panel1;
+        protected global::FineUIPro.Panel Panel2;
+
+        /// <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 控件。
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx
index 40a8233..f156d11 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx
@@ -26,119 +26,114 @@
                 <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
                     Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
                     <Items>
-                        <f:Panel ID="Panel1" runat="server" Margin="10px" BodyPadding="10px" ShowBorder="false" MinHeight="700px"
-                            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch" AutoScroll="true">
-                            <Items>
-                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="特种作业人员资质" EnableCollapse="true"
-                                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="PersonId" DataIDField="PersonId" AllowSorting="true"
-                                    SortField="UnitCode,WorkPostCode,PersonName" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
-                                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
-                                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" OnRowCommand="Grid1_RowCommand"
-                                    EnableTextSelection="True" EnableSummary="true" SummaryPosition="Flow">
-                                    <Toolbars>
-                                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                                            <Items>
-                                                <f:TextBox runat="server" Label="编号" ID="txtCardNo" EmptyText="输入查询条件"
-                                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px"
-                                                    LabelAlign="right">
-                                                </f:TextBox>
-                                                <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoSelectFirstItem="true"
-                                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px">
-                                                </f:DropDownList>
-                                                <f:TextBox runat="server" Label="姓名" ID="txtPersonName" EmptyText="输入查询条件" AutoPostBack="true"
-                                                    OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px" LabelAlign="right">
-                                                </f:TextBox>
-                                                <f:TextBox runat="server" Label="岗位" ID="txtWorkPostName" EmptyText="输入查询条件" AutoPostBack="true"
-                                                    OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px" LabelAlign="right" >
-                                                </f:TextBox>
-                                                <f:DropDownList ID="drpIsUsedName" runat="server" Label="是否在岗" EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged"
-                                                    AutoPostBack="true" Width="200px" LabelWidth="100px" LabelAlign="right" ForceSelection="false">
-                                                    <f:ListItem Value="是" Text="是" />
-                                                    <f:ListItem Value="否" Text="否" />
-                                                </f:DropDownList>
-                                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                                </f:ToolbarFill>
-                                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                                    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="250px" ColumnID="UnitName" DataField="UnitName"
-                                            SortField="UnitName" FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
-                                            TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="90px" ColumnID="PersonName" DataField="PersonName"
-                                            SortField="PersonName" FieldType="String" HeaderText="姓名" HeaderTextAlign="Center"
-                                            TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="WorkPostName" DataField="WorkPostName"
-                                            SortField="WorkPostName" FieldType="String" HeaderText="岗位" HeaderTextAlign="Center"
-                                            TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="CertificateName" DataField="CertificateName"
-                                            SortField="CertificateName" FieldType="String" HeaderText="特岗证书"
-                                            HeaderTextAlign="Center" TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="180px" ColumnID="CertificateNo" DataField="CertificateNo"
-                                            SortField="CertificateNo" FieldType="String" HeaderText="证书编号" HeaderTextAlign="Center"
-                                            TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="InTime" DataField="InTime" SortField="InTime"
-                                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="入场时间"
-                                            HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="SendDate" DataField="SendDate" SortField="SendDate"
-                                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="发证时间"
-                                            HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="LimitDate" DataField="LimitDate" SortField="LimitDate"
-                                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="有效期至"
-                                            HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-
-                                        <f:RenderField Width="100px" ColumnID="ExitQuality" DataField="ExitQuality"
-                                            SortField="ExitQuality" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                                            TextAlign="Left">
-                                        </f:RenderField>
-                                        <%-- <f:RenderField Width="220px" ColumnID="SendUnit" DataField="SendUnit" 
-                        SortField="SendUnit" FieldType="String" HeaderText="发证单位" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                   <f:RenderField Width="100px" ColumnID="AuditorName" DataField="AuditorName" 
-                        SortField="AuditorName" FieldType="String" HeaderText="审核人" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="AuditDate" DataField="AuditDate" SortField="AuditDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="审核时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>--%>
-
-                                        <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="60px" CommandName="attchUrl" ColumnID="AttchUrl"
-                                            TextAlign="Center" ToolTip="附件" Text="附件" />
-                                    </Columns>
-                                    <Listeners>
-                                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                                    </Listeners>
-                                    <PageItems>
-                                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                                        </f:ToolbarSeparator>
-                                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                                        </f:ToolbarText>
-                                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="特种作业人员资质" EnableCollapse="true"
+                            runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="PersonId" DataIDField="PersonId" AllowSorting="true"
+                            SortField="UnitCode,WorkPostCode,PersonName" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" OnRowCommand="Grid1_RowCommand"
+                            EnableTextSelection="True" EnableSummary="true" SummaryPosition="Flow">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:TextBox runat="server" Label="编号" ID="txtCardNo" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoSelectFirstItem="true"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="70px" Width="250px">
                                         </f:DropDownList>
-                                    </PageItems>
-                                </f:Grid>
-                            </Items>
-                        </f:Panel>
+                                        <f:TextBox runat="server" Label="姓名" ID="txtPersonName" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="岗位" ID="txtWorkPostName" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="70px" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:DropDownList ID="drpIsUsedName" runat="server" Label="是否在岗" EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged"
+                                            AutoPostBack="true" Width="200px" LabelWidth="100px" LabelAlign="right" ForceSelection="false">
+                                            <f:ListItem Value="是" Text="是" />
+                                            <f:ListItem Value="否" Text="否" />
+                                        </f:DropDownList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            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="250px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="PersonName" DataField="PersonName"
+                                    SortField="PersonName" FieldType="String" HeaderText="姓名" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="WorkPostName" DataField="WorkPostName"
+                                    SortField="WorkPostName" FieldType="String" HeaderText="岗位" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="CertificateName" DataField="CertificateName"
+                                    SortField="CertificateName" FieldType="String" HeaderText="特岗证书"
+                                    HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="CertificateNo" DataField="CertificateNo"
+                                    SortField="CertificateNo" FieldType="String" HeaderText="证书编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="InTime" DataField="InTime" SortField="InTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="入场时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="SendDate" DataField="SendDate" SortField="SendDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="发证时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="LimitDate" DataField="LimitDate" SortField="LimitDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="有效期至"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+
+                                <f:RenderField Width="100px" ColumnID="ExitQuality" DataField="ExitQuality"
+                                    SortField="ExitQuality" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <%-- <f:RenderField Width="220px" ColumnID="SendUnit" DataField="SendUnit" 
+     SortField="SendUnit" FieldType="String" HeaderText="发证单位" HeaderTextAlign="Center"
+     TextAlign="Left">
+ </f:RenderField>
+<f:RenderField Width="100px" ColumnID="AuditorName" DataField="AuditorName" 
+     SortField="AuditorName" FieldType="String" HeaderText="审核人" HeaderTextAlign="Center"
+     TextAlign="Left">
+ </f:RenderField>
+ <f:RenderField Width="100px" ColumnID="AuditDate" DataField="AuditDate" SortField="AuditDate"
+     FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="审核时间"
+     HeaderTextAlign="Center" TextAlign="Center">
+ </f:RenderField>--%>
+
+                                <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="60px" CommandName="attchUrl" ColumnID="AttchUrl"
+                                    TextAlign="Center" ToolTip="附件" Text="附件" />
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
                     </Items>
                 </f:Panel>
             </Items>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.designer.cs
index 64330bb..6d73515 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.designer.cs
@@ -77,15 +77,6 @@ namespace FineUIPro.Web.HSSE.QualityAudit
         /// </remarks>
         protected global::FineUIPro.Panel panelCenterRegion;
 
-        /// <summary>
-        /// Panel1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Panel Panel1;
-
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/DayReport.aspx b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/DayReport.aspx
index 5682291..0d1739c 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/DayReport.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/DayReport.aspx
@@ -26,105 +26,100 @@
                 <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
                     Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
                     <Items>
-                        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" MinHeight="700px"
-                            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-                            <Items>
-                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="人工时日报" EnableCollapse="true"
-                                    runat="server" BoxFlex="1" DataKeyNames="DayReportId" ForceFit="true"
-                                    DataIDField="DayReportId" AllowSorting="true" SortField="CompileDate"
-                                    SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
-                                    EnableColumnLines="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True"
-                                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
-                                    <Toolbars>
-                                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
-                                            <Items>
-                                                <f:DatePicker runat="server" Label="查询日期" ID="txtDate" LabelWidth="100px" AutoPostBack="true"
-                                                    OnTextChanged="TextBox_TextChanged"
-                                                    Width="230px" LabelAlign="right">
-                                                </f:DatePicker>
-                                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                                </f:ToolbarFill>
-                                                <f:CheckBox runat="server" Label="历史" ID="ckRecord" Width="100px" LabelWidth="50px"
-                                                    AutoPostBack="true" OnCheckedChanged="ckRecord_CheckedChanged">
-                                                </f:CheckBox>
-                                                <f:ToolbarFill ID="ToolbarFill2" runat="server">
-                                                </f:ToolbarFill>
-                                                <f:DatePicker runat="server" Label="日报日期" ID="txtCompileDate" LabelWidth="100px"
-                                                    Width="220px" LabelAlign="right">
-                                                </f:DatePicker>
-                                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Text="新增"
-                                                    Hidden="true">
-                                                </f:Button>
-                                                <f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationGet" Hidden="true" runat="server" Text="导入"
-                                                    OnClick="btnImport_Click">
-                                                </f:Button>
-                                                <f:Button ID="btnImport2" ToolTip="导入2" Icon="ApplicationGet" Hidden="true" runat="server"
-                                                    OnClick="btnImport2_Click">
-                                                </f:Button>
-                                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                                </f:Button>
-                                            </Items>
-                                        </f:Toolbar>
-                                    </Toolbars>
-                                    <Columns>
-                                        <f:TemplateField ColumnID="tfPageIndex" Width="100px" HeaderText="序号" HeaderTextAlign="Center"
-                                            TextAlign="Center" EnableLock="true" Locked="False">
-                                            <ItemTemplate>
-                                                <asp:Label ID="lblPageIndex" runat="server" Text='<%#Grid1.RecordCount- Grid1.PageIndex * Grid1.PageSize - Container.DataItemIndex  %>'></asp:Label>
-                                            </ItemTemplate>
-                                        </f:TemplateField>
-                                        <%--                    <f:RenderField Width="200px" ColumnID="DayReportCode" DataField="DayReportCode" SortField="DayReportCode"
-                        FieldType="String" HeaderText="编号" TextAlign="Left" HeaderTextAlign="Center">
-                    </f:RenderField>--%>
-                                        <f:RenderField Width="150px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
-                                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
-                                            HeaderTextAlign="Center" TextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="150px" ColumnID="UserName" DataField="UserName" SortField="UserName"
-                                            FieldType="String" HeaderText="编制人" TextAlign="Left" HeaderTextAlign="Center">
-                                        </f:RenderField>
-                                        <f:TemplateField ColumnID="tfWorkTime" Width="200px" HeaderText="当日人工时" HeaderTextAlign="Center"
-                                            TextAlign="Center">
-                                            <ItemTemplate>
-                                                <asp:Label ID="lblWorkTime" runat="server" Text='<%# ConvertPersonWorkTimeSum(Eval("DayReportId")) %>'
-                                                    ToolTip='<%# ConvertPersonWorkTimeSum(Eval("DayReportId")) %>'></asp:Label>
-                                            </ItemTemplate>
-                                        </f:TemplateField>
-                                        <%--<f:TemplateField ColumnID="tfWorkTimeYear" Width="150px" HeaderText="当年累计人工时" HeaderTextAlign="Center"
-                        TextAlign="Center">
-                        <ItemTemplate>
-                            <asp:Label ID="lblWorkTimeYear" runat="server" Text='<%# ConvertYearPersonWorkTime(Eval("CompileDate")) %>'
-                                ToolTip='<%# ConvertYearPersonWorkTime(Eval("CompileDate")) %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>--%>
-                                        <%--<f:TemplateField ColumnID="tfTotal" Width="150px" HeaderText="累计人工时" HeaderTextAlign="Center"
-                        TextAlign="Center">
-                        <ItemTemplate>
-                            <asp:Label ID="lblTotal" runat="server" Text='<%# ConvertTotalPersonWorkTimeSum(Eval("CompileDate")) %>'
-                                ToolTip='<%# ConvertTotalPersonWorkTimeSum(Eval("CompileDate")) %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>--%>
-                                        <%--<f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
-                        ExpandUnusedSpace="true" 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>
-                            </Items>
-                        </f:Panel>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="人工时日报" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="DayReportId" ForceFit="true"
+                            DataIDField="DayReportId" AllowSorting="true" SortField="CompileDate"
+                            SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
+                            EnableColumnLines="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                                    <Items>
+                                        <f:DatePicker runat="server" Label="查询日期" ID="txtDate" LabelWidth="100px" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged"
+                                            Width="230px" LabelAlign="right">
+                                        </f:DatePicker>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:CheckBox runat="server" Label="历史" ID="ckRecord" Width="100px" LabelWidth="50px"
+                                            AutoPostBack="true" OnCheckedChanged="ckRecord_CheckedChanged">
+                                        </f:CheckBox>
+                                        <f:ToolbarFill ID="ToolbarFill2" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:DatePicker runat="server" Label="日报日期" ID="txtCompileDate" LabelWidth="100px"
+                                            Width="220px" LabelAlign="right">
+                                        </f:DatePicker>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Text="新增"
+                                            Hidden="true">
+                                        </f:Button>
+                                        <f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationGet" Hidden="true" runat="server" Text="导入"
+                                            OnClick="btnImport_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnImport2" ToolTip="导入2" Icon="ApplicationGet" Hidden="true" runat="server"
+                                            OnClick="btnImport2_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="100px" HeaderText="序号" HeaderTextAlign="Center"
+                                    TextAlign="Center" EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%#Grid1.RecordCount- Grid1.PageIndex * Grid1.PageSize - Container.DataItemIndex  %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <%--                    <f:RenderField Width="200px" ColumnID="DayReportCode" DataField="DayReportCode" SortField="DayReportCode"
+    FieldType="String" HeaderText="编号" TextAlign="Left" HeaderTextAlign="Center">
+</f:RenderField>--%>
+                                <f:RenderField Width="150px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="UserName" DataField="UserName" SortField="UserName"
+                                    FieldType="String" HeaderText="编制人" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="tfWorkTime" Width="200px" HeaderText="当日人工时" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblWorkTime" runat="server" Text='<%# ConvertPersonWorkTimeSum(Eval("DayReportId")) %>'
+                                            ToolTip='<%# ConvertPersonWorkTimeSum(Eval("DayReportId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <%--<f:TemplateField ColumnID="tfWorkTimeYear" Width="150px" HeaderText="当年累计人工时" HeaderTextAlign="Center"
+    TextAlign="Center">
+    <ItemTemplate>
+        <asp:Label ID="lblWorkTimeYear" runat="server" Text='<%# ConvertYearPersonWorkTime(Eval("CompileDate")) %>'
+            ToolTip='<%# ConvertYearPersonWorkTime(Eval("CompileDate")) %>'></asp:Label>
+    </ItemTemplate>
+</f:TemplateField>--%>
+                                <%--<f:TemplateField ColumnID="tfTotal" Width="150px" HeaderText="累计人工时" HeaderTextAlign="Center"
+    TextAlign="Center">
+    <ItemTemplate>
+        <asp:Label ID="lblTotal" runat="server" Text='<%# ConvertTotalPersonWorkTimeSum(Eval("CompileDate")) %>'
+            ToolTip='<%# ConvertTotalPersonWorkTimeSum(Eval("CompileDate")) %>'></asp:Label>
+    </ItemTemplate>
+</f:TemplateField>--%>
+                                <%--<f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
+    ExpandUnusedSpace="true" 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>
                     </Items>
                 </f:Panel>
             </Items>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/DayReport.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/DayReport.aspx.designer.cs
index c126d05..b64be62 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/DayReport.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/DayReport.aspx.designer.cs
@@ -77,15 +77,6 @@ namespace FineUIPro.Web.HSSE.SitePerson
         /// </remarks>
         protected global::FineUIPro.Panel panelCenterRegion;
 
-        /// <summary>
-        /// Panel1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Panel Panel1;
-
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonStatistic.aspx b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonStatistic.aspx
index 21c521e..1eaf8c5 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonStatistic.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonStatistic.aspx
@@ -24,84 +24,78 @@
                         </f:ContentPanel>
                     </Items>
                 </f:Panel>
-                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true" 
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
                     Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
                     <Items>
-                        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" MinHeight="700px"
-                            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-                            <Items>
-                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="现场人员统计" EnableCollapse="true"
-                                    runat="server" BoxFlex="1" DataKeyNames="Number" DataIDField="Number" AllowSorting="true" ForceFit="true"
-                                    SortField="Number" SortDirection="ASC" EnableColumnLines="true" EnableTextSelection="True">
-                                    <Toolbars>
-                                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                                            <Items>
-                                                <f:DropDownList runat="server" ID="drpUnit" Label="单位"
-                                                    Width="300px" LabelAlign="Right" LabelWidth="50px">
-                                                </f:DropDownList>
-                                                <f:DropDownList runat="server" ID="drpWorkPost" Label="岗位"
-                                                    Width="220px" LabelAlign="Right" LabelWidth="50px">
-                                                </f:DropDownList>
-                                                <f:DatePicker ID="txtStartDate" runat="server" Label="开始日期" LabelWidth="80px" Width="220px">
-                                                </f:DatePicker>
-                                                <f:DatePicker ID="txtEndDate" runat="server" Label="结束日期" LabelWidth="80px" Width="220px">
-                                                </f:DatePicker>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="现场人员统计" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="Number" DataIDField="Number" AllowSorting="true" ForceFit="true"
+                            SortField="Number" SortDirection="ASC" EnableColumnLines="true" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList runat="server" ID="drpUnit" Label="单位"
+                                            Width="300px" LabelAlign="Right" LabelWidth="50px">
+                                        </f:DropDownList>
+                                        <f:DropDownList runat="server" ID="drpWorkPost" Label="岗位"
+                                            Width="220px" LabelAlign="Right" LabelWidth="50px">
+                                        </f:DropDownList>
+                                        <f:DatePicker ID="txtStartDate" runat="server" Label="开始日期" LabelWidth="80px" Width="220px">
+                                        </f:DatePicker>
+                                        <f:DatePicker ID="txtEndDate" runat="server" Label="结束日期" LabelWidth="80px" Width="220px">
+                                        </f:DatePicker>
 
-                                            </Items>
-                                        </f:Toolbar>
-                                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
-                                            <Items>
-                                                <f:RadioButtonList ID="rblIsUsed" runat="server" Label="进出场" LabelAlign="Right" Width="300px">
-                                                    <f:RadioItem Value="0" Text="全部" Selected="true" />
-                                                    <f:RadioItem Value="True" Text="进场" />
-                                                    <f:RadioItem Value="False" Text="出场" />
-                                                </f:RadioButtonList>
-                                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                                <f:Button ID="btnSearch" runat="server" Icon="BrickMagnify" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
-                                                </f:Button>
-                                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                                    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="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                                            </ItemTemplate>
-                                        </f:TemplateField>
-                                        <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName"
-                                            SortField="UnitName" FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
-                                            TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="200px" ColumnID="WorkAreaName" DataField="WorkAreaName"
-                                            SortField="WorkAreaName" FieldType="String" HeaderText="区域名称" HeaderTextAlign="Center"
-                                            TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="200px" ColumnID="WorkPostName" DataField="WorkPostName"
-                                            SortField="WorkPostName" FieldType="String" HeaderText="岗位名称" HeaderTextAlign="Center"
-                                            TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="PersonCount" DataField="PersonCount"
-                                            SortField="PersonCount" FieldType="Int" HeaderText="出入人次" HeaderTextAlign="Center"
-                                            TextAlign="Left">
-                                        </f:RenderField>
-                                        <%-- <f:TemplateField Width="120px" HeaderText="总人数" HeaderTextAlign="Center" TextAlign="Center">
-                        <ItemTemplate>
-                            <asp:Label ID="Label6" runat="server" Text='<%# Bind("PersonCount") %>' ToolTip='<%#Bind("PersonCount") %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>--%>
-                                    </Columns>
-                                </f:Grid>
-                            </Items>
-                        </f:Panel>
+                                    </Items>
+                                </f:Toolbar>
+                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:RadioButtonList ID="rblIsUsed" runat="server" Label="进出场" LabelAlign="Right" Width="300px">
+                                            <f:RadioItem Value="0" Text="全部" Selected="true" />
+                                            <f:RadioItem Value="True" Text="进场" />
+                                            <f:RadioItem Value="False" Text="出场" />
+                                        </f:RadioButtonList>
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSearch" runat="server" Icon="BrickMagnify" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            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="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="WorkAreaName" DataField="WorkAreaName"
+                                    SortField="WorkAreaName" FieldType="String" HeaderText="区域名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="WorkPostName" DataField="WorkPostName"
+                                    SortField="WorkPostName" FieldType="String" HeaderText="岗位名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="PersonCount" DataField="PersonCount"
+                                    SortField="PersonCount" FieldType="Int" HeaderText="出入人次" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <%-- <f:TemplateField Width="120px" HeaderText="总人数" HeaderTextAlign="Center" TextAlign="Center">
+    <ItemTemplate>
+        <asp:Label ID="Label6" runat="server" Text='<%# Bind("PersonCount") %>' ToolTip='<%#Bind("PersonCount") %>'></asp:Label>
+    </ItemTemplate>
+</f:TemplateField>--%>
+                            </Columns>
+                        </f:Grid>
                     </Items>
                 </f:Panel>
             </Items>
         </f:Panel>
-
     </form>
 </body>
 </html>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonStatistic.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonStatistic.aspx.designer.cs
index 0052287..49b8865 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonStatistic.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonStatistic.aspx.designer.cs
@@ -77,15 +77,6 @@ namespace FineUIPro.Web.HSSE.SitePerson
         /// </remarks>
         protected global::FineUIPro.Panel panelCenterRegion;
 
-        /// <summary>
-        /// Panel1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Panel Panel1;
-
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/ProjectWorkPersonStatistic.aspx b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/ProjectWorkPersonStatistic.aspx
index 5aca502..11f5913 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/ProjectWorkPersonStatistic.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/ProjectWorkPersonStatistic.aspx
@@ -23,72 +23,67 @@
                         </f:ContentPanel>
                     </Items>
                 </f:Panel>
-                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true" 
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
                     Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
                     <Items>
-                        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" MinHeight="700px"
-                            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-                            <Items>
-                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="基层人才队伍统计" EnableCollapse="true"
-                                    runat="server" BoxFlex="1" DataKeyNames="ProjectId" ForceFit="true"
-                                    DataIDField="ProjectId" AllowSorting="true" SortField="ProjectName"
-                                    SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
-                                    EnableColumnLines="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True"
-                                    EnableRowDoubleClickEvent="true">
-                                    <%--OnRowDoubleClick="Grid1_RowDoubleClick"--%>
-                                    <Toolbars>
-                                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
-                                            <Items>
-                                                <f:TextBox runat="server" Label="项目名称" ID="txtProjectName" EmptyText="输入项目名称"
-                                                    Width="400px" LabelWidth="80px" LabelAlign="right" OnTextChanged="TextBox_TextChanged" Hidden="true">
-                                                </f:TextBox>
-                                                <f:Button ID="btSearch" ToolTip="查询" Icon="SystemSearch" runat="server" OnClick="TextBox_TextChanged" Text="查询" Hidden="true"></f:Button>
-                                                <f:ToolbarFill ID="ToolbarFill2" runat="server">
-                                                </f:ToolbarFill>
-                                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                                    EnableAjax="false" DisableControlBeforePostBack="false">
-                                                </f:Button>
-                                            </Items>
-                                        </f:Toolbar>
-                                    </Toolbars>
-                                    <Columns>
-                                        <f:TemplateField ColumnID="tfPageIndex" Width="100px" HeaderText="序号" HeaderTextAlign="Center"
-                                            TextAlign="Center" EnableLock="true" Locked="False">
-                                            <ItemTemplate>
-                                                <asp:Label ID="lblPageIndex" runat="server" Text='<%#Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                                            </ItemTemplate>
-                                        </f:TemplateField>
-                                        <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
-                                            FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="120" ColumnID="Work1" DataField="Work1" SortField="Work1"
-                                            FieldType="String" HeaderText="安全工程师" TextAlign="Center" HeaderTextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="120" ColumnID="Work2" DataField="Work2" SortField="Work2"
-                                            FieldType="String" HeaderText="安全总监" TextAlign="Center" HeaderTextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="120" ColumnID="Work3" DataField="Work3" SortField="Work3"
-                                            FieldType="String" HeaderText="项目总工" TextAlign="Center" HeaderTextAlign="Center">
-                                        </f:RenderField>
-                                        <f:RenderField Width="120" ColumnID="Work4" DataField="Work4" SortField="Work4"
-                                            FieldType="String" HeaderText="班组长" TextAlign="Center" HeaderTextAlign="Center">
-                                        </f:RenderField>
-                                    </Columns>
-                                    <Listeners>
-                                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                                    </Listeners>
-                                    <PageItems>
-                                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                                        </f:ToolbarSeparator>
-                                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                                        </f:ToolbarText>
-                                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                                        </f:DropDownList>
-                                    </PageItems>
-                                </f:Grid>
-                            </Items>
-                        </f:Panel>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="基层人才队伍统计" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="ProjectId" ForceFit="true"
+                            DataIDField="ProjectId" AllowSorting="true" SortField="ProjectName"
+                            SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
+                            EnableColumnLines="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True"
+                            EnableRowDoubleClickEvent="true">
+                            <%--OnRowDoubleClick="Grid1_RowDoubleClick"--%>
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                                    <Items>
+                                        <f:TextBox runat="server" Label="项目名称" ID="txtProjectName" EmptyText="输入项目名称"
+                                            Width="400px" LabelWidth="80px" LabelAlign="right" OnTextChanged="TextBox_TextChanged" Hidden="true">
+                                        </f:TextBox>
+                                        <f:Button ID="btSearch" ToolTip="查询" Icon="SystemSearch" runat="server" OnClick="TextBox_TextChanged" Text="查询" Hidden="true"></f:Button>
+                                        <f:ToolbarFill ID="ToolbarFill2" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="100px" HeaderText="序号" HeaderTextAlign="Center"
+                                    TextAlign="Center" EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%#Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
+                                    FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120" ColumnID="Work1" DataField="Work1" SortField="Work1"
+                                    FieldType="String" HeaderText="安全工程师" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120" ColumnID="Work2" DataField="Work2" SortField="Work2"
+                                    FieldType="String" HeaderText="安全总监" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120" ColumnID="Work3" DataField="Work3" SortField="Work3"
+                                    FieldType="String" HeaderText="项目总工" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120" ColumnID="Work4" DataField="Work4" SortField="Work4"
+                                    FieldType="String" HeaderText="班组长" TextAlign="Center" HeaderTextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
                     </Items>
                 </f:Panel>
             </Items>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/ProjectWorkPersonStatistic.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/ProjectWorkPersonStatistic.aspx.designer.cs
index e8fb4bf..5431961 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/ProjectWorkPersonStatistic.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/ProjectWorkPersonStatistic.aspx.designer.cs
@@ -77,15 +77,6 @@ namespace FineUIPro.Web.HSSE.SitePerson
         /// </remarks>
         protected global::FineUIPro.Panel panelCenterRegion;
 
-        /// <summary>
-        /// Panel1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Panel Panel1;
-
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx
index a005ff8..82e8f5d 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx
@@ -26,72 +26,67 @@
                 <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
                     Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
                     <Items>
-                        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" MinHeight="700px"
-                            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-                            <Items>
-                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="现场岗位人工时统计" EnableCollapse="true"
-                                    runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true" ForceFit="true"
-                                    SortField="UnitName,WorkPostName" SortDirection="ASC" EnableColumnLines="true" EnableTextSelection="True"
-                                    AllowPaging="true" IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange">
-                                    <Toolbars>
-                                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                                            <Items>
-                                                <f:DropDownList runat="server" ID="drpUnit" Label="单位"
-                                                    Width="300px" LabelAlign="Right" LabelWidth="50px">
-                                                </f:DropDownList>
-                                                <f:DropDownList runat="server" ID="drpWorkPost" Label="岗位"
-                                                    Width="200px" LabelAlign="Right" LabelWidth="50px">
-                                                </f:DropDownList>
-                                                <f:DatePicker ID="txtStartDate" runat="server" Label="开始日期" LabelWidth="80px" Width="210px" EnableEdit="false">
-                                                </f:DatePicker>
-                                                <f:DatePicker ID="txtEndDate" runat="server" Label="结束日期" LabelWidth="80px" Width="210px" EnableEdit="false">
-                                                </f:DatePicker>
-                                                <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                                <f:Button ID="btnSearch" runat="server" Icon="SystemSearch" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
-                                                </f:Button>
-                                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                                    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="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                                            </ItemTemplate>
-                                        </f:TemplateField>
-                                        <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName"
-                                            SortField="UnitName" FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
-                                            TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="200px" ColumnID="WorkPostName" DataField="WorkPostName"
-                                            SortField="WorkPostName" FieldType="String" HeaderText="岗位名称" HeaderTextAlign="Center"
-                                            TextAlign="Left">
-                                        </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="PersonCount" DataField="PersonCount"
-                                            SortField="PersonCount" FieldType="Int" HeaderText="人数" HeaderTextAlign="Center"
-                                            TextAlign="Right">
-                                        </f:RenderField>
-                                        <f:TemplateField Width="120px" HeaderText="人工时" HeaderTextAlign="Center" TextAlign="Right">
-                                            <ItemTemplate>
-                                                <asp:Label ID="Label1" runat="server" Text='<%# ConvertWorkTime(Eval("UnitWorkPostID")) %>'></asp:Label>
-                                            </ItemTemplate>
-                                        </f:TemplateField>
-                                    </Columns>
-                                    <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:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="现场岗位人工时统计" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true" ForceFit="true"
+                            SortField="UnitName,WorkPostName" SortDirection="ASC" EnableColumnLines="true" EnableTextSelection="True"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList runat="server" ID="drpUnit" Label="单位"
+                                            Width="300px" LabelAlign="Right" LabelWidth="50px">
                                         </f:DropDownList>
-                                    </PageItems>
-                                </f:Grid>
-                            </Items>
-                        </f:Panel>
+                                        <f:DropDownList runat="server" ID="drpWorkPost" Label="岗位"
+                                            Width="200px" LabelAlign="Right" LabelWidth="50px">
+                                        </f:DropDownList>
+                                        <f:DatePicker ID="txtStartDate" runat="server" Label="开始日期" LabelWidth="80px" Width="210px" EnableEdit="false">
+                                        </f:DatePicker>
+                                        <f:DatePicker ID="txtEndDate" runat="server" Label="结束日期" LabelWidth="80px" Width="210px" EnableEdit="false">
+                                        </f:DatePicker>
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSearch" runat="server" Icon="SystemSearch" ToolTip="查询" OnClick="btnSearch_Click" Text="查询">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            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="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="WorkPostName" DataField="WorkPostName"
+                                    SortField="WorkPostName" FieldType="String" HeaderText="岗位名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="PersonCount" DataField="PersonCount"
+                                    SortField="PersonCount" FieldType="Int" HeaderText="人数" HeaderTextAlign="Center"
+                                    TextAlign="Right">
+                                </f:RenderField>
+                                <f:TemplateField Width="120px" HeaderText="人工时" HeaderTextAlign="Center" TextAlign="Right">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label1" runat="server" Text='<%# ConvertWorkTime(Eval("UnitWorkPostID")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                            </Columns>
+                            <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>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx.designer.cs
index 2f47df0..6ba7a0a 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx.designer.cs
@@ -77,15 +77,6 @@ namespace FineUIPro.Web.HSSE.SitePerson
         /// </remarks>
         protected global::FineUIPro.Panel panelCenterRegion;
 
-        /// <summary>
-        /// Panel1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Panel Panel1;
-
         /// <summary>
         /// Grid1 控件。
         /// </summary>