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

---
 .../CNCCG/HSSE/Check/SafetyOfficerCheck.aspx  | 202 +++++------
 .../HSSE/Check/SafetyOfficerCheck.aspx.cs     |  60 +++-
 .../Check/SafetyOfficerCheck.aspx.designer.cs |  36 ++
 .../ZJ/HSSE/Hazard/HazardInfo.aspx            | 234 +++++++------
 .../ZJ/HSSE/Hazard/HazardInfo.aspx.cs         |  35 +-
 .../HSSE/Hazard/HazardInfo.aspx.designer.cs   |  36 ++
 .../ZJ/HSSE/Hazard/HazardList.aspx            | 232 +++++++------
 .../ZJ/HSSE/Hazard/HazardList.aspx.cs         |  36 +-
 .../HSSE/Hazard/HazardList.aspx.designer.cs   |  36 ++
 .../HJGL/HotProcessHard/HardTrustEdit.aspx.cs |   2 +-
 .../HSSE/ActionPlan/ActionPlanList.aspx       | 203 +++++------
 .../HSSE/ActionPlan/ActionPlanList.aspx.cs    | 103 +++---
 .../ActionPlanList.aspx.designer.cs           |  90 +++--
 .../HSSE/ActionPlan/CompanyManageRule.aspx    | 171 +++++-----
 .../HSSE/ActionPlan/CompanyManageRule.aspx.cs |  59 +++-
 .../CompanyManageRule.aspx.designer.cs        |  92 +++--
 .../HSSE/ActionPlan/ManagerRule.aspx          | 260 ++++++++-------
 .../HSSE/ActionPlan/ManagerRule.aspx.cs       |  75 ++++-
 .../ActionPlan/ManagerRule.aspx.designer.cs   |  96 ++++--
 .../HSSE/ActionPlan/ManagerRuleList.aspx      | 214 ++++++------
 .../HSSE/ActionPlan/ManagerRuleList.aspx.cs   |  52 ++-
 .../ManagerRuleList.aspx.designer.cs          |  90 +++--
 .../HSSE/ActionPlan/ProjectManageRule.aspx    | 165 ++++-----
 .../HSSE/ActionPlan/ProjectManageRule.aspx.cs |  55 ++-
 .../ProjectManageRule.aspx.designer.cs        |  90 +++--
 .../HSSE/Check/CheckSpecial.aspx.cs           |  17 +-
 .../HSSE/Check/CheckSpecialRecord.aspx.cs     |  26 +-
 .../FineUIPro.Web/HSSE/Check/ContactList.aspx | 221 ++++++------
 .../HSSE/Check/ContactList.aspx.cs            |  51 ++-
 .../HSSE/Check/ContactList.aspx.designer.cs   |  84 +++--
 .../FineUIPro.Web/HSSE/Check/OfficeCheck.aspx |  30 +-
 .../HSSE/Check/OfficeCheck.aspx.cs            |  42 ++-
 .../HSSE/Check/OfficeCheck.aspx.designer.cs   |  64 +++-
 .../FineUIPro.Web/HSSE/Check/PauseNotice.aspx | 214 ++++++------
 .../HSSE/Check/PauseNotice.aspx.cs            | 115 ++++---
 .../HSSE/Check/PauseNotice.aspx.designer.cs   |  86 +++--
 .../HSSE/Check/ProjectLeaderCheck.aspx        | 188 ++++++-----
 .../HSSE/Check/ProjectLeaderCheck.aspx.cs     |  35 +-
 .../Check/ProjectLeaderCheck.aspx.designer.cs |  92 +++--
 .../HSSE/Check/RectifyNotices.aspx            | 234 +++++++------
 .../HSSE/Check/RectifyNotices.aspx.cs         |  32 +-
 .../Check/RectifyNotices.aspx.designer.cs     |  98 ++++--
 .../HSSE/Check/RectifyNoticesFinalDoc.aspx    | 234 +++++++------
 .../HSSE/Check/RectifyNoticesFinalDoc.aspx.cs |  72 +++-
 .../RectifyNoticesFinalDoc.aspx.designer.cs   |  36 ++
 .../HSSE/Hazard/EnvironmentalRiskList.aspx    | 247 +++++++-------
 .../HSSE/Hazard/EnvironmentalRiskList.aspx.cs |  48 ++-
 .../EnvironmentalRiskList.aspx.designer.cs    |  96 ++++--
 .../FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx | 292 ++++++++--------
 .../HSSE/Hazard/HazardInfo.aspx.cs            |  34 +-
 .../HSSE/Hazard/HazardInfo.aspx.designer.cs   |  36 ++
 .../FineUIPro.Web/HSSE/Hazard/HazardList.aspx | 232 +++++++------
 .../HSSE/Hazard/HazardList.aspx.cs            |  43 ++-
 .../HSSE/Hazard/HazardList.aspx.designer.cs   |  92 +++--
 .../HSSE/Hazard/MajorHazardList.aspx          | 218 ++++++------
 .../HSSE/Hazard/MajorHazardList.aspx.cs       |  32 ++
 .../Hazard/MajorHazardList.aspx.designer.cs   |  74 ++++-
 .../HSSE/Hazard/OtherHazard.aspx              | 150 +++++----
 .../HSSE/Hazard/OtherHazard.aspx.cs           |  57 +++-
 .../HSSE/Hazard/OtherHazard.aspx.designer.cs  |  80 +++--
 .../HSSE/Hazard/RiskControl.aspx              | 314 +++++++++---------
 .../HSSE/Hazard/RiskControl.aspx.cs           |  36 +-
 .../HSSE/Hazard/RiskControl.aspx.designer.cs  |  94 ++++--
 .../HSSE/Hazard/RoutingInspection.aspx        | 274 ++++++++-------
 .../HSSE/Hazard/RoutingInspection.aspx.cs     |  33 +-
 .../Hazard/RoutingInspection.aspx.designer.cs |  86 +++--
 .../HiddenRectificationList.aspx              |   5 +-
 .../HiddenRectificationList.aspx.cs           |   2 +-
 .../ConstructionStandardIdentify.aspx         | 192 ++++++-----
 .../ConstructionStandardIdentify.aspx.cs      |  65 +++-
 ...structionStandardIdentify.aspx.designer.cs |  86 +++--
 .../LawRegulationIdentify.aspx                | 175 +++++-----
 .../LawRegulationIdentify.aspx.cs             |  42 ++-
 .../LawRegulationIdentify.aspx.designer.cs    |  80 +++--
 .../HSSE/License/HSETechnical.aspx.cs         | 124 +++----
 .../HSSE/QualityAudit/InUnit.aspx             | 223 +++++++------
 .../HSSE/QualityAudit/InUnit.aspx.cs          |  61 +++-
 .../HSSE/QualityAudit/InUnit.aspx.designer.cs |  84 +++--
 .../HSSE/QualityAudit/ProjectRecord.aspx      | 164 ++++-----
 .../HSSE/QualityAudit/ProjectRecord.aspx.cs   |  43 ++-
 .../ProjectRecord.aspx.designer.cs            |  86 +++--
 .../SubcontractLeasingProtocol.aspx.cs        |  49 +--
 .../HSSE/Solution/ExpertArgumentList.aspx     | 179 +++++-----
 .../HSSE/Solution/ExpertArgumentList.aspx.cs  |  60 +++-
 .../ExpertArgumentList.aspx.designer.cs       |  80 +++--
 .../FireGasSafety/SafetyOrganization.aspx.cs  |   6 +-
 86 files changed, 5694 insertions(+), 3375 deletions(-)

diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCCG/HSSE/Check/SafetyOfficerCheck.aspx b/SUBQHSE/FineUIPro.Web/Customization/CNCCG/HSSE/Check/SafetyOfficerCheck.aspx
index 30e3b88..48ccfc4 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCCG/HSSE/Check/SafetyOfficerCheck.aspx
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCCG/HSSE/Check/SafetyOfficerCheck.aspx
@@ -1,119 +1,135 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SafetyOfficerCheck.aspx.cs" Inherits="FineUIPro.Web.Customization.CNCCG.HSSE.Check.SafetyOfficerCheck" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>群安员巡检</title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
-    <style type="text/css">       
+    <style type="text/css">
         .f-grid-row .f-grid-cell-inner {
             white-space: normal;
             word-break: break-all;
-        }        
+        }
     </style>
 </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="SafetyOfficerCheckId"
-                AllowCellEditing="true" ClicksToEdit="2" DataIDField="SafetyOfficerCheckId" AllowSorting="true"
-                SortField="CompileDate" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" ForceFit="true">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items>
-                             <f:RadioButtonList runat="server" ID="ckState" AutoPostBack="true" Label="" LabelWidth="80px" LabelAlign="Right"
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" 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="SafetyOfficerCheckId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="SafetyOfficerCheckId" AllowSorting="true"
+                            SortField="CompileDate" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" ForceFit="true">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:RadioButtonList runat="server" ID="ckState" AutoPostBack="true" Label="" LabelWidth="80px" LabelAlign="Right"
                                             OnSelectedIndexChanged="TextBox_TextChanged" Width="300px">
                                             <f:RadioItem Text="全部" Value="" Selected="true" />
-                                 <f:RadioItem Text="待提交" Value="0" />
+                                            <f:RadioItem Text="待提交" Value="0" />
                                             <f:RadioItem Text="待生成" Value="1" />
                                             <f:RadioItem Text="已生成" Value="2" />
-                            </f:RadioButtonList>
-                            <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:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                        TextAlign="Center" />
-                      <f:RenderField Width="400px"  ColumnID="HandleIdea" DataField="HandleIdea" SortField="HandleIdea"
+                                        </f:RadioButtonList>
+                                        <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:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField Width="400px" ColumnID="HandleIdea" DataField="HandleIdea" SortField="HandleIdea"
                                     FieldType="String" HeaderText="问题描述" TextAlign="Left" HeaderTextAlign="Center">
                                 </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="rUser" DataField="rUser" 
-                        SortField="rUser" FieldType="String" HeaderText="接收人" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>   
-                     <f:RenderField Width="120px" ColumnID="CompileManUser" DataField="CompileManUser"
-                        SortField="CompileManUser" FieldType="String" HeaderText="编制人" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                     <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate"
-                        SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="编制日期" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                  <f:TemplateField ColumnID="tfImageUrl1" Width="200px" HeaderText="整改前照片" HeaderTextAlign="Center"
-                      TextAlign="Left">
-                      <ItemTemplate>
-                          <asp:Label ID="lbImageUrl1" runat="server"   Text='<%# ConvertImageUrlByImage(Eval("SafetyOfficerCheckId")) %>'></asp:Label>
-                      </ItemTemplate>
-                    </f:TemplateField> 
+                                <f:RenderField Width="120px" ColumnID="rUser" DataField="rUser"
+                                    SortField="rUser" FieldType="String" HeaderText="接收人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="CompileManUser" DataField="CompileManUser"
+                                    SortField="CompileManUser" FieldType="String" HeaderText="编制人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate"
+                                    SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="编制日期" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="tfImageUrl1" Width="200px" HeaderText="整改前照片" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lbImageUrl1" runat="server" Text='<%# ConvertImageUrlByImage(Eval("SafetyOfficerCheckId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
 
-                    <f:RenderField Width="200px" ColumnID="StatesNr" DataField="StatesNr"
-                        SortField="StatesNr" 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:ListItem Text="10" Value="10" />
-                        <f:ListItem Text="15" Value="15" />
-                        <f:ListItem Text="20" Value="20" />
-                        <f:ListItem Text="25" Value="25" />
-                        <f:ListItem Text="所有行" Value="100000" />
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1"  Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="900px" Height="450px">
-    </f:Window>
-    <f:Window ID="WindowAtt" Title="附件页面" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="700px" Height="500px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="TableEdit" EnablePostBack="true"
-            Hidden="true" runat="server" Text="编辑">
-        </f:MenuButton>
+                                <f:RenderField Width="200px" ColumnID="StatesNr" DataField="StatesNr"
+                                    SortField="StatesNr" FieldType="String" HeaderText="是否生成日常巡检" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
 
-         <f:MenuButton ID="btnMenuGenerate" OnClick="btnbtnMenuGenerate_Click" Icon="TableEdit" EnablePostBack="true"
-            Hidden="false" runat="server" Text="生成日常巡检">
-        </f:MenuButton>
+                            </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:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="100000" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="900px" Height="450px">
+        </f:Window>
+        <f:Window ID="WindowAtt" Title="附件页面" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="700px" Height="500px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="TableEdit" 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>
+            <f:MenuButton ID="btnMenuGenerate" OnClick="btnbtnMenuGenerate_Click" Icon="TableEdit" EnablePostBack="true"
+                Hidden="false" 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">
         var menuID = '<%= Menu1.ClientID %>';
@@ -128,4 +144,4 @@
         }
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCCG/HSSE/Check/SafetyOfficerCheck.aspx.cs b/SUBQHSE/FineUIPro.Web/Customization/CNCCG/HSSE/Check/SafetyOfficerCheck.aspx.cs
index 475bece..ae55e72 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCCG/HSSE/Check/SafetyOfficerCheck.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCCG/HSSE/Check/SafetyOfficerCheck.aspx.cs
@@ -9,6 +9,23 @@ namespace FineUIPro.Web.Customization.CNCCG.HSSE.Check
 {
     public partial class SafetyOfficerCheck : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
         /// <summary>
         /// 页面加载
         /// </summary>
@@ -18,8 +35,21 @@ namespace FineUIPro.Web.Customization.CNCCG.HSSE.Check
         {
             if (!IsPostBack)
             {
-                ////权限按钮方法
-                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("SafetyOfficerCheckEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -30,6 +60,22 @@ namespace FineUIPro.Web.Customization.CNCCG.HSSE.Check
                 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;
+            }
+        }
 
         #region 获取按钮权限
         /// <summary>
@@ -45,7 +91,7 @@ namespace FineUIPro.Web.Customization.CNCCG.HSSE.Check
             }
             var menuid = Const.Check_SafetyOfficerCheckMenuId;
             
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, menuid);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, menuid);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
@@ -98,6 +144,10 @@ namespace FineUIPro.Web.Customization.CNCCG.HSSE.Check
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT 
             CASE WHEN State='0' then '待提交' when State='1' then '待生成日常巡检' when State='2' then '已生成日常巡检' END 
             as StatesNr,F.State,F.CompileDate,F.SafetyOfficerCheckId,F.ImageUrl,F.HandleIdea,
@@ -108,9 +158,9 @@ namespace FineUIPro.Web.Customization.CNCCG.HSSE.Check
             left join Project_ProjectUser AS PUser on F.ReceiveMan=PUser.UserId
             WHERE 1=1 ";
             var userId = CurrUser.UserId;
-            if (!string.IsNullOrEmpty(CurrUser.LoginProjectId))
+            if (!string.IsNullOrEmpty(ProjectId))
             {
-                strSql += " and PUser.ProjectId='" + CurrUser.LoginProjectId + "' ";
+                strSql += " and PUser.ProjectId='" + ProjectId + "' ";
             }
            
             List<SqlParameter> listStr = new List<SqlParameter>();
diff --git a/SUBQHSE/FineUIPro.Web/Customization/CNCCG/HSSE/Check/SafetyOfficerCheck.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/Customization/CNCCG/HSSE/Check/SafetyOfficerCheck.aspx.designer.cs
index 49456d0..fec5f71 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/CNCCG/HSSE/Check/SafetyOfficerCheck.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/CNCCG/HSSE/Check/SafetyOfficerCheck.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.Customization.CNCCG.HSSE.Check
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardInfo.aspx b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardInfo.aspx
index 9926119..8fd5dc2 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardInfo.aspx
+++ b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardInfo.aspx
@@ -1,5 +1,7 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HazardInfo.aspx.cs" Inherits="FineUIPro.Web.Customization.ZJ.HSSE.Hazard.HazardInfo" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,121 +12,135 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="风险信息库" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="HazardSelectedItemId" DataIDField="HazardSelectedItemId" AllowSorting="true" SortField="CompileDate"
-                    SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
-                    EnableColumnLines="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True" EnableCheckBoxSelect="True"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
-                            <Items>
-                                <f:TextBox runat="server" Label="单位工程" ID="txtWorkAreaName" EmptyText="输入查询条件" AutoPostBack="true"
-                                    OnTextChanged="TextBox_TextChanged" LabelAlign="right">
-                                </f:TextBox>
-                                <f:DropDownList ID="drpHazardLevel" runat="server" Label="危险级别" LabelAlign="Right"
-                                    AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                </f:DropDownList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnPrint" runat="server" Icon="Printer" EnableAjax="false" Text="打印二维码" ToolTip="打印" OnClick="btnPrint_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="55px" 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="130px" ColumnID="WorkAreaName" DataField="WorkAreaName"
-                            SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:TemplateField Width="150px" HeaderText="工作阶段" HeaderTextAlign="Center" TextAlign="Center" ColumnID="WorkStageName" Hidden="True">
-                            <ItemTemplate>
-                                <asp:Label ID="lbWorkStageName" runat="server" Text='<%# ConvertWorkStage(Eval("WorkStage")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:TemplateField Width="100px" HeaderText="危险源类别" HeaderTextAlign="Center" TextAlign="Center" ColumnID="SupHazardListType">
-                            <ItemTemplate>
-                                <asp:Label ID="lbSupHazardListType" runat="server" Text='<%# ConvertSupHazardListTypeId(Eval("HazardListTypeId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:TemplateField Width="100px" HeaderText="危险源项" HeaderTextAlign="Center" TextAlign="Center" ColumnID="HazardListType">
-                            <ItemTemplate>
-                                <asp:Label ID="lbHazardListType" runat="server" Text='<%# ConvertHazardListTypeId(Eval("HazardListTypeId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:TemplateField Width="150px" HeaderText="危险源代码" HeaderTextAlign="Center" TextAlign="Center" ColumnID="Hazard">
-                            <ItemTemplate>
-                                <asp:Label ID="lbHazard" runat="server" Text='<%# ConvertHazardCode(Eval("HazardId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-<%--                        <f:RenderField Width="1px" ColumnID="HazardListTypeId" DataField="HazardListTypeId"
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="风险信息库" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="HazardSelectedItemId" DataIDField="HazardSelectedItemId" AllowSorting="true" SortField="CompileDate"
+                            SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
+                            EnableColumnLines="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True" EnableCheckBoxSelect="True"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                                    <Items>
+                                        <f:TextBox runat="server" Label="单位工程" ID="txtWorkAreaName" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:DropDownList ID="drpHazardLevel" runat="server" Label="危险级别" LabelAlign="Right"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnPrint" runat="server" Icon="Printer" EnableAjax="false" Text="打印二维码" ToolTip="打印" OnClick="btnPrint_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="55px" 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="130px" ColumnID="WorkAreaName" DataField="WorkAreaName"
+                                    SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField Width="150px" HeaderText="工作阶段" HeaderTextAlign="Center" TextAlign="Center" ColumnID="WorkStageName" Hidden="True">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lbWorkStageName" runat="server" Text='<%# ConvertWorkStage(Eval("WorkStage")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField Width="100px" HeaderText="危险源类别" HeaderTextAlign="Center" TextAlign="Center" ColumnID="SupHazardListType">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lbSupHazardListType" runat="server" Text='<%# ConvertSupHazardListTypeId(Eval("HazardListTypeId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField Width="100px" HeaderText="危险源项" HeaderTextAlign="Center" TextAlign="Center" ColumnID="HazardListType">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lbHazardListType" runat="server" Text='<%# ConvertHazardListTypeId(Eval("HazardListTypeId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField Width="150px" HeaderText="危险源代码" HeaderTextAlign="Center" TextAlign="Center" ColumnID="Hazard">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lbHazard" runat="server" Text='<%# ConvertHazardCode(Eval("HazardId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <%--                        <f:RenderField Width="1px" ColumnID="HazardListTypeId" DataField="HazardListTypeId"
                             FieldType="String" HeaderText="" Hidden="true" HeaderTextAlign="Center">
                         </f:RenderField>
                         <f:RenderField Width="1px" ColumnID="HazardListId" DataField="HazardListId"
                             FieldType="String" HeaderText="" Hidden="true" HeaderTextAlign="Center">
                         </f:RenderField>--%>
-                        <f:RenderField Width="180px" ColumnID="HazardItems" DataField="HazardItems" FieldType="String"
-                            HeaderText="危险因素明细" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="DefectsType" DataField="DefectsType" FieldType="String"
-                            HeaderText="缺陷类型" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="MayLeadAccidents" DataField="MayLeadAccidents"
-                            FieldType="String" HeaderText="可能导致的事故" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="HelperMethod" DataField="HelperMethod" FieldType="String"
-                            HeaderText="辅助方法" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="L" DataField="HazardJudge_L" FieldType="String"
-                            HeaderText="危险评价(L)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="E" DataField="HazardJudge_E" FieldType="String"
-                            HeaderText="危险评价(E)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="C" DataField="HazardJudge_C" FieldType="String"
-                            HeaderText="危险评价(C)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="D" DataField="HazardJudge_D" FieldType="Double"
-                            HeaderText="危险评价(D)" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="G" DataField="RiskLevelName" FieldType="String"
-                            HeaderText="危险级别" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="ControlMeasures" DataField="ControlMeasures"
-                            FieldType="String" HeaderText="控制措施" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="EvaluatorPersonName" DataField="EvaluatorPersonName"
-                            SortField="EvaluatorPersonName" FieldType="String" HeaderText="评价人" TextAlign="Left"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="EvaluatorDate" DataField="EvaluatorDate" SortField="EvaluatorDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="评价时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                                <f:RenderField Width="180px" ColumnID="HazardItems" DataField="HazardItems" FieldType="String"
+                                    HeaderText="危险因素明细" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="DefectsType" DataField="DefectsType" FieldType="String"
+                                    HeaderText="缺陷类型" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="MayLeadAccidents" DataField="MayLeadAccidents"
+                                    FieldType="String" HeaderText="可能导致的事故" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="HelperMethod" DataField="HelperMethod" FieldType="String"
+                                    HeaderText="辅助方法" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="L" DataField="HazardJudge_L" FieldType="String"
+                                    HeaderText="危险评价(L)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="E" DataField="HazardJudge_E" FieldType="String"
+                                    HeaderText="危险评价(E)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="C" DataField="HazardJudge_C" FieldType="String"
+                                    HeaderText="危险评价(C)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="D" DataField="HazardJudge_D" FieldType="Double"
+                                    HeaderText="危险评价(D)" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="G" DataField="RiskLevelName" FieldType="String"
+                                    HeaderText="危险级别" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="ControlMeasures" DataField="ControlMeasures"
+                                    FieldType="String" HeaderText="控制措施" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="EvaluatorPersonName" DataField="EvaluatorPersonName"
+                                    SortField="EvaluatorPersonName" FieldType="String" HeaderText="评价人" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="EvaluatorDate" DataField="EvaluatorDate" SortField="EvaluatorDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="评价时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="风险编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardInfo.aspx.cs b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardInfo.aspx.cs
index f3878e6..f370549 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardInfo.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardInfo.aspx.cs
@@ -56,12 +56,20 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.Hazard
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
-                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                ////权限按钮方法
-                this.GetButtonPower();
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
+
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.RiskLevelService.InitRiskLevelDropDownList(this.drpHazardLevel, true);
                 // 绑定表格
@@ -69,11 +77,32 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.Hazard
             }
         }
 
+        /// <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 HazardListItem.*,ControllingPersonUsers.UserName AS ControllingPersonName,Users.UserName,HazardList.WorkAreaName,HazardList.CompileDate,case HazardListItem.State when '1' then '存在' else '已取消' end as StateStr,"
                           + @" (select UserName from Sys_User where UserId=(select top 1 Evaluatorld from Hazard_RiskEvaluationRecord where DataId=HazardListItem.HazardSelectedItemId order by EvaluatorDate desc)) as EvaluatorPersonName, "
                           + @" (select top 1 EvaluatorDate from Hazard_RiskEvaluationRecord where DataId=HazardListItem.HazardSelectedItemId order by EvaluatorDate desc) as EvaluatorDate,"
diff --git a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardInfo.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardInfo.aspx.designer.cs
index 5a60d44..6f3a322 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardInfo.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardInfo.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.Hazard
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardList.aspx b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardList.aspx
index 2a845b7..1a704c3 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardList.aspx
+++ b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardList.aspx
@@ -1,5 +1,7 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HazardList.aspx.cs" Inherits="FineUIPro.Web.Customization.ZJ.HSSE.Hazard.HazardList" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -8,114 +10,128 @@
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-        <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="风险评估" EnableCollapse="true"
-                runat="server" BoxFlex="1" DataKeyNames="HazardListId" DataIDField="HazardListId" AllowSorting="true" SortField="CompileDate"
-                SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" ForceFit="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="txtHazardListCode" EmptyText="输入查询条件" AutoPostBack="true"
-                                OnTextChanged="TextBox_TextChanged" LabelWidth="50px" LabelAlign="right">
-                            </f:TextBox>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Text="新增"
-                                Hidden="true">
-                            </f:Button>
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                EnableAjax="false" DisableControlBeforePostBack="false">
-                            </f:Button>
-                            <f:Button ID="btnHelp" runat="server" ToolTip="点击下载本页面使用说明" Text="帮助" Icon="Help">
-                                <Listeners>
-                                    <f:Listener Event="click" Handler="onToolSourceCodeClick" />
-                                </Listeners>
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RenderField Width="100px" ColumnID="HazardListCode" DataField="HazardListCode"
-                        SortField="HazardListCode" FieldType="String" HeaderText="清单编号" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:TemplateField ColumnID="tfVersionNo" Width="70px" HeaderText="版本号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                        <ItemTemplate>
-                            <asp:Label ID="lblVersionNo" runat="server" Text='<%# Bind("VersionNo") %>' ToolTip='<%#Bind("VersionNo") %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:TemplateField ColumnID="tfWorkStage" Width="300px" HeaderText="工作阶段" HeaderTextAlign="Center" Hidden="True"
-                        TextAlign="Left" >
-                        <ItemTemplate>
-                            <asp:Label ID="lblWorkStage" runat="server" Text='<%# ConvertWorkStage(Eval("WorkStage")) %>'
-                                ToolTip='<%# ConvertWorkStage(Eval("WorkStage")) %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:RenderField Width="130px" ColumnID="WorkAreaName" DataField="WorkAreaName" 
-                        SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="IdentificationDate" DataField="IdentificationDate"
-                        SortField="IdentificationDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="评估时间" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="ControllingPersonName" DataField="ControllingPersonName"
-                        SortField="ControllingPersonName" FieldType="String" HeaderText="风险责任人" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="UserName" DataField="UserName" SortField="UserName"
-                        FieldType="String" HeaderText="评价人" TextAlign="Left" HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                </Columns>
-                <Listeners>
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
-                <PageItems>
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarSeparator>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                    </f:ToolbarText>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">                 
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="风险评估" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
-        Width="1200px" Height="800px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuAllOut" EnablePostBack="true" runat="server" Text="导出危险源"
-            Icon="FolderUp" Hidden="true">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuImportantOut" EnablePostBack="true" runat="server" Text="导出重大危险源"
-            Icon="FolderPage" Hidden="true">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
-            Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
-            Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuAllPrint" EnablePostBack="true" runat="server" Hidden="true"
-            Text="打印危险源" Icon="Printer" OnClick="btnMenuAllPrint_Click">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuImportantPrint" EnablePostBack="true" runat="server" Hidden="true"
-            Text="打印重大危险源" Icon="Printer" OnClick="btnMenuImportantPrint_Click">
-        </f:MenuButton>
-    </f:Menu>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" 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" DataKeyNames="HazardListId" DataIDField="HazardListId" AllowSorting="true" SortField="CompileDate"
+                            SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" ForceFit="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="txtHazardListCode" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged" LabelWidth="50px" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Text="新增"
+                                            Hidden="true">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                        <f:Button ID="btnHelp" runat="server" ToolTip="点击下载本页面使用说明" Text="帮助" Icon="Help">
+                                            <Listeners>
+                                                <f:Listener Event="click" Handler="onToolSourceCodeClick" />
+                                            </Listeners>
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RenderField Width="100px" ColumnID="HazardListCode" DataField="HazardListCode"
+                                    SortField="HazardListCode" FieldType="String" HeaderText="清单编号" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="tfVersionNo" Width="70px" HeaderText="版本号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblVersionNo" runat="server" Text='<%# Bind("VersionNo") %>' ToolTip='<%#Bind("VersionNo") %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="tfWorkStage" Width="300px" HeaderText="工作阶段" HeaderTextAlign="Center" Hidden="True"
+                                    TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblWorkStage" runat="server" Text='<%# ConvertWorkStage(Eval("WorkStage")) %>'
+                                            ToolTip='<%# ConvertWorkStage(Eval("WorkStage")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="130px" ColumnID="WorkAreaName" DataField="WorkAreaName"
+                                    SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="IdentificationDate" DataField="IdentificationDate"
+                                    SortField="IdentificationDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="评估时间" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="ControllingPersonName" DataField="ControllingPersonName"
+                                    SortField="ControllingPersonName" FieldType="String" HeaderText="风险责任人" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="UserName" DataField="UserName" SortField="UserName"
+                                    FieldType="String" HeaderText="评价人" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                            </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" OnClose="Window1_Close" IsModal="true"
+            Width="1200px" Height="800px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuAllOut" EnablePostBack="true" runat="server" Text="导出危险源"
+                Icon="FolderUp" Hidden="true">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuImportantOut" EnablePostBack="true" runat="server" Text="导出重大危险源"
+                Icon="FolderPage" Hidden="true">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
+                Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
+                Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuAllPrint" EnablePostBack="true" runat="server" Hidden="true"
+                Text="打印危险源" Icon="Printer" OnClick="btnMenuAllPrint_Click">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuImportantPrint" EnablePostBack="true" runat="server" Hidden="true"
+                Text="打印重大危险源" Icon="Printer" OnClick="btnMenuImportantPrint_Click">
+            </f:MenuButton>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardList.aspx.cs b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardList.aspx.cs
index 2854243..8f6f4ab 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardList.aspx.cs
@@ -54,23 +54,53 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.Hazard
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
-                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                ////权限按钮方法
-                this.GetButtonPower();
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
+
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 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 HazardList.HazardListId,HazardList.VersionNo,HazardList.WorkStage,Users.UserName,HazardList.CompileDate,CodeRecords.Code AS HazardListCode,HazardList.WorkAreaName,HazardList.IdentificationDate,ControllingPersonUsers.UserName AS ControllingPersonName "
                           + @" ,(CASE WHEN HazardList.States = " + BLL.Const.State_0 + " OR HazardList.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN HazardList.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
                           + @" from Hazard_HazardList AS HazardList "
diff --git a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardList.aspx.designer.cs
index 84e8f36..6c1e2a1 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/Hazard/HazardList.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.Hazard
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HJGL/HotProcessHard/HardTrustEdit.aspx.cs b/SUBQHSE/FineUIPro.Web/HJGL/HotProcessHard/HardTrustEdit.aspx.cs
index ab402fe..11c9b98 100644
--- a/SUBQHSE/FineUIPro.Web/HJGL/HotProcessHard/HardTrustEdit.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HJGL/HotProcessHard/HardTrustEdit.aspx.cs
@@ -232,7 +232,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
         /// <param name="e"></param>
         protected void btnSave_Click(object sender, EventArgs e)
         {
-            if (CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, Const.HJGL_HotHardManageEditMenuId, Const.BtnSave))
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_HotHardManageEditMenuId, Const.BtnSave))
             {
                 if (BLL.Hard_TrustService.IsExistTrustCode(this.txtHardTrustNo.Text, !string.IsNullOrEmpty(this.HardTrustID) ? this.HardTrustID : "", this.ProjectId))
                 {
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx
index d90094e..fc202ab 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx
@@ -1,6 +1,8 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ActionPlanList.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.ActionPlan.ActionPlanList" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -9,102 +11,115 @@
 </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="ActionPlanListId"
-                DataIDField="ActionPlanListId" AllowSorting="true" ForceFit="true"
-                SortField="ActionPlanListCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                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="txtActionPlanListCode" EmptyText="输入查询条件"
-                                Width="250px" LabelWidth="60px" LabelAlign="right">
-                            </f:TextBox>
-                            <f:TextBox runat="server" Label="名称" ID="txtActionPlanListName" EmptyText="输入查询条件"
-                                Width="250px" LabelWidth="60px" LabelAlign="right">
-                            </f:TextBox>
-                              <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                             <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" Text="查询" 
-                                 EnablePostBack="true" OnClick="TextBox_TextChanged" runat="server" >
-                            </f:Button>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </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="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:RenderField Width="100px" ColumnID="ActionPlanListCode" DataField="ActionPlanListCode"
-                        SortField="ActionPlanListCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="200px" ColumnID="ActionPlanListName" DataField="ActionPlanListName" ExpandUnusedSpace="True"
-                        SortField="ActionPlanListName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="VersionNo" DataField="VersionNo" SortField="VersionNo"
-                        FieldType="String" HeaderText="版本号" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="140px" ColumnID="ProjectType" DataField="ProjectType" SortField="ProjectType"
-                        FieldType="String" HeaderText="项目类型" HeaderTextAlign="Center" TextAlign="Left"
-                        RendererFunction="renderProjectType">
-                    </f:RenderField>   
-                    <f:WindowField TextAlign="Left" Width="80px" WindowID="WindowAtt" HeaderText="附件"
-                        Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="ActionPlanListId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ActionPlanListAttachUrl&menuId=CBC47C8B-141C-446B-90D9-CE8F5AE66CE4"
-                          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" OnClose="Window1_Close" IsModal="true"
-        Width="1024px" Height="600px">
-    </f:Window>
-    <f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
-        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>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" 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="ActionPlanListId"
+                            DataIDField="ActionPlanListId" AllowSorting="true" ForceFit="true"
+                            SortField="ActionPlanListCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            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="txtActionPlanListCode" EmptyText="输入查询条件"
+                                            Width="250px" LabelWidth="60px" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="名称" ID="txtActionPlanListName" EmptyText="输入查询条件"
+                                            Width="250px" LabelWidth="60px" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" Text="查询"
+                                            EnablePostBack="true" OnClick="TextBox_TextChanged" runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </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="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="100px" ColumnID="ActionPlanListCode" DataField="ActionPlanListCode"
+                                    SortField="ActionPlanListCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="ActionPlanListName" DataField="ActionPlanListName" ExpandUnusedSpace="True"
+                                    SortField="ActionPlanListName" FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="VersionNo" DataField="VersionNo" SortField="VersionNo"
+                                    FieldType="String" HeaderText="版本号" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="ProjectType" DataField="ProjectType" SortField="ProjectType"
+                                    FieldType="String" HeaderText="项目类型" HeaderTextAlign="Center" TextAlign="Left"
+                                    RendererFunction="renderProjectType">
+                                </f:RenderField>
+                                <f:WindowField TextAlign="Left" Width="80px" WindowID="WindowAtt" HeaderText="附件"
+                                    Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="ActionPlanListId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ActionPlanListAttachUrl&menuId=CBC47C8B-141C-446B-90D9-CE8F5AE66CE4"
+                                    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>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="实施计划" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="1024px" Height="600px">
+        </f:Window>
+        <f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            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 renderProjectType(value) {    
+        function renderProjectType(value) {
         }
 
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs
index a8f15cb..b431fc2 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs
@@ -39,13 +39,19 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             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("ActionPlanListEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -57,49 +63,66 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             }
         }
 
+        /// <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))
+            if (string.IsNullOrEmpty(this.ProjectId))
             {
-                string strSql = "SELECT ActionPlanList.ActionPlanListId,ActionPlanList.ProjectId,CodeRecords.Code AS ActionPlanListCode,ActionPlanList.ActionPlanListName,ActionPlanList.VersionNo,(CASE ProjectType WHEN '1' THEN '系统内项目' WHEN '2' THEN '系统外项目' WHEN '3' THEN '海外项目' END ) AS ProjectType,ActionPlanList.ActionPlanListContents,ActionPlanList.CompileMan,Users.UserName AS CompileManName, ActionPlanList.CompileDate,ActionPlanList.States"
-                            + @" ,(CASE WHEN ActionPlanList.States = " + BLL.Const.State_0 + " OR ActionPlanList.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN ActionPlanList.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
-                            + @" FROM ActionPlan_ActionPlanList AS ActionPlanList "
-                            + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON ActionPlanList.ActionPlanListId=CodeRecords.DataId "
-                            + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON ActionPlanList.ActionPlanListId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
-                            + @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId "
-                            + @" LEFT JOIN Sys_User AS Users ON Users.UserId = ActionPlanList.CompileMan "
-                            + @" WHERE 1=1 ";
-                List<SqlParameter> listStr = new List<SqlParameter>();
-
-                strSql += " AND ActionPlanList.ProjectId = @ProjectId";
-                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
-                if (!string.IsNullOrEmpty(Request.Params["projectId"]))  ///是否文件柜查看页面传项目值
-                {
-                    strSql += " AND ActionPlanList.States = @States";  ///状态为已完成
-                    listStr.Add(new SqlParameter("@States", BLL.Const.State_2));
-                }
-
-                if (!string.IsNullOrEmpty(this.txtActionPlanListCode.Text.Trim()))
-                {
-                    strSql += " AND ActionPlanListCode LIKE @ActionPlanListCode";
-                    listStr.Add(new SqlParameter("@ActionPlanListCode", "%" + this.txtActionPlanListCode.Text.Trim() + "%"));
-                }
-                if (!string.IsNullOrEmpty(this.txtActionPlanListName.Text.Trim()))
-                {
-                    strSql += " AND ActionPlanListName LIKE @ActionPlanListName";
-                    listStr.Add(new SqlParameter("@ActionPlanListName", "%" + this.txtActionPlanListName.Text.Trim() + "%"));
-                }
-                SqlParameter[] parameter = listStr.ToArray();
-                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-
-                Grid1.RecordCount = tb.Rows.Count;
-                var table = this.GetPagedDataTable(Grid1, tb);
-                Grid1.DataSource = table;
-                Grid1.DataBind();
+                return;
             }
+            string strSql = "SELECT ActionPlanList.ActionPlanListId,ActionPlanList.ProjectId,CodeRecords.Code AS ActionPlanListCode,ActionPlanList.ActionPlanListName,ActionPlanList.VersionNo,(CASE ProjectType WHEN '1' THEN '系统内项目' WHEN '2' THEN '系统外项目' WHEN '3' THEN '海外项目' END ) AS ProjectType,ActionPlanList.ActionPlanListContents,ActionPlanList.CompileMan,Users.UserName AS CompileManName, ActionPlanList.CompileDate,ActionPlanList.States"
+                        + @" ,(CASE WHEN ActionPlanList.States = " + BLL.Const.State_0 + " OR ActionPlanList.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN ActionPlanList.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
+                        + @" FROM ActionPlan_ActionPlanList AS ActionPlanList "
+                        + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON ActionPlanList.ActionPlanListId=CodeRecords.DataId "
+                        + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON ActionPlanList.ActionPlanListId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
+                        + @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId "
+                        + @" LEFT JOIN Sys_User AS Users ON Users.UserId = ActionPlanList.CompileMan "
+                        + @" WHERE 1=1 ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+
+            strSql += " AND ActionPlanList.ProjectId = @ProjectId";
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+            if (!string.IsNullOrEmpty(Request.Params["projectId"]))  ///是否文件柜查看页面传项目值
+            {
+                strSql += " AND ActionPlanList.States = @States";  ///状态为已完成
+                listStr.Add(new SqlParameter("@States", BLL.Const.State_2));
+            }
+
+            if (!string.IsNullOrEmpty(this.txtActionPlanListCode.Text.Trim()))
+            {
+                strSql += " AND ActionPlanListCode LIKE @ActionPlanListCode";
+                listStr.Add(new SqlParameter("@ActionPlanListCode", "%" + this.txtActionPlanListCode.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(this.txtActionPlanListName.Text.Trim()))
+            {
+                strSql += " AND ActionPlanListName LIKE @ActionPlanListName";
+                listStr.Add(new SqlParameter("@ActionPlanListName", "%" + this.txtActionPlanListName.Text.Trim() + "%"));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
         }
         #endregion
 
@@ -203,7 +226,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                 {
                     PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ActionPlanListEdit.aspx?ActionPlanListId={0}", id, "编辑 - ")));
                 }
-            } 
+            }
         }
         #endregion
 
@@ -276,7 +299,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                 return;
             }
 
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectActionPlanListMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectActionPlanListMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.designer.cs
index 99f8435..cec484d 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.ActionPlan {
-    
-    
-    public partial class ActionPlanList {
-        
+namespace FineUIPro.Web.HSSE.ActionPlan
+{
+
+
+    public partial class ActionPlanList
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,16 +31,52 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         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 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtActionPlanListCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtActionPlanListCode;
-        
+
         /// <summary>
         /// txtActionPlanListName 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtActionPlanListName;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/CompanyManageRule.aspx b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/CompanyManageRule.aspx
index 9b5cc66..645f879 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/CompanyManageRule.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/CompanyManageRule.aspx
@@ -1,5 +1,6 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CompanyManageRule.aspx.cs" Inherits="FineUIPro.Web.HSSE.ActionPlan.CompanyManageRule" %>
-
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %> 
+ 
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,84 +11,98 @@
 <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" Height="550px ">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="公司安全管理制度发布" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="ManagerRuleId" DataIDField="ManagerRuleId" AllowSorting="true" SortField="IssueDate,CompileDate" SortDirection="DESC" EnableColumnLines="true"
-                    OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" ForceFit="true"
-                    OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
-                    OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
-                            <Items>
-                                <f:CheckBoxList runat="server" ID="cbIssue" ShowLabel="false" Width="150px" LabelAlign="Right">
-                                    <f:CheckItem Text="未发布" Value="0" Selected="true" />
-                                    <f:CheckItem Text="已发布" Value="1" />
-                                </f:CheckBoxList>
-                                <f:TextBox runat="server" Label="编号" ID="txtManageRuleCode" EmptyText="输入查询条件"
-                                    Width="210px" LabelWidth="60px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                                <f:TextBox runat="server" Label="名称" ID="txtManageRuleName" EmptyText="输入查询条件"
-                                    Width="210px" LabelWidth="60px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                                <f:TextBox runat="server" Label="分类" ID="txtManageRuleTypeName" EmptyText="输入查询条件"
-                                    Width="210px" LabelWidth="60px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                               
-                                
-                                <f:ToolbarFill runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" OnClick="TextBox_TextChanged" Text="查询" runat="server">
-                                </f:Button> 
-                                <f:Button ID="btnCompile" ToolTip="新增" Icon="Add" Hidden="true" runat="server" OnClick="btnCompile_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="tfManageRuleCode" Width="80px" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left"
-                            SortField="ManageRuleCode">
-                            <ItemTemplate>
-                                <asp:Label ID="lblManageRuleCode" runat="server" Text='<%# Bind("ManageRuleCode") %>'
-                                    ToolTip='<%#Bind("ManageRuleCode") %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:TemplateField ColumnID="tfManageRuleName" Width="250px" HeaderText="文件名称" HeaderTextAlign="Center" TextAlign="Left"
-                            SortField="ManageRuleName">
-                            <ItemTemplate>
-                                <asp:Label ID="lblManageRuleName" runat="server" Text='<%# Bind("ManageRuleName") %>'
-                                    ToolTip='<%#Bind("ManageRuleName") %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="160px" ColumnID="ManageRuleTypeName" DataField="ManageRuleTypeName"
-                            SortField="ManageRuleTypeName" FieldType="String" HeaderText="分类" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="IssueDate" DataField="IssueDate" SortField="IssueDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="发布时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:unitprojecttcontrol id="ucTree" runat="server" onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="公司安全管理制度发布" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="ManagerRuleId" DataIDField="ManagerRuleId" AllowSorting="true" SortField="IssueDate,CompileDate" SortDirection="DESC" EnableColumnLines="true"
+                            OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" ForceFit="true"
+                            OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
+                            OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                                    <Items>
+                                        <f:CheckBoxList runat="server" ID="cbIssue" ShowLabel="false" Width="150px" LabelAlign="Right">
+                                            <f:CheckItem Text="未发布" Value="0" Selected="true" />
+                                            <f:CheckItem Text="已发布" Value="1" />
+                                        </f:CheckBoxList>
+                                        <f:TextBox runat="server" Label="编号" ID="txtManageRuleCode" EmptyText="输入查询条件"
+                                            Width="210px" LabelWidth="60px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="名称" ID="txtManageRuleName" EmptyText="输入查询条件"
+                                            Width="210px" LabelWidth="60px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="分类" ID="txtManageRuleTypeName" EmptyText="输入查询条件"
+                                            Width="210px" LabelWidth="60px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+
+
+                                        <f:ToolbarFill runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" OnClick="TextBox_TextChanged" Text="查询" runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnCompile" ToolTip="新增" Icon="Add" Hidden="true" runat="server" OnClick="btnCompile_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="tfManageRuleCode" Width="80px" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left"
+                                    SortField="ManageRuleCode">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblManageRuleCode" runat="server" Text='<%# Bind("ManageRuleCode") %>'
+                                            ToolTip='<%#Bind("ManageRuleCode") %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="tfManageRuleName" Width="250px" HeaderText="文件名称" HeaderTextAlign="Center" TextAlign="Left"
+                                    SortField="ManageRuleName">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblManageRuleName" runat="server" Text='<%# Bind("ManageRuleName") %>'
+                                            ToolTip='<%#Bind("ManageRuleName") %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="160px" ColumnID="ManageRuleTypeName" DataField="ManageRuleTypeName"
+                                    SortField="ManageRuleTypeName" FieldType="String" HeaderText="分类" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="IssueDate" DataField="IssueDate" SortField="IssueDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="发布时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="管理规定选择" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/CompanyManageRule.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/CompanyManageRule.aspx.cs
index dc77b09..21504e8 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/CompanyManageRule.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/CompanyManageRule.aspx.cs
@@ -14,6 +14,21 @@ namespace FineUIPro.Web.HSSE.ActionPlan
 {
     public partial class CompanyManageRule : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
         /// <summary>
         /// 页面
         /// </summary>
@@ -28,6 +43,8 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                 ViewState["PageSize"] = value;
             }
         }
+        #endregion
+
         #region 加载页面
         /// <summary>
         /// 加载页面
@@ -39,7 +56,21 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             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.btnMenuDelete.OnClientClick = Grid1.GetNoSelectionAlertReference("请至少选择一项！");
                 this.btnMenuDelete.ConfirmText = String.Format("你确定要删除选中的&nbsp;<b><script>{0}</script></b>&nbsp;行数据吗？", Grid1.GetSelectedCountReference());
                 // 绑定表格
@@ -47,11 +78,33 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             }
         }
 
+        /// <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 ManagerRule.ManagerRuleId,CodeRecords.Code AS ManageRuleCode,ManagerRule.ProjectId,
                              ManagerRule.ManageRuleName,ManagerRule.ManageRuleTypeId,
                              ManagerRule.VersionNo,
@@ -82,7 +135,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (!string.IsNullOrEmpty(this.txtManageRuleCode.Text.Trim()))
             {
@@ -472,7 +525,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                 return;
             }
 
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ActionPlan_CompanyManagerRuleMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ActionPlan_CompanyManagerRuleMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/CompanyManageRule.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/CompanyManageRule.aspx.designer.cs
index 296dd84..1f04e99 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/CompanyManageRule.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/CompanyManageRule.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.ActionPlan {
-    
-    
-    public partial class CompanyManageRule {
-        
+namespace FineUIPro.Web.HSSE.ActionPlan
+{
+
+
+    public partial class CompanyManageRule
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// cbIssue 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBoxList cbIssue;
-        
+
         /// <summary>
         /// txtManageRuleCode 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtManageRuleCode;
-        
+
         /// <summary>
         /// txtManageRuleName 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtManageRuleName;
-        
+
         /// <summary>
         /// txtManageRuleTypeName 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtManageRuleTypeName;
-        
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
-        
+
         /// <summary>
         /// btnCompile 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnCompile;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblManageRuleCode 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblManageRuleCode;
-        
+
         /// <summary>
         /// lblManageRuleName 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblManageRuleName;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -200,7 +238,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuIssuance 控件。
         /// </summary>
@@ -209,7 +247,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuIssuance;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRule.aspx b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRule.aspx
index 543ac31..4d4129d 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRule.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRule.aspx
@@ -1,6 +1,9 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ManagerRule.aspx.cs" MaintainScrollPositionOnPostback="true" 
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ManagerRule.aspx.cs" MaintainScrollPositionOnPostback="true"
     Inherits="FineUIPro.Web.HSSE.ActionPlan.ManagerRule" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
+
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -9,128 +12,143 @@
 </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" Height="550px ">        
-        <Items>                 
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管理规定发布" EnableCollapse="true"
-              runat="server" BoxFlex="1" DataKeyNames="ManagerRuleId"  DataIDField="ManagerRuleId" AllowSorting="true" SortField="IssueDate,CompileDate" SortDirection="DESC" EnableColumnLines="true"
-                OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" ForceFit="true"
-                OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true" 
-                OnRowDoubleClick="Grid1_RowDoubleClick"  EnableTextSelection="True"> 
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
-                        <Items>
-                                <f:CheckBoxList runat="server" ID="cbIssue" ShowLabel="false" Width="150px" LabelAlign="Right">
-                                <f:CheckItem Text="未发布" Value="0"  Selected="true"/>
-                                <f:CheckItem Text="已发布" Value="1" />
-                                </f:CheckBoxList>
-                                <f:TextBox runat="server" Label="编号" ID="txtManageRuleCode" EmptyText="输入查询条件"
-                                Width="210px" LabelWidth="60px"
-                                LabelAlign="right">
-                                </f:TextBox>
-                                <f:TextBox runat="server" Label="名称" ID="txtManageRuleName" EmptyText="输入查询条件"
-                                Width="210px" LabelWidth="60px"
-                                LabelAlign="right">
-                                </f:TextBox>
-                                <f:TextBox runat="server" Label="分类" ID="txtManageRuleTypeName" EmptyText="输入查询条件"
-                                Width="210px" LabelWidth="60px"
-                                LabelAlign="right">
-                                </f:TextBox>
-                                                  
-                                <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" 	OnClick="TextBox_TextChanged" runat="server" >
-                                </f:Button> 
-                                <f:ToolbarFill runat="server">
-                                </f:ToolbarFill>        
-                                <f:Button ID="btnCompile" ToolTip="新增" Icon="Add" Hidden="true" runat="server" OnClick="btnCompile_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" HeaderText="序号" Width="50px" 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:TemplateField ColumnID="tfManageRuleCode" Width="80px" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left"
-                        SortField="ManageRuleCode">
-                        <ItemTemplate>
-                            <asp:Label ID="lblManageRuleCode" runat="server" Text='<%# Bind("ManageRuleCode") %>'
-                                ToolTip='<%#Bind("ManageRuleCode") %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:TemplateField ColumnID="tfOldManageRuleCode" Width="220px" HeaderText="原编号" HeaderTextAlign="Center" TextAlign="Left"
-                        SortField="OldManageRuleCode">
-                        <ItemTemplate>
-                            <asp:Label ID="lblOldManageRuleCode" runat="server" Text='<%# Bind("OldManageRuleCode") %>' ToolTip='<%#Bind("OldManageRuleCode") %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:TemplateField ColumnID="tfManageRuleName" Width="250px" HeaderText="文件名称" HeaderTextAlign="Center" TextAlign="Left"
-                        SortField="ManageRuleName">
-                        <ItemTemplate>
-                            <asp:Label ID="lblManageRuleName" runat="server" Text='<%# Bind("ManageRuleName") %>'
-                                ToolTip='<%#Bind("ManageRuleName") %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:TemplateField ColumnID="tfManageRuleTypeName" Width="150px" HeaderText="分类" HeaderTextAlign="Center" TextAlign="Left"
-                        SortField="ManageRuleTypeName">
-                        <ItemTemplate>
-                            <asp:Label ID="lblManageRuleTypeName" runat="server" Text='<%# Bind("ManageRuleTypeName") %>'
-                                ToolTip='<%#Bind("ManageRuleTypeName") %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-            <%--        <f:TemplateField ColumnID="tfShortRemark" Width="300px" HeaderText="摘要" HeaderTextAlign="Center" TextAlign="Left"
-                        ExpandUnusedSpace="true" SortField="Remark">
-                        <ItemTemplate>
-                            <asp:Label ID="lblRemark" runat="server" Text='<%# Bind("ShortRemark") %>' ToolTip='<%#Bind("Remark") %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>--%>
-                    <f:RenderField Width="100px" ColumnID="IssueDate" DataField="IssueDate" SortField="IssueDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="发布时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                </Columns>
-                <Listeners>
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
-                <PageItems>
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarSeparator>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                    </f:ToolbarText>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">                        
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="管理规定选择" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
-        OnClose="Window1_Close" Height="500px">
-    </f:Window>
-    <f:Window ID="Window2" Title="管理规定编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
-        Width="1024px" Height="550px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
-            runat="server" Text="编辑" Icon="Pencil" Hidden="true">
-        </f:MenuButton>
-        <%--<f:MenuButton ID="btnMenuAudit"  OnClick="btnMenuAudit_Click" EnablePostBack="true"
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" 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" DataKeyNames="ManagerRuleId" DataIDField="ManagerRuleId" AllowSorting="true" SortField="IssueDate,CompileDate" SortDirection="DESC" EnableColumnLines="true"
+                            OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" ForceFit="true"
+                            OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
+                            OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                                    <Items>
+                                        <f:CheckBoxList runat="server" ID="cbIssue" ShowLabel="false" Width="150px" LabelAlign="Right">
+                                            <f:CheckItem Text="未发布" Value="0" Selected="true" />
+                                            <f:CheckItem Text="已发布" Value="1" />
+                                        </f:CheckBoxList>
+                                        <f:TextBox runat="server" Label="编号" ID="txtManageRuleCode" EmptyText="输入查询条件"
+                                            Width="210px" LabelWidth="60px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="名称" ID="txtManageRuleName" EmptyText="输入查询条件"
+                                            Width="210px" LabelWidth="60px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="分类" ID="txtManageRuleTypeName" EmptyText="输入查询条件"
+                                            Width="210px" LabelWidth="60px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+
+                                        <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" OnClick="TextBox_TextChanged" runat="server">
+                                        </f:Button>
+                                        <f:ToolbarFill runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnCompile" ToolTip="新增" Icon="Add" Hidden="true" runat="server" OnClick="btnCompile_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" HeaderText="序号" Width="50px" 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:TemplateField ColumnID="tfManageRuleCode" Width="80px" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left"
+                                    SortField="ManageRuleCode">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblManageRuleCode" runat="server" Text='<%# Bind("ManageRuleCode") %>'
+                                            ToolTip='<%#Bind("ManageRuleCode") %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="tfOldManageRuleCode" Width="220px" HeaderText="原编号" HeaderTextAlign="Center" TextAlign="Left"
+                                    SortField="OldManageRuleCode">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblOldManageRuleCode" runat="server" Text='<%# Bind("OldManageRuleCode") %>' ToolTip='<%#Bind("OldManageRuleCode") %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="tfManageRuleName" Width="250px" HeaderText="文件名称" HeaderTextAlign="Center" TextAlign="Left"
+                                    SortField="ManageRuleName">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblManageRuleName" runat="server" Text='<%# Bind("ManageRuleName") %>'
+                                            ToolTip='<%#Bind("ManageRuleName") %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="tfManageRuleTypeName" Width="150px" HeaderText="分类" HeaderTextAlign="Center" TextAlign="Left"
+                                    SortField="ManageRuleTypeName">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblManageRuleTypeName" runat="server" Text='<%# Bind("ManageRuleTypeName") %>'
+                                            ToolTip='<%#Bind("ManageRuleTypeName") %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <%--        <f:TemplateField ColumnID="tfShortRemark" Width="300px" HeaderText="摘要" HeaderTextAlign="Center" TextAlign="Left"
+            ExpandUnusedSpace="true" SortField="Remark">
+            <ItemTemplate>
+                <asp:Label ID="lblRemark" runat="server" Text='<%# Bind("ShortRemark") %>' ToolTip='<%#Bind("Remark") %>'></asp:Label>
+            </ItemTemplate>
+        </f:TemplateField>--%>
+                                <f:RenderField Width="100px" ColumnID="IssueDate" DataField="IssueDate" SortField="IssueDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="发布时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+
+        <f:Window ID="Window1" Title="管理规定选择" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1100px"
+            OnClose="Window1_Close" Height="500px">
+        </f:Window>
+        <f:Window ID="Window2" Title="管理规定编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="1024px" Height="550px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
+                runat="server" Text="编辑" Icon="Pencil" Hidden="true">
+            </f:MenuButton>
+            <%--<f:MenuButton ID="btnMenuAudit"  OnClick="btnMenuAudit_Click" EnablePostBack="true"
             Hidden="true" runat="server" Text="审核" Icon="ZoomIn">
         </f:MenuButton>--%>
-        <f:MenuButton ID="btnMenuIssuance" Icon="BookNext" OnClick="btnMenuIssuance_Click"
-            EnablePostBack="true" Hidden="true" runat="server" Text="发布" >
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuDelete" Icon="Delete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
-            Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除" >
-        </f:MenuButton>
-    </f:Menu>
+            <f:MenuButton ID="btnMenuIssuance" Icon="BookNext" OnClick="btnMenuIssuance_Click"
+                EnablePostBack="true" Hidden="true" runat="server" Text="发布">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" Icon="Delete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
+                Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
+            </f:MenuButton>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRule.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRule.aspx.cs
index 11b9f19..6f7799d 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRule.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRule.aspx.cs
@@ -13,6 +13,20 @@ namespace FineUIPro.Web.HSSE.ActionPlan
     {
         #region 定义项
         /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        /// <summary>
         /// 管理规定发布主键
         /// </summary>
         public string ManagerRuleId
@@ -69,7 +83,20 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             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.btnMenuDelete.OnClientClick = Grid1.GetNoSelectionAlertReference("请至少选择一项！");
                 this.btnMenuDelete.ConfirmText = String.Format("你确定要删除选中的&nbsp;<b><script>{0}</script></b>&nbsp;行数据吗？", Grid1.GetSelectedCountReference());
                 this.ManagerRuleListCode = Request.Params["managerRuleListCode"];
@@ -77,12 +104,32 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                 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 ManagerRule.ManagerRuleId,CodeRecords.Code AS ManageRuleCode,ManagerRule.ProjectId,"
                 + @"ManagerRule.OldManageRuleCode,ManagerRule.ManageRuleName,ManagerRule.ManageRuleTypeId,"
                 + @"ManagerRule.VersionNo,"
@@ -113,7 +160,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (!string.IsNullOrEmpty(this.txtManageRuleCode.Text.Trim()))
             {
@@ -133,11 +180,11 @@ namespace FineUIPro.Web.HSSE.ActionPlan
 
             if (this.cbIssue.SelectedValueArray.Length == 1)
             {
-               ///是否发布
+                ///是否发布
                 string selectValue = String.Join(", ", this.cbIssue.SelectedValueArray);
                 if (selectValue == "1")
                 {
-                    strSql += " AND ManagerRule.IsIssue = 1 ";                    
+                    strSql += " AND ManagerRule.IsIssue = 1 ";
                 }
                 else
                 {
@@ -148,7 +195,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
-            Grid1.RecordCount = tb.Rows.Count;          
+            Grid1.RecordCount = tb.Rows.Count;
             var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
             Grid1.DataBind();
@@ -198,7 +245,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
         /// <param name="sender"></param>
         /// <param name="e"></param>
         protected void btnMenuDelete_Click(object sender, EventArgs e)
-        {            
+        {
             this.DeleteData();
         }
 
@@ -230,7 +277,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                             BLL.LogService.AddSys_Log(this.CurrUser, manageRule.ManageRuleCode, manageRule.ManagerRuleId, BLL.Const.ActionPlan_ManagerRuleMenuId, Const.BtnDelete);
                             BLL.ActionPlan_ManagerRuleService.DeleteManageRuleById(rowID);
                         }
-                        
+
                         BindGrid();
                         ShowNotify("删除成功！", MessageBoxIcon.Success);
                         //}
@@ -306,14 +353,14 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             if (managerRule != null)
             {
                 if (this.btnMenuEdit.Hidden || managerRule.State == BLL.Const.State_2)   ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
-                {                    
+                {
                     PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("ManagerRuleView.aspx?ManagerRuleId={0}", managerRuleId, "查看 - ")));
                 }
                 else
                 {
                     PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("ManagerRuleEdit.aspx?ManagerRuleId={0}", managerRuleId, "编辑 - ")));
                 }
-            } 
+            }
         }
         #endregion
 
@@ -420,7 +467,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
         /// <param name="e"></param>
         protected void btnMenuIssuance_Click(object sender, EventArgs e)
         {
-            string strShowNotify = string.Empty;   
+            string strShowNotify = string.Empty;
             if (Grid1.SelectedRowIndexArray.Length > 0)
             {
                 foreach (int rowIndex in Grid1.SelectedRowIndexArray)
@@ -451,7 +498,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                         else
                         {
                             strShowNotify += "管理规定：" + managerRule.ManageRuleName + "；";
-                           
+
                         }
                     }
                 }
@@ -513,7 +560,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                 return;
             }
 
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ActionPlan_ManagerRuleMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ActionPlan_ManagerRuleMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
@@ -539,7 +586,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             }
         }
         #endregion
-        
+
         #region 查询
         /// <summary>
         /// 查询
@@ -549,7 +596,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
         protected void TextBox_TextChanged(object sender, EventArgs e)
         {
             this.BindGrid();
-            if(this.PageSize.HasValue)
+            if (this.PageSize.HasValue)
             {
                 this.ddlPageSize.SelectedValue = this.PageSize.ToString();
             }
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRule.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRule.aspx.designer.cs
index ca6aca1..38fb5d6 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRule.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRule.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.ActionPlan {
-    
-    
-    public partial class ManagerRule {
-        
+namespace FineUIPro.Web.HSSE.ActionPlan
+{
+
+
+    public partial class ManagerRule
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// cbIssue 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBoxList cbIssue;
-        
+
         /// <summary>
         /// txtManageRuleCode 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtManageRuleCode;
-        
+
         /// <summary>
         /// txtManageRuleName 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtManageRuleName;
-        
+
         /// <summary>
         /// txtManageRuleTypeName 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtManageRuleTypeName;
-        
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
-        
+
         /// <summary>
         /// btnCompile 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnCompile;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblManageRuleCode 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblManageRuleCode;
-        
+
         /// <summary>
         /// lblOldManageRuleCode 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblOldManageRuleCode;
-        
+
         /// <summary>
         /// lblManageRuleName 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblManageRuleName;
-        
+
         /// <summary>
         /// lblManageRuleTypeName 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblManageRuleTypeName;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -200,7 +238,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -209,7 +247,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -218,7 +256,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuIssuance 控件。
         /// </summary>
@@ -227,7 +265,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuIssuance;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRuleList.aspx b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRuleList.aspx
index 8b9ecd9..f6700f0 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRuleList.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRuleList.aspx
@@ -1,5 +1,7 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ManagerRuleList.aspx.cs" Inherits="FineUIPro.Web.HSSE.ActionPlan.ManagerRuleList" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -9,106 +11,120 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管理规定清单" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="ManagerRuleId" DataIDField="ManagerRuleId" AllowSorting="true"
-                    SortField="CompileDate" SortDirection="ASC" EnableColumnLines="true" OnSort="Grid1_Sort" ForceFit="true"
-                    AllowPaging="true" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:RadioButtonList runat="server" ID="rblType" ShowRedStar="true" AutoPostBack="true" Width="210px" OnSelectedIndexChanged="rblType_SelectedIndexChanged">
-                                    <f:RadioItem Text="集团" Value="集团" Selected="true" />
-                                    <f:RadioItem Text="公司" Value="公司" />
-                                    <f:RadioItem Text="项目" Value="项目" />
-                                </f:RadioButtonList>
-                                <f:TextBox runat="server" Label="编号" ID="txtManageRuleCode" EmptyText="输入查询条件"
-                                    Width="210px" LabelWidth="60px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                                <f:TextBox runat="server" Label="名称" ID="txtManageRuleName" EmptyText="输入查询条件"
-                                    Width="210px" LabelWidth="60px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                                <f:TextBox runat="server" Label="分类" ID="txtManageRuleTypeName" EmptyText="输入查询条件"
-                                    Width="210px" LabelWidth="60px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                               
-                                
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" Text="查询"
-                                    OnClick="TextBox_TextChanged" runat="server">
-                                </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="tfManageRuleCode" Width="80px" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left"
-                            SortField="ManageRuleCode">
-                            <ItemTemplate>
-                                <asp:Label ID="lblManageRuleCode" runat="server" Text='<%# Bind("ManageRuleCode") %>'
-                                    ToolTip='<%#Bind("ManageRuleCode") %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="220px" ColumnID="OldManageRuleCode" DataField="OldManageRuleCode"
-                            SortField="OldManageRuleCode" FieldType="String" HeaderText="原编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="tfManageRuleName" Width="250px" HeaderText="文件名称" HeaderTextAlign="Center" TextAlign="Left"
-                            SortField="ManageRuleName">
-                            <ItemTemplate>
-                                <asp:Label ID="lblManageRuleName" runat="server" Text='<%# Bind("ManageRuleName") %>'
-                                    ToolTip='<%#Bind("ManageRuleName") %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:TemplateField ColumnID="tfManageRuleTypeName" Width="150px" HeaderText="分类" HeaderTextAlign="Center" TextAlign="Left"
-                            SortField="ManageRuleTypeName">
-                            <ItemTemplate>
-                                <asp:Label ID="lblManageRuleTypeName" runat="server" Text='<%# Bind("ManageRuleTypeName") %>'
-                                    ToolTip='<%#Bind("ManageRuleTypeName") %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:TemplateField ColumnID="tfVersionNo" Width="60px" HeaderText="版本" HeaderTextAlign="Center" TextAlign="Left"
-                            SortField="VersionNo">
-                            <ItemTemplate>
-                                <asp:Label ID="lblVersionNo" runat="server" Text='<%# Bind("VersionNo") %>'
-                                    ToolTip='<%#Bind("VersionNo") %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <%-- <f:TemplateField ColumnID="tfRemark" Width="300px" HeaderText="摘要" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true"
-                        SortField="Remark">
-                        <ItemTemplate>
-                            <asp:Label ID="lblRemark" runat="server" Text='<%# Bind("ShortRemark") %>' ToolTip='<%#Bind("Remark") %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>--%>
-                        <%--<f:WindowField TextAlign="Center" Width="120px" WindowID="WindowAtt" HeaderText="附件"
-                        Text="附件上传查看" ToolTip="附件上传查看" DataIFrameUrlFields="ManagerRuleId" DataIFrameUrlFormatString="../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ActionPlanManagerRule&menuId=775EFCF4-DE5C-46E9-8EA3-B16270E2F6A6"
-                         />
-                    <f:WindowField TextAlign="Center" Width="60px" WindowID="Window6" HeaderText="内容"
-                        Text="编辑" ToolTip="编辑内容" DataIFrameUrlFields="ManagerRuleId" DataIFrameUrlFormatString="../ShowDialog/ShowSeeFile.aspx?toKeyId={0}&type=ActionPlanManageRule"
-                        Title="编辑内容"  />--%>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管理规定清单" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="ManagerRuleId" DataIDField="ManagerRuleId" AllowSorting="true"
+                            SortField="CompileDate" SortDirection="ASC" EnableColumnLines="true" OnSort="Grid1_Sort" ForceFit="true"
+                            AllowPaging="true" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:RadioButtonList runat="server" ID="rblType" ShowRedStar="true" AutoPostBack="true" Width="210px" OnSelectedIndexChanged="rblType_SelectedIndexChanged">
+                                            <f:RadioItem Text="集团" Value="集团" Selected="true" />
+                                            <f:RadioItem Text="公司" Value="公司" />
+                                            <f:RadioItem Text="项目" Value="项目" />
+                                        </f:RadioButtonList>
+                                        <f:TextBox runat="server" Label="编号" ID="txtManageRuleCode" EmptyText="输入查询条件"
+                                            Width="210px" LabelWidth="60px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="名称" ID="txtManageRuleName" EmptyText="输入查询条件"
+                                            Width="210px" LabelWidth="60px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="分类" ID="txtManageRuleTypeName" EmptyText="输入查询条件"
+                                            Width="210px" LabelWidth="60px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+
+
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" Text="查询"
+                                            OnClick="TextBox_TextChanged" runat="server">
+                                        </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="tfManageRuleCode" Width="80px" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left"
+                                    SortField="ManageRuleCode">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblManageRuleCode" runat="server" Text='<%# Bind("ManageRuleCode") %>'
+                                            ToolTip='<%#Bind("ManageRuleCode") %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="220px" ColumnID="OldManageRuleCode" DataField="OldManageRuleCode"
+                                    SortField="OldManageRuleCode" FieldType="String" HeaderText="原编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="tfManageRuleName" Width="250px" HeaderText="文件名称" HeaderTextAlign="Center" TextAlign="Left"
+                                    SortField="ManageRuleName">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblManageRuleName" runat="server" Text='<%# Bind("ManageRuleName") %>'
+                                            ToolTip='<%#Bind("ManageRuleName") %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="tfManageRuleTypeName" Width="150px" HeaderText="分类" HeaderTextAlign="Center" TextAlign="Left"
+                                    SortField="ManageRuleTypeName">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblManageRuleTypeName" runat="server" Text='<%# Bind("ManageRuleTypeName") %>'
+                                            ToolTip='<%#Bind("ManageRuleTypeName") %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="tfVersionNo" Width="60px" HeaderText="版本" HeaderTextAlign="Center" TextAlign="Left"
+                                    SortField="VersionNo">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblVersionNo" runat="server" Text='<%# Bind("VersionNo") %>'
+                                            ToolTip='<%#Bind("VersionNo") %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <%-- <f:TemplateField ColumnID="tfRemark" Width="300px" HeaderText="摘要" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true"
+         SortField="Remark">
+         <ItemTemplate>
+             <asp:Label ID="lblRemark" runat="server" Text='<%# Bind("ShortRemark") %>' ToolTip='<%#Bind("Remark") %>'></asp:Label>
+         </ItemTemplate>
+     </f:TemplateField>--%>
+                                <%--<f:WindowField TextAlign="Center" Width="120px" WindowID="WindowAtt" HeaderText="附件"
+         Text="附件上传查看" ToolTip="附件上传查看" DataIFrameUrlFields="ManagerRuleId" DataIFrameUrlFormatString="../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ActionPlanManagerRule&menuId=775EFCF4-DE5C-46E9-8EA3-B16270E2F6A6"
+          />
+     <f:WindowField TextAlign="Center" Width="60px" WindowID="Window6" HeaderText="内容"
+         Text="编辑" ToolTip="编辑内容" DataIFrameUrlFields="ManagerRuleId" DataIFrameUrlFormatString="../ShowDialog/ShowSeeFile.aspx?toKeyId={0}&type=ActionPlanManageRule"
+         Title="编辑内容"  />--%>
+                            </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"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRuleList.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRuleList.aspx.cs
index d5865c1..960906f 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRuleList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRuleList.aspx.cs
@@ -13,6 +13,20 @@ namespace FineUIPro.Web.HSSE.ActionPlan
     {
         #region 定义项
         /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        /// <summary>
         /// 管理规定发布主键
         /// </summary>
         public string ManagerRuleId
@@ -51,7 +65,20 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                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.btnMenuDelete.OnClientClick = Grid1.GetNoSelectionAlertReference("请至少选择一项！");
                 this.btnMenuDelete.ConfirmText = String.Format("你确定要删除选中的&nbsp;<b><script>{0}</script></b>&nbsp;行数据吗？", Grid1.GetSelectedCountReference());
 
@@ -61,12 +88,31 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                 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 = string.Empty;
             if (this.rblType.SelectedValue == "集团")
             {
@@ -98,7 +144,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
 
             if (!string.IsNullOrEmpty(this.txtManageRuleCode.Text.Trim()))
@@ -341,7 +387,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                 return;
             }
 
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ActionPlan_ManagerRuleListMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ActionPlan_ManagerRuleListMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnDelete))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRuleList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRuleList.aspx.designer.cs
index ec27092..dae41df 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRuleList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ManagerRuleList.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.ActionPlan {
-    
-    
-    public partial class ManagerRuleList {
-        
+namespace FineUIPro.Web.HSSE.ActionPlan
+{
+
+
+    public partial class ManagerRuleList
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// rblType 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblType;
-        
+
         /// <summary>
         /// txtManageRuleCode 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtManageRuleCode;
-        
+
         /// <summary>
         /// txtManageRuleName 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtManageRuleName;
-        
+
         /// <summary>
         /// txtManageRuleTypeName 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtManageRuleTypeName;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblManageRuleCode 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblManageRuleCode;
-        
+
         /// <summary>
         /// lblManageRuleName 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblManageRuleName;
-        
+
         /// <summary>
         /// lblManageRuleTypeName 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblManageRuleTypeName;
-        
+
         /// <summary>
         /// lblVersionNo 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblVersionNo;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -200,7 +238,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ProjectManageRule.aspx b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ProjectManageRule.aspx
index 7057666..f55724e 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ProjectManageRule.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ProjectManageRule.aspx
@@ -1,5 +1,8 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectManageRule.aspx.cs" Inherits="FineUIPro.Web.HSSE.ActionPlan.ProjectManageRule" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,81 +13,95 @@
 <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" Height="550px ">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="公司安全管理制度发布" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="ManagerRuleId" DataIDField="ManagerRuleId" AllowSorting="true" SortField="IssueDate,CompileDate" SortDirection="DESC" EnableColumnLines="true"
-                    OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" ForceFit="true"
-                    OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
-                    OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
-                            <Items>
-                                <f:CheckBoxList runat="server" ID="cbIssue" ShowLabel="false" Width="150px" LabelAlign="Right">
-                                    <f:CheckItem Text="未发布" Value="0" Selected="true" />
-                                    <f:CheckItem Text="已发布" Value="1" />
-                                </f:CheckBoxList>
-                                <f:TextBox runat="server" Label="编号" ID="txtManageRuleCode" EmptyText="输入查询条件"
-                                    Width="210px" LabelWidth="60px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                                <f:TextBox runat="server" Label="名称" ID="txtManageRuleName" EmptyText="输入查询条件"
-                                    Width="210px" LabelWidth="60px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                                <f:TextBox runat="server" Label="分类" ID="txtManageRuleTypeName" EmptyText="输入查询条件"
-                                    Width="210px" LabelWidth="60px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                                
-                                
-                                <f:ToolbarFill runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" OnClick="TextBox_TextChanged" Text="查询" runat="server">
-                                </f:Button>
-                                <f:Button ID="btnCompile" ToolTip="新增" Icon="Add" Hidden="true" runat="server" OnClick="btnCompile_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:RenderField Width="80px" ColumnID="ManageRuleCode" DataField="ManageRuleCode"
-                            SortField="ManageRuleCode" FieldType="String" HeaderText="文件编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="tfManageRuleName" Width="250px" HeaderText="文件名称" HeaderTextAlign="Center" TextAlign="Left"
-                            SortField="ManageRuleName">
-                            <ItemTemplate>
-                                <asp:Label ID="lblManageRuleName" runat="server" Text='<%# Bind("ManageRuleName") %>'
-                                    ToolTip='<%#Bind("ManageRuleName") %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                         <f:RenderField Width="160px" ColumnID="ManageRuleTypeName" DataField="ManageRuleTypeName"
-                            SortField="ManageRuleTypeName" FieldType="String" HeaderText="分类" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="IssueDate" DataField="IssueDate" SortField="IssueDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="发布时间"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="公司安全管理制度发布" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="ManagerRuleId" DataIDField="ManagerRuleId" AllowSorting="true" SortField="IssueDate,CompileDate" SortDirection="DESC" EnableColumnLines="true"
+                            OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" ForceFit="true"
+                            OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
+                            OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                                    <Items>
+                                        <f:CheckBoxList runat="server" ID="cbIssue" ShowLabel="false" Width="150px" LabelAlign="Right">
+                                            <f:CheckItem Text="未发布" Value="0" Selected="true" />
+                                            <f:CheckItem Text="已发布" Value="1" />
+                                        </f:CheckBoxList>
+                                        <f:TextBox runat="server" Label="编号" ID="txtManageRuleCode" EmptyText="输入查询条件"
+                                            Width="210px" LabelWidth="60px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="名称" ID="txtManageRuleName" EmptyText="输入查询条件"
+                                            Width="210px" LabelWidth="60px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="分类" ID="txtManageRuleTypeName" EmptyText="输入查询条件"
+                                            Width="210px" LabelWidth="60px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+
+
+                                        <f:ToolbarFill runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" OnClick="TextBox_TextChanged" Text="查询" runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnCompile" ToolTip="新增" Icon="Add" Hidden="true" runat="server" OnClick="btnCompile_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:RenderField Width="80px" ColumnID="ManageRuleCode" DataField="ManageRuleCode"
+                                    SortField="ManageRuleCode" FieldType="String" HeaderText="文件编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="tfManageRuleName" Width="250px" HeaderText="文件名称" HeaderTextAlign="Center" TextAlign="Left"
+                                    SortField="ManageRuleName">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblManageRuleName" runat="server" Text='<%# Bind("ManageRuleName") %>'
+                                            ToolTip='<%#Bind("ManageRuleName") %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="160px" ColumnID="ManageRuleTypeName" DataField="ManageRuleTypeName"
+                                    SortField="ManageRuleTypeName" FieldType="String" HeaderText="分类" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="IssueDate" DataField="IssueDate" SortField="IssueDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="发布时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="管理规定选择" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ProjectManageRule.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ProjectManageRule.aspx.cs
index e30966d..468418a 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ProjectManageRule.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ProjectManageRule.aspx.cs
@@ -14,6 +14,21 @@ namespace FineUIPro.Web.HSSE.ActionPlan
 {
     public partial class ProjectManageRule : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
         /// <summary>
         /// 页面
         /// </summary>
@@ -28,6 +43,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                 ViewState["PageSize"] = value;
             }
         }
+        #endregion
         #region 加载页面
         /// <summary>
         /// 加载页面
@@ -39,19 +55,52 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             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.btnMenuDelete.OnClientClick = Grid1.GetNoSelectionAlertReference("请至少选择一项！");
                 this.btnMenuDelete.ConfirmText = String.Format("你确定要删除选中的&nbsp;<b><script>{0}</script></b>&nbsp;行数据吗？", Grid1.GetSelectedCountReference());
                 // 绑定表格
                 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 ManagerRule.ManagerRuleId,ManagerRule.ProjectId,ManageRuleCode,
                              ManagerRule.ManageRuleName,
                              ManagerRule.VersionNo,
@@ -81,7 +130,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (!string.IsNullOrEmpty(this.txtManageRuleCode.Text.Trim()))
             {
@@ -365,7 +414,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
                 return;
             }
 
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ActionPlan_ProjectManagerRuleMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ActionPlan_ProjectManagerRuleMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ProjectManageRule.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ProjectManageRule.aspx.designer.cs
index 889ec39..12c1988 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ProjectManageRule.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/ActionPlan/ProjectManageRule.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.ActionPlan {
-    
-    
-    public partial class ProjectManageRule {
-        
+namespace FineUIPro.Web.HSSE.ActionPlan
+{
+
+
+    public partial class ProjectManageRule
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// cbIssue 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBoxList cbIssue;
-        
+
         /// <summary>
         /// txtManageRuleCode 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtManageRuleCode;
-        
+
         /// <summary>
         /// txtManageRuleName 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtManageRuleName;
-        
+
         /// <summary>
         /// txtManageRuleTypeName 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtManageRuleTypeName;
-        
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
-        
+
         /// <summary>
         /// btnCompile 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnCompile;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblManageRuleName 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblManageRuleName;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuIssuance 控件。
         /// </summary>
@@ -200,7 +238,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuIssuance;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs
index a846cd2..8f9b05e 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs
@@ -55,6 +55,14 @@ namespace FineUIPro.Web.HSSE.Check
                 {
                     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();
+                }
                 Technique_CheckItemSetService.InitCheckItemSetDropDownList(this.drpSupCheckItemSet, "2", "0", true);
              
                 checkItem = Request.Params["checkItem"];
@@ -66,15 +74,6 @@ namespace FineUIPro.Web.HSSE.Check
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 BindGrid();
-
-                this.ucTree.UnitId = this.CurrUser.UnitId;
-                this.ucTree.ProjectId = this.ProjectId;
-                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
-                {
-                    this.panelLeftRegion.Hidden = true;
-                    ////权限按钮方法
-                    this.GetButtonPower();
-                }
             }
         }
 
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/CheckSpecialRecord.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/CheckSpecialRecord.aspx.cs
index 081be4f..c783dfc 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/CheckSpecialRecord.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/CheckSpecialRecord.aspx.cs
@@ -64,14 +64,6 @@ namespace FineUIPro.Web.HSSE.Check
 
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
-
-                if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
-                {
-                    Grid1.PageSize = this.CurrUser.PageSize.Value;
-                }
-                this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                // 绑定表格
-                this.BindGrid();
                 if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
                 {
                     this.panelLeftRegion.Hidden = true;
@@ -80,6 +72,12 @@ namespace FineUIPro.Web.HSSE.Check
                     this.GetButtonPower();
                 }
 
+
+                if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
+                {
+                    Grid1.PageSize = this.CurrUser.PageSize.Value;
+                }
+                this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 //Funs.DropDownPageSize(this.ddlPageSize);
                 //GetButtonPower();
                 this.ItemSelectedList = new List<string>();
@@ -90,7 +88,7 @@ namespace FineUIPro.Web.HSSE.Check
                 //this.drpStates.DataBind();
                 //Funs.FineUIPleaseSelect(this.drpStates);
                 // 绑定表格
-                //BindGrid();
+                this.BindGrid();
             }
         }
 
@@ -109,6 +107,10 @@ namespace FineUIPro.Web.HSSE.Check
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 string strSql = @"SELECT  a.CheckSpecialCode,(CASE WHEN a.States='2' THEN '已完成' WHEN a.States='1' THEN '待整改' ELSE '待提交' END) AS StatesName,a.CheckTime,b.* FROM Check_CheckSpecial 
@@ -400,7 +402,7 @@ namespace FineUIPro.Web.HSSE.Check
         /// <param name="e"></param>
         protected void btnNew_Click(object sender, EventArgs e)
         {
-            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnAdd))
+            if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnAdd))
             {
                 PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HiddenInspection/HiddenRectificationAdd.aspx", "登记 - ")));
             }
@@ -440,7 +442,7 @@ namespace FineUIPro.Web.HSSE.Check
                 }
             }
             if (e.CommandName == "attchUrl")
-            { 
+            {
                 PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/CheckSpecial&menuId={1}&edit=1&type=-1", RegistrationId, BLL.Const.ProjectCheckSpecialMenuId)));
             }
             if (e.CommandName == "del")
@@ -742,7 +744,7 @@ namespace FineUIPro.Web.HSSE.Check
             {
                 if (buttonList.Contains(Const.BtnAdd))
                 {
-                  //  this.btnNew.Hidden = false;
+                    //  this.btnNew.Hidden = false;
                     this.btnRectify.Hidden = false;
                     this.btnConfirm.Hidden = false;
                 }
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/ContactList.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Check/ContactList.aspx
index 591307c..c87e03a 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/ContactList.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/ContactList.aspx
@@ -1,15 +1,16 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContactList.aspx.cs" Inherits="FineUIPro.Web.HSSE.Check.ContactList" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>联系单</title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
-     <style type="text/css">
-        .f-grid-row .f-grid-cell-inner
-        {
+    <style type="text/css">
+        .f-grid-row .f-grid-cell-inner {
             white-space: normal;
             word-break: break-all;
         }
@@ -17,108 +18,122 @@
 </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="ContactListId"
-                AllowCellEditing="true" ClicksToEdit="2" DataIDField="ContactListId" AllowSorting="true"
-                SortField="Code" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items>       
-                             <f:DropDownList ID="drpSponsorUnit" runat="server" Label="发起单位" EnableEdit="true"  EmptyText="请选择查询条件"
-                                AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" Width="300px" LabelWidth="80px" LabelAlign="right">
-                            </f:DropDownList>
-                            <f:DropDownList ID="drpReceivingUnits" runat="server" Label="接收单位" EnableEdit="true"  EmptyText="请选择查询条件"
-                                AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" Width="300px" LabelWidth="80px" LabelAlign="right">
-                            </f:DropDownList>                     
-                            <%--<f:TextBox runat="server" Label="标题" ID="txtTitle" EmptyText="输入查询条件"
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" 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="ContactListId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="ContactListId" AllowSorting="true"
+                            SortField="Code" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList ID="drpSponsorUnit" runat="server" Label="发起单位" EnableEdit="true" EmptyText="请选择查询条件"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" Width="300px" LabelWidth="80px" LabelAlign="right">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpReceivingUnits" runat="server" Label="接收单位" EnableEdit="true" EmptyText="请选择查询条件"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" Width="300px" LabelWidth="80px" LabelAlign="right">
+                                        </f:DropDownList>
+                                        <%--<f:TextBox runat="server" Label="标题" ID="txtTitle" EmptyText="输入查询条件"
                                 AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
                                 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>
-                            <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="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="220px" ColumnID="SponsorUnitName" DataField="SponsorUnitName"
-                         SortField="SponsorUnitName" FieldType="String" HeaderText="发起单位"
-                        HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="350px" ColumnID="ReceivingUnitNames" DataField="ReceivingUnitNames"
-                        SortField="ReceivingUnitNames" FieldType="String" HeaderText="接收单位" HeaderTextAlign="Center"
-                        TextAlign="Left" ExpandUnusedSpace="true">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="CompileDate" DataField="CompileDate"
-                        SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="整理日期" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="Scope" DataField="CompileManName"
-                        SortField="CompileManName" FieldType="String" HeaderText="整理人" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="Remark" DataField="Remark"
-                        SortField="Remark" FieldType="String" HeaderText="摘要" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" HeaderText="附件" Text="附件" ToolTip="附件上传查看"
-                        DataIFrameUrlFields="ContactListId" DataIFrameUrlFormatString="../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ContactListAttachUrl&menuId=9D04CD8B-575C-4854-B8B0-F90CEEB75815"
-                        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:ListItem Text="10" Value="10" />
-                        <f:ListItem Text="15" Value="15" />
-                        <f:ListItem Text="20" Value="20" />
-                        <f:ListItem Text="25" Value="25" />
-                        <f:ListItem Text="所有行" Value="100000" />
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="联系单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1024px"
-        Height="500px">
-    </f:Window>
-    <f:Window ID="WindowAtt" Title="附件页面" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="700px"
-        Height="500px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="TableEdit" 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>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </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="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="220px" ColumnID="SponsorUnitName" DataField="SponsorUnitName"
+                                    SortField="SponsorUnitName" FieldType="String" HeaderText="发起单位"
+                                    HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="350px" ColumnID="ReceivingUnitNames" DataField="ReceivingUnitNames"
+                                    SortField="ReceivingUnitNames" FieldType="String" HeaderText="接收单位" HeaderTextAlign="Center"
+                                    TextAlign="Left" ExpandUnusedSpace="true">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="CompileDate" DataField="CompileDate"
+                                    SortField="CompileDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="整理日期" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="Scope" DataField="CompileManName"
+                                    SortField="CompileManName" FieldType="String" HeaderText="整理人" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="Remark" DataField="Remark"
+                                    SortField="Remark" FieldType="String" HeaderText="摘要" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" HeaderText="附件" Text="附件" ToolTip="附件上传查看"
+                                    DataIFrameUrlFields="ContactListId" DataIFrameUrlFormatString="../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ContactListAttachUrl&menuId=9D04CD8B-575C-4854-B8B0-F90CEEB75815"
+                                    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:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="100000" />
+                                </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="true" runat="server" IsModal="true" Width="1024px"
+            Height="500px">
+        </f:Window>
+        <f:Window ID="WindowAtt" Title="附件页面" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="TableEdit" 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">
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/ContactList.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/ContactList.aspx.cs
index 9176219..131a30e 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/ContactList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/ContactList.aspx.cs
@@ -9,7 +9,7 @@ using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Check
 {
-    public partial class ContactList :PageBase
+    public partial class ContactList : PageBase
     {
         #region 定义项
         /// <summary>
@@ -38,16 +38,21 @@ namespace FineUIPro.Web.HSSE.Check
         {
             if (!IsPostBack)
             {
+                Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                //发起单位
-                BLL.UnitService.InitUnitDropDownList(this.drpSponsorUnit, this.ProjectId, true);
-                //接收单位
-                BLL.UnitService.InitUnitDropDownList(this.drpReceivingUnits, this.ProjectId, true);
-
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 ////权限按钮方法
                 this.GetButtonPower();
                 this.btnNew.OnClientClick = Window1.GetShowReference("ContactListEdit.aspx") + "return false;";
@@ -60,11 +65,41 @@ namespace FineUIPro.Web.HSSE.Check
                 this.BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            //发起单位
+            BLL.UnitService.InitUnitDropDownList(this.drpSponsorUnit, this.ProjectId, true);
+            //接收单位
+            BLL.UnitService.InitUnitDropDownList(this.drpReceivingUnits, this.ProjectId, true);
+        }
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+
+            this.GetButtonPower();
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.BindGrid();
+        }
+
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = @"SELECT T.ContactListId,T.ProjectId,CodeRecords.Code,T.SponsorUnitId,Unit.UnitName AS SponsorUnitName,T.ReceivingUnits,T.ReceivingUnitNames,T.CompileDate,Users.UserName AS CompileManName,T.Remark,T.AttachUrl,T.SeeFile"
                           + @" FROM Check_ContactList AS T "
                           + @" LEFT JOIN Sys_User AS Users ON T.CompileMan=Users.UserId"
@@ -75,7 +110,7 @@ namespace FineUIPro.Web.HSSE.Check
             strSql += " AND T.ProjectId = @ProjectId";
             listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
 
-            if (this.drpSponsorUnit.SelectedValue != BLL.Const._Null)
+            if (this.drpSponsorUnit.SelectedValue != null && this.drpSponsorUnit.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND T.SponsorUnitId = @SponsorUnitId";
                 listStr.Add(new SqlParameter("@SponsorUnitId", this.drpSponsorUnit.SelectedValue));
@@ -227,7 +262,7 @@ namespace FineUIPro.Web.HSSE.Check
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectContactListMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectContactListMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/ContactList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/ContactList.aspx.designer.cs
index 6aac3e6..818113f 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/ContactList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/ContactList.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Check {
-    
-    
-    public partial class ContactList {
-        
+namespace FineUIPro.Web.HSSE.Check
+{
+
+
+    public partial class ContactList
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// drpSponsorUnit 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpSponsorUnit;
-        
+
         /// <summary>
         /// drpReceivingUnits 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpReceivingUnits;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx
index 0d3a599..d558152 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx
@@ -1,21 +1,33 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OfficeCheck.aspx.cs" Inherits="FineUIPro.Web.HSSE.Check.OfficeCheck" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>总部检查</title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
     <script type="text/javascript" src="../../Controls/My97DatePicker/WdatePicker.js"></script>
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
-        <f:Form ID="Form2" ShowBorder="true" ShowHeader="false" Title="安全隐患及整改要求" AutoScroll="true"
-            runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
-            <Rows>
-                <f:FormRow>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" 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" AllowCellEditing="true" ClicksToEdit="1"
                             ForceFit="true" EnableCollapse="true" EnableColumnLines="true" EnableColumnMove="true" runat="server" BoxFlex="1"
@@ -56,9 +68,9 @@
                             </Columns>
                         </f:Grid>
                     </Items>
-                </f:FormRow>
-            </Rows>
-        </f:Form>
+                </f:Panel>
+            </Items>
+        </f:Panel>
         <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
             Height="500px">
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs
index 5366bd3..d68435b 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs
@@ -8,6 +8,22 @@ namespace FineUIPro.Web.HSSE.Check
 {
     public partial class OfficeCheck : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载
         /// <summary>
         /// 加载页面
@@ -23,12 +39,35 @@ namespace FineUIPro.Web.HSSE.Check
         }
         #endregion
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            //if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            //{
+            //    btnNew.Hidden = true;
+            //}
+            //this.GetButtonPower();
+            this.BindGrid();
+        }
+
         #region 数据绑定
+
         /// <summary>
         /// 绑定明细
         /// </summary>
         public void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = @"SELECT Item.RectifyItemId,
                                      Item.RectifyId,
                                      Item.WrongContent,
@@ -43,7 +82,7 @@ namespace FineUIPro.Web.HSSE.Check
             List<SqlParameter> listStr = new List<SqlParameter>();
             strSql += " WHERE Rectify.ProjectId = @ProjectId";
             strSql += " AND Rectify.States = @States";
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             listStr.Add(new SqlParameter("@States", this.rbStates.SelectedValue));
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -51,6 +90,7 @@ namespace FineUIPro.Web.HSSE.Check
             Grid1.DataSource = table;
             Grid1.DataBind();
         }
+
         #endregion
 
         #region 状态筛选事件
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.designer.cs
index 876c35c..be01232 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Check {
-    
-    
-    public partial class OfficeCheck {
-        
+namespace FineUIPro.Web.HSSE.Check
+{
+
+
+    public partial class OfficeCheck
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,16 +31,52 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
-        /// Form2 控件。
+        /// Panel1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Form Form2;
-        
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// rbStates 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rbStates;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/PauseNotice.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Check/PauseNotice.aspx
index cf9bba7..b5a6c7f 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/PauseNotice.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/PauseNotice.aspx
@@ -1,5 +1,7 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PauseNotice.aspx.cs" Inherits="FineUIPro.Web.HSSE.Check.PauseNotice" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,108 +12,122 @@
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-        <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工程暂停令" EnableCollapse="true"
-                runat="server" BoxFlex="1" DataKeyNames="PauseNoticeId" ForceFit="true"
-                DataIDField="PauseNoticeId" AllowSorting="true" SortField="PauseNoticeCode"
-                SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
-                IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items>
-                              <f:RadioButtonList runat="server" ID="rbStates" Width="450px" 
-                                 AutoPostBack="true" OnSelectedIndexChanged="rbStates_SelectedIndexChanged">
-                                <f:RadioItem Text="全部" Value="-1" Selected="true" />
-                                <f:RadioItem Text="待提交" Value="0" />
-                                <f:RadioItem Text="待签发" Value="1" />
-                                <f:RadioItem Text="待批准" Value="2" />
-                                <f:RadioItem Text="待接收" Value="3" />
-                                <f:RadioItem Text="已闭环" Value="4" />
-                            </f:RadioButtonList>  
-                            <f:TextBox runat="server" Label="编号" ID="txtPauseNoticeCode" EmptyText="输入查询条件"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="50px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增"
-                                Hidden="true">
-                            </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="140px" ColumnID="PauseNoticeCode" DataField="PauseNoticeCode"
-                        SortField="PauseNoticeCode" FieldType="String" HeaderText="编号" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="260px" ColumnID="UnitName" DataField="UnitName"
-                        SortField="UnitName" FieldType="String" HeaderText="单位名称" TextAlign="Left" HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="200px" ColumnID="ProjectPlace" DataField="ProjectPlace" ExpandUnusedSpace="true"
-                        SortField="ProjectPlace" FieldType="String" HeaderText="单位工程" TextAlign="Left" HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="PauseTime" DataField="PauseTime" SortField="PauseTime"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="停工日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-     <%--               <f:RenderField Width="150px" ColumnID="IsConfirmStr" DataField="IsConfirmStr" FieldType="String"
-                        HeaderText="是否签字确认" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>--%>
-                    <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
-                        SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                </Columns>
-                <Listeners>
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
-                <PageItems>
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarSeparator>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                    </f:ToolbarText>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">                     
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="编辑工程暂停令" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
-        Width="1000px" Height="550px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <Items>
-            <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
-                Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
-            </f:MenuButton>
-            <%--<f:MenuButton ID="btnMenuConfirm" EnablePostBack="true" runat="server" Hidden="true"
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" 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" DataKeyNames="PauseNoticeId" ForceFit="true"
+                            DataIDField="PauseNoticeId" AllowSorting="true" SortField="PauseNoticeCode"
+                            SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:RadioButtonList runat="server" ID="rbStates" Width="450px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="rbStates_SelectedIndexChanged">
+                                            <f:RadioItem Text="全部" Value="-1" Selected="true" />
+                                            <f:RadioItem Text="待提交" Value="0" />
+                                            <f:RadioItem Text="待签发" Value="1" />
+                                            <f:RadioItem Text="待批准" Value="2" />
+                                            <f:RadioItem Text="待接收" Value="3" />
+                                            <f:RadioItem Text="已闭环" Value="4" />
+                                        </f:RadioButtonList>
+                                        <f:TextBox runat="server" Label="编号" ID="txtPauseNoticeCode" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="50px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增"
+                                            Hidden="true">
+                                        </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="140px" ColumnID="PauseNoticeCode" DataField="PauseNoticeCode"
+                                    SortField="PauseNoticeCode" FieldType="String" HeaderText="编号" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="260px" ColumnID="UnitName" DataField="UnitName"
+                                    SortField="UnitName" FieldType="String" HeaderText="单位名称" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="ProjectPlace" DataField="ProjectPlace" ExpandUnusedSpace="true"
+                                    SortField="ProjectPlace" FieldType="String" HeaderText="单位工程" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="PauseTime" DataField="PauseTime" SortField="PauseTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="停工日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <%--               <f:RenderField Width="150px" ColumnID="IsConfirmStr" DataField="IsConfirmStr" FieldType="String"
+                   HeaderText="是否签字确认" HeaderTextAlign="Center" TextAlign="Center">
+               </f:RenderField>--%>
+                                <f:RenderField Width="150px" ColumnID="FlowOperateName" DataField="FlowOperateName"
+                                    SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </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" OnClose="Window1_Close"
+            Width="1000px" Height="550px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
+                    Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
+                </f:MenuButton>
+                <%--<f:MenuButton ID="btnMenuConfirm" EnablePostBack="true" runat="server" Hidden="true"
                 Text="确认" Icon="Accept" OnClick="btnMenuConfirm_Click">
             </f:MenuButton>--%>
-            <f:MenuButton ID="btnMenuView" EnablePostBack="true" runat="server" Text="查看" Icon="Find" OnClick="btnMenuView_Click">
+                <f:MenuButton ID="btnMenuView" EnablePostBack="true" runat="server" Text="查看" Icon="Find" OnClick="btnMenuView_Click">
                 </f:MenuButton>
-            <f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server"
-                Text="导出" Icon="Printer" OnClick="btnPrinter_Click" EnableAjax="false" DisableControlBeforePostBack="false">
-            </f:MenuButton>
-            <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
-                Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click">
-            </f:MenuButton>
-        </Items>
-    </f:Menu>
+                <f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server"
+                    Text="导出" Icon="Printer" OnClick="btnPrinter_Click" EnableAjax="false" DisableControlBeforePostBack="false">
+                </f:MenuButton>
+                <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
+                    Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/PauseNotice.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/PauseNotice.aspx.cs
index 25378e1..0d512c5 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/PauseNotice.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/PauseNotice.aspx.cs
@@ -46,8 +46,15 @@ namespace FineUIPro.Web.HSSE.Check
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                ////权限按钮方法
-                this.GetButtonPower();
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 btnNew.OnClientClick = Window1.GetShowReference("PauseNoticeAdd.aspx") + "return false;";
 
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
@@ -56,11 +63,33 @@ namespace FineUIPro.Web.HSSE.Check
             }
         }
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
+
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = @"SELECT PauseNotice.PauseNoticeId,PauseNotice.ProjectId,CodeRecords.Code AS PauseNoticeCode,Unit.UnitName,UnitWork.UnitWorkName as ProjectPlace,PauseNotice.UnitId,PauseNotice.PauseTime,case PauseNotice.IsConfirm when 1 then '已确认' else '未确认' end as IsConfirmStr ,
                 (CASE WHEN PauseNotice.PauseStates = '0' OR PauseNotice.PauseStates IS NULL THEN '待['+CompileMan.UserName+']提交' WHEN PauseNotice.PauseStates = '1' THEN '待['+SignMan.UserName+']签发'  WHEN PauseNotice.PauseStates = '2' THEN '待['+ApproveMan.UserName+']批准' WHEN PauseNotice.PauseStates = '3' THEN '待['+DutyPerson.UserName+']接收' WHEN PauseNotice.PauseStates = '4' THEN '审批完成' END) AS  FlowOperateName 
              FROM Check_PauseNotice AS PauseNotice 
@@ -81,7 +110,7 @@ namespace FineUIPro.Web.HSSE.Check
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (this.rbStates.SelectedValue != "-1")
             {
@@ -107,7 +136,7 @@ namespace FineUIPro.Web.HSSE.Check
             var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
             Grid1.DataBind();
-           
+
         }
         #endregion
 
@@ -198,7 +227,7 @@ namespace FineUIPro.Web.HSSE.Check
                 return;
             }
             EditData(Grid1.SelectedRowID);
-            
+
         }
         protected void btnMenuView_Click(object sender, EventArgs e)
         {
@@ -234,7 +263,7 @@ namespace FineUIPro.Web.HSSE.Check
                 url = "PauseNoticeEdit.aspx?PauseNoticeId={0}";
             }
             PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format(url, PauseNoticeId, "操作 - ")));
-            
+
         }
         #endregion
 
@@ -253,11 +282,11 @@ namespace FineUIPro.Web.HSSE.Check
                     string rowID = Grid1.DataKeys[rowIndex][0].ToString();
                     Model.Check_PunishNoticeFlowOperate Operate = (from x in Funs.DB.Check_PunishNoticeFlowOperate
                                                                    where x.PunishNoticeId == rowID
-                                                            select x).FirstOrDefault();
+                                                                   select x).FirstOrDefault();
                     var getV = BLL.Check_PauseNoticeService.GetPauseNoticeByPauseNoticeId(rowID);
                     if (getV != null)
                     {
-                        BLL.LogService.AddSys_Log(this.CurrUser, getV.PauseNoticeCode, getV.PauseNoticeId, BLL.Const.ProjectPauseNoticeMenuId, BLL.Const.BtnDelete);                    
+                        BLL.LogService.AddSys_Log(this.CurrUser, getV.PauseNoticeCode, getV.PauseNoticeId, BLL.Const.ProjectPauseNoticeMenuId, BLL.Const.BtnDelete);
                         BLL.Check_PauseNoticeService.DeletePauseNotice(rowID);
                     }
                 }
@@ -280,7 +309,7 @@ namespace FineUIPro.Web.HSSE.Check
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectPauseNoticeMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectPauseNoticeMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
@@ -386,35 +415,35 @@ namespace FineUIPro.Web.HSSE.Check
                 {
                     if (getPauseNotice.PauseTime.HasValue)
                     {
-                        bookmarkDateTime.Text = getPauseNotice.PauseTime.Value.Year+"年"+ getPauseNotice.PauseTime.Value.Month+"月"+ getPauseNotice.PauseTime.Value.Day+"日";
+                        bookmarkDateTime.Text = getPauseNotice.PauseTime.Value.Year + "年" + getPauseNotice.PauseTime.Value.Month + "月" + getPauseNotice.PauseTime.Value.Day + "日";
 
                     }
 
                 }
             }
-                Bookmark bookmarkSignPerson = doc.Range.Bookmarks["SignPerson"];
-                if (bookmarkSignPerson != null)
+            Bookmark bookmarkSignPerson = doc.Range.Bookmarks["SignPerson"];
+            if (bookmarkSignPerson != null)
+            {
+                if (!string.IsNullOrEmpty(getPauseNotice.SignManId))
                 {
-                    if (!string.IsNullOrEmpty(getPauseNotice.SignManId))
-                    {
 
-                        var getUser = UserService.GetUserByUserId(getPauseNotice.SignManId);
-                        if (getUser != null)
+                    var getUser = UserService.GetUserByUserId(getPauseNotice.SignManId);
+                    if (getUser != null)
+                    {
+                        if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl))
                         {
-                            if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl))
-                            {
-                                var file = rootPath + getUser.SignatureUrl;
-                                DocumentBuilder builders = new DocumentBuilder(doc);
-                                builders.MoveToBookmark("SignPerson");
-                                builders.InsertImage(file, 80, 20);
-                            }
-                            else
-                            {
-                                bookmarkSignPerson.Text = getUser.UserName;
-                            }
+                            var file = rootPath + getUser.SignatureUrl;
+                            DocumentBuilder builders = new DocumentBuilder(doc);
+                            builders.MoveToBookmark("SignPerson");
+                            builders.InsertImage(file, 80, 20);
+                        }
+                        else
+                        {
+                            bookmarkSignPerson.Text = getUser.UserName;
                         }
                     }
                 }
+            }
 
 
             Bookmark bookmarkSignDate = doc.Range.Bookmarks["SignTime"];
@@ -425,25 +454,25 @@ namespace FineUIPro.Web.HSSE.Check
                     bookmarkSignDate.Text = string.Format("{0:yyyy-MM-dd}", getPauseNotice.SignDate);
                 }
             }
-                Bookmark bookmarkDutyPerson = doc.Range.Bookmarks["DutyPerson"];
-                if (bookmarkDutyPerson != null)
+            Bookmark bookmarkDutyPerson = doc.Range.Bookmarks["DutyPerson"];
+            if (bookmarkDutyPerson != null)
+            {
+                var getUser = UserService.GetUserByUserId(getPauseNotice.DutyPersonId);
+                if (getUser != null)
                 {
-                    var getUser = UserService.GetUserByUserId(getPauseNotice.DutyPersonId);
-                    if (getUser != null)
+                    if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl))
                     {
-                        if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl))
-                        {
-                            var file = rootPath + getUser.SignatureUrl;
-                            DocumentBuilder builders = new DocumentBuilder(doc);
-                            builders.MoveToBookmark("DutyPerson");
-                            builders.InsertImage(file, 80, 20);
-                        }
-                        else
-                        {
-                            bookmarkDutyPerson.Text = getUser.UserName;
-                        }
+                        var file = rootPath + getUser.SignatureUrl;
+                        DocumentBuilder builders = new DocumentBuilder(doc);
+                        builders.MoveToBookmark("DutyPerson");
+                        builders.InsertImage(file, 80, 20);
+                    }
+                    else
+                    {
+                        bookmarkDutyPerson.Text = getUser.UserName;
                     }
                 }
+            }
 
 
             Bookmark bookmarkDutyTime = doc.Range.Bookmarks["DutyTime"];
@@ -512,7 +541,7 @@ namespace FineUIPro.Web.HSSE.Check
                     bookmarkOwnerTime.Text = string.Format("{0:yyyy-MM-dd}", getPauseNotice.OwnerTime);
                 }
             }
-           
+
 
             doc.Save(newUrl);
             //生成PDF文件
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/PauseNotice.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/PauseNotice.aspx.designer.cs
index d11e314..5ea97fc 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/PauseNotice.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/PauseNotice.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Check {
-    
-    
-    public partial class PauseNotice {
-        
+namespace FineUIPro.Web.HSSE.Check
+{
+
+
+    public partial class PauseNotice
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// rbStates 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rbStates;
-        
+
         /// <summary>
         /// txtPauseNoticeCode 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPauseNoticeCode;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// labNumber 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuView 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuView;
-        
+
         /// <summary>
         /// btnPrinter 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnPrinter;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/ProjectLeaderCheck.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Check/ProjectLeaderCheck.aspx
index 31aaebb..1078acd 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/ProjectLeaderCheck.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/ProjectLeaderCheck.aspx
@@ -1,10 +1,12 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectLeaderCheck.aspx.cs" Inherits="FineUIPro.Web.HSSE.Check.ProjectLeaderCheck" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-   <title>领导带班检查</title>
+    <title>领导带班检查</title>
     <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
     <style type="text/css">
         .f-grid-row .f-grid-cell-inner {
@@ -16,92 +18,106 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="领导带班检查" EnableCollapse="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ProjectLeaderCheckId" ForceFit="true"
-                    DataIDField="ProjectLeaderCheckId" AllowSorting="true" SortField="CheckDate" SortDirection="DESC"
-                    OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" EmptyText="开始日期" ID="txtStartTime"
-                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="120px">
-                                </f:DatePicker>
-                                <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" EmptyText="结束日期" ID="txtEndTime"
-                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="120px">
-                                </f:DatePicker>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                    runat="server">
-                                </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="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="100px" ColumnID="CheckCode" DataField="CheckCode"
-                            SortField="CheckCode" FieldType="String" HeaderText="编号"
-                            HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="tfUnitName" Width="150px" HeaderText="责任单位" HeaderTextAlign="Center" TextAlign="Left">
-                            <ItemTemplate>
-                                <asp:Label ID="lbUnitName" runat="server" Text='<%# BLL.UnitService.getUnitNamesUnitIds(Eval("UnitIds")) %>'
-                                    ToolTip='<%# BLL.UnitService.getUnitNamesUnitIds(Eval("UnitIds")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:TemplateField ColumnID="tfName" Width="150px" HeaderText="带班领导" HeaderTextAlign="Center" TextAlign="Left">
-                            <ItemTemplate>
-                                <asp:Label ID="lbName" runat="server" Text='<%# BLL.Check_ProjectLeaderCheckService.getLeaderName(Eval("ProjectLeaderCheckId")) %>'
-                                    ToolTip='<%# BLL.Check_ProjectLeaderCheckService.getLeaderName(Eval("ProjectLeaderCheckId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="100px" ColumnID="CheckDate" DataField="CheckDate" SortField="CheckDate"
-                            FieldType="Date" HeaderText="检查日期" TextAlign="Center" HeaderTextAlign="Center" RendererArgument="yyyy-MM-dd">
-                        </f:RenderField>
-                        <f:RenderField Width="200px" ColumnID="QuestionDef" DataField="QuestionDef"
-                            SortField="QuestionDef" FieldType="String" HeaderText="问题描述"
-                            HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="tfImageUrl" Width="100px" HeaderText="照片(上传)" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                            <ItemTemplate>
-                                <asp:Label ID="lbtnImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("ProjectLeaderCheckId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="120px" ColumnID="IsHoldMeetName" DataField="IsHoldMeetName"
-                            SortField="IsHoldMeetName" FieldType="String" HeaderText="是否召开专题讲评会"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="200px" ColumnID="Requirement" DataField="Requirement"
-                            SortField="Requirement" FieldType="String" HeaderText="提出的整改要求"
-                            HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <f: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="ProjectLeaderCheckId" ForceFit="true"
+                            DataIDField="ProjectLeaderCheckId" AllowSorting="true" SortField="CheckDate" SortDirection="DESC"
+                            OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" EmptyText="开始日期" ID="txtStartTime"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="120px">
+                                        </f:DatePicker>
+                                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" EmptyText="结束日期" ID="txtEndTime"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="120px">
+                                        </f:DatePicker>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </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="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="100px" ColumnID="CheckCode" DataField="CheckCode"
+                                    SortField="CheckCode" FieldType="String" HeaderText="编号"
+                                    HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="tfUnitName" Width="150px" HeaderText="责任单位" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lbUnitName" runat="server" Text='<%# BLL.UnitService.getUnitNamesUnitIds(Eval("UnitIds")) %>'
+                                            ToolTip='<%# BLL.UnitService.getUnitNamesUnitIds(Eval("UnitIds")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="tfName" Width="150px" HeaderText="带班领导" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lbName" runat="server" Text='<%# BLL.Check_ProjectLeaderCheckService.getLeaderName(Eval("ProjectLeaderCheckId")) %>'
+                                            ToolTip='<%# BLL.Check_ProjectLeaderCheckService.getLeaderName(Eval("ProjectLeaderCheckId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="100px" ColumnID="CheckDate" DataField="CheckDate" SortField="CheckDate"
+                                    FieldType="Date" HeaderText="检查日期" TextAlign="Center" HeaderTextAlign="Center" RendererArgument="yyyy-MM-dd">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="QuestionDef" DataField="QuestionDef"
+                                    SortField="QuestionDef" FieldType="String" HeaderText="问题描述"
+                                    HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="tfImageUrl" Width="100px" HeaderText="照片(上传)" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lbtnImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("ProjectLeaderCheckId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="120px" ColumnID="IsHoldMeetName" DataField="IsHoldMeetName"
+                                    SortField="IsHoldMeetName" FieldType="String" HeaderText="是否召开专题讲评会"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="200px" ColumnID="Requirement" DataField="Requirement"
+                                    SortField="Requirement" 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>
         </f:Panel>
         <f:Window ID="Window1" Title="领导带班检查" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/ProjectLeaderCheck.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/ProjectLeaderCheck.aspx.cs
index 440bbbe..e4efaf3 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/ProjectLeaderCheck.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/ProjectLeaderCheck.aspx.cs
@@ -41,20 +41,47 @@ namespace FineUIPro.Web.HSSE.Check
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-
-                ////权限按钮方法
-                this.GetButtonPower();
+                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("ProjectLeaderCheckEdit.aspx") + "return false;";
                 Funs.DropDownPageSize(this.ddlPageSize);
                 // 绑定表格
                 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;
+            }
             var getData = Check_ProjectLeaderCheckService.getListData(this.ProjectId, this.txtStartTime.Text, this.txtEndTime.Text, Grid1);
             Grid1.RecordCount = Check_ProjectLeaderCheckService.count;
             Grid1.DataSource = getData;
@@ -194,7 +221,7 @@ namespace FineUIPro.Web.HSSE.Check
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectLeaderCheckMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectLeaderCheckMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/ProjectLeaderCheck.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/ProjectLeaderCheck.aspx.designer.cs
index 53ed466..687da18 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/ProjectLeaderCheck.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/ProjectLeaderCheck.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Check {
-    
-    
-    public partial class ProjectLeaderCheck {
-        
+namespace FineUIPro.Web.HSSE.Check
+{
+
+
+    public partial class ProjectLeaderCheck
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtStartTime 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartTime;
-        
+
         /// <summary>
         /// txtEndTime 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndTime;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// lbUnitName 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lbUnitName;
-        
+
         /// <summary>
         /// lbName 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lbName;
-        
+
         /// <summary>
         /// lbtnImageUrl 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lbtnImageUrl;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -200,7 +238,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnView 控件。
         /// </summary>
@@ -209,7 +247,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnView;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx
index 9499170..dac1069 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx
@@ -1,126 +1,142 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RectifyNotices.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.Check.RectifyNotices" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>  
+    <script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
     <title>隐患整改通知单</title>
 </head>
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="隐患整改通知单" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="RectifyNoticesId" DataIDField="RectifyNoticesId" AllowSorting="true" 
-                    SortField="RectifyNoticesCode" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" 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="txtUnitName" EmptyText="输入查询条件"
-                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="50px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                                <f:TextBox runat="server" Label="单位工程" ID="txtWorkAreaName" EmptyText="输入查询条件"
-                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px"
-                                    LabelAlign="right">
-                                </f:TextBox>
-                                <f:TextBox runat="server" Label="编号" ID="txtRectifyNoticesCode" EmptyText="输入查询条件" Width="200px"
-                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="50px" LabelAlign="right">
-                                </f:TextBox>
-                            </Items>
-                        </f:Toolbar>
-                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:RadioButtonList runat="server" ID="rbStates" Width="500px" LabelWidth="60px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="rbStates_SelectedIndexChanged">
-                                    <f:RadioItem Text="全部" Value="-1" Selected="true" />
-                                    <f:RadioItem Text="待提交" Value="0" />
-                                    <f:RadioItem Text="待签发" Value="1" />
-                                    <f:RadioItem Text="待整改" Value="2" />
-                                    <f:RadioItem Text="待复审" Value="4" />
-                                    <f:RadioItem Text="已完成" Value="5" />
-                                </f:RadioButtonList>
-                                <f:ToolbarSeparator ID="ToolbarFill2" runat="server">
-                                </f:ToolbarSeparator>
-                                <f:RadioButtonList runat="server" ID="rbrbHiddenHazardType" Width="300px" Label="隐患类别" LabelWidth="80px"
-                                    AutoPostBack="true" OnSelectedIndexChanged="rbStates_SelectedIndexChanged">
-                                    <f:RadioItem Text="全部" Value="-1" Selected="true" />
-                                    <f:RadioItem Text="一般" Value="1" />
-                                    <f:RadioItem Text="较大" Value="2" />
-                                    <f:RadioItem Text="重大" Value="3" />
-                                </f:RadioButtonList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增"
-                                    Hidden="true">
-                                </f:Button>
-                                <%--<f:Button ID="btnUpload" ToolTip="定稿文件上传" Icon="ArrowUp" EnablePostBack="false" runat="server" Text="定稿文件上传"
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="隐患整改通知单" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="RectifyNoticesId" DataIDField="RectifyNoticesId" AllowSorting="true"
+                            SortField="RectifyNoticesCode" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" 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="txtUnitName" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="50px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="单位工程" ID="txtWorkAreaName" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="编号" ID="txtRectifyNoticesCode" EmptyText="输入查询条件" Width="200px"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="50px" LabelAlign="right">
+                                        </f:TextBox>
+                                    </Items>
+                                </f:Toolbar>
+                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:RadioButtonList runat="server" ID="rbStates" Width="500px" LabelWidth="60px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="rbStates_SelectedIndexChanged">
+                                            <f:RadioItem Text="全部" Value="-1" Selected="true" />
+                                            <f:RadioItem Text="待提交" Value="0" />
+                                            <f:RadioItem Text="待签发" Value="1" />
+                                            <f:RadioItem Text="待整改" Value="2" />
+                                            <f:RadioItem Text="待复审" Value="4" />
+                                            <f:RadioItem Text="已完成" Value="5" />
+                                        </f:RadioButtonList>
+                                        <f:ToolbarSeparator ID="ToolbarFill2" runat="server">
+                                        </f:ToolbarSeparator>
+                                        <f:RadioButtonList runat="server" ID="rbrbHiddenHazardType" Width="300px" Label="隐患类别" LabelWidth="80px"
+                                            AutoPostBack="true" OnSelectedIndexChanged="rbStates_SelectedIndexChanged">
+                                            <f:RadioItem Text="全部" Value="-1" Selected="true" />
+                                            <f:RadioItem Text="一般" Value="1" />
+                                            <f:RadioItem Text="较大" Value="2" />
+                                            <f:RadioItem Text="重大" Value="3" />
+                                        </f:RadioButtonList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增"
+                                            Hidden="true">
+                                        </f:Button>
+                                        <%--<f:Button ID="btnUpload" ToolTip="定稿文件上传" Icon="ArrowUp" EnablePostBack="false" runat="server" Text="定稿文件上传"
                                     Hidden="true">
                                 </f:Button>--%>
-                              <%--  <f:Button ID="btnPrint" ToolTip="打印" Icon="Printer" Hidden="true" runat="server"
+                                        <%--  <f:Button ID="btnPrint" ToolTip="打印" Icon="Printer" Hidden="true" runat="server"
                                     OnClick="btnPrint_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:RenderField Width="100px" ColumnID="RectifyNoticesCode" DataField="RectifyNoticesCode"
-                            SortField="RectifyNoticesCode" FieldType="String" HeaderText="单号" TextAlign="Left"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="WorkAreaName" DataField="WorkAreaName"
-                            SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" ExpandUnusedSpace="true"
-                            SortField="UnitName" FieldType="String" HeaderText="受检单位名称" TextAlign="Left" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="CheckManNames" Width="200px" HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Left"
-                            EnableLock="true" Locked="False">
-                            <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertCheckPerson(Eval("CheckManIds")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="100px" ColumnID="CheckedDate" DataField="CheckedDate" SortField="CheckedDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="检查日期"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="110px" ColumnID="DutyPersonName" DataField="DutyPersonName"
-                            SortField="DutyPersonName" FieldType="String" HeaderText="整改责任人"
-                            TextAlign="Left" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="CompleteDate" DataField="CompleteDate" SortField="CompleteDate"
-                            FieldType="Date" Renderer="Date" HeaderText="整改日期"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="145px" ColumnID="StatesName" DataField="StatesName"
-                            SortField="StatesName" FieldType="String" HeaderText="状态"
-                            TextAlign="Left" HeaderTextAlign="Center">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">                         
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                                        <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:RenderField Width="100px" ColumnID="RectifyNoticesCode" DataField="RectifyNoticesCode"
+                                    SortField="RectifyNoticesCode" FieldType="String" HeaderText="单号" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="WorkAreaName" DataField="WorkAreaName"
+                                    SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" ExpandUnusedSpace="true"
+                                    SortField="UnitName" FieldType="String" HeaderText="受检单位名称" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="CheckManNames" Width="200px" HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Left"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# ConvertCheckPerson(Eval("CheckManIds")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="100px" ColumnID="CheckedDate" DataField="CheckedDate" SortField="CheckedDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="检查日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="DutyPersonName" DataField="DutyPersonName"
+                                    SortField="DutyPersonName" FieldType="String" HeaderText="整改责任人"
+                                    TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CompleteDate" DataField="CompleteDate" SortField="CompleteDate"
+                                    FieldType="Date" Renderer="Date" HeaderText="整改日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="145px" ColumnID="StatesName" DataField="StatesName"
+                                    SortField="StatesName" FieldType="String" HeaderText="状态"
+                                    TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="编辑隐患整改通知单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
@@ -129,16 +145,16 @@
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <Items>
-		        <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
                     Text="编辑" Icon="Pencil" OnClick="btnMenuModify_Click">
                 </f:MenuButton>
-                 <f:MenuButton ID="btnView" EnablePostBack="true" runat="server" 
+                <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
                     Text="查看" Icon="Find" OnClick="btnView_Click">
                 </f:MenuButton>
-                 <f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server" 
+                <f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server"
                     Text="导出[通知单]" Icon="Printer" OnClick="btnPrinter_Click" EnableAjax="false" DisableControlBeforePostBack="false">
                 </f:MenuButton>
-                <f:MenuButton ID="btnPrinterReturn" EnablePostBack="true" runat="server" 
+                <f:MenuButton ID="btnPrinterReturn" EnablePostBack="true" runat="server"
                     Text="导出[反馈单]" Icon="Printer" OnClick="btnPrinterReturn_Click" EnableAjax="false" DisableControlBeforePostBack="false">
                 </f:MenuButton>
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs
index 7ea1c31..8279aad 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs
@@ -60,8 +60,15 @@ namespace FineUIPro.Web.HSSE.Check
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                ////权限按钮方法
-                this.GetButtonPower();
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 //btnNew.OnClientClick = Window1.GetShowReference("RectifyNoticesEdit.aspx") + "return false;";
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
@@ -70,11 +77,32 @@ namespace FineUIPro.Web.HSSE.Check
             }
         }
 
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = @"SELECT R.RectifyNoticesId,R.ProjectId,R.RectifyNoticesCode,R.UnitId ,Unit.UnitName,R.WorkAreaId,R.CheckManNames,R.CheckManIds
                         ,WorkAreaName= STUFF(( SELECT ',' + UnitWorkName FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +R.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''),CheckPersonName= (STUFF(( SELECT ',' + UserName FROM dbo.Sys_User where PATINDEX('%,' + RTRIM(UserId) + ',%',',' +R.CheckManIds+ ',')>0 FOR XML PATH('')), 1, 1,'')+ (CASE WHEN CheckManNames IS NOT NULL AND CheckManNames !='' THEN ','+ CheckManNames ELSE '' END)),R.DutyPerson,R.CheckedDate,DutyPerson.UserName AS DutyPersonName,R.DutyPersonTime,R.CompleteDate
                         ,(CASE WHEN States = 0 THEN '待['+CompileMan.UserName+']提交' WHEN States = 1 THEN '待['+SignMan.UserName+']签发' WHEN States = 2 THEN '待['+DutyPerson.UserName+']整改' WHEN States = 3 THEN '待['+UnitHeadMan.UserName+']审核' WHEN States = 4 THEN (case when CompileMan.UserName=SignMan.UserName then '待['+CompileMan.UserName+']复查' else '待['+CompileMan.UserName+','+SignMan.UserName+']复查' end) WHEN States = 5 THEN '已完成' ELSE '' END) AS StatesName
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.designer.cs
index 9435acd..be33bbd 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Check {
-    
-    
-    public partial class RectifyNotices {
-        
+namespace FineUIPro.Web.HSSE.Check
+{
+
+
+    public partial class RectifyNotices
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtUnitName 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtUnitName;
-        
+
         /// <summary>
         /// txtWorkAreaName 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkAreaName;
-        
+
         /// <summary>
         /// txtRectifyNoticesCode 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRectifyNoticesCode;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// rbStates 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rbStates;
-        
+
         /// <summary>
         /// ToolbarFill2 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarFill2;
-        
+
         /// <summary>
         /// rbrbHiddenHazardType 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rbrbHiddenHazardType;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// Label2 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label2;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -200,7 +238,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -209,7 +247,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnView 控件。
         /// </summary>
@@ -218,7 +256,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnView;
-        
+
         /// <summary>
         /// btnPrinter 控件。
         /// </summary>
@@ -227,7 +265,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnPrinter;
-        
+
         /// <summary>
         /// btnPrinterReturn 控件。
         /// </summary>
@@ -236,7 +274,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnPrinterReturn;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesFinalDoc.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesFinalDoc.aspx
index 3679ae5..59a3462 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesFinalDoc.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesFinalDoc.aspx
@@ -1,5 +1,7 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RectifyNoticesFinalDoc.aspx.cs" Inherits="FineUIPro.Web.HSSE.Check.RectifyNoticesFinalDoc" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -7,116 +9,130 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
 </head>
-    <body>
+<body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-        <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="隐患整改单(定稿文件)" EnableCollapse="true"
-                runat="server" BoxFlex="1"  DataKeyNames="RectifyNoticesFinalDocId" DataIDField="RectifyNoticesFinalDocId" AllowSorting="true"
-                SortField="RectifyNoticesFinalDocCode" SortDirection="DESC" EnableColumnLines="true" 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:DropDownList ID="drpUnit" runat="server" Label="受检单位名称" Width="260px" LabelWidth="120px"
-                                EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                            </f:DropDownList>
-                           
-                           <f:DatePicker ID="txtStartDate" runat="server" Label="检查日期" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
-                                Width="220px" EmptyText="开始时间" LabelAlign="Right" EnableEdit="true" LabelWidth="90px">
-                            </f:DatePicker>
-                            <f:Label ID="lblTo" runat="server" Text="至">
-                            </f:Label>
-                            <f:DatePicker ID="txtEndDate" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
-                                Width="150px" EmptyText="结束时间" LabelWidth="80px">
-                            </f:DatePicker>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                runat="server">
-                            </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="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:RenderField Width="90px" ColumnID="RectifyNoticesFinalDocCode" DataField="RectifyNoticesFinalDocCode"
-                        SortField="RectifyNoticesFinalDocCode" FieldType="String" HeaderText="单号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
- 
-                    <f:RenderField Width="140px" ColumnID="UnitWorkName" DataField="UnitWorkName" SortField="UnitWorkName"
-                        FieldType="String" HeaderText="单位工程" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>     
-                    <f:RenderField Width="140px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
-                        FieldType="String" HeaderText="受检单位名称" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>  
-                    <f:RenderField Width="140px" ColumnID="CheckManName" DataField="CheckManName" SortField="CheckManName"
-                        FieldType="String" HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField> 
-                    <f:RenderField Width="100px" ColumnID="CheckManDate" DataField="CheckManDate" SortField="CheckManDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="检查日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="140px" ColumnID="ReformManName" DataField="ReformManName" SortField="ReformManName"
-                        FieldType="String" HeaderText="整改责任人" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField> 
-                    <f:RenderField Width="100px" ColumnID="ReformManDate" DataField="ReformManDate" SortField="ReformManDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="整改日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="140px" ColumnID="State" DataField="State"
-                        SortField="State" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                   <%-- <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" HeaderText="附件"
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" 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" DataKeyNames="RectifyNoticesFinalDocId" DataIDField="RectifyNoticesFinalDocId" AllowSorting="true"
+                            SortField="RectifyNoticesFinalDocCode" SortDirection="DESC" EnableColumnLines="true" 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:DropDownList ID="drpUnit" runat="server" Label="受检单位名称" Width="260px" LabelWidth="120px"
+                                            EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+
+                                        <f:DatePicker ID="txtStartDate" runat="server" Label="检查日期" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                            Width="220px" EmptyText="开始时间" LabelAlign="Right" EnableEdit="true" LabelWidth="90px">
+                                        </f:DatePicker>
+                                        <f:Label ID="lblTo" runat="server" Text="至">
+                                        </f:Label>
+                                        <f:DatePicker ID="txtEndDate" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                            Width="150px" EmptyText="结束时间" LabelWidth="80px">
+                                        </f:DatePicker>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </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="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="90px" ColumnID="RectifyNoticesFinalDocCode" DataField="RectifyNoticesFinalDocCode"
+                                    SortField="RectifyNoticesFinalDocCode" FieldType="String" HeaderText="单号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+
+                                <f:RenderField Width="140px" ColumnID="UnitWorkName" DataField="UnitWorkName" SortField="UnitWorkName"
+                                    FieldType="String" HeaderText="单位工程" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
+                                    FieldType="String" HeaderText="受检单位名称" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="CheckManName" DataField="CheckManName" SortField="CheckManName"
+                                    FieldType="String" HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CheckManDate" DataField="CheckManDate" SortField="CheckManDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="检查日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="ReformManName" DataField="ReformManName" SortField="ReformManName"
+                                    FieldType="String" HeaderText="整改责任人" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="ReformManDate" DataField="ReformManDate" SortField="ReformManDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="整改日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="State" DataField="State"
+                                    SortField="State" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <%-- <f:WindowField TextAlign="Left" Width="60px" WindowID="WindowAtt" HeaderText="附件"
                         Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="RectifyNoticesFinalDocId" DataIFrameUrlFormatString="~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/LicenseManagerAttachUrl&menuId=0E9B7084-D021-4CA3-B9D2-9CBAA27A571B"
                          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" OnClose="Window1_Close" IsModal="true"
-        Width="1100px" Height="640px">
-    </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" OnClose="Window1_Close" IsModal="true"
+            Width="1100px" Height="640px">
+        </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">
         var menuID = '<%= Menu1.ClientID %>';
@@ -130,6 +146,6 @@
             __doPostBack(null, 'reloadGrid');
         }
     </script>
-</body> 
-    
+</body>
+
 </html>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesFinalDoc.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesFinalDoc.aspx.cs
index 0532ffa..6e0710a 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesFinalDoc.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesFinalDoc.aspx.cs
@@ -38,18 +38,21 @@ namespace FineUIPro.Web.HSSE.Check
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                ////权限按钮方法
-                this.GetButtonPower();
                 this.ProjectId = this.CurrUser.LoginProjectId;
- 
-
-                BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
- 
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
-                    this.drpUnit.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnit.Enabled = false;
+                    this.ProjectId = Request.Params["projectId"];
                 }
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
+
                 this.btnNew.OnClientClick = Window1.GetShowReference("RectifyNoticesFinalDocEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -60,11 +63,44 @@ namespace FineUIPro.Web.HSSE.Check
                 this.BindGrid();
             }
         }
+
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnit.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnit.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.GetButtonPower();
+            this.BindGrid();
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = @"SELECT RectifyNoticesFinalDocId
                                               ,RectifyNoticesFinalDocCode
                                               ,(case State when '1' then '已完成' else '未完成'  end ) as State
@@ -81,9 +117,9 @@ namespace FineUIPro.Web.HSSE.Check
                                     + @" WHERE 1=1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             strSql += " AND Doc.ProjectId = @ProjectId";
-            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))  
+            if (!string.IsNullOrEmpty(this.ProjectId))
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             else
             {
@@ -100,8 +136,8 @@ namespace FineUIPro.Web.HSSE.Check
             {
                 strSql += " AND Doc.CheckManDate <= @EndDate";
                 listStr.Add(new SqlParameter("@EndDate", endDate));
-            }         
-            if (this.drpUnit.SelectedValue != BLL.Const._Null)
+            }
+            if (this.drpUnit.SelectedValue != null && this.drpUnit.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND Doc.UnitId = @UnitId2";
                 listStr.Add(new SqlParameter("@UnitId2", this.drpUnit.SelectedValue));
@@ -207,9 +243,9 @@ namespace FineUIPro.Web.HSSE.Check
             var licenseManager = BLL.Check_RectifyNoticesFinalDocService.GetCheck_RectifyNoticesFinalDocById(id);
             if (licenseManager != null)
             {
-                 
-                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RectifyNoticesFinalDocEdit.aspx?RectifyNoticesFinalDocId={0}", id, "编辑 - ")));
-                 
+
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RectifyNoticesFinalDocEdit.aspx?RectifyNoticesFinalDocId={0}", id, "编辑 - ")));
+
             }
         }
         #endregion
@@ -230,7 +266,7 @@ namespace FineUIPro.Web.HSSE.Check
                     var Doc = BLL.Check_RectifyNoticesFinalDocService.GetCheck_RectifyNoticesFinalDocById(rowID);
                     if (Doc != null)
                     {
-                        BLL.LogService.AddSys_Log(this.CurrUser, Doc.RectifyNoticesFinalDocCode,Doc.RectifyNoticesFinalDocId, BLL.Const.ProjectRectifyNoticesFinalDocEditMenuId, BLL.Const.BtnDelete);
+                        BLL.LogService.AddSys_Log(this.CurrUser, Doc.RectifyNoticesFinalDocCode, Doc.RectifyNoticesFinalDocId, BLL.Const.ProjectRectifyNoticesFinalDocEditMenuId, BLL.Const.BtnDelete);
                         BLL.Check_RectifyNoticesFinalDocService.DeleteCheck_RectifyNoticesFinalDocById(rowID);
                     }
                 }
@@ -253,7 +289,7 @@ namespace FineUIPro.Web.HSSE.Check
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectRectifyNoticesFinalDocEditMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectRectifyNoticesFinalDocEditMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesFinalDoc.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesFinalDoc.aspx.designer.cs
index d7f2fd1..0e99bbc 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesFinalDoc.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesFinalDoc.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.HSSE.Check
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/EnvironmentalRiskList.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/EnvironmentalRiskList.aspx
index 33e3021..1a20461 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/EnvironmentalRiskList.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/EnvironmentalRiskList.aspx
@@ -1,129 +1,144 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EnvironmentalRiskList.aspx.cs"
     Inherits="FineUIPro.Web.HSSE.Hazard.EnvironmentalRiskList" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <title>环境危险源辨识与评价</title>
-      <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />   
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-        <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="环境危险源辨识与评价" EnableCollapse="true"
-                runat="server" BoxFlex="1" DataKeyNames="EnvironmentalRiskListId" DataIDField="EnvironmentalRiskListId" 
-                AllowSorting="true" SortField="CompileDate" SortDirection="DESC" OnSort="Grid1_Sort" 
-                AllowPaging="true" IsDatabasePaging="true"  EnableColumnLines="true" PageSize="10" 
-                OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True" ForceFit="true"
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
-                        <Items>
-                            <f:TextBox runat="server" Label="单位工程" ID="txtWorkAreaName" EmptyText="输入查询条件" AutoPostBack="true"
-                                OnTextChanged="TextBox_TextChanged" LabelWidth="80px" LabelAlign="right" Width="210">
-                            </f:TextBox>
-                            <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
-                                LabelWidth="70px" Width="250px">
-                            </f:DropDownList>
-                            <f:DatePicker runat="server" Label="辨识日期" ID="txtStartDate" LabelWidth="100px" AutoPostBack="true"
-                                Width="210px" OnTextChanged="TextBox_TextChanged" LabelAlign="right">
-                            </f:DatePicker>
-                            <f:DatePicker runat="server" Label="至" ID="txtEndDate" LabelWidth="40px" AutoPostBack="true"
-                                Width="160px" OnTextChanged="TextBox_TextChanged" LabelAlign="right">
-                            </f:DatePicker>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Text="新增"
-                                Hidden="true">
-                            </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="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:RenderField Width="150px" ColumnID="EnvironmentalRiskListCode" DataField="EnvironmentalRiskListCode"
-                        SortField="EnvironmentalRiskListCode" FieldType="String" HeaderText="编号" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="WorkAreaName" DataField="WorkAreaName" ExpandUnusedSpace="true"
-                        SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="IdentificationDate" DataField="IdentificationDate"
-                        SortField="IdentificationDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="辨识时间" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="ControllingPersonName" DataField="ControllingPersonName"
-                        SortField="ControllingPersonName" FieldType="String" HeaderText="控制责任人" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="CompileManName" DataField="CompileManName"
-                        SortField="CompileManName" FieldType="String" HeaderText="编制人" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>                    
-                    <f:WindowField TextAlign="Center" Width="90px" WindowID="WindowAtt" HeaderText="附件"
-                        Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="EnvironmentalRiskListId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/CheckDay&menuId=762F0BF9-471B-4115-B35E-03A26C573877"
-                        HeaderTextAlign="Center" ColumnID="attWindow" />
-                    
-                </Columns>
-                <Listeners>
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
-                <PageItems>
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarSeparator>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                    </f:ToolbarText>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="环境危险源辨识与评价" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
-        Width="1200px" Height="700px">
-    </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="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
-            Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
-            Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuAllOut" EnablePostBack="true" runat="server" Text="导出危险源"
-            Icon="FolderUp" Hidden="true">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuImportantOut" EnablePostBack="true" runat="server" Text="导出重要危险源"
-            Icon="FolderPage" Hidden="true">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuAllPrint" EnablePostBack="true" runat="server" Hidden="true"
-            Icon="Printer" Text="打印危险源" OnClick="btnMenuAllPrint_Click">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuImportantPrint" EnablePostBack="true" runat="server" Hidden="true"
-            Icon="Printer" Text="打印重要危险源" OnClick="btnMenuImportantPrint_Click">
-        </f:MenuButton>
-    </f:Menu>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" 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" DataKeyNames="EnvironmentalRiskListId" DataIDField="EnvironmentalRiskListId"
+                            AllowSorting="true" SortField="CompileDate" SortDirection="DESC" OnSort="Grid1_Sort"
+                            AllowPaging="true" IsDatabasePaging="true" EnableColumnLines="true" PageSize="10"
+                            OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True" ForceFit="true"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                                    <Items>
+                                        <f:TextBox runat="server" Label="单位工程" ID="txtWorkAreaName" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged" LabelWidth="80px" LabelAlign="right" Width="210">
+                                        </f:TextBox>
+                                        <f:DropDownList ID="drpUnitId" runat="server" Label="单位" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
+                                            LabelWidth="70px" Width="250px">
+                                        </f:DropDownList>
+                                        <f:DatePicker runat="server" Label="辨识日期" ID="txtStartDate" LabelWidth="100px" AutoPostBack="true"
+                                            Width="210px" OnTextChanged="TextBox_TextChanged" LabelAlign="right">
+                                        </f:DatePicker>
+                                        <f:DatePicker runat="server" Label="至" ID="txtEndDate" LabelWidth="40px" AutoPostBack="true"
+                                            Width="160px" OnTextChanged="TextBox_TextChanged" LabelAlign="right">
+                                        </f:DatePicker>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Text="新增"
+                                            Hidden="true">
+                                        </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="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="150px" ColumnID="EnvironmentalRiskListCode" DataField="EnvironmentalRiskListCode"
+                                    SortField="EnvironmentalRiskListCode" FieldType="String" HeaderText="编号" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="WorkAreaName" DataField="WorkAreaName" ExpandUnusedSpace="true"
+                                    SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="IdentificationDate" DataField="IdentificationDate"
+                                    SortField="IdentificationDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="辨识时间" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="ControllingPersonName" DataField="ControllingPersonName"
+                                    SortField="ControllingPersonName" FieldType="String" HeaderText="控制责任人" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CompileManName" DataField="CompileManName"
+                                    SortField="CompileManName" FieldType="String" HeaderText="编制人" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:WindowField TextAlign="Center" Width="90px" WindowID="WindowAtt" HeaderText="附件"
+                                    Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="EnvironmentalRiskListId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/CheckDay&menuId=762F0BF9-471B-4115-B35E-03A26C573877"
+                                    HeaderTextAlign="Center" ColumnID="attWindow" />
+                            </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" OnClose="Window1_Close" IsModal="true"
+            Width="1200px" Height="700px">
+        </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="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
+                Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
+                Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuAllOut" EnablePostBack="true" runat="server" Text="导出危险源"
+                Icon="FolderUp" Hidden="true">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuImportantOut" EnablePostBack="true" runat="server" Text="导出重要危险源"
+                Icon="FolderPage" Hidden="true">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuAllPrint" EnablePostBack="true" runat="server" Hidden="true"
+                Icon="Printer" Text="打印危险源" OnClick="btnMenuAllPrint_Click">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuImportantPrint" EnablePostBack="true" runat="server" Hidden="true"
+                Icon="Printer" Text="打印重要危险源" OnClick="btnMenuImportantPrint_Click">
+            </f:MenuButton>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/EnvironmentalRiskList.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/EnvironmentalRiskList.aspx.cs
index d05cd2d..383dd4c 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/EnvironmentalRiskList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/EnvironmentalRiskList.aspx.cs
@@ -58,25 +58,57 @@ namespace FineUIPro.Web.HSSE.Hazard
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
                 {
-                    this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
-                    this.drpUnitId.Enabled = false;
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
                 }
-                ////权限按钮方法
-                this.GetButtonPower();
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 BindGrid();
             }
         }
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            this.GetButtonPower();
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+            this.BindGrid();
+        }
+
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
+            {
+                this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
+                this.drpUnitId.Enabled = false;
+            }
+        }
 
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 string strSql = "SELECT ERiskList.EnvironmentalRiskListId,ERiskList.ProjectId,ERiskList.WorkAreaName,Unit.UnitId,ERiskList.IdentificationDate,CompileManUsers.UserName AS CompileManName,ERiskList.CompileDate,CodeRecords.Code AS EnvironmentalRiskListCode,ControllingPersonUsers.UserName AS ControllingPersonName "
@@ -101,7 +133,7 @@ namespace FineUIPro.Web.HSSE.Hazard
                     strSql += " AND ERiskList.WorkAreaName LIKE @WorkAreaName";
                     listStr.Add(new SqlParameter("@WorkAreaName", "%" + this.txtWorkAreaName.Text.Trim() + "%"));
                 }
-                if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+                if (this.drpUnitId.SelectedValue != null && this.drpUnitId.SelectedValue != BLL.Const._Null)
                 {
                     strSql += " AND Unit.UnitId = @UnitId";
                     listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue.Trim()));
@@ -143,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Hazard
             this.BindGrid();
         }
         #endregion
-        
+
         #region 页索引改变事件
         /// <summary>
         /// 页索引改变事件
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/EnvironmentalRiskList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/EnvironmentalRiskList.aspx.designer.cs
index 66c9f83..ecad67a 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/EnvironmentalRiskList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/EnvironmentalRiskList.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Hazard {
-    
-    
-    public partial class EnvironmentalRiskList {
-        
+namespace FineUIPro.Web.HSSE.Hazard
+{
+
+
+    public partial class EnvironmentalRiskList
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtWorkAreaName 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkAreaName;
-        
+
         /// <summary>
         /// drpUnitId 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitId;
-        
+
         /// <summary>
         /// txtStartDate 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartDate;
-        
+
         /// <summary>
         /// txtEndDate 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndDate;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
@@ -200,7 +238,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuDel;
-        
+
         /// <summary>
         /// btnMenuAllOut 控件。
         /// </summary>
@@ -209,7 +247,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuAllOut;
-        
+
         /// <summary>
         /// btnMenuImportantOut 控件。
         /// </summary>
@@ -218,7 +256,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuImportantOut;
-        
+
         /// <summary>
         /// btnMenuAllPrint 控件。
         /// </summary>
@@ -227,7 +265,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuAllPrint;
-        
+
         /// <summary>
         /// btnMenuImportantPrint 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx
index 777c44d..704773d 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx
@@ -1,5 +1,7 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HazardInfo.aspx.cs" Inherits="FineUIPro.Web.HSSE.Hazard.HazardInfo" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,144 +12,158 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="风险信息库" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="HazardSelectedItemId" DataIDField="HazardSelectedItemId" 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:TextBox runat="server" Label="单位工程" ID="txtWorkAreaName" EmptyText="输入查询条件" AutoPostBack="true"
-                                    OnTextChanged="TextBox_TextChanged" LabelAlign="right">
-                                </f:TextBox>
-                                <f:DropDownList ID="drpHazardLevel" runat="server" Label="危险级别" LabelAlign="Right"
-                                AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                            </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="tfPageIndex" Width="55px" 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="130px" ColumnID="WorkAreaName" DataField="WorkAreaName"
-                            SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:TemplateField Width="150px" HeaderText="工作阶段" HeaderTextAlign="Center" TextAlign="Center" ColumnID="WorkStageName">
-                            <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertWorkStage(Eval("WorkStage")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:TemplateField Width="100px" HeaderText="危险源类别" HeaderTextAlign="Center" TextAlign="Center" ColumnID="SupHazardListType">
-                            <ItemTemplate>
-                                <asp:Label ID="Label4" runat="server" Text='<%# ConvertSupHazardListTypeId(Eval("HazardListTypeId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:TemplateField Width="100px" HeaderText="危险源项" HeaderTextAlign="Center" TextAlign="Center" ColumnID="HazardListType">
-                            <ItemTemplate>
-                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertHazardListTypeId(Eval("HazardListTypeId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:TemplateField Width="150px" HeaderText="危险源代码" HeaderTextAlign="Center" TextAlign="Center" ColumnID="Hazard">
-                            <ItemTemplate>
-                                <asp:Label ID="lblHazardId" runat="server" Text='<%# ConvertHazardCode(Eval("HazardId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="1px" ColumnID="HazardListTypeId" DataField="HazardListTypeId"
-                            FieldType="String" HeaderText="" Hidden="true" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="1px" ColumnID="HazardListId" DataField="HazardListId"
-                            FieldType="String" HeaderText="" Hidden="true" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="HazardItems" DataField="HazardItems" FieldType="String"
-                            HeaderText="危险因素明细" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="DefectsType" DataField="DefectsType" FieldType="String"
-                            HeaderText="缺陷类型" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="MayLeadAccidents" DataField="MayLeadAccidents"
-                            FieldType="String" HeaderText="可能导致的事故" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="HelperMethod" DataField="HelperMethod" FieldType="String"
-                            HeaderText="辅助方法" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="L" DataField="HazardJudge_L" FieldType="String"
-                            HeaderText="危险评价(L)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="E" DataField="HazardJudge_E" FieldType="String"
-                            HeaderText="危险评价(E)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="C" DataField="HazardJudge_C" FieldType="String"
-                            HeaderText="危险评价(C)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="D" DataField="HazardJudge_D" FieldType="Double"
-                            HeaderText="危险评价(D)" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="G" DataField="RiskLevelName" FieldType="String"
-                            HeaderText="危险级别" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="ControlMeasures" DataField="ControlMeasures"
-                            FieldType="String" HeaderText="控制措施" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:TemplateField Width="150px" HeaderText="第一责任人" HeaderTextAlign="Center" TextAlign="Center" ColumnID="Hazard">
-                            <ItemTemplate>
-                                <asp:Label ID="lbtheFirstResponsiblePerson" runat="server" Text='<%# ConverttheFirstResponsiblePerson(Eval("ProjectId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="100px" ColumnID="ControllingPersonName" DataField="ControllingPersonName"
-                        SortField="ControllingPersonName" FieldType="String" HeaderText="风险责任人" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField> 
-                        <f:RenderField Width="100px" ColumnID="EvaluatorPersonName" DataField="EvaluatorPersonName"
-                        SortField="EvaluatorPersonName" FieldType="String" HeaderText="评价人" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="EvaluatorDate" DataField="EvaluatorDate" SortField="EvaluatorDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="评价时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="Days" DataField="Days" SortField="Days"
-                        FieldType="String" HeaderText="巡检频次(天)" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="CheckStartDate" DataField="CheckStartDate" SortField="CheckStartDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="巡检启动时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                        <f:CheckBoxField Width="80px" RenderAsStaticField="true" TextAlign="Center"  DataField="IsStart" HeaderText="是否启动" />
-                        <f:RenderField Width="100px" ColumnID="StateStr" DataField="StateStr" SortField="StateStr"
-                        FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                         <f:RenderField Width="120px" ColumnID="PlanExistDate" DataField="PlanExistDate" SortField="PlanExistDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="预计存在时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="风险信息库" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="HazardSelectedItemId" DataIDField="HazardSelectedItemId" 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:TextBox runat="server" Label="单位工程" ID="txtWorkAreaName" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:DropDownList ID="drpHazardLevel" runat="server" Label="危险级别" LabelAlign="Right"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </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="tfPageIndex" Width="55px" 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="130px" ColumnID="WorkAreaName" DataField="WorkAreaName"
+                                    SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField Width="150px" HeaderText="工作阶段" HeaderTextAlign="Center" TextAlign="Center" ColumnID="WorkStageName">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# ConvertWorkStage(Eval("WorkStage")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField Width="100px" HeaderText="危险源类别" HeaderTextAlign="Center" TextAlign="Center" ColumnID="SupHazardListType">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label4" runat="server" Text='<%# ConvertSupHazardListTypeId(Eval("HazardListTypeId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField Width="100px" HeaderText="危险源项" HeaderTextAlign="Center" TextAlign="Center" ColumnID="HazardListType">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label3" runat="server" Text='<%# ConvertHazardListTypeId(Eval("HazardListTypeId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField Width="150px" HeaderText="危险源代码" HeaderTextAlign="Center" TextAlign="Center" ColumnID="Hazard">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblHazardId" runat="server" Text='<%# ConvertHazardCode(Eval("HazardId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="1px" ColumnID="HazardListTypeId" DataField="HazardListTypeId"
+                                    FieldType="String" HeaderText="" Hidden="true" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="1px" ColumnID="HazardListId" DataField="HazardListId"
+                                    FieldType="String" HeaderText="" Hidden="true" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="HazardItems" DataField="HazardItems" FieldType="String"
+                                    HeaderText="危险因素明细" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="DefectsType" DataField="DefectsType" FieldType="String"
+                                    HeaderText="缺陷类型" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="MayLeadAccidents" DataField="MayLeadAccidents"
+                                    FieldType="String" HeaderText="可能导致的事故" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="HelperMethod" DataField="HelperMethod" FieldType="String"
+                                    HeaderText="辅助方法" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="L" DataField="HazardJudge_L" FieldType="String"
+                                    HeaderText="危险评价(L)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="E" DataField="HazardJudge_E" FieldType="String"
+                                    HeaderText="危险评价(E)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="C" DataField="HazardJudge_C" FieldType="String"
+                                    HeaderText="危险评价(C)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="D" DataField="HazardJudge_D" FieldType="Double"
+                                    HeaderText="危险评价(D)" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="G" DataField="RiskLevelName" FieldType="String"
+                                    HeaderText="危险级别" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="ControlMeasures" DataField="ControlMeasures"
+                                    FieldType="String" HeaderText="控制措施" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField Width="150px" HeaderText="第一责任人" HeaderTextAlign="Center" TextAlign="Center" ColumnID="Hazard">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lbtheFirstResponsiblePerson" runat="server" Text='<%# ConverttheFirstResponsiblePerson(Eval("ProjectId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="100px" ColumnID="ControllingPersonName" DataField="ControllingPersonName"
+                                    SortField="ControllingPersonName" FieldType="String" HeaderText="风险责任人" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="EvaluatorPersonName" DataField="EvaluatorPersonName"
+                                    SortField="EvaluatorPersonName" FieldType="String" HeaderText="评价人" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="EvaluatorDate" DataField="EvaluatorDate" SortField="EvaluatorDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="评价时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="Days" DataField="Days" SortField="Days"
+                                    FieldType="String" HeaderText="巡检频次(天)" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="CheckStartDate" DataField="CheckStartDate" SortField="CheckStartDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="巡检启动时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:CheckBoxField Width="80px" RenderAsStaticField="true" TextAlign="Center" DataField="IsStart" HeaderText="是否启动" />
+                                <f:RenderField Width="100px" ColumnID="StateStr" DataField="StateStr" SortField="StateStr"
+                                    FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="PlanExistDate" DataField="PlanExistDate" SortField="PlanExistDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="预计存在时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="风险编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
@@ -161,7 +177,7 @@
             <f:MenuButton ID="btnReEvaluator" EnablePostBack="true" runat="server" Hidden="true"
                 Text="二次评估" Icon="TableRefresh" OnClick="btnReEvaluator_Click">
             </f:MenuButton>
-            <f:MenuButton ID="btnQR" EnablePostBack="true" runat="server" 
+            <f:MenuButton ID="btnQR" EnablePostBack="true" runat="server"
                 Text="二维码" Icon="Shading" OnClick="btnQR_Click">
             </f:MenuButton>
         </f:Menu>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx.cs
index 433cabf..826ef19 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx.cs
@@ -54,24 +54,52 @@ namespace FineUIPro.Web.HSSE.Hazard
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
-                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                ////权限按钮方法
-                this.GetButtonPower();
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.RiskLevelService.InitRiskLevelDropDownList(this.drpHazardLevel, true);
                 // 绑定表格
                 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.ProjectId))
+            //{
+            //    btnNew.Hidden = true;
+            //}
+        }
 
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = "select HazardListItem.*,ControllingPersonUsers.UserName AS ControllingPersonName,Users.UserName,HazardList.WorkAreaName,HazardList.CompileDate,HazardList.ProjectId,case HazardListItem.State when '1' then '存在' else '已取消' end as StateStr,"
                           + @" (select UserName from Sys_User where UserId=(select top 1 Evaluatorld from Hazard_RiskEvaluationRecord where DataId=HazardListItem.HazardSelectedItemId order by EvaluatorDate desc)) as EvaluatorPersonName, "
                           + @" (select top 1 EvaluatorDate from Hazard_RiskEvaluationRecord where DataId=HazardListItem.HazardSelectedItemId order by EvaluatorDate desc) as EvaluatorDate,"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx.designer.cs
index a5db0fa..9cffca3 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx.designer.cs
@@ -41,6 +41,42 @@ namespace FineUIPro.Web.HSSE.Hazard
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
 
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardList.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardList.aspx
index 3300fca..8014363 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardList.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardList.aspx
@@ -1,5 +1,7 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HazardList.aspx.cs" Inherits="FineUIPro.Web.HSSE.Hazard.HazardList" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -8,114 +10,128 @@
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-        <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="风险评估" EnableCollapse="true"
-                runat="server" BoxFlex="1" DataKeyNames="HazardListId" DataIDField="HazardListId" AllowSorting="true" SortField="CompileDate"
-                SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" ForceFit="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="txtHazardListCode" EmptyText="输入查询条件" AutoPostBack="true"
-                                OnTextChanged="TextBox_TextChanged" LabelWidth="50px" LabelAlign="right">
-                            </f:TextBox>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Text="新增"
-                                Hidden="true">
-                            </f:Button>
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                EnableAjax="false" DisableControlBeforePostBack="false">
-                            </f:Button>
-                            <f:Button ID="btnHelp" runat="server" ToolTip="点击下载本页面使用说明" Text="帮助" Icon="Help">
-                                <Listeners>
-                                    <f:Listener Event="click" Handler="onToolSourceCodeClick" />
-                                </Listeners>
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:RenderField Width="100px" ColumnID="HazardListCode" DataField="HazardListCode"
-                        SortField="HazardListCode" FieldType="String" HeaderText="清单编号" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:TemplateField ColumnID="tfVersionNo" Width="70px" HeaderText="版本号" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                        <ItemTemplate>
-                            <asp:Label ID="lblVersionNo" runat="server" Text='<%# Bind("VersionNo") %>' ToolTip='<%#Bind("VersionNo") %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:TemplateField ColumnID="tfWorkStage" Width="300px" HeaderText="工作阶段" HeaderTextAlign="Center"
-                        TextAlign="Left" >
-                        <ItemTemplate>
-                            <asp:Label ID="lblWorkStage" runat="server" Text='<%# ConvertWorkStage(Eval("WorkStage")) %>'
-                                ToolTip='<%# ConvertWorkStage(Eval("WorkStage")) %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:RenderField Width="130px" ColumnID="WorkAreaName" DataField="WorkAreaName" 
-                        SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="IdentificationDate" DataField="IdentificationDate"
-                        SortField="IdentificationDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="评估时间" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="ControllingPersonName" DataField="ControllingPersonName"
-                        SortField="ControllingPersonName" FieldType="String" HeaderText="风险责任人" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="UserName" DataField="UserName" SortField="UserName"
-                        FieldType="String" HeaderText="评价人" TextAlign="Left" HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                </Columns>
-                <Listeners>
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
-                <PageItems>
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarSeparator>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                    </f:ToolbarText>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">                 
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="风险评估" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
-        Width="1200px" Height="800px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuAllOut" EnablePostBack="true" runat="server" Text="导出危险源"
-            Icon="FolderUp" Hidden="true">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuImportantOut" EnablePostBack="true" runat="server" Text="导出重大危险源"
-            Icon="FolderPage" Hidden="true">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
-            Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
-            Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuAllPrint" EnablePostBack="true" runat="server" Hidden="true"
-            Text="打印危险源" Icon="Printer" OnClick="btnMenuAllPrint_Click">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuImportantPrint" EnablePostBack="true" runat="server" Hidden="true"
-            Text="打印重大危险源" Icon="Printer" OnClick="btnMenuImportantPrint_Click">
-        </f:MenuButton>
-    </f:Menu>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" 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" DataKeyNames="HazardListId" DataIDField="HazardListId" AllowSorting="true" SortField="CompileDate"
+                            SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" ForceFit="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="txtHazardListCode" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged" LabelWidth="50px" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Text="新增"
+                                            Hidden="true">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                        <f:Button ID="btnHelp" runat="server" ToolTip="点击下载本页面使用说明" Text="帮助" Icon="Help">
+                                            <Listeners>
+                                                <f:Listener Event="click" Handler="onToolSourceCodeClick" />
+                                            </Listeners>
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RenderField Width="100px" ColumnID="HazardListCode" DataField="HazardListCode"
+                                    SortField="HazardListCode" FieldType="String" HeaderText="清单编号" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="tfVersionNo" Width="70px" HeaderText="版本号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblVersionNo" runat="server" Text='<%# Bind("VersionNo") %>' ToolTip='<%#Bind("VersionNo") %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="tfWorkStage" Width="300px" HeaderText="工作阶段" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblWorkStage" runat="server" Text='<%# ConvertWorkStage(Eval("WorkStage")) %>'
+                                            ToolTip='<%# ConvertWorkStage(Eval("WorkStage")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="130px" ColumnID="WorkAreaName" DataField="WorkAreaName"
+                                    SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="IdentificationDate" DataField="IdentificationDate"
+                                    SortField="IdentificationDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="评估时间" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="ControllingPersonName" DataField="ControllingPersonName"
+                                    SortField="ControllingPersonName" FieldType="String" HeaderText="风险责任人" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="UserName" DataField="UserName" SortField="UserName"
+                                    FieldType="String" HeaderText="评价人" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="编制日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                            </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" OnClose="Window1_Close" IsModal="true"
+            Width="1200px" Height="800px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuAllOut" EnablePostBack="true" runat="server" Text="导出危险源"
+                Icon="FolderUp" Hidden="true">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuImportantOut" EnablePostBack="true" runat="server" Text="导出重大危险源"
+                Icon="FolderPage" Hidden="true">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
+                Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
+                Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuAllPrint" EnablePostBack="true" runat="server" Hidden="true"
+                Text="打印危险源" Icon="Printer" OnClick="btnMenuAllPrint_Click">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuImportantPrint" EnablePostBack="true" runat="server" Hidden="true"
+                Text="打印重大危险源" Icon="Printer" OnClick="btnMenuImportantPrint_Click">
+            </f:MenuButton>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardList.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardList.aspx.cs
index 817b3c5..c1fdf5b 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardList.aspx.cs
@@ -54,23 +54,49 @@ namespace FineUIPro.Web.HSSE.Hazard
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
-                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                ////权限按钮方法
-                this.GetButtonPower();
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 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.ProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = "select HazardList.HazardListId,HazardList.VersionNo,HazardList.WorkStage,Users.UserName,HazardList.CompileDate,CodeRecords.Code AS HazardListCode,HazardList.WorkAreaName,HazardList.IdentificationDate,ControllingPersonUsers.UserName AS ControllingPersonName "
                           + @" ,(CASE WHEN HazardList.States = " + BLL.Const.State_0 + " OR HazardList.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN HazardList.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
                           + @" from Hazard_HazardList AS HazardList "
@@ -85,11 +111,12 @@ namespace FineUIPro.Web.HSSE.Hazard
             {
                 listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
                 strSql += " AND HazardList.States = @States";  ///状态为已完成
-                listStr.Add(new SqlParameter("@States", BLL.Const.State_2));            }
+                listStr.Add(new SqlParameter("@States", BLL.Const.State_2));
+            }
             else
 
             {
-                listStr.Add(new SqlParameter("@ProjectId",  this.ProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (!string.IsNullOrEmpty(this.txtHazardListCode.Text.Trim()))
             {
@@ -178,7 +205,7 @@ namespace FineUIPro.Web.HSSE.Hazard
         /// <param name="e"></param>
         protected void btnNew_Click(object sender, EventArgs e)
         {
-            int count = BLL.Hazard_HazardListService.GetHazardListCountByVersionNoIsNull( this.ProjectId);
+            int count = BLL.Hazard_HazardListService.GetHazardListCountByVersionNoIsNull(this.ProjectId);
             if (count > 0)
             {
                 Alert.ShowInTop("风险评估版本号还未生成，不能进行操作！", MessageBoxIcon.Warning);
@@ -223,7 +250,7 @@ namespace FineUIPro.Web.HSSE.Hazard
                         if (getV != null)
                         {
                             BLL.LogService.AddSys_Log(this.CurrUser, getV.HazardListCode, getV.HazardListId, BLL.Const.ProjectHazardListMenuId, BLL.Const.BtnDelete);
-                            BLL.Hazard_HazardSelectedItemService.DeleteHazardSelectedItemByHazardListId(rowID);                          
+                            BLL.Hazard_HazardSelectedItemService.DeleteHazardSelectedItemByHazardListId(rowID);
                             BLL.Hazard_HazardListService.DeleteHazardListByHazardListId(rowID);
                         }
                     }
@@ -341,7 +368,7 @@ namespace FineUIPro.Web.HSSE.Hazard
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList( this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectHazardListMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectHazardListMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardList.aspx.designer.cs
index d47110c..ba5e198 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/HazardList.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Hazard {
-    
-    
-    public partial class HazardList {
-        
+namespace FineUIPro.Web.HSSE.Hazard
+{
+
+
+    public partial class HazardList
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtHazardListCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtHazardListCode;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// btnHelp 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnHelp;
-        
+
         /// <summary>
         /// lblVersionNo 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblVersionNo;
-        
+
         /// <summary>
         /// lblWorkStage 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblWorkStage;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuAllOut 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuAllOut;
-        
+
         /// <summary>
         /// btnMenuImportantOut 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuImportantOut;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
@@ -200,7 +238,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuDel;
-        
+
         /// <summary>
         /// btnMenuAllPrint 控件。
         /// </summary>
@@ -209,7 +247,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuAllPrint;
-        
+
         /// <summary>
         /// btnMenuImportantPrint 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/MajorHazardList.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/MajorHazardList.aspx
index 0af5df3..ad96aee 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/MajorHazardList.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/MajorHazardList.aspx
@@ -1,5 +1,7 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MajorHazardList.aspx.cs" Inherits="FineUIPro.Web.HSSE.Hazard.MajorHazardList" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -16,108 +18,122 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目现场重大HSE因素控制措施一览表" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="NewId" AllowCellEditing="true"
-                    ClicksToEdit="2" DataIDField="NewId" AllowSorting="true" SortField="HazardListCode"
-                    SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" EnableColumnLines="true"
-                    PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange"
-                    EnableTextSelection="True" AllowColumnLocking="true">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
-                            <Items>
-                                <f:NumberBox runat="server" Label="危险评价D" ID="txtStartD" EmptyText="输入查询条件" AutoPostBack="true"
-                                    OnTextChanged="TextBox_TextChanged" LabelWidth="90px" LabelAlign="right" NoNegative="true">
-                                </f:NumberBox>
-                                <f:NumberBox runat="server" Label="危险级别" ID="txtHazardLevel" EmptyText="输入查询条件" AutoPostBack="true"
-                                    OnTextChanged="TextBox_TextChanged" LabelWidth="80px" LabelAlign="right" NoNegative="true" NoDecimal="true">
-                                </f:NumberBox>
-                                <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="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="130px" ColumnID="HazardListCode" DataField="HazardListCode" SortField="HazardListCode"
-                            FieldType="String" HeaderText="辨识评价编号" TextAlign="Left" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:TemplateField ColumnID="tfWorkStage" Width="150px" HeaderText="工作阶段" HeaderTextAlign="Center" TextAlign="Left">
-                            <ItemTemplate>
-                                <asp:Label ID="lblWorkStage" runat="server" Text='<%# ConvertWorkStage(Eval("WorkStage")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="150px" ColumnID="HazardCode" DataField="HazardCode" SortField="HazardCode"
-                            FieldType="String" HeaderText="危险源代码" TextAlign="Left" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="280px" ColumnID="HazardItems" DataField="HazardItems" SortField="HazardItems"
-                            FieldType="String" HeaderText="危险因素明细" TextAlign="Left" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="DefectsType" DataField="DefectsType" SortField="DefectsType"
-                            FieldType="String" HeaderText="缺陷类型" TextAlign="Left" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="MayLeadAccidents" DataField="MayLeadAccidents"
-                            SortField="MayLeadAccidents" FieldType="String" HeaderText="可能导致的事故" TextAlign="Left"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="HelperMethod" DataField="HelperMethod"
-                            SortField="HelperMethod" FieldType="String" HeaderText="辅助方法" TextAlign="Left"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="HazardJudge_L" DataField="HazardJudge_L"
-                            SortField="HazardJudge_L" FieldType="String" HeaderText="危险评价(L)" TextAlign="Left"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="HazardJudge_E" DataField="HazardJudge_E"
-                            SortField="HazardJudge_E" FieldType="String" HeaderText="危险评价(E)" TextAlign="Left"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="HazardJudge_C" DataField="HazardJudge_C"
-                            SortField="HazardJudge_C" FieldType="String" HeaderText="危险评价(C)" TextAlign="Left"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="HazardJudge_D" DataField="HazardJudge_D"
-                            SortField="HazardJudge_D" FieldType="String" HeaderText="危险评价(D)" TextAlign="Left"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="90px" ColumnID="RiskLevelName" DataField="RiskLevelName"
-                            SortField="RiskLevelName" FieldType="String" HeaderText="危险级别" TextAlign="Left"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="220px" ColumnID="ControlMeasures" DataField="ControlMeasures"
-                            SortField="ControlMeasures" FieldType="String" HeaderText="控制措施" TextAlign="Left"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                        <f:Listener Event="dataload" Handler="onGridDataLoad" />
-                    </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:ListItem Text="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                            <f:ListItem Text="所有行" Value="10000" />
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <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="项目现场重大HSE因素控制措施一览表" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="NewId" AllowCellEditing="true"
+                            ClicksToEdit="2" DataIDField="NewId" AllowSorting="true" SortField="HazardListCode"
+                            SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" EnableColumnLines="true"
+                            PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange"
+                            EnableTextSelection="True" AllowColumnLocking="true">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                                    <Items>
+                                        <f:NumberBox runat="server" Label="危险评价D" ID="txtStartD" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged" LabelWidth="90px" LabelAlign="right" NoNegative="true">
+                                        </f:NumberBox>
+                                        <f:NumberBox runat="server" Label="危险级别" ID="txtHazardLevel" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged" LabelWidth="80px" LabelAlign="right" NoNegative="true" NoDecimal="true">
+                                        </f:NumberBox>
+                                        <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="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="130px" ColumnID="HazardListCode" DataField="HazardListCode" SortField="HazardListCode"
+                                    FieldType="String" HeaderText="辨识评价编号" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="tfWorkStage" Width="150px" HeaderText="工作阶段" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblWorkStage" runat="server" Text='<%# ConvertWorkStage(Eval("WorkStage")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="150px" ColumnID="HazardCode" DataField="HazardCode" SortField="HazardCode"
+                                    FieldType="String" HeaderText="危险源代码" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="280px" ColumnID="HazardItems" DataField="HazardItems" SortField="HazardItems"
+                                    FieldType="String" HeaderText="危险因素明细" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="DefectsType" DataField="DefectsType" SortField="DefectsType"
+                                    FieldType="String" HeaderText="缺陷类型" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="MayLeadAccidents" DataField="MayLeadAccidents"
+                                    SortField="MayLeadAccidents" FieldType="String" HeaderText="可能导致的事故" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="HelperMethod" DataField="HelperMethod"
+                                    SortField="HelperMethod" FieldType="String" HeaderText="辅助方法" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="HazardJudge_L" DataField="HazardJudge_L"
+                                    SortField="HazardJudge_L" FieldType="String" HeaderText="危险评价(L)" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="HazardJudge_E" DataField="HazardJudge_E"
+                                    SortField="HazardJudge_E" FieldType="String" HeaderText="危险评价(E)" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="HazardJudge_C" DataField="HazardJudge_C"
+                                    SortField="HazardJudge_C" FieldType="String" HeaderText="危险评价(C)" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="HazardJudge_D" DataField="HazardJudge_D"
+                                    SortField="HazardJudge_D" FieldType="String" HeaderText="危险评价(D)" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="RiskLevelName" DataField="RiskLevelName"
+                                    SortField="RiskLevelName" FieldType="String" HeaderText="危险级别" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="220px" ColumnID="ControlMeasures" DataField="ControlMeasures"
+                                    SortField="ControlMeasures" FieldType="String" HeaderText="控制措施" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                            </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:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="10000" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
     </form>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/MajorHazardList.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/MajorHazardList.aspx.cs
index c5190d4..226bdd5 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/MajorHazardList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/MajorHazardList.aspx.cs
@@ -37,11 +37,21 @@ namespace FineUIPro.Web.HSSE.Hazard
         {
             if (!IsPostBack)
             {
+                Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    //////权限按钮方法
+                    //this.GetButtonPower();
+                }
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
                     Grid1.PageSize = this.CurrUser.PageSize.Value;
@@ -53,11 +63,33 @@ namespace FineUIPro.Web.HSSE.Hazard
             }
         }
 
+
+        /// <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 Item.HazardId,Item.HazardListTypeId,Item.HazardListId,Item.HazardItems,Item.DefectsType,Item.MayLeadAccidents,Item.HelperMethod,Item.HazardJudge_L "
                           + @" ,Item.HazardJudge_E,Item.HazardJudge_C,Item.HazardJudge_D,Item.HazardLevel,Item.ControlMeasures,Item.IsResponse"
                           + @" ,(select RiskLevelName from Base_RiskLevel where RiskLevelId=Item.HazardLevel) as RiskLevelName"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/MajorHazardList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/MajorHazardList.aspx.designer.cs
index 6f6a5d8..cdaafcc 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/MajorHazardList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/MajorHazardList.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Hazard {
-    
-    
-    public partial class MajorHazardList {
-        
+namespace FineUIPro.Web.HSSE.Hazard
+{
+
+
+    public partial class MajorHazardList
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtStartD 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtStartD;
-        
+
         /// <summary>
         /// txtHazardLevel 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtHazardLevel;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// lblWorkStage 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblWorkStage;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/OtherHazard.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/OtherHazard.aspx
index 0b8408f..7985dbf 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/OtherHazard.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/OtherHazard.aspx
@@ -1,5 +1,7 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OtherHazard.aspx.cs" Inherits="FineUIPro.Web.HSSE.Hazard.OtherHazard" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -20,74 +22,88 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="其他危险源辨识文件" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="OtherHazardId" AllowCellEditing="true"
-                    ClicksToEdit="2" DataIDField="OtherHazardId" AllowSorting="true" SortField="CompileDate"
-                    SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" AllowFilters="true"
-                    OnFilterChange="Grid1_FilterChange" EnableTextSelection="True">
-                    <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:TextBox runat="server" Label="编号" ID="txtOtherHazardCode" EmptyText="输入查询条件" AutoPostBack="true"
-                                    OnTextChanged="TextBox_TextChanged" LabelWidth="50px" LabelAlign="right">
-                                </f:TextBox>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增"
-                                    Hidden="true">
-                                </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="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="250px" ColumnID="OtherHazardCode" DataField="OtherHazardCode"
-                            SortField="OtherHazardCode" FieldType="String" HeaderText="文件编号" TextAlign="Left"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="250px" ColumnID="OtherHazardName" DataField="OtherHazardName"
-                            ExpandUnusedSpace="true" SortField="OtherHazardName" FieldType="String" HeaderText="文件名称"
-                            TextAlign="Left" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName" SortField="UserName"
-                            FieldType="String" HeaderText="编制人" TextAlign="Left" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="95px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="检查日期"
-                            HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                            <f:ListItem Text="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                            <f:ListItem Text="所有行" Value="100000" />
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="其他危险源辨识文件" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="OtherHazardId" AllowCellEditing="true"
+                            ClicksToEdit="2" DataIDField="OtherHazardId" AllowSorting="true" SortField="CompileDate"
+                            SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" AllowFilters="true"
+                            OnFilterChange="Grid1_FilterChange" EnableTextSelection="True">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:TextBox runat="server" Label="编号" ID="txtOtherHazardCode" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged" LabelWidth="50px" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增"
+                                            Hidden="true">
+                                        </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="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="250px" ColumnID="OtherHazardCode" DataField="OtherHazardCode"
+                                    SortField="OtherHazardCode" FieldType="String" HeaderText="文件编号" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="250px" ColumnID="OtherHazardName" DataField="OtherHazardName"
+                                    ExpandUnusedSpace="true" SortField="OtherHazardName" FieldType="String" HeaderText="文件名称"
+                                    TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName" SortField="UserName"
+                                    FieldType="String" HeaderText="编制人" TextAlign="Left" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="95px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="检查日期"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                    <f:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="100000" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="编辑其他危险源辨识文件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/OtherHazard.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/OtherHazard.aspx.cs
index d53ddc2..0d8de88 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/OtherHazard.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/OtherHazard.aspx.cs
@@ -11,6 +11,22 @@ namespace FineUIPro.Web.HSSE.Hazard
 {
     public partial class OtherHazard : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载页面
         /// <summary>
         /// 加载页面
@@ -23,8 +39,21 @@ namespace FineUIPro.Web.HSSE.Hazard
             //FilterDataRowItem = FilterDataRowItemImplement;
             if (!IsPostBack)
             {
-                ////权限按钮方法
-                this.GetButtonPower();
+                Funs.DropDownPageSize(this.ddlPageSize);
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.ProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 btnNew.OnClientClick = Window1.GetShowReference("OtherHazardEdit.aspx") + "return false;";
 
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
@@ -32,12 +61,32 @@ namespace FineUIPro.Web.HSSE.Hazard
                 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.ProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
+
             string strSql = @"SELECT OtherHazard.OtherHazardId,OtherHazard.ProjectId,CodeRecords.Code AS OtherHazardCode,OtherHazard.OtherHazardName,Users.UserName,OtherHazard.CompileDate "
                           + @" ,(CASE WHEN OtherHazard.States = " + BLL.Const.State_0 + " OR OtherHazard.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN OtherHazard.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
                           + @" FROM Hazard_OtherHazard AS OtherHazard "
@@ -55,7 +104,7 @@ namespace FineUIPro.Web.HSSE.Hazard
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (!string.IsNullOrEmpty(this.txtOtherHazardCode.Text.Trim()))
             {
@@ -224,7 +273,7 @@ namespace FineUIPro.Web.HSSE.Hazard
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.OtherHazardMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.OtherHazardMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/OtherHazard.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/OtherHazard.aspx.designer.cs
index 7296169..79a08a2 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/OtherHazard.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/OtherHazard.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Hazard {
-    
-    
-    public partial class OtherHazard {
-        
+namespace FineUIPro.Web.HSSE.Hazard
+{
+
+
+    public partial class OtherHazard
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtOtherHazardCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtOtherHazardCode;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RiskControl.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RiskControl.aspx
index f252b46..0df98d0 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RiskControl.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RiskControl.aspx
@@ -1,5 +1,7 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RiskControl.aspx.cs" Inherits="FineUIPro.Web.HSSE.Hazard.RiskControl" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,159 +12,173 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="风险分级管控" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="PatrolPlanId" DataIDField="PatrolPlanId" 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:TextBox runat="server" Label="单位工程" ID="txtWorkAreaName" EmptyText="输入查询条件" AutoPostBack="true"
-                                    OnTextChanged="TextBox_TextChanged" LabelAlign="right">
-                                </f:TextBox>
-                                <f:DropDownList ID="drpHazardLevel" runat="server" Label="危险级别" LabelAlign="Right"
-                                AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                            </f:DropDownList>
-                                <f:DropDownList ID="drpState" runat="server" Label="状态" LabelAlign="Right"
-                                AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                    <f:ListItem Value="0" Text="未巡检" />
-                                    <f:ListItem Value="1" Text="已巡检" />
-                                    <f:ListItem Value="2" Text="超期巡检" />
-                                    <f:ListItem Value="3" Text="超期未巡检" />
-                            </f:DropDownList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:HiddenField runat="server" ID="hdID">
-                            </f:HiddenField>
-                                <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="55px" 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="130px" ColumnID="WorkAreaName" DataField="WorkAreaName"
-                            SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:TemplateField Width="150px" HeaderText="工作阶段" HeaderTextAlign="Center" TextAlign="Center" ColumnID="WorkStageName">
-                            <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertWorkStage(Eval("WorkStage")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:TemplateField Width="100px" HeaderText="危险源类别" HeaderTextAlign="Center" TextAlign="Center" ColumnID="SupHazardListType">
-                            <ItemTemplate>
-                                <asp:Label ID="Label4" runat="server" Text='<%# ConvertSupHazardListTypeId(Eval("HazardListTypeId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:TemplateField Width="100px" HeaderText="危险源项" HeaderTextAlign="Center" TextAlign="Center" ColumnID="HazardListType">
-                            <ItemTemplate>
-                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertHazardListTypeId(Eval("HazardListTypeId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:TemplateField Width="150px" HeaderText="危险源代码" HeaderTextAlign="Center" TextAlign="Center" ColumnID="Hazard">
-                            <ItemTemplate>
-                                <asp:Label ID="lblHazardId" runat="server" Text='<%# ConvertHazardCode(Eval("HazardId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="1px" ColumnID="HazardListTypeId" DataField="HazardListTypeId"
-                            FieldType="String" HeaderText="" Hidden="true" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="1px" ColumnID="HazardListId" DataField="HazardListId"
-                            FieldType="String" HeaderText="" Hidden="true" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="HazardItems" DataField="HazardItems" FieldType="String"
-                            HeaderText="危险因素明细" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <%--<f:RenderField Width="100px" ColumnID="DefectsType" DataField="DefectsType" FieldType="String"
-                            HeaderText="缺陷类型" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="MayLeadAccidents" DataField="MayLeadAccidents"
-                            FieldType="String" HeaderText="可能导致的事故" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="HelperMethod" DataField="HelperMethod" FieldType="String"
-                            HeaderText="辅助方法" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="L" DataField="HazardJudge_L" FieldType="String"
-                            HeaderText="危险评价(L)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="E" DataField="HazardJudge_E" FieldType="String"
-                            HeaderText="危险评价(E)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="C" DataField="HazardJudge_C" FieldType="String"
-                            HeaderText="危险评价(C)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="D" DataField="HazardJudge_D" FieldType="Double"
-                            HeaderText="危险评价(D)" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>--%>
-                        <f:RenderField Width="90px" ColumnID="G" DataField="RiskLevelName" FieldType="String"
-                            HeaderText="危险级别" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <%--<f:RenderField Width="180px" ColumnID="ControlMeasures" DataField="ControlMeasures"
-                            FieldType="String" HeaderText="控制措施" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>--%>
-                        <f:RenderField Width="100px" ColumnID="ControllingPersonName" DataField="ControllingPersonName"
-                        SortField="ControllingPersonName" FieldType="String" HeaderText="风险责任人" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                        <%--<f:RenderField Width="100px" ColumnID="EvaluatorPersonName" DataField="EvaluatorPersonName"
-                        SortField="EvaluatorPersonName" FieldType="String" HeaderText="评价人" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="EvaluatorDate" DataField="EvaluatorDate" SortField="EvaluatorDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="评价时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>--%>
-                        <f:RenderField Width="120px" ColumnID="Days" DataField="Days" SortField="Days"
-                        FieldType="String" HeaderText="巡检频次(天)" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="CheckStartDate" DataField="CheckStartDate" SortField="CheckStartDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="巡检启动时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                       <f:RenderField Width="120px" ColumnID="LimitCheckDate" DataField="LimitCheckDate" SortField="LimitCheckDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="巡检限时时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                        <f:RenderField Width="140px" ColumnID="LastCheckDate" DataField="LastCheckDate" SortField="LastCheckDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="最近一次巡检时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="NextCheckDate" DataField="NextCheckDate" SortField="NextCheckDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="下一次巡检限时时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="StateStr" DataField="StateStr" SortField="StateStr"
-                        FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="风险分级管控" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="PatrolPlanId" DataIDField="PatrolPlanId" 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:TextBox runat="server" Label="单位工程" ID="txtWorkAreaName" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:DropDownList ID="drpHazardLevel" runat="server" Label="危险级别" LabelAlign="Right"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpState" runat="server" Label="状态" LabelAlign="Right"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                            <f:ListItem Value="0" Text="未巡检" />
+                                            <f:ListItem Value="1" Text="已巡检" />
+                                            <f:ListItem Value="2" Text="超期巡检" />
+                                            <f:ListItem Value="3" Text="超期未巡检" />
+                                        </f:DropDownList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:HiddenField runat="server" ID="hdID">
+                                        </f:HiddenField>
+                                        <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="55px" 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="130px" ColumnID="WorkAreaName" DataField="WorkAreaName"
+                                    SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField Width="150px" HeaderText="工作阶段" HeaderTextAlign="Center" TextAlign="Center" ColumnID="WorkStageName">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# ConvertWorkStage(Eval("WorkStage")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField Width="100px" HeaderText="危险源类别" HeaderTextAlign="Center" TextAlign="Center" ColumnID="SupHazardListType">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label4" runat="server" Text='<%# ConvertSupHazardListTypeId(Eval("HazardListTypeId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField Width="100px" HeaderText="危险源项" HeaderTextAlign="Center" TextAlign="Center" ColumnID="HazardListType">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label3" runat="server" Text='<%# ConvertHazardListTypeId(Eval("HazardListTypeId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField Width="150px" HeaderText="危险源代码" HeaderTextAlign="Center" TextAlign="Center" ColumnID="Hazard">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblHazardId" runat="server" Text='<%# ConvertHazardCode(Eval("HazardId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="1px" ColumnID="HazardListTypeId" DataField="HazardListTypeId"
+                                    FieldType="String" HeaderText="" Hidden="true" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="1px" ColumnID="HazardListId" DataField="HazardListId"
+                                    FieldType="String" HeaderText="" Hidden="true" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="HazardItems" DataField="HazardItems" FieldType="String"
+                                    HeaderText="危险因素明细" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <%--<f:RenderField Width="100px" ColumnID="DefectsType" DataField="DefectsType" FieldType="String"
+             HeaderText="缺陷类型" HeaderTextAlign="Center" TextAlign="Center">
+         </f:RenderField>
+         <f:RenderField Width="180px" ColumnID="MayLeadAccidents" DataField="MayLeadAccidents"
+             FieldType="String" HeaderText="可能导致的事故" HeaderTextAlign="Center" TextAlign="Center">
+         </f:RenderField>
+         <f:RenderField Width="100px" ColumnID="HelperMethod" DataField="HelperMethod" FieldType="String"
+             HeaderText="辅助方法" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+         </f:RenderField>
+         <f:RenderField Width="100px" ColumnID="L" DataField="HazardJudge_L" FieldType="String"
+             HeaderText="危险评价(L)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+         </f:RenderField>
+         <f:RenderField Width="100px" ColumnID="E" DataField="HazardJudge_E" FieldType="String"
+             HeaderText="危险评价(E)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+         </f:RenderField>
+         <f:RenderField Width="100px" ColumnID="C" DataField="HazardJudge_C" FieldType="String"
+             HeaderText="危险评价(C)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+         </f:RenderField>
+         <f:RenderField Width="100px" ColumnID="D" DataField="HazardJudge_D" FieldType="Double"
+             HeaderText="危险评价(D)" HeaderTextAlign="Center" TextAlign="Left">
+         </f:RenderField>--%>
+                                <f:RenderField Width="90px" ColumnID="G" DataField="RiskLevelName" FieldType="String"
+                                    HeaderText="危险级别" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <%--<f:RenderField Width="180px" ColumnID="ControlMeasures" DataField="ControlMeasures"
+             FieldType="String" HeaderText="控制措施" HeaderTextAlign="Center" TextAlign="Center">
+         </f:RenderField>--%>
+                                <f:RenderField Width="100px" ColumnID="ControllingPersonName" DataField="ControllingPersonName"
+                                    SortField="ControllingPersonName" FieldType="String" HeaderText="风险责任人" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <%--<f:RenderField Width="100px" ColumnID="EvaluatorPersonName" DataField="EvaluatorPersonName"
+         SortField="EvaluatorPersonName" FieldType="String" HeaderText="评价人" TextAlign="Left"
+         HeaderTextAlign="Center">
+     </f:RenderField>
+         <f:RenderField Width="100px" ColumnID="EvaluatorDate" DataField="EvaluatorDate" SortField="EvaluatorDate"
+         FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="评价时间"
+         HeaderTextAlign="Center" TextAlign="Center">
+     </f:RenderField>--%>
+                                <f:RenderField Width="120px" ColumnID="Days" DataField="Days" SortField="Days"
+                                    FieldType="String" HeaderText="巡检频次(天)" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="CheckStartDate" DataField="CheckStartDate" SortField="CheckStartDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="巡检启动时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="LimitCheckDate" DataField="LimitCheckDate" SortField="LimitCheckDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="巡检限时时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="140px" ColumnID="LastCheckDate" DataField="LastCheckDate" SortField="LastCheckDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="最近一次巡检时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="NextCheckDate" DataField="NextCheckDate" SortField="NextCheckDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="下一次巡检限时时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="StateStr" DataField="StateStr" SortField="StateStr"
+                                    FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="风险编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-            Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true" 
+            Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
             Width="1200px" Height="800px">
         </f:Window>
         <f:Window ID="Window2" Title="二次评估" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RiskControl.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RiskControl.aspx.cs
index dcc0c13..0a207c9 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RiskControl.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RiskControl.aspx.cs
@@ -54,12 +54,20 @@ namespace FineUIPro.Web.HSSE.Hazard
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
-                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                ////权限按钮方法
-                this.GetButtonPower();
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
+
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.RiskLevelService.InitRiskLevelDropDownList(this.drpHazardLevel, true);
                 Funs.FineUIPleaseSelect(this.drpState);
@@ -69,11 +77,33 @@ namespace FineUIPro.Web.HSSE.Hazard
             }
         }
 
+        /// <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 p.*,HazardListItem.WorkStage,HazardListItem.HazardListTypeId,HazardListItem.HazardId,HazardListItem.HazardItems,ControllingPersonUsers.UserName AS ControllingPersonName,Users.UserName,HazardList.WorkAreaName,HazardList.CompileDate,case p.State when '0' then '未巡检' when '1' then '已巡检' when '2' then '超期巡检' else '超期未巡检' end as StateStr,"
                           + @" (select Days from Base_RiskLevel where RiskLevelId=(select top 1 RiskLevel from Hazard_RiskEvaluationRecord where DataId=p.HazardSelectedItemId order by EvaluatorDate desc)) as Days, "
                           + @" (select RiskLevelName from Base_RiskLevel where RiskLevelId=(select top 1 RiskLevel from Hazard_RiskEvaluationRecord where DataId=p.HazardSelectedItemId order by EvaluatorDate desc)) as RiskLevelName,"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RiskControl.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RiskControl.aspx.designer.cs
index 6b01f00..e43d0be 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RiskControl.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RiskControl.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Hazard {
-    
-    
-    public partial class RiskControl {
-        
+namespace FineUIPro.Web.HSSE.Hazard
+{
+
+
+    public partial class RiskControl
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtWorkAreaName 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkAreaName;
-        
+
         /// <summary>
         /// drpHazardLevel 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpHazardLevel;
-        
+
         /// <summary>
         /// drpState 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpState;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// hdID 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdID;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// Label2 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label2;
-        
+
         /// <summary>
         /// Label4 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label4;
-        
+
         /// <summary>
         /// Label3 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label3;
-        
+
         /// <summary>
         /// lblHazardId 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblHazardId;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -191,7 +229,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -200,7 +238,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Window3 控件。
         /// </summary>
@@ -209,7 +247,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window3;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -218,7 +256,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RoutingInspection.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RoutingInspection.aspx
index 4777001..045348b 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RoutingInspection.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RoutingInspection.aspx
@@ -1,5 +1,7 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RoutingInspection.aspx.cs" Inherits="FineUIPro.Web.HSSE.Hazard.RoutingInspection" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,134 +12,148 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="风险巡检记录" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="RoutingInspectionId" DataIDField="RoutingInspectionId" AllowSorting="true" SortField="PatrolTime"
-                    SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" ForceFit="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="txtWorkAreaName" EmptyText="输入查询条件" AutoPostBack="true"
-                                    OnTextChanged="TextBox_TextChanged" LabelAlign="right">
-                                </f:TextBox>
-                                <f:DropDownList ID="drpHazardLevel" runat="server" Label="现等级" LabelAlign="Right"
-                                AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                            </f:DropDownList>
-                                <f:DropDownList ID="drpState" runat="server" Label="巡检结果" LabelAlign="Right"
-                                AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
-                                    <f:ListItem Value="0" Text="原状态" />
-                                    <f:ListItem Value="1" Text="二次评估" />
-                                    <f:ListItem Value="2" Text="下整改单" />
-                                    <f:ListItem Value="-1" 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="tfPageIndex" Width="55px" 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="130px" ColumnID="WorkAreaName" DataField="WorkAreaName"
-                            SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
-                            HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:TemplateField Width="150px" HeaderText="工作阶段" HeaderTextAlign="Center" TextAlign="Center" ColumnID="WorkStageName">
-                            <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertWorkStage(Eval("WorkStage")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:TemplateField Width="100px" HeaderText="危险源项" HeaderTextAlign="Center" TextAlign="Center" ColumnID="HazardListType">
-                            <ItemTemplate>
-                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertHazardListTypeId(Eval("HazardListTypeId")) %>'></asp:Label>
-                            </ItemTemplate>
-                        </f:TemplateField>
-                        <f:RenderField Width="1px" ColumnID="HazardListTypeId" DataField="HazardListTypeId"
-                            FieldType="String" HeaderText="" Hidden="true" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="1px" ColumnID="HazardListId" DataField="HazardListId"
-                            FieldType="String" HeaderText="" Hidden="true" HeaderTextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="HazardItems" DataField="HazardItems" FieldType="String"
-                            HeaderText="危险因素明细" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <%--<f:RenderField Width="100px" ColumnID="DefectsType" DataField="DefectsType" FieldType="String"
-                            HeaderText="缺陷类型" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="180px" ColumnID="MayLeadAccidents" DataField="MayLeadAccidents"
-                            FieldType="String" HeaderText="可能导致的事故" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="HelperMethod" DataField="HelperMethod" FieldType="String"
-                            HeaderText="辅助方法" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="L" DataField="HazardJudge_L" FieldType="String"
-                            HeaderText="危险评价(L)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="E" DataField="HazardJudge_E" FieldType="String"
-                            HeaderText="危险评价(E)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="C" DataField="HazardJudge_C" FieldType="String"
-                            HeaderText="危险评价(C)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="D" DataField="HazardJudge_D" FieldType="Double"
-                            HeaderText="危险评价(D)" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>--%>
-                        <%--<f:RenderField Width="180px" ColumnID="ControlMeasures" DataField="ControlMeasures"
-                            FieldType="String" HeaderText="控制措施" HeaderTextAlign="Center" TextAlign="Center">
-                        </f:RenderField>--%>
-                        <f:RenderField Width="100px" ColumnID="PatrolManName" DataField="PatrolManName"
-                        SortField="PatrolManName" FieldType="String" HeaderText="巡检人" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="PatrolTime" DataField="PatrolTime" SortField="PatrolTime"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="巡检时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="OldRiskLevelName" DataField="OldRiskLevelName"
-                        SortField="OldRiskLevelName" FieldType="String" HeaderText="原等级" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="RiskLevelName" DataField="RiskLevelName"
-                        SortField="RiskLevelName" FieldType="String" HeaderText="现等级" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="PatrolResultStr" DataField="PatrolResultStr"
-                        SortField="PatrolResultStr" FieldType="String" HeaderText="巡检结果" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                        <%--<f:RenderField Width="100px" ColumnID="EvaluatorPersonName" DataField="EvaluatorPersonName"
-                        SortField="EvaluatorPersonName" FieldType="String" HeaderText="评价人" TextAlign="Left"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="EvaluatorDate" DataField="EvaluatorDate" SortField="EvaluatorDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="评价时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>--%>
-                    </Columns>
-                    <Listeners>
-                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
-                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                        </f:ToolbarSeparator>
-                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                        </f:ToolbarText>
-                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="风险巡检记录" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="RoutingInspectionId" DataIDField="RoutingInspectionId" AllowSorting="true" SortField="PatrolTime"
+                            SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" ForceFit="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="txtWorkAreaName" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:DropDownList ID="drpHazardLevel" runat="server" Label="现等级" LabelAlign="Right"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpState" runat="server" Label="巡检结果" LabelAlign="Right"
+                                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                            <f:ListItem Value="0" Text="原状态" />
+                                            <f:ListItem Value="1" Text="二次评估" />
+                                            <f:ListItem Value="2" Text="下整改单" />
+                                            <f:ListItem Value="-1" 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="tfPageIndex" Width="55px" 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="130px" ColumnID="WorkAreaName" DataField="WorkAreaName"
+                                    SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField Width="150px" HeaderText="工作阶段" HeaderTextAlign="Center" TextAlign="Center" ColumnID="WorkStageName">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label2" runat="server" Text='<%# ConvertWorkStage(Eval("WorkStage")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField Width="100px" HeaderText="危险源项" HeaderTextAlign="Center" TextAlign="Center" ColumnID="HazardListType">
+                                    <ItemTemplate>
+                                        <asp:Label ID="Label3" runat="server" Text='<%# ConvertHazardListTypeId(Eval("HazardListTypeId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="1px" ColumnID="HazardListTypeId" DataField="HazardListTypeId"
+                                    FieldType="String" HeaderText="" Hidden="true" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="1px" ColumnID="HazardListId" DataField="HazardListId"
+                                    FieldType="String" HeaderText="" Hidden="true" HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="HazardItems" DataField="HazardItems" FieldType="String"
+                                    HeaderText="危险因素明细" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <%--<f:RenderField Width="100px" ColumnID="DefectsType" DataField="DefectsType" FieldType="String"
+              HeaderText="缺陷类型" HeaderTextAlign="Center" TextAlign="Center">
+          </f:RenderField>
+          <f:RenderField Width="180px" ColumnID="MayLeadAccidents" DataField="MayLeadAccidents"
+              FieldType="String" HeaderText="可能导致的事故" HeaderTextAlign="Center" TextAlign="Center">
+          </f:RenderField>
+          <f:RenderField Width="100px" ColumnID="HelperMethod" DataField="HelperMethod" FieldType="String"
+              HeaderText="辅助方法" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+          </f:RenderField>
+          <f:RenderField Width="100px" ColumnID="L" DataField="HazardJudge_L" FieldType="String"
+              HeaderText="危险评价(L)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+          </f:RenderField>
+          <f:RenderField Width="100px" ColumnID="E" DataField="HazardJudge_E" FieldType="String"
+              HeaderText="危险评价(E)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+          </f:RenderField>
+          <f:RenderField Width="100px" ColumnID="C" DataField="HazardJudge_C" FieldType="String"
+              HeaderText="危险评价(C)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
+          </f:RenderField>
+          <f:RenderField Width="100px" ColumnID="D" DataField="HazardJudge_D" FieldType="Double"
+              HeaderText="危险评价(D)" HeaderTextAlign="Center" TextAlign="Left">
+          </f:RenderField>--%>
+                                <%--<f:RenderField Width="180px" ColumnID="ControlMeasures" DataField="ControlMeasures"
+              FieldType="String" HeaderText="控制措施" HeaderTextAlign="Center" TextAlign="Center">
+          </f:RenderField>--%>
+                                <f:RenderField Width="100px" ColumnID="PatrolManName" DataField="PatrolManName"
+                                    SortField="PatrolManName" FieldType="String" HeaderText="巡检人" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="PatrolTime" DataField="PatrolTime" SortField="PatrolTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="巡检时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="OldRiskLevelName" DataField="OldRiskLevelName"
+                                    SortField="OldRiskLevelName" FieldType="String" HeaderText="原等级" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="RiskLevelName" DataField="RiskLevelName"
+                                    SortField="RiskLevelName" FieldType="String" HeaderText="现等级" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="PatrolResultStr" DataField="PatrolResultStr"
+                                    SortField="PatrolResultStr" FieldType="String" HeaderText="巡检结果" TextAlign="Left"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <%--<f:RenderField Width="100px" ColumnID="EvaluatorPersonName" DataField="EvaluatorPersonName"
+          SortField="EvaluatorPersonName" FieldType="String" HeaderText="评价人" TextAlign="Left"
+          HeaderTextAlign="Center">
+      </f:RenderField>
+          <f:RenderField Width="100px" ColumnID="EvaluatorDate" DataField="EvaluatorDate" SortField="EvaluatorDate"
+          FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="评价时间"
+          HeaderTextAlign="Center" TextAlign="Center">
+      </f:RenderField>--%>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="风险编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
@@ -149,8 +165,8 @@
                 Text="查看" Icon="Find" OnClick="btnMenuView_Click">
             </f:MenuButton>
             <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Icon="Delete"
-                    ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除" Hidden="true">
-                </f:MenuButton>
+                ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除" Hidden="true">
+            </f:MenuButton>
         </f:Menu>
     </form>
     <script type="text/javascript">
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RoutingInspection.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RoutingInspection.aspx.cs
index a70d1f9..7a72ec2 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RoutingInspection.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RoutingInspection.aspx.cs
@@ -54,12 +54,19 @@ namespace FineUIPro.Web.HSSE.Hazard
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 this.ProjectId = this.CurrUser.LoginProjectId;
-                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                ////权限按钮方法
-                this.GetButtonPower();
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 BLL.RiskLevelService.InitRiskLevelDropDownList(this.drpHazardLevel, true);
                 Funs.FineUIPleaseSelect(this.drpState);
@@ -68,11 +75,31 @@ namespace FineUIPro.Web.HSSE.Hazard
             }
         }
 
+        /// <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.ProjectId))
+            //{
+            //    btnNew.Hidden = true;
+            //}
+        }
         /// <summary>  
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = "select r.*,HazardListItem.WorkStage,HazardListItem.HazardListTypeId,HazardListItem.HazardId,HazardListItem.HazardItems,ControllingPersonUsers.UserName AS ControllingPersonName,Users.UserName as PatrolManName,HazardList.WorkAreaName,HazardList.CompileDate,case r.PatrolResult when 0 then '原状态' when 1 then '二次评估' when 2 then '下整改单' else '消除' end as PatrolResultStr,"
                           + @" (select RiskLevelName from Base_RiskLevel where RiskLevelId=r.OldRiskLevel) as OldRiskLevelName,"
                           + @" (select RiskLevelName from Base_RiskLevel where RiskLevelId=(select HazardLevel from Hazard_HazardSelectedItem where HazardSelectedItemId=r.HazardSelectedItemId)) as RiskLevelName"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RoutingInspection.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RoutingInspection.aspx.designer.cs
index 602ca94..37b1350 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RoutingInspection.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Hazard/RoutingInspection.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Hazard {
-    
-    
-    public partial class RoutingInspection {
-        
+namespace FineUIPro.Web.HSSE.Hazard
+{
+
+
+    public partial class RoutingInspection
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtWorkAreaName 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkAreaName;
-        
+
         /// <summary>
         /// drpHazardLevel 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpHazardLevel;
-        
+
         /// <summary>
         /// drpState 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpState;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// Label2 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label2;
-        
+
         /// <summary>
         /// Label3 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label3;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuView 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuView;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx
index cf4b894..815ac58 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx
@@ -101,14 +101,13 @@
                                             Width="130px">
                                         </f:DatePicker>
                                         <f:DropDownList ID="drpStates" runat="server" Label="状态" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
-                                            LabelWidth="70px" LabelAlign="Right" Width="210px">
+                                            LabelWidth="70px" LabelAlign="Right" Width="160px">
                                         </f:DropDownList>
-                                        <f:DropDownList runat="server" EnableSimulateTree="True" LabelAlign="Right" Label="级别" ID="dpRiskLevel" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        <f:DropDownList runat="server" EnableSimulateTree="True" LabelWidth="70px" LabelAlign="Right" Width="160px" Label="级别" ID="dpRiskLevel" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
                                             <f:ListItem Text="-请选择-" Value="" />
                                             <f:ListItem Text="一般" Value="一般" />
                                             <f:ListItem Text="重大" Value="重大" />
                                         </f:DropDownList>
-
                                     </Items>
                                 </f:Toolbar>
                                 <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
index 8b5a126..1713e97 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
@@ -542,7 +542,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
                         //    return;
                         //}
                     }
-                    // Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.SupervisionAndInspection);
+                    // Project_HSSEData_HSSEService.StatisticalData(this.ProjectId, Project_HSSEData_HSSEService.HSSEDateType.SupervisionAndInspection);
                     BindGrid();
                     ShowNotify("删除成功!", MessageBoxIcon.Success);
                 }
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentify.aspx b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentify.aspx
index ac1b26f..f402593 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentify.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentify.aspx
@@ -1,5 +1,6 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ConstructionStandardIdentify.aspx.cs"
-    Inherits="FineUIPro.Web.HSSE.InformationProject.ConstructionStandardIdentify" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ConstructionStandardIdentify.aspx.cs" Inherits="FineUIPro.Web.HSSE.InformationProject.ConstructionStandardIdentify" %>
+
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
 
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,92 +10,107 @@
 </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" Title="标准规范辨识"
-        Layout="HBox" ShowHeader="false">
-        <Items>
-            <f:Grid ID="Grid1" Title="标准规范辨识" ShowHeader="false" EnableCollapse="true" PageSize="10"
-                ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" EnableColumnLines="true"  
-                DataKeyNames="ConstructionStandardIdentifyId" DataIDField="ConstructionStandardIdentifyId"  AllowSorting="true"
-                SortField="ConstructionStandardIdentifyCode" SortDirection="DESC" OnSort="Grid1_Sort"  ForceFit="true"
-                OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange"
-                EnableRowDoubleClickEvent="True" OnRowDoubleClick="Grid1_RowDoubleClick">
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items>
-                            <f:TextBox runat="server" EmptyText="按编号查询" AutoPostBack="True" Label="编号" LabelWidth="70px"
-                                Width="250px" ID="txtConstructionStandardIdentifyCode" OnTextChanged="TextBox_TextChanged" LabelAlign="Right">
-                            </f:TextBox>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                            </f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" OnClick="btnNew_Click" runat="server" Hidden="true" 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="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:RenderField Width="200px" ColumnID="ConstructionStandardIdentifyCode" DataField="ConstructionStandardIdentifyCode"
-                        FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="VersionNumber" DataField="VersionNumber" FieldType="String"
-                        HeaderText="版本号" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="IdentifyPersonName" DataField="IdentifyPersonName"
-                        FieldType="String" HeaderText="整理人" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="IdentifyDate" DataField="IdentifyDate" FieldType="Date"
-                        Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="实施日期" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="UpdateDate" DataField="UpdateDate" FieldType="Date"
-                        Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="更新日期" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>                    
-                    <f:WindowField TextAlign="Left" Width="80px" WindowID="WindowAtt" HeaderText="附件" ExpandUnusedSpace="true"
-                        Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="ConstructionStandardIdentifyId"
-                        DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ConstructionStandardIdentifyAttachUrl&menuId=28B0235F-3DB5-4C15-A7E3-6F5DF52C8FDC"
-                        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" OnClose="Window1_Close" IsModal="true"
-        Width="1200px" Height="800px">
-    </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"
-            ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除" Icon="Delete">
-        </f:MenuButton>
-    </f:Menu>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" 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" Title="标准规范辨识" ShowHeader="false" EnableCollapse="true" PageSize="10"
+                            ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" EnableColumnLines="true"
+                            DataKeyNames="ConstructionStandardIdentifyId" DataIDField="ConstructionStandardIdentifyId" AllowSorting="true"
+                            SortField="ConstructionStandardIdentifyCode" SortDirection="DESC" OnSort="Grid1_Sort" ForceFit="true"
+                            OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange"
+                            EnableRowDoubleClickEvent="True" OnRowDoubleClick="Grid1_RowDoubleClick">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:TextBox runat="server" EmptyText="按编号查询" AutoPostBack="True" Label="编号" LabelWidth="70px"
+                                            Width="250px" ID="txtConstructionStandardIdentifyCode" OnTextChanged="TextBox_TextChanged" LabelAlign="Right">
+                                        </f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" OnClick="btnNew_Click" runat="server" Hidden="true" 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="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="200px" ColumnID="ConstructionStandardIdentifyCode" DataField="ConstructionStandardIdentifyCode"
+                                    FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="VersionNumber" DataField="VersionNumber" FieldType="String"
+                                    HeaderText="版本号" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="IdentifyPersonName" DataField="IdentifyPersonName"
+                                    FieldType="String" HeaderText="整理人" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="IdentifyDate" DataField="IdentifyDate" FieldType="Date"
+                                    Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="实施日期" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="UpdateDate" DataField="UpdateDate" FieldType="Date"
+                                    Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="更新日期" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:WindowField TextAlign="Left" Width="80px" WindowID="WindowAtt" HeaderText="附件" ExpandUnusedSpace="true"
+                                    Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="ConstructionStandardIdentifyId"
+                                    DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ConstructionStandardIdentifyAttachUrl&menuId=28B0235F-3DB5-4C15-A7E3-6F5DF52C8FDC"
+                                    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>
+            </Items>
+        </f:Panel>
+
+        <f:Window ID="Window1" Title="标准规范辨识" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="1200px" Height="800px">
+        </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"
+                ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除" Icon="Delete">
+            </f:MenuButton>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentify.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentify.aspx.cs
index f25f72c..3deb1d0 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentify.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentify.aspx.cs
@@ -10,6 +10,22 @@ namespace FineUIPro.Web.HSSE.InformationProject
 {
     public partial class ConstructionStandardIdentify : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
         #region 加载页面
         /// <summary>
         /// 加载页面
@@ -21,13 +37,44 @@ namespace FineUIPro.Web.HSSE.InformationProject
             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();
+                }
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 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;
+            }
+        }
+
+
         #endregion
 
         #region 绑定数据
@@ -46,16 +93,16 @@ namespace FineUIPro.Web.HSSE.InformationProject
         /// </summary>
         private void BindGrid()
         {
-            string projectId = this.CurrUser.LoginProjectId;
-            if (!string.IsNullOrEmpty(Request.Params["projectId"]))
+            if (string.IsNullOrEmpty(this.ProjectId))
             {
-                projectId = Request.Params["projectId"];
+                return;
             }
+
+            string projectId = this.ProjectId;
             List<Model.View_InformationProject_ConstructionStandardIdentify> q = (from x in Funs.DB.View_InformationProject_ConstructionStandardIdentify
                                                                                   where x.ProjectId == projectId && x.State == BLL.Const.State_2
                                                                                   orderby x.IdentifyDate descending
                                                                                   select x).ToList();
-           
 
             if (!string.IsNullOrEmpty(txtConstructionStandardIdentifyCode.Text.Trim()))
             {
@@ -76,7 +123,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
         {
             List<Model.View_InformationProject_ConstructionStandardIdentify> source = new List<Model.View_InformationProject_ConstructionStandardIdentify>();
             source = (from x in Funs.DB.View_InformationProject_ConstructionStandardIdentify
-                      where x.ProjectId == this.CurrUser.LoginProjectId
+                      where x.ProjectId == this.ProjectId
                       orderby x.IdentifyDate descending
                       select x).ToList();
             if (!string.IsNullOrEmpty(txtConstructionStandardIdentifyCode.Text.Trim()))
@@ -183,7 +230,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
         /// <param name="e"></param>
         protected void btnNew_Click(object sender, EventArgs e)
         {
-            int count = BLL.ConstructionStandardIdentifyService.GetConstructionStandardIdentifyByVersionIsNull(this.CurrUser.LoginProjectId);
+            int count = BLL.ConstructionStandardIdentifyService.GetConstructionStandardIdentifyByVersionIsNull(this.ProjectId);
             if (count == 0)
             {
                 PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConstructionStandardIdentifyEdit.aspx", "选择 - ")));
@@ -242,7 +289,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
                 return;
             }
 
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ConstructionStandardIdentifyMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ConstructionStandardIdentifyMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentify.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentify.aspx.designer.cs
index 767052d..308f080 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentify.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentify.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.InformationProject {
-    
-    
-    public partial class ConstructionStandardIdentify {
-        
+namespace FineUIPro.Web.HSSE.InformationProject
+{
+
+
+    public partial class ConstructionStandardIdentify
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,16 +31,52 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         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 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtConstructionStandardIdentifyCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtConstructionStandardIdentifyCode;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentify.aspx b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentify.aspx
index c764241..c43e6c1 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentify.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentify.aspx
@@ -1,90 +1,107 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LawRegulationIdentify.aspx.cs" Inherits="FineUIPro.Web.HSSE.InformationProject.LawRegulationIdentify" %>
 
-<!DOCTYPE html>     
+<%@ 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" />
+    <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" Title="法律法规辨识记录" ShowHeader="false"
-        Layout="HBox">
-        <Items>
-            <f:Grid ID="Grid1" Title="法律法规辨识记录" ShowHeader="false" EnableCollapse="true" PageSize="10"
-                ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" EnableColumnLines="true"
-                DataKeyNames="LawRegulationIdentifyId" DataIDField="LawRegulationIdentifyId"  AllowSorting="true"
-                SortField="LawRegulationIdentifyCode" SortDirection="DESC" OnSort="Grid1_Sort"  ForceFit="true"
-                OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" EnableRowDoubleClickEvent="true"
-                OnRowDoubleClick="Grid1_RowDoubleClick" OnFilterChange="Grid1_FilterChange">
-                <Toolbars>
-                    <f:Toolbar runat="server" ID="Toolbar4">
-                        <Items>
-                            <f:TextBox runat="server" EmptyText="按编号查询" AutoPostBack="True" Label="编号" LabelWidth="70px"
-                                Width="250px" ID="txtLawRegulationIdentifyCode" OnTextChanged="TextBox_TextChanged" LabelAlign="Right">
-                            </f:TextBox>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" Hidden="true" EnablePostBack="true" runat="server" OnClick="btnNew_Click" Text="新增">
-                            </f:Button>
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
-                                EnableAjax="false" DisableControlBeforePostBack="false">
-                            </f:Button>                            
-                        </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="220px" ColumnID="LawRegulationIdentifyCode" DataField="LawRegulationIdentifyCode" FieldType="String"
-                        HeaderText="编号" HeaderTextAlign="Center" TextAlign="Center" >
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="VersionNumber" DataField="VersionNumber" FieldType="String"
-                        HeaderText="版本号" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="IdentifyPersonName" DataField="IdentifyPersonName"
-                        FieldType="String" HeaderText="整理人" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="IdentifyDate" DataField="IdentifyDate" FieldType="Date"
-                        Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="实施日期" HeaderTextAlign="Center"
-                        TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="150px" ColumnID="UpdateDate" DataField="UpdateDate" FieldType="Date"
-                        Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="更新日期" HeaderTextAlign="Center"
-                        TextAlign="Center">
-                    </f:RenderField>
-                </Columns>
-                <Listeners>
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
-                <PageItems>
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarSeparator>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                    </f:ToolbarText>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">                
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="法律法规辨识记录" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
-        Width="1300px" Height="600px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
-            Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
-        </f:MenuButton>
-        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Hidden="true"
-            ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Icon="Delete" Text="删除">
-        </f:MenuButton>
-    </f:Menu>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" 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" Title="法律法规辨识记录" ShowHeader="false" EnableCollapse="true" PageSize="10"
+                            ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" EnableColumnLines="true"
+                            DataKeyNames="LawRegulationIdentifyId" DataIDField="LawRegulationIdentifyId" AllowSorting="true"
+                            SortField="LawRegulationIdentifyCode" SortDirection="DESC" OnSort="Grid1_Sort" ForceFit="true"
+                            OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" EnableRowDoubleClickEvent="true"
+                            OnRowDoubleClick="Grid1_RowDoubleClick" OnFilterChange="Grid1_FilterChange">
+                            <Toolbars>
+                                <f:Toolbar runat="server" ID="Toolbar4">
+                                    <Items>
+                                        <f:TextBox runat="server" EmptyText="按编号查询" AutoPostBack="True" Label="编号" LabelWidth="70px"
+                                            Width="250px" ID="txtLawRegulationIdentifyCode" OnTextChanged="TextBox_TextChanged" LabelAlign="Right">
+                                        </f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" Hidden="true" EnablePostBack="true" runat="server" OnClick="btnNew_Click" Text="新增">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" Text="导出"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                    </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="220px" ColumnID="LawRegulationIdentifyCode" DataField="LawRegulationIdentifyCode" FieldType="String"
+                                    HeaderText="编号" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="VersionNumber" DataField="VersionNumber" FieldType="String"
+                                    HeaderText="版本号" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="IdentifyPersonName" DataField="IdentifyPersonName"
+                                    FieldType="String" HeaderText="整理人" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="IdentifyDate" DataField="IdentifyDate" FieldType="Date"
+                                    Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="实施日期" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="UpdateDate" DataField="UpdateDate" FieldType="Date"
+                                    Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="更新日期" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+
+        <f:Window ID="Window1" Title="法律法规辨识记录" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="1300px" Height="600px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
+                Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Hidden="true"
+                ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Icon="Delete" Text="删除">
+            </f:MenuButton>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentify.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentify.aspx.cs
index f363342..f1c0b4d 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentify.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentify.aspx.cs
@@ -42,13 +42,37 @@ namespace FineUIPro.Web.HSSE.InformationProject
                     this.ProjectId = Request.Params["projectId"];
                 }
                 Funs.DropDownPageSize(this.ddlPageSize);
-                ////权限按钮方法
-                this.GetButtonPower();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 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;
+            }
+        }
+
         #endregion
 
         #region 绑定数据
@@ -67,6 +91,10 @@ namespace FineUIPro.Web.HSSE.InformationProject
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = "select LawRegulationIdentify.LawRegulationIdentifyId,LawRegulationIdentify.VersionNumber,LawRegulationIdentify.ProjectId,Users.UserName as IdentifyPersonName,LawRegulationIdentify.IdentifyDate,CodeRecords.Code AS LawRegulationIdentifyCode "
                           + @" ,(CASE WHEN LawRegulationIdentify.States = " + BLL.Const.State_0 + " OR LawRegulationIdentify.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN LawRegulationIdentify.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
                           + @",LawRegulationIdentify.UpdateDate"
@@ -85,7 +113,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (!string.IsNullOrEmpty(this.txtLawRegulationIdentifyCode.Text.Trim()))
             {
@@ -150,7 +178,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
         /// <param name="e"></param>
         protected void btnNew_Click(object sender, EventArgs e)
         {
-          
+
             PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("LawRegulationIdentifyEdit.aspx?LawRegulationIdentifyId={0}", string.Empty, "编辑 - ")));
         }
 
@@ -230,7 +258,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.LawRegulationIdentifyMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.LawRegulationIdentifyMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
@@ -305,8 +333,8 @@ namespace FineUIPro.Web.HSSE.InformationProject
 
             return sb.ToString();
         }
-        #endregion        
-        
+        #endregion
+
         /// <summary>
         /// 排序
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentify.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentify.aspx.designer.cs
index dc070ce..40f25a3 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentify.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/LawRegulationIdentify.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.InformationProject {
-    
-    
-    public partial class LawRegulationIdentify {
-        
+namespace FineUIPro.Web.HSSE.InformationProject
+{
+
+
+    public partial class LawRegulationIdentify
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar4 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar4;
-        
+
         /// <summary>
         /// txtLawRegulationIdentifyCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtLawRegulationIdentifyCode;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/License/HSETechnical.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/License/HSETechnical.aspx.cs
index 6c8ddad..9d2ebba 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/License/HSETechnical.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/License/HSETechnical.aspx.cs
@@ -44,11 +44,10 @@ namespace FineUIPro.Web.HSSE.License
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-
+                this.InitDropDownList();
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
 
-                BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
                 this.btnNew.OnClientClick = Window1.GetShowReference("HSETechnicalEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -67,17 +66,21 @@ namespace FineUIPro.Web.HSSE.License
                 }
             }
         }
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+        }
         protected void changeTree(object sender, EventArgs e)
         {
-
             this.ProjectId = this.ucTree.ProjectId;
-            this.BindGrid();
+            this.InitDropDownList();
 
             this.GetButtonPower();
-            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            if (string.IsNullOrEmpty(this.ProjectId))
             {
                 btnNew.Hidden = true;
             }
+            this.BindGrid();
         }
 
         /// <summary>
@@ -90,63 +93,60 @@ namespace FineUIPro.Web.HSSE.License
                 return;
             }
 
-            if (!string.IsNullOrEmpty(this.ProjectId))
+            string strSql = "SELECT HSETechnical.HSETechnicalId,"
+                        + @"HSETechnical.ProjectId,"
+                        + @"CodeRecords.Code AS HSETechnicalCode,"
+                        + @"HSETechnical.HSETechnicalDate,"
+                        + @"HSETechnical.UnitId,"
+                        + @"HSETechnical.TeamGroupId,"
+                        + @"HSETechnical.WorkContents,"
+                        + @"HSETechnical.Address,"
+                        + @"HSETechnical.CompileMan,"
+                        + @"HSETechnical.CompileDate,"
+                        + @"HSETechnical.States,"
+                        + @"Unit.UnitName,"
+                        + @"TeamGroup.TeamGroupName,"
+                        + @"Users.UserName,"
+                        + @"(CASE WHEN HSETechnical.States = " + BLL.Const.State_0 + " OR HSETechnical.States IS NULL THEN ISNULL(OperateUser.UserName,Users.UserName) WHEN HSETechnical.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName,Project.ProjectName"
+               + @" FROM License_HSETechnical AS HSETechnical "
+               + @" LEFT JOIN Base_Project AS Project ON HSETechnical.ProjectId = Project.ProjectId "
+               + @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = HSETechnical.UnitId "
+               + @" LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId = HSETechnical.TeamGroupId "
+               + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON HSETechnical.HSETechnicalId = CodeRecords.DataId "
+               + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON  HSETechnical.HSETechnicalId = FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
+                      + @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId"
+               + @" LEFT JOIN Sys_User AS Users ON HSETechnical.CompileMan = Users.UserId WHERE 1=1 ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            strSql += " AND HSETechnical.ProjectId = @ProjectId";
+            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+
+            if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
             {
-                string strSql = "SELECT HSETechnical.HSETechnicalId,"
-                            + @"HSETechnical.ProjectId,"
-                            + @"CodeRecords.Code AS HSETechnicalCode,"
-                            + @"HSETechnical.HSETechnicalDate,"
-                            + @"HSETechnical.UnitId,"
-                            + @"HSETechnical.TeamGroupId,"
-                            + @"HSETechnical.WorkContents,"
-                            + @"HSETechnical.Address,"
-                            + @"HSETechnical.CompileMan,"
-                            + @"HSETechnical.CompileDate,"
-                            + @"HSETechnical.States,"
-                            + @"Unit.UnitName,"
-                            + @"TeamGroup.TeamGroupName,"
-                            + @"Users.UserName,"
-                            + @"(CASE WHEN HSETechnical.States = " + BLL.Const.State_0 + " OR HSETechnical.States IS NULL THEN ISNULL(OperateUser.UserName,Users.UserName) WHEN HSETechnical.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName,Project.ProjectName"
-                   + @" FROM License_HSETechnical AS HSETechnical "
-                   + @" LEFT JOIN Base_Project AS Project ON HSETechnical.ProjectId = Project.ProjectId "
-                   + @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = HSETechnical.UnitId "
-                   + @" LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId = HSETechnical.TeamGroupId "
-                   + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON HSETechnical.HSETechnicalId = CodeRecords.DataId "
-                   + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON  HSETechnical.HSETechnicalId = FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
-                          + @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId"
-                   + @" LEFT JOIN Sys_User AS Users ON HSETechnical.CompileMan = Users.UserId WHERE 1=1 ";
-                List<SqlParameter> listStr = new List<SqlParameter>();
-                strSql += " AND HSETechnical.ProjectId = @ProjectId";
-                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
-
-                if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
-                {
-                    strSql += " AND HSETechnical.UnitId = @UnitId";  ///状态为已完成
-                    listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
-                }
-                if (!string.IsNullOrEmpty(this.txtHSETechnicalCode.Text.Trim()))
-                {
-                    strSql += " AND HSETechnical.HSETechnicalCode LIKE @HSETechnicalCode";
-                    listStr.Add(new SqlParameter("@HSETechnicalCode", "%" + this.txtHSETechnicalCode.Text.Trim() + "%"));
-                }
-                if (!string.IsNullOrEmpty(this.txtWorkContents.Text.Trim()))
-                {
-                    strSql += " AND HSETechnical.WorkContents LIKE @WorkContents";
-                    listStr.Add(new SqlParameter("@WorkContents", "%" + this.txtWorkContents.Text.Trim() + "%"));
-                }
-                if (this.drpUnit.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpUnit.SelectedValue))
-                {
-                    strSql += " AND HSETechnical.UnitId = @UnitId2";
-                    listStr.Add(new SqlParameter("@UnitId2", this.drpUnit.SelectedValue));
-                }
-
-                SqlParameter[] parameter = listStr.ToArray();
-                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-                Grid1.RecordCount = tb.Rows.Count;
-                var table = this.GetPagedDataTable(Grid1, tb);
-                Grid1.DataSource = table;
-                Grid1.DataBind();
+                strSql += " AND HSETechnical.UnitId = @UnitId";  ///状态为已完成
+                listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
             }
+            if (!string.IsNullOrEmpty(this.txtHSETechnicalCode.Text.Trim()))
+            {
+                strSql += " AND HSETechnical.HSETechnicalCode LIKE @HSETechnicalCode";
+                listStr.Add(new SqlParameter("@HSETechnicalCode", "%" + this.txtHSETechnicalCode.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(this.txtWorkContents.Text.Trim()))
+            {
+                strSql += " AND HSETechnical.WorkContents LIKE @WorkContents";
+                listStr.Add(new SqlParameter("@WorkContents", "%" + this.txtWorkContents.Text.Trim() + "%"));
+            }
+            if (this.drpUnit.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpUnit.SelectedValue))
+            {
+                strSql += " AND HSETechnical.UnitId = @UnitId2";
+                listStr.Add(new SqlParameter("@UnitId2", this.drpUnit.SelectedValue));
+            }
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
         }
 
         /// <summary>
@@ -250,7 +250,7 @@ namespace FineUIPro.Web.HSSE.License
                 {
                     PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HSETechnicalEdit.aspx?HSETechnicalId={0}", id, "编辑 - ")));
                 }
-            }        
+            }
         }
         #endregion
 
@@ -270,7 +270,7 @@ namespace FineUIPro.Web.HSSE.License
                     var getV = BLL.HSETechnicalService.GetHSETechnicalById(rowID);
                     if (getV != null)
                     {
-                        BLL.LogService.AddSys_Log(this.CurrUser, getV.HSETechnicalCode, getV.HSETechnicalId,BLL.Const.ProjectHSETechnicalMenuId,BLL.Const.BtnDelete); 
+                        BLL.LogService.AddSys_Log(this.CurrUser, getV.HSETechnicalCode, getV.HSETechnicalId, BLL.Const.ProjectHSETechnicalMenuId, BLL.Const.BtnDelete);
                         BLL.HSETechnicalService.DeleteHSETechnicalById(rowID);
                     }
                 }
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/InUnit.aspx b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/InUnit.aspx
index 85ccbd4..97b5c6f 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/InUnit.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/InUnit.aspx
@@ -1,15 +1,16 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InUnit.aspx.cs" Inherits="FineUIPro.Web.HSSE.QualityAudit.InUnit" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>采购供货厂家管理</title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
     <style type="text/css">
-        .f-grid-row .f-grid-cell-inner
-        {
+        .f-grid-row .f-grid-cell-inner {
             white-space: normal;
             word-break: break-all;
         }
@@ -17,107 +18,121 @@
 </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="InUnitId" AllowCellEditing="true"
-                ClicksToEdit="2" DataIDField="InUnitId" AllowSorting="true" SortField="InUnitCode"
-                SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
-                PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" 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="txtInUnitCode" EmptyText="输入查询条件" AutoPostBack="true"
-                                OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="right">
-                            </f:TextBox>
-                            <f:TextBox runat="server" Label="厂家名称" ID="txtManufacturerName" EmptyText="输入查询条件"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
-                                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>                           
-                            <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="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="180px" ColumnID="InUnitCode" DataField="InUnitCode" SortField="InUnitCode"
-                        FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="180px" ColumnID="ManufacturerName" DataField="ManufacturerName"
-                        ExpandUnusedSpace="true" SortField="ManufacturerName" FieldType="String" HeaderText="厂家名称"
-                        HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="InDate" DataField="InDate" SortField="InDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="入场时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:TemplateField ColumnID="tfOutDate" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
-                        <ItemTemplate>
-                            <asp:Label ID="lblOutDate" runat="server" Text='<%# ConvertOutDate(Eval("InUnitId")) %>'>
-                            </asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:RenderField Width="120px" ColumnID="JobTicketValidity" DataField="JobTicketValidity"
-                        SortField="JobTicketValidity" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
-                        HeaderText="作业票有效期" HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="HSEMan" DataField="HSEMan" ExpandUnusedSpace="true"
-                        SortField="HSEMan" FieldType="String" HeaderText="负责人及安全员姓名" HeaderTextAlign="Center"
-                        TextAlign="Left">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="HeadTel" DataField="HeadTel" ExpandUnusedSpace="true"
-                        SortField="HeadTel" 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:ListItem Text="10" Value="10" />
-                        <f:ListItem Text="15" Value="15" />
-                        <f:ListItem Text="20" Value="20" />
-                        <f:ListItem Text="25" Value="25" />
-                        <f:ListItem Text="所有行" Value="100000" />
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="采购供货厂家管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1024px"
-        Height="620px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="TableEdit" 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>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" 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="InUnitId" AllowCellEditing="true"
+                            ClicksToEdit="2" DataIDField="InUnitId" AllowSorting="true" SortField="InUnitCode"
+                            SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
+                            PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" 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="txtInUnitCode" EmptyText="输入查询条件" AutoPostBack="true"
+                                            OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="厂家名称" ID="txtManufacturerName" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
+                                            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>
+                                        <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="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="180px" ColumnID="InUnitCode" DataField="InUnitCode" SortField="InUnitCode"
+                                    FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="180px" ColumnID="ManufacturerName" DataField="ManufacturerName"
+                                    ExpandUnusedSpace="true" SortField="ManufacturerName" FieldType="String" HeaderText="厂家名称"
+                                    HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="InDate" DataField="InDate" SortField="InDate"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="入场时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:TemplateField ColumnID="tfOutDate" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblOutDate" runat="server" Text='<%# ConvertOutDate(Eval("InUnitId")) %>'>
+                                        </asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="120px" ColumnID="JobTicketValidity" DataField="JobTicketValidity"
+                                    SortField="JobTicketValidity" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                    HeaderText="作业票有效期" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="HSEMan" DataField="HSEMan" ExpandUnusedSpace="true"
+                                    SortField="HSEMan" FieldType="String" HeaderText="负责人及安全员姓名" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="HeadTel" DataField="HeadTel" ExpandUnusedSpace="true"
+                                    SortField="HeadTel" 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:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="100000" />
+                                </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="true" runat="server" IsModal="true" Width="1024px"
+            Height="620px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="TableEdit" 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">
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/InUnit.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/InUnit.aspx.cs
index 78e5615..746721d 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/InUnit.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/InUnit.aspx.cs
@@ -11,6 +11,23 @@ namespace FineUIPro.Web.HSSE.QualityAudit
 {
     public partial class InUnit : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
         #region 加载
         /// <summary>
         /// 加载页面
@@ -21,8 +38,20 @@ namespace FineUIPro.Web.HSSE.QualityAudit
         {
             if (!IsPostBack)
             {
-                ////权限按钮方法
-                this.GetButtonPower();
+                Funs.DropDownPageSize(this.ddlPageSize);
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("InUnitEdit.aspx") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -33,11 +62,33 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 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 InUnit.InUnitId,"
                           + @"InUnit.ProjectId,"
                           + @"CodeRecords.Code AS InUnitCode,"
@@ -63,10 +114,10 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                           + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON InUnit.InUnitId = CodeRecords.DataId "
                           + @" LEFT JOIN Sys_User AS Users ON InUnit.CompileMan = Users.UserId WHERE 1=1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))  ///是否文件柜查看页面传项目值
+            if (!string.IsNullOrEmpty(this.ProjectId))  ///是否文件柜查看页面传项目值
             {
                 strSql += " AND InUnit.ProjectId = @ProjectId";
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (!string.IsNullOrEmpty(this.txtInUnitCode.Text.Trim()))
             {
@@ -234,7 +285,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
         /// <returns></returns>
         private void GetButtonPower()
         {
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.InUnitMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.InUnitMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/InUnit.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/InUnit.aspx.designer.cs
index b126155..3cd7ec4 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/InUnit.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/InUnit.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.QualityAudit {
-    
-    
-    public partial class InUnit {
-        
+namespace FineUIPro.Web.HSSE.QualityAudit
+{
+
+
+    public partial class InUnit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtInUnitCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtInUnitCode;
-        
+
         /// <summary>
         /// txtManufacturerName 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtManufacturerName;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// lblOutDate 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblOutDate;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/ProjectRecord.aspx b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/ProjectRecord.aspx
index 5c92e3f..2f1d834 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/ProjectRecord.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/ProjectRecord.aspx
@@ -1,5 +1,7 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectRecord.aspx.cs" Inherits="FineUIPro.Web.HSSE.QualityAudit.ProjectRecord" %>
 
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -17,82 +19,96 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目协议记录" EnableCollapse="true"
-                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="ProjectRecordId"
-                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="ProjectRecordId" AllowSorting="true"
-                    SortField="ProjectRecordCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    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="txtProjectRecordCode" EmptyText="输入查询条件"
-                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelAlign="right">
-                                </f:TextBox>
-                                <f:TextBox runat="server" Label="标题" ID="txtProjectRecordName" EmptyText="输入查询条件"
-                                    AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelAlign="right">
-                                </f:TextBox>
-                                <f:DropDownList ID="drpUnit" runat="server" Label="单位" Width="300px" LabelWidth="60px" EmptyText="请选择单位"
-                                    EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                <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="ProjectRecordId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="ProjectRecordId" AllowSorting="true"
+                            SortField="ProjectRecordCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                            IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            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="txtProjectRecordCode" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:TextBox runat="server" Label="标题" ID="txtProjectRecordName" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:DropDownList ID="drpUnit" runat="server" Label="单位" Width="300px" LabelWidth="60px" EmptyText="请选择单位"
+                                            EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                        </f:DropDownList>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                        </f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
+                                            runat="server">
+                                        </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="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="90px" ColumnID="ProjectRecordCode" DataField="ProjectRecordCode"
+                                    SortField="ProjectRecordCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="250px" ColumnID="ProjectRecordName" DataField="ProjectRecordName"
+                                    SortField="ProjectRecordName" FieldType="String" HeaderText="标题"
+                                    HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="350px" ColumnID="Name" DataField="Name" SortField="Name" FieldType="String" HeaderText="单位名称"
+                                    HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="Remark" DataField="Remark"
+                                    SortField="Remark" FieldType="String" HeaderText="备注" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:WindowField TextAlign="Left" Width="80px" WindowID="WindowAtt" HeaderText="附件"
+                                    Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="ProjectRecordId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ProjectRecordAttachUrl&menuId=874B4232-E0AD-41CD-8C66-8A7FF2D79358"
+                                    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:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="所有行" Value="100000" />
                                 </f:DropDownList>
-                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
-                                </f:ToolbarFill>
-                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" Hidden="true" Text="新增"
-                                    runat="server">
-                                </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="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="90px" ColumnID="ProjectRecordCode" DataField="ProjectRecordCode"
-                            SortField="ProjectRecordCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="250px" ColumnID="ProjectRecordName" DataField="ProjectRecordName"
-                            SortField="ProjectRecordName" FieldType="String" HeaderText="标题"
-                            HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="350px" ColumnID="Name" DataField="Name" SortField="Name" FieldType="String" HeaderText="单位名称"
-                            HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="Remark" DataField="Remark"
-                            SortField="Remark" FieldType="String" HeaderText="备注" HeaderTextAlign="Center"
-                            TextAlign="Left">
-                        </f:RenderField>
-                        <f:WindowField TextAlign="Left" Width="80px" WindowID="WindowAtt" HeaderText="附件"
-                            Text="详细" ToolTip="附件上传查看" DataIFrameUrlFields="ProjectRecordId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ProjectRecordAttachUrl&menuId=874B4232-E0AD-41CD-8C66-8A7FF2D79358"
-                            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:ListItem Text="10" Value="10" />
-                            <f:ListItem Text="15" Value="15" />
-                            <f:ListItem Text="20" Value="20" />
-                            <f:ListItem Text="25" Value="25" />
-                            <f:ListItem Text="所有行" Value="100000" />
-                        </f:DropDownList>
-                    </PageItems>
-                </f:Grid>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="项目协议记录" Hidden="true" EnableIFrame="true" EnableMaximize="true"
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/ProjectRecord.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/ProjectRecord.aspx.cs
index b3fbff7..b7541ba 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/ProjectRecord.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/ProjectRecord.aspx.cs
@@ -38,14 +38,20 @@ namespace FineUIPro.Web.HSSE.QualityAudit
         {
             if (!IsPostBack)
             {
-                ////权限按钮方法
-                this.GetButtonPower();
                 this.ProjectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+                this.InitDropDownList();
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
                 if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
                 {
                     this.drpUnit.SelectedValue = this.CurrUser.UnitId;
@@ -61,11 +67,36 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 this.BindGrid();
             }
         }
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+        }
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.InitDropDownList();
+            this.BindGrid();
+
+            this.GetButtonPower();
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+        }
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT ProjectRecord.ProjectRecordId,"
                           + @"ProjectRecord.ProjectId,"
                           + @"ProjectRecord.UnitId,"
@@ -84,10 +115,10 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                           + @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = ProjectRecord.UnitId "
                           + @" LEFT JOIN Sys_User AS Users ON ProjectRecord.CompileMan = Users.UserId WHERE 1=1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 strSql += " AND ProjectRecord.ProjectId = @ProjectId";
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
             {
@@ -238,7 +269,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
         /// <returns></returns>
         private void GetButtonPower()
         {
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectRecordMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectRecordMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/ProjectRecord.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/ProjectRecord.aspx.designer.cs
index 969b385..552a0b0 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/ProjectRecord.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/ProjectRecord.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.QualityAudit {
-    
-    
-    public partial class ProjectRecord {
-        
+namespace FineUIPro.Web.HSSE.QualityAudit
+{
+
+
+    public partial class ProjectRecord
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtProjectRecordCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectRecordCode;
-        
+
         /// <summary>
         /// txtProjectRecordName 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectRecordName;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -164,7 +202,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -173,7 +211,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -182,7 +220,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/SubcontractLeasingProtocol.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/SubcontractLeasingProtocol.aspx.cs
index c91dc2c..f4454a6 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/SubcontractLeasingProtocol.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/SubcontractLeasingProtocol.aspx.cs
@@ -47,7 +47,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 {
                     this.ProjectId = Request.Params["projectId"];
                 }
-                BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+                this.InitDropDownList();
                 //if (BLL.SubcontractLeasingProtocolService.GetSubcontractLeasingProtocolTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
                 //{
                 //    this.drpUnit.SelectedValue = this.CurrUser.UnitId;
@@ -59,8 +59,6 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                     Grid1.PageSize = this.CurrUser.PageSize.Value;
                 }
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                // 绑定表格
-                this.BindGrid();
                 this.ucTree.UnitId = this.CurrUser.UnitId;
                 this.ucTree.ProjectId = this.ProjectId;
                 if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
@@ -69,20 +67,24 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                     ////权限按钮方法
                     this.GetButtonPower();
                 }
+                // 绑定表格
+                this.BindGrid();
             }
         }
-
+        private void InitDropDownList()
+        {
+            BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
+        }
         protected void changeTree(object sender, EventArgs e)
         {
-
             this.ProjectId = this.ucTree.ProjectId;
-            this.BindGrid();
-
+            this.InitDropDownList();
             this.GetButtonPower();
-            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            if (string.IsNullOrEmpty(this.ProjectId))
             {
                 btnNew.Hidden = true;
             }
+            this.BindGrid();
         }
 
         /// <summary>
@@ -100,10 +102,10 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                                 left join Sys_User as z on z.UserId=x.CompileMan
                             where 1=1");
             List<SqlParameter> listStr = new List<SqlParameter>();
-            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            if (!string.IsNullOrEmpty(this.ProjectId))
             {
                 sb.Append(" AND x.ProjectId = @ProjectId ");
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId))
             {
@@ -133,33 +135,6 @@ namespace FineUIPro.Web.HSSE.QualityAudit
             var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
             Grid1.DataBind();
-
-            //string unitId = this.drpUnit.SelectedValue;
-            //var db = Funs.DB;
-            //var queryData = from x in db.QualityAudit_SubcontractLeasingProtocol
-            //                join y in db.Sys_User on x.CompileMan equals y.UserId
-            //                join z in db.Base_Unit on x.UnitId equals z.UnitId
-            //                where x.ProjectId == this.ProjectId
-            //                    && (string.IsNullOrEmpty(txtCode.Text.Trim()) || x.Code.Contains(txtCode.Text.Trim()))
-            //                    && (string.IsNullOrEmpty(txtName.Text.Trim()) || x.Name.Contains(txtName.Text.Trim()))
-            //                    && (string.IsNullOrEmpty(unitId) || x.UnitId == unitId)
-            //                select new
-            //                {
-            //                    x.Id,
-            //                    x.Code,
-            //                    x.Name,
-            //                    x.UnitId,
-            //                    UnitName = z.UnitName,
-            //                    x.Content,
-            //                    x.CompileMan,
-            //                    x.CompileDate,
-            //                    x.ValidStartDate,
-            //                    x.ValidEndDate,
-            //                    CompileManName = y.UserName
-            //                };
-            //Grid1.RecordCount = queryData.Count();
-            //Grid1.DataSource = queryData;
-            //Grid1.DataBind();
         }
 
         /// <summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx
index a99b1cc..c99f733 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx
@@ -1,98 +1,113 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ExpertArgumentList.aspx.cs" Inherits="FineUIPro.Web.HSSE.Solution.ExpertArgumentList" %>
 
+<%@ 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" />
     <style type="text/css">
-        .labcenter
-        {
+        .labcenter {
             text-align: center;
-        }        
+        }
     </style>
 </head>
 <body>
     <form id="form1" runat="server">
-   <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-        <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="专家论证清单" EnableCollapse="true"
-                runat="server" BoxFlex="1" DataKeyNames="LargerHazardListId" DataIDField="LargerHazardListId" AllowSorting="true" SortField="RecordTime"
-                SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true"  ForceFit="true"
-                AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                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="txtHazardCode" EmptyText="输入查询条件"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="50px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增"
-                                Hidden="true">
-                            </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="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:RenderField Width="120px" ColumnID="HazardCode" DataField="HazardCode"
-                        SortField="HazardCode" FieldType="String" HeaderText="文件编号" TextAlign="Center"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="120px" ColumnID="VersionNo" DataField="VersionNo"
-                        SortField="VersionNo" FieldType="String" HeaderText="版本号" TextAlign="Center"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                      <f:RenderField Width="150px" ColumnID="RecardManName" DataField="RecardManName"
-                        SortField="RecardManName" FieldType="String" HeaderText="整理人" TextAlign="Center"
-                        HeaderTextAlign="Center">
-                    </f:RenderField>
-                     <f:RenderField Width="150px" ColumnID="RecordTime" DataField="RecordTime" SortField="RecordTime"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="整理时间"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                </Columns>
-                <Listeners>
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
-                <PageItems>
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarSeparator>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                    </f:ToolbarText>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">                  
-                    </f:DropDownList>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="专家论证清单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close"
-        Width="1200px" Height="560px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <Items>
-           <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true" Text="修改" Icon="Pencil"
-                OnClick="btnMenuModify_Click">
-            </f:MenuButton>
-            <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
-                OnClick="btnMenuDel_Click">
-            </f:MenuButton>
-        </Items>
-    </f:Menu>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" 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" DataKeyNames="LargerHazardListId" DataIDField="LargerHazardListId" AllowSorting="true" SortField="RecordTime"
+                            SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" ForceFit="true"
+                            AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                            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="txtHazardCode" EmptyText="输入查询条件"
+                                            AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="50px"
+                                            LabelAlign="right">
+                                        </f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server" Text="新增"
+                                            Hidden="true">
+                                        </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="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="120px" ColumnID="HazardCode" DataField="HazardCode"
+                                    SortField="HazardCode" FieldType="String" HeaderText="文件编号" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="VersionNo" DataField="VersionNo"
+                                    SortField="VersionNo" FieldType="String" HeaderText="版本号" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="RecardManName" DataField="RecardManName"
+                                    SortField="RecardManName" FieldType="String" HeaderText="整理人" TextAlign="Center"
+                                    HeaderTextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="RecordTime" DataField="RecordTime" SortField="RecordTime"
+                                    FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="整理时间"
+                                    HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="专家论证清单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="1200px" Height="560px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true" Text="修改" Icon="Pencil"
+                    OnClick="btnMenuModify_Click">
+                </f:MenuButton>
+                <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
+                    OnClick="btnMenuDel_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
     </form>
     <script type="text/javascript">
         var menuID = '<%= Menu1.ClientID %>';
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx.cs
index ddaf4f7..7feb79a 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx.cs
@@ -9,6 +9,23 @@ namespace FineUIPro.Web.HSSE.Solution
 {
     public partial class ExpertArgumentList : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
         #region 加载页面
         /// <summary>
         /// 加载页面
@@ -19,8 +36,22 @@ namespace FineUIPro.Web.HSSE.Solution
         {
             if (!IsPostBack)
             {
-                ////权限按钮方法
-                this.GetButtonPower();
+                //Funs.DropDownPageSize(this.ddlPageSize);
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    ////权限按钮方法
+                    this.GetButtonPower();
+                }
+
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 btnNew.OnClientClick = Window1.GetShowReference("ExpertArgumentListEdit.aspx") + "return false;";
                 // 绑定表格
@@ -28,11 +59,32 @@ namespace FineUIPro.Web.HSSE.Solution
             }
         }
 
+        /// <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.ProjectId))
+            {
+                btnNew.Hidden = true;
+            }
+        }
+
         /// <summary>
         /// 绑定数据
         /// </summary>
         private void BindGrid()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             string strSql = @"SELECT Larger.LargerHazardListId,Larger.HazardCode,Larger.ProjectId,Larger.RecordTime,Larger.RecardManId,sysUser.UserName as RecardManName,Larger.Remark,Larger.States,Larger.VersionNo"
                           + @",(CASE WHEN Larger.States=1 THEN '已完成' WHEN Larger.States=-1 THEN '已作废' ELSE '待提交' END) AS StatesName"
                           + @" FROM dbo.Solution_LargerHazardList AS Larger"
@@ -47,7 +99,7 @@ namespace FineUIPro.Web.HSSE.Solution
             }
             else
             {
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
             }
             if (!string.IsNullOrEmpty(this.txtHazardCode.Text.Trim()))
             {
@@ -200,7 +252,7 @@ namespace FineUIPro.Web.HSSE.Solution
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectExpertArgumentMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectExpertArgumentMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx.designer.cs
index 6136768..072439b 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Solution {
-    
-    
-    public partial class ExpertArgumentList {
-        
+namespace FineUIPro.Web.HSSE.Solution
+{
+
+
+    public partial class ExpertArgumentList
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Solution {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Solution {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,43 @@ namespace FineUIPro.Web.HSSE.Solution {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Solution {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Solution {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// txtHazardCode 控件。
         /// </summary>
@@ -65,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Solution {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtHazardCode;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -74,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Solution {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -83,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Solution {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -92,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Solution {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -101,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Solution {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Solution {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Solution {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Solution {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Solution {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Solution {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -155,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Solution {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/ThreeYearAction/FireGasSafety/SafetyOrganization.aspx.cs b/SUBQHSE/FineUIPro.Web/ThreeYearAction/FireGasSafety/SafetyOrganization.aspx.cs
index 89f027d..ddc6560 100644
--- a/SUBQHSE/FineUIPro.Web/ThreeYearAction/FireGasSafety/SafetyOrganization.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/ThreeYearAction/FireGasSafety/SafetyOrganization.aspx.cs
@@ -303,7 +303,7 @@ namespace FineUIPro.Web.ThreeYearAction.FireGasSafety
         {
             if (this.trSafetyOrganization.SelectedNode != null && this.trSafetyOrganization.SelectedNode.CommandName != "project")
             {
-                if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.SafetyOrganizationMenuId, BLL.Const.BtnModify))
+                if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.SafetyOrganizationMenuId, BLL.Const.BtnModify))
                 {
                     if (this.trSafetyOrganization.SelectedNode.Text != "总图")   //非专业节点可以修改
                     {
@@ -335,7 +335,7 @@ namespace FineUIPro.Web.ThreeYearAction.FireGasSafety
         {
             if (this.trSafetyOrganization.SelectedNode != null && trSafetyOrganization.SelectedNode.CommandName == "project")
             {
-                if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.SafetyOrganizationMenuId, BLL.Const.BtnAdd))
+                if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.SafetyOrganizationMenuId, BLL.Const.BtnAdd))
                 {
                     string openUrl = String.Format("SafetyOrganizationSave.aspx?operating=add&SuperId={0}", this.trSafetyOrganization.SelectedNode.NodeID, "增加 - ");
 
@@ -362,7 +362,7 @@ namespace FineUIPro.Web.ThreeYearAction.FireGasSafety
         {
             if (this.trSafetyOrganization.SelectedNode != null)
             {
-                if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.SafetyOrganizationMenuId, BLL.Const.BtnDelete))
+                if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.SafetyOrganizationMenuId, BLL.Const.BtnDelete))
                 {
                     if (this.trSafetyOrganization.SelectedNode.CommandName != "project")   //非专业节点可以删除
                     {