diff --git a/DataBase/版本日志/SGGLDB_V2023-11-09.sql b/DataBase/版本日志/SGGLDB_V2023-11-09.sql
new file mode 100644
index 00000000..5aa119bb
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2023-11-09.sql
@@ -0,0 +1,30 @@
+
+ALTER VIEW [dbo].[View_WBS]
+AS
+select '1' as Id,'0' as SupId ,'JZ' as Code, '��������' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as RealEndDate,null as WBSCode,JDWeights,null as Unit,null as PlanProjectQuantity,null as RealProjectQuantity,null as RealStartDate,null as IsMileStone,PlanCost,null as PreWorkCode,'' as ShowId,
+ProjectId from dbo.WBS_UnitWork 
+Union
+select '2' as Id,'0' as SupId ,'AZ' as Code, '��װ����' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as RealEndDate,null as WBSCode,JDWeights,null as Unit,null as PlanProjectQuantity,null as RealProjectQuantity,null as RealStartDate,null as IsMileStone,PlanCost,null as PreWorkCode,'' as ShowId,
+ProjectId from dbo.WBS_UnitWork 
+Union
+select UnitWorkId as Id,ProjectType as SupId ,UnitWorkCode as Code, UnitWorkName as Name,'UnitWork' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,JDWeights,null as Unit,null as PlanProjectQuantity,null as RealProjectQuantity,RealStartDate,null as IsMileStone,PlanCost,null as PreWorkCode,'' as ShowId,
+ProjectId from dbo.WBS_UnitWork 
+Union all
+select WorkPackageId as id,UnitWorkId as SupId,WorkPackageCode as Code,PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,JDWeights,Unit,PlanProjectQuantity,RealProjectQuantity,RealStartDate,IsMileStone,PlanCost,PreWorkCode,case when (select COUNT(*) from WBS_WorkPackage a where a.SuperWorkPackageId=w.WorkPackageId and a.IsApprove=1)=0 then WorkPackageId else '' end as ShowId,
+ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is null
+Union all
+select WorkPackageId as id,SuperWorkPackageId as SupId,WorkPackageCode as Code, PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,JDWeights,Unit,PlanProjectQuantity,RealProjectQuantity,RealStartDate,IsMileStone,PlanCost,PreWorkCode,case when (select COUNT(*) from WBS_WorkPackage a where a.SuperWorkPackageId=w.WorkPackageId and a.IsApprove=1)=0 then WorkPackageId else '' end as ShowId,
+ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is not null
+
+
+
+
+
+
+
+
+
+
+GO
+
+
diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs
index 01bd6402..fd000c2f 100644
--- a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs
+++ b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs
@@ -245,7 +245,7 @@ namespace BLL
         /// 获取模拟树表格
         /// </summary>
         /// <returns></returns>
-        public static DataTable GetAllTreeDataTable(string projectId, string IsOut, string startTime, string endTime, string isOK)
+        public static DataTable GetAllTreeDataTable0(string projectId, string IsOut, string startTime, string endTime, string isOK)
         {
             using (var db = new Model.SGGLDB(Funs.ConnString))
             {
@@ -292,11 +292,6 @@ namespace BLL
                 table.Columns.Add(new DataColumn("PlanCost", typeof(String)));
                 table.Columns.Add(new DataColumn("PreWorkCode", typeof(String)));
                 table.Columns.Add(new DataColumn("Code", typeof(String)));
-                for (int i = 0; i < months.Count; i++)
-                {
-                    table.Columns.Add(new DataColumn("PlanNum" + (i + 1).ToString(), typeof(String)));
-                    table.Columns.Add(new DataColumn("ThisNum" + (i + 1).ToString(), typeof(String)));
-                }
                 if (getWBSs.Count() > 0)
                 {
                     List<Model.View_WBS> newList = new List<Model.View_WBS>();
@@ -372,19 +367,6 @@ namespace BLL
                                         row[15] = decimal.Round(Convert.ToDecimal(workPackage.PlanCost), 2);
                                     }
                                     row[16] = workPackage.PreWorkCode;
-                                    var details = getDetails.Where(x => x.WorkPackageId == item.Id).ToList();
-                                    foreach (var item1 in details)
-                                    {
-                                        var index = months.FindIndex(x => x.Equals(item1.Months));
-                                        if (item1.PlanNum != 0)
-                                        {
-                                            row[18 + index * 2] = decimal.Round(Convert.ToDecimal(item1.PlanNum), 2);
-                                        }
-                                        if (item1.ThisNum != 0)
-                                        {
-                                            row[19 + index * 2] = decimal.Round(Convert.ToDecimal(item1.ThisNum), 2);
-                                        }
-                                    }
                                 }
                                 else
                                 {
@@ -454,6 +436,168 @@ namespace BLL
             }
         }
 
+        public static List<Model.View_WBS> GetAllTreeDataTable2(string projectId, string IsOut, string startTime, string endTime, string isOK)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                List<Model.View_WBS> getWBSs = (from x in db.View_WBS where x.ProjectId == projectId select x).ToList();
+                List<Model.View_WBS> newList = new List<Model.View_WBS>();
+                if (getWBSs.Count() > 0)
+                {
+               
+                    var projectTypes = getWBSs.Where(x => x.WBSType == "ProjectType" && x.SupId == "0");
+                    int a = 1;
+                    foreach (var item in projectTypes)
+                    {
+                        item.Code = a.ToString();
+                        newList.Add(item);
+                        if (string.IsNullOrEmpty(IsOut))
+                        {
+                            AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime, isOK);
+                        }
+                        else
+                        {
+                            AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime, isOK);
+                        }
+                        a++;
+                    }
+                }
+                return newList;
+            }
+        }
+
+        /// <summary>
+        /// 获取模拟树表格
+        /// </summary>
+        /// <returns></returns>
+        public static DataTable GetAllTreeDataTable(string projectId, string IsOut, string startTime, string endTime, string isOK)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                IQueryable<Model.View_WBS_WorkPackageDetail> getDetails = from x in db.View_WBS_WorkPackageDetail where x.ProjectId == projectId select x;
+                List<Model.View_WBS> getWBSs = (from x in db.View_WBS where x.ProjectId == projectId select x).ToList();
+                DateTime startDate, endDate, startMonth, endMonth;
+                List<DateTime> months = new List<DateTime>();
+                var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == projectId);
+                if (project.StartDate != null)
+                {
+                    startDate = Convert.ToDateTime(project.StartDate);
+                    endDate = DateTime.Now;
+                    if (project.EndDate != null)
+                    {
+                        endDate = Convert.ToDateTime(project.EndDate);
+                    }
+                    startMonth = Convert.ToDateTime(startDate.Year + "-" + startDate.Month + "-01");
+                    endMonth = Convert.ToDateTime(endDate.Year + "-" + endDate.Month + "-01");
+                    do
+                    {
+                        months.Add(startMonth);
+                        startMonth = startMonth.AddMonths(1);
+                    } while (startMonth <= endMonth);
+                }
+                DataTable table = new DataTable();
+                table.Columns.Add(new DataColumn("Id", typeof(String)));
+                table.Columns.Add(new DataColumn("SupId", typeof(String)));
+                table.Columns.Add(new DataColumn("Name", typeof(String)));
+                table.Columns.Add(new DataColumn("WBSType", typeof(String)));
+                table.Columns.Add(new DataColumn("ProjectId", typeof(String)));
+                table.Columns.Add(new DataColumn("ShowId", typeof(String)));
+                table.Columns.Add(new DataColumn("JDWeights", typeof(String)));
+                table.Columns.Add(new DataColumn("Unit", typeof(String)));
+                table.Columns.Add(new DataColumn("PlanProjectQuantity", typeof(String)));
+                table.Columns.Add(new DataColumn("RealProjectQuantity", typeof(String)));
+                table.Columns.Add(new DataColumn("PlanStartDate", typeof(DateTime)));
+                table.Columns.Add(new DataColumn("PlanEndDate", typeof(DateTime)));
+                table.Columns.Add(new DataColumn("RealStartDate", typeof(DateTime)));
+                table.Columns.Add(new DataColumn("RealEndDate", typeof(DateTime)));
+                table.Columns.Add(new DataColumn("IsMileStone", typeof(bool)));
+                table.Columns.Add(new DataColumn("PlanCost", typeof(String)));
+                table.Columns.Add(new DataColumn("PreWorkCode", typeof(String)));
+                table.Columns.Add(new DataColumn("Code", typeof(String)));
+                for (int i = 0; i < months.Count; i++)
+                {
+                    table.Columns.Add(new DataColumn("PlanNum" + (i + 1).ToString(), typeof(String)));
+                    table.Columns.Add(new DataColumn("ThisNum" + (i + 1).ToString(), typeof(String)));
+                }
+                if (getWBSs.Count() > 0)
+                {
+                    List<Model.View_WBS> newList = new List<Model.View_WBS>();
+                    var projectTypes = getWBSs.Where(x => x.WBSType == "ProjectType" && x.SupId == "0");
+                    int a = 1;
+                    foreach (var item in projectTypes)
+                    {
+                        item.Code = a.ToString();
+                        newList.Add(item);
+                        if (string.IsNullOrEmpty(IsOut))
+                        {
+                            AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime, isOK);
+                        }
+                        else
+                        {
+                            AddDetail(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime, isOK);
+                        }
+                        a++;
+                    }
+                    DataRow row;
+                    foreach (Model.View_WBS item in newList)
+                    {
+                        row = table.NewRow();
+                        row[0] = item.Id;
+                        row[1] = item.SupId;
+                        row[2] = item.Name;
+                        row[3] = item.WBSType;
+                        row[4] = item.ProjectId;
+                        row[5] = item.ShowId;
+                        row[6] = item.JDWeights;
+                        row[7] = item.Unit;
+                        row[8] = item.PlanProjectQuantity;
+                        row[9] = item.RealProjectQuantity;
+                        if (item.PlanStartDate != null)
+                        {
+                            row[10] = item.PlanStartDate;
+                        }
+                        if (item.PlanEndDate != null)
+                        {
+                            row[11] = item.PlanEndDate;
+                        }
+                        if (item.RealStartDate != null)
+                        {
+                            row[12] = item.RealStartDate;
+                        }
+                        if (item.RealEndDate != null)
+                        {
+                            row[13] = item.RealEndDate;
+                        }
+                        if (item.IsMileStone != null)
+                        {
+                            row[14] = item.IsMileStone;
+                        }
+                        row[15] = item.PlanCost;
+                        row[16] = item.PreWorkCode;
+                        row[17] = item.Code;
+                        if (!string.IsNullOrEmpty(item.ShowId))
+                        {
+                            var details = getDetails.Where(x => x.WorkPackageId == item.Id).ToList();
+                            foreach (var item1 in details)
+                            {
+                                var index = months.FindIndex(x => x.Equals(item1.Months));
+                                if (item1.PlanNum != 0)
+                                {
+                                    row[18 + index * 2] = decimal.Round(Convert.ToDecimal(item1.PlanNum), 2);
+                                }
+                                if (item1.ThisNum != 0)
+                                {
+                                    row[19 + index * 2] = decimal.Round(Convert.ToDecimal(item1.ThisNum), 2);
+                                }
+                            }
+                        }
+                        table.Rows.Add(row);
+                    }
+                }
+                return table;
+            }
+        }
+
         private static void AddDetail(List<Model.View_WBS> newList, List<Model.View_WBS> oldList, string id, string preCode, string startTime, string endTime, string isOK)
         {
             if (isOK == "0")
@@ -760,7 +904,7 @@ namespace BLL
         public static string getWorkPageNamesByControlItemAndCycle(string workPackageId, string controlItemAndCycleId)
         {
             string returnValues = string.Empty;
-            string ControlItemName=string.Empty;
+            string ControlItemName = string.Empty;
             if (!string.IsNullOrEmpty(controlItemAndCycleId))
             {
                 var getControlItemAndCycle = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ControlItemAndCycleId == controlItemAndCycleId);
@@ -802,7 +946,7 @@ namespace BLL
                     var getSupWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == getWorkPackage.SuperWorkPackageId);
                     if (getSupWorkPackage != null)
                     {
-                        returnValues = getWorkPackage.PackageContent + "|"  + returnValues;
+                        returnValues = getWorkPackage.PackageContent + "|" + returnValues;
                         returnValues = getSelectIds(getWorkPackage.SuperWorkPackageId, returnValues);
                     }
 
@@ -820,7 +964,7 @@ namespace BLL
                         {
                             returnValues = "安装工程|" + getUnitWork.UnitWorkName + "|" + returnValues;
                         }
-                      
+
                     }
                 }
             }
@@ -1093,7 +1237,7 @@ namespace BLL
             }
         }
 
-        private static void AddDetail2(List<Model.View_WBS> newList, List<Model.View_WBS> oldList, string id, string preCode, DateTime startTime, DateTime endTime,List<string> ids)
+        private static void AddDetail2(List<Model.View_WBS> newList, List<Model.View_WBS> oldList, string id, string preCode, DateTime startTime, DateTime endTime, List<string> ids)
         {
             var items = oldList.Where(x => x.SupId == id && ((x.PlanEndDate > startTime && x.PlanEndDate <= endTime) || ids.Contains(x.Id))).OrderBy(x => x.Code);
             int b = 1;
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx
index 8812e0f3..4b3f7180 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx
+++ b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx
@@ -30,7 +30,10 @@
                             <Items>
                                 <f:TextBox runat="server" ID="hdId" Hidden="true"></f:TextBox>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存"
+                                <f:Button ID="btnShow" Icon="ChartPie" runat="server" ToolTip="统计" Text="统计"
+                                    OnClick="btnShow_Click">
+                                </f:Button>
+                                <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存"
                                     OnClick="btnSave_Click">
                                 </f:Button>
                             </Items>
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs
index 23ee103f..0680367e 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs
@@ -132,31 +132,36 @@ namespace FineUIPro.Web.JDGL.Check
             {
                 errorInfos = string.Empty;
                 string Id = Request.Params["Id"];
-                DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty, null, null, "0");
-                Grid1.DataSource = table;
-                Grid1.DataBind();
-                for (int i = 0; i < this.Grid1.Rows.Count; i++)
+             
+            }
+        }
+
+        protected void btnShow_Click(object sender, EventArgs e)
+        {
+            DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty, null, null, "0");
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+            for (int i = 0; i < this.Grid1.Rows.Count; i++)
+            {
+                if (string.IsNullOrEmpty(this.Grid1.Rows[i].DataKeys[2].ToString()))
                 {
-                    if (string.IsNullOrEmpty(this.Grid1.Rows[i].DataKeys[2].ToString()))
+                    System.Web.UI.WebControls.CheckBox cbIsMileStone = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[i].FindControl("cbIsMileStone"));
+                    cbIsMileStone.Visible = false;
+                    foreach (GridColumn column in Grid1.Columns)
                     {
-                        System.Web.UI.WebControls.CheckBox cbIsMileStone = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[i].FindControl("cbIsMileStone"));
-                        cbIsMileStone.Visible = false;
-                        foreach (GridColumn column in Grid1.Columns)
+                        if (column.ColumnIndex != 0 && column.ColumnIndex != 1)
                         {
-                            if (column.ColumnIndex != 0 && column.ColumnIndex != 1)
-                            {
-                                this.Grid1.Rows[i].CellCssClasses[column.ColumnIndex] = "f-grid-cell-uneditable";
-                            }
+                            this.Grid1.Rows[i].CellCssClasses[column.ColumnIndex] = "f-grid-cell-uneditable";
                         }
                     }
-                    else
+                }
+                else
+                {
+                    System.Web.UI.WebControls.CheckBox cbIsMileStone = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[i].FindControl("cbIsMileStone"));
+                    Model.WBS_WorkPackage workPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(this.Grid1.Rows[i].DataKeys[2].ToString());
+                    if (workPackage != null && workPackage.IsMileStone == true)
                     {
-                        System.Web.UI.WebControls.CheckBox cbIsMileStone = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[i].FindControl("cbIsMileStone"));
-                        Model.WBS_WorkPackage workPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(this.Grid1.Rows[i].DataKeys[2].ToString());
-                        if (workPackage != null && workPackage.IsMileStone == true)
-                        {
-                            cbIsMileStone.Checked = true;
-                        }
+                        cbIsMileStone.Checked = true;
                     }
                 }
             }
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.designer.cs
index c6abcb68..43a25ccb 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.designer.cs
@@ -66,6 +66,15 @@ namespace FineUIPro.Web.JDGL.Check {
         /// </remarks>
         protected global::FineUIPro.TextBox hdId;
         
+        /// <summary>
+        /// btnShow 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnShow;
+        
         /// <summary>
         /// btnSave 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx
index 3f77a098..1d38a46c 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx
+++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx
@@ -28,7 +28,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目情况" BoxFlex="1" AllowColumnLocking="true" ForceFit="true"
                     runat="server" EnableCollapse="true" DataKeyNames="Id,Name,ShowId" EnableTree="true" EnableColumnLines="true" ClicksToEdit="1" AllowCellEditing="true"
-                    TreeColumn="Name" DataIDField="Id" DataParentIDField="SupId" ExpandAllTreeNodes="false">
+                    TreeColumn="Name" DataIDField="Id" DataParentIDField="SupId" ExpandAllTreeNodes="true">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
                             <Items>
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs
index a865e1e5..e6b170e0 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs
@@ -28,7 +28,7 @@ namespace FineUIPro.Web.JDGL.Check
 
         private void BindGrid()
         {
-            DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty,this.txtStartTime.Text.Trim(),this.txtEndTime.Text.Trim(),this.rblIsOK.SelectedValue);
+            var table = BLL.WorkPackageService.GetAllTreeDataTable2(this.CurrUser.LoginProjectId, string.Empty,this.txtStartTime.Text.Trim(),this.txtEndTime.Text.Trim(),this.rblIsOK.SelectedValue);
             Grid1.DataSource = table;
             Grid1.DataBind();
             for (int i = 0; i < this.Grid1.Rows.Count; i++)
diff --git a/SGGL/FineUIPro.Web/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml
index bb7a7a34..b532a9bb 100644
--- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml
@@ -1,51 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl="">
-    <TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl="">
-      <TreeNode id="8B550B58-C681-4F34-83F0-F1E99CE04A47" Text="国内标准" NavigateUrl="">
-      </TreeNode>
-<TreeNode id="97D1E401-EA0F-4C90-B7DC-61D568BAE617" Text="国外标准" NavigateUrl=""></TreeNode>
-</TreeNode>
-<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""><TreeNode id="2C7F78D3-DA7B-4193-A37F-CC479E4B9583" Text="法律法规" NavigateUrl=""></TreeNode>
-</TreeNode>
-<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""><TreeNode id="406EBAAB-05B2-4249-BAC2-5589F50AE365" Text="企业标准" NavigateUrl=""></TreeNode>
-<TreeNode id="59F3FA81-7D08-4611-A3FF-22BFA656A940" Text="企业制度" NavigateUrl=""></TreeNode>
-</TreeNode>
-<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
-</TreeNode>
-<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""><TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="安全法律法规" NavigateUrl="HSSE/Law/LawRegulationList.aspx"></TreeNode>
-<TreeNode id="499E23C1-057C-4B04-B92A-973B1DACD546" Text="赛鼎制度" NavigateUrl="HSSE/HSSESystem/SafetyInstitution.aspx"></TreeNode>
-<TreeNode id="EFDSFVDE-RTHN-7UMG-4THA-5TGED48F8IOL" Text="安全标准规范" NavigateUrl="HSSE/Law/HSSEStandardList.aspx"></TreeNode>
-<TreeNode id="DF1413F3-4CE5-40B3-A574-E01CE64FEA25" Text="安全规章制度" NavigateUrl="HSSE/Law/RulesRegulations.aspx"></TreeNode>
-<TreeNode id="56960940-81A8-43D1-9565-C306EC7AFD12" Text="集团制度" NavigateUrl="HSSE/Law/ManageRule.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
-<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
-<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
-<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
-<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
-<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
-<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
-<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
-<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
-<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
-<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
-<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
-</TreeNode>
-</TreeNode>
-<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
-<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
-<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
-</TreeNode>
-<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
-<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
-<TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
+  <TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl="">
+    <TreeNode id="0E9C6A47-E410-43C4-95D1-1EC1C01E9967" Text="WBS数据仓库" NavigateUrl="DigData/WBSDW.aspx">
+    </TreeNode>
+<TreeNode id="92B50285-30BD-4B62-9E23-A0D6B4BA1577" Text="项目数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
 <TreeNode id="04B182E4-D31E-449F-9803-322F3F380D89" Text="HSE日常检查问题分析" NavigateUrl="DigData/DailyProblemAnalysis.aspx"></TreeNode>
 <TreeNode id="24939ABD-E174-4C3D-8B04-494917B7BE40" Text="HSE隐患整改问题分析" NavigateUrl="DigData/RectifyProblemAnalysis.aspx"></TreeNode>
 <TreeNode id="4B2E7EE5-AC7C-4143-B5BC-60080C763A24" Text="HSE教育培训统计" NavigateUrl="DigData/TrainRecordAnalysis.aspx"></TreeNode>
@@ -58,15 +16,12 @@
 <TreeNode id="A20E2443-A118-4C67-9084-FFEB685CA539" Text="清单子目使用率及价格走势图" NavigateUrl=""></TreeNode>
 <TreeNode id="6D1F3A3F-EFD1-420A-87E7-8CFAEF971165" Text="日工效统计" NavigateUrl=""></TreeNode>
 </TreeNode>
-<TreeNode id="5BE7F83B-C02D-4481-815F-153279B44C39" Text="劳务数据库" NavigateUrl=""></TreeNode>
 </TreeNode>
-<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="AF5C32FD-F0CB-404E-B56D-C4AE79A8A050" Text="人员功效分析" NavigateUrl=""></TreeNode>
-<TreeNode id="0DB6BB5F-B17A-4A38-AABB-278300EA9E39" Text="员工产值分析" NavigateUrl=""></TreeNode>
 </TreeNode>
-<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""><TreeNode id="506F42F3-F4CF-46A7-AC90-787117B4F1DC" Text="安全文件柜" NavigateUrl=""></TreeNode>
-<TreeNode id="A90460D0-2658-43F7-9558-A72E91E54ABD" Text="质量文件柜" NavigateUrl=""></TreeNode>
-<TreeNode id="2539A5CE-E209-4A16-A9B7-4C43E4E3CBEC" Text="进度文件柜" NavigateUrl=""></TreeNode>
-<TreeNode id="8FB0A651-485F-4413-BCD6-22BF82438125" Text="焊接文件柜" NavigateUrl=""></TreeNode>
-<TreeNode id="F596EC1A-71A3-4B34-B36C-68628F2F42FE" Text="合同文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="CFEF47C0-8EFA-46FF-8648-5B1922519DCC" Text="WBS数据分析" NavigateUrl="DigData/WBSAnalysis.aspx"></TreeNode>
+<TreeNode id="B146FC96-B199-426B-8504-4BE093C0DCB1" Text="项目数据汇总分析" NavigateUrl=""><TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
+<TreeNode id="DD960B76-1F33-468B-9FEF-76328235C079" Text="项目质量数据汇总" NavigateUrl="DigData/CQMSDataCollect.aspx"></TreeNode>
+<TreeNode id="A705738B-D0A2-41D2-A01A-18774B5AED49" Text="项目施工数据汇总" NavigateUrl=""></TreeNode>
+</TreeNode>
 </TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml
index 129ab5fd..c0fc81f0 100644
--- a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="E9D387EB-2797-43E3-AACE-93413839CCF7" Text="合同管理" NavigateUrl="">
-  </TreeNode>
-<TreeNode id="E36CBDD0-2E49-415E-BBE7-B8222F40D749" Text="合同模板" NavigateUrl=""><TreeNode id="C141ABE5-E377-45C1-9507-E723C40099B8" Text="基本信息" NavigateUrl="PHTGL/ContractCompile/Contract.aspx"></TreeNode>
+  <TreeNode id="E36CBDD0-2E49-415E-BBE7-B8222F40D749" Text="合同模板" NavigateUrl="">
+    <TreeNode id="C141ABE5-E377-45C1-9507-E723C40099B8" Text="基本信息" NavigateUrl="PHTGL/ContractCompile/Contract.aspx">
+    </TreeNode>
 <TreeNode id="C5560FF5-8181-4BA2-8326-D2B49E45660C" Text="合同协议书" NavigateUrl="PHTGL/ContractCompile/ContractAgreementEdit.aspx"></TreeNode>
 <TreeNode id="98573D16-3310-4292-96A5-A59B9A5E6B6B" Text="通用条款" NavigateUrl="PHTGL/ContractCompile/GeneralTermsConditions.aspx"></TreeNode>
 <TreeNode id="98367C43-9C85-467E-9144-288D80101E41" Text="专用条款" NavigateUrl="PHTGL/ContractCompile/SpecialTermsConditions.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="E3978B9E-89D7-4B23-B44B-A680FAFA0443" Text="施工长名单管理" NavigateUrl=""><TreeNode id="9C4E7381-4080-4082-8C4D-B041149D48C7" Text="施工长名单入网申请" NavigateUrl="PHTGL/LongListManager/LongListNetApplication.aspx"></TreeNode>
-</TreeNode>
 <TreeNode id="C18B4A2E-7BE7-43E6-A969-8A6292D19987" Text="招标工作台账" NavigateUrl="PHTGL/Filing/BidDocumentsStandingBook.aspx"></TreeNode>
 <TreeNode id="0A5DF9F5-B6B5-41B8-8951-C203C5749495" Text="合同台账" NavigateUrl="PHTGL/Filing/ContractStandingBook.aspx"></TreeNode>
 <TreeNode id="8213BE20-2680-4A13-91B8-49028BB89869" Text="工程量清单" NavigateUrl=""><TreeNode id="326AA80C-6B01-4214-ACF2-B29595BA28D5" Text="土建工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=0"></TreeNode>
@@ -16,10 +14,7 @@
 <TreeNode id="0E04FA16-FFA6-4987-A0A5-A4658F0099F2" Text="工艺管道安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=2"></TreeNode>
 <TreeNode id="FAC4F0F7-A7C0-4F66-8BCB-846C082BCA40" Text="工艺设备安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=3"></TreeNode>
 <TreeNode id="10586190-0FDD-4DA8-A877-CE4599D6F0DF" Text="非标设备现场制作安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=4"></TreeNode>
-<TreeNode id="1C770E20-7912-484C-9739-499B1B2F8DEB" Text="电仪安装工程" NavigateUrl=""><TreeNode id="3593DF22-78C1-4A73-8468-B20CB44D88C9" Text="电气工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.1"></TreeNode>
-<TreeNode id="3ECE6333-6785-424D-996E-B923A650D8C7" Text="仪表工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.2"></TreeNode>
-<TreeNode id="480F8C85-F5F2-4C5C-BE72-2ADABB7250CF" Text="电信工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.3"></TreeNode>
-</TreeNode>
+<TreeNode id="1C770E20-7912-484C-9739-499B1B2F8DEB" Text="电仪安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5"></TreeNode>
 <TreeNode id="92101A90-9C22-4B43-B012-9AFF8402F85D" Text="水暖安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=6"></TreeNode>
 <TreeNode id="33A03E2C-4E00-4722-AA14-F50419468154" Text="防腐绝热工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=7"></TreeNode>
 <TreeNode id="A5A31FE8-0643-4396-99E3-A4A31A947789" Text="无损检测工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=8"></TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
index fd6a0762..8d4aa005 100644
--- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="BAC3D994-03A8-466C-8975-A31039998BCC" Text="施工进度统计" NavigateUrl="JDGL/Check/ProgressShow.aspx">
+  <TreeNode id="E23F0879-3E9F-4E7B-9A2D-EFF34798D629" Text="进度计划编制" NavigateUrl="JDGL/Check/PlanSet.aspx">
   </TreeNode>
-<TreeNode id="1172B112-2A12-4410-AD66-E5BA6B461475" Text="施工进度赢得值曲线" NavigateUrl="JDGL/Check/ProgressStatistics.aspx"></TreeNode>
 <TreeNode id="B479EC55-E12A-4F91-AF3F-864DAAA136FB" Text="进度完成情况录入" NavigateUrl="JDGL/Check/CompleteInput.aspx"></TreeNode>
-<TreeNode id="4288426D-E49B-4E5D-A495-7E6A76F269B5" Text="周计划" NavigateUrl=""></TreeNode>
 <TreeNode id="F0E296C3-6499-43E5-88CD-E00C5180D3BC" Text="赢得值曲线" NavigateUrl="JDGL/Check/EarnedValueCurve.aspx"></TreeNode>
-<TreeNode id="C75F0853-8A2B-4B32-83B7-509278D11957" Text="项目里程碑节点" NavigateUrl=""></TreeNode>
-<TreeNode id="3550F422-E520-4962-9816-B691B0EE2865" Text="形象进度照片" NavigateUrl=""></TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
index 31955789..eb672a76 100644
--- a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
@@ -17,20 +17,19 @@
 <TreeNode id="dedaf6f6-af14-4e4e-9fc6-164aa808cab9" Text="合同台账" NavigateUrl="PHTGL/Filing/ContractFile.aspx"></TreeNode>
 <TreeNode id="9a772430-8a74-4d70-876d-136db8ce01a4" Text="文件归档" NavigateUrl="PHTGL/Filing/Files.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="7D8CF5B4-B945-4254-B134-4ABF55255497" Text="价格体系" NavigateUrl=""><TreeNode id="C8C719BC-450F-43AB-B17F-AB5DECD83E17" Text="土建工程" NavigateUrl=""></TreeNode>
-<TreeNode id="BBA09E69-5017-411C-A516-64D0140AF70E" Text="钢结构预制工程" NavigateUrl=""></TreeNode>
-<TreeNode id="999FCA97-E28A-46FA-9293-0399D1172AC9" Text="工艺管道安装工程" NavigateUrl=""></TreeNode>
-<TreeNode id="838ED633-B375-4937-A4E1-F95FCCF640A0" Text="工艺设备安装工程" NavigateUrl=""></TreeNode>
-<TreeNode id="AD5C7CBB-310D-4D15-9AFF-530BF765F460" Text="非标设备现场制作安装工程" NavigateUrl=""></TreeNode>
-<TreeNode id="0141B1F4-970A-4C23-B58A-BDF0785CA96E" Text="电仪安装工程" NavigateUrl=""></TreeNode>
-<TreeNode id="8A1D2885-2584-44AD-A4DD-ED3F98198C8A" Text="水暖安装工程" NavigateUrl=""></TreeNode>
-<TreeNode id="48216E20-7103-48AB-A12F-237E28605952" Text="防腐绝热工程" NavigateUrl=""></TreeNode>
-<TreeNode id="5EB73242-63F0-402C-A42B-2BCDC0AC2229" Text="无损检测工程" NavigateUrl=""></TreeNode>
-<TreeNode id="2A5A325E-C3C2-4412-9F5D-FB9185E9EB9B" Text="消防工程" NavigateUrl=""></TreeNode>
+<TreeNode id="7D8CF5B4-B945-4254-B134-4ABF55255497" Text="价格体系" NavigateUrl=""><TreeNode id="C8C719BC-450F-43AB-B17F-AB5DECD83E17" Text="土建" NavigateUrl=""></TreeNode>
+<TreeNode id="BBA09E69-5017-411C-A516-64D0140AF70E" Text="工艺" NavigateUrl=""></TreeNode>
+<TreeNode id="999FCA97-E28A-46FA-9293-0399D1172AC9" Text="电气" NavigateUrl=""></TreeNode>
+<TreeNode id="838ED633-B375-4937-A4E1-F95FCCF640A0" Text="仪表" NavigateUrl=""></TreeNode>
+<TreeNode id="AD5C7CBB-310D-4D15-9AFF-530BF765F460" Text="给排水" NavigateUrl=""></TreeNode>
+<TreeNode id="0141B1F4-970A-4C23-B58A-BDF0785CA96E" Text="暖通" NavigateUrl=""></TreeNode>
+<TreeNode id="8A1D2885-2584-44AD-A4DD-ED3F98198C8A" Text="防腐保温" NavigateUrl=""></TreeNode>
+<TreeNode id="48216E20-7103-48AB-A12F-237E28605952" Text="消防电信" NavigateUrl=""></TreeNode>
+<TreeNode id="5EB73242-63F0-402C-A42B-2BCDC0AC2229" Text="临建设施" NavigateUrl=""></TreeNode>
 </TreeNode>
 <TreeNode id="73B84D49-940A-42DF-AC14-F4C75E10EC39" Text="合同执行跟踪" NavigateUrl=""><TreeNode id="D9BAB30E-3255-4EA0-8631-EF15C9203EFD" Text="合同价格信息" NavigateUrl="PHTGL/ContractCompile/ContractTrackList.aspx"></TreeNode>
-<TreeNode id="D715B66F-8E99-498F-87DA-E85B4B8EB923" Text="费用对比统计" NavigateUrl="PHTGL/ContractCompile/ContractTrackComparison.aspx"></TreeNode>
 <TreeNode id="98269480-3F36-4169-A91D-16144D903C6C" Text="WBS工作包" NavigateUrl="PHTGL/ContractCompile/ContractWBS.aspx"></TreeNode>
+<TreeNode id="D715B66F-8E99-498F-87DA-E85B4B8EB923" Text="费用对比统计" NavigateUrl="PHTGL/ContractCompile/ContractTrackComparison.aspx"></TreeNode>
 <TreeNode id="F545E899-B3B5-4B49-A741-DE19356553D5" Text="进度检测" NavigateUrl="PHTGL/ContractCompile/ContractTrackProgressDetection.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="A9BBF623-83AC-4353-A010-07A5D4CEB7D1" Text="工效统计" NavigateUrl=""><TreeNode id="118B3E91-073B-468C-BDE3-DD6DCF6034C6" Text="日工效统计" NavigateUrl="PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx"></TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
index 9bc36592..03eb9188 100644
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@@ -48,6 +48,43 @@
 <TreeNode id="3BBFCD70-D7A3-435C-9571-DD499D5ED7B8" Text="应急信息" NavigateUrl=""><TreeNode id="D12C2412-E12A-4F78-9AEF-1EE8AC84A561" Text="应急预案管理清单" NavigateUrl="ZHGL/Emergency/EmergencyList.aspx"></TreeNode>
 <TreeNode id="172F25E0-F5E2-42E3-AD67-AC824D4E0FBB" Text="应急演练开展情况" NavigateUrl="ZHGL/Emergency/DrillRecordList.aspx"></TreeNode>
 </TreeNode>
+<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl=""><TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl=""></TreeNode>
+<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""></TreeNode>
+<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""></TreeNode>
+<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
+</TreeNode>
+<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""></TreeNode>
+<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
+<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
+<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
+<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
+<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
+<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
+<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
+<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
+<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
+<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
+<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
+<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
+</TreeNode>
+</TreeNode>
+<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
+<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
+<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
+</TreeNode>
+<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
+<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""><TreeNode id="506F42F3-F4CF-46A7-AC90-787117B4F1DC" Text="安全文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="A90460D0-2658-43F7-9558-A72E91E54ABD" Text="质量文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="2539A5CE-E209-4A16-A9B7-4C43E4E3CBEC" Text="进度文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="8FB0A651-485F-4413-BCD6-22BF82438125" Text="焊接文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="F596EC1A-71A3-4B34-B36C-68628F2F42FE" Text="合同文件柜" NavigateUrl=""></TreeNode>
+</TreeNode>
 <TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
 <TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
 <TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 3245a2b7..d0e1f9e9 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -11763,7 +11763,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
 		public string ApproveIdea
 		{
 			get
@@ -151221,7 +151221,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
 		public string AttentPerson
 		{
 			get
@@ -182744,7 +182744,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")]
 		public System.Nullable<decimal> WorkPackageEstimate
 		{
 			get
@@ -292484,6 +292484,24 @@ namespace Model
 		
 		private string _WBSCode;
 		
+		private System.Nullable<decimal> _JDWeights;
+		
+		private string _Unit;
+		
+		private System.Nullable<decimal> _PlanProjectQuantity;
+		
+		private System.Nullable<decimal> _RealProjectQuantity;
+		
+		private System.Nullable<System.DateTime> _RealStartDate;
+		
+		private System.Nullable<bool> _IsMileStone;
+		
+		private System.Nullable<decimal> _PlanCost;
+		
+		private string _PreWorkCode;
+		
+		private string _ShowId;
+		
 		private string _ProjectId;
 		
 		public View_WBS()
@@ -292538,7 +292556,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(81)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
 		public string Name
 		{
 			get
@@ -292634,6 +292652,150 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JDWeights", DbType="Decimal(9,2)")]
+		public System.Nullable<decimal> JDWeights
+		{
+			get
+			{
+				return this._JDWeights;
+			}
+			set
+			{
+				if ((this._JDWeights != value))
+				{
+					this._JDWeights = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Unit", DbType="NVarChar(50)")]
+		public string Unit
+		{
+			get
+			{
+				return this._Unit;
+			}
+			set
+			{
+				if ((this._Unit != value))
+				{
+					this._Unit = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanProjectQuantity", DbType="Decimal(18,2)")]
+		public System.Nullable<decimal> PlanProjectQuantity
+		{
+			get
+			{
+				return this._PlanProjectQuantity;
+			}
+			set
+			{
+				if ((this._PlanProjectQuantity != value))
+				{
+					this._PlanProjectQuantity = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealProjectQuantity", DbType="Decimal(18,2)")]
+		public System.Nullable<decimal> RealProjectQuantity
+		{
+			get
+			{
+				return this._RealProjectQuantity;
+			}
+			set
+			{
+				if ((this._RealProjectQuantity != value))
+				{
+					this._RealProjectQuantity = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RealStartDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> RealStartDate
+		{
+			get
+			{
+				return this._RealStartDate;
+			}
+			set
+			{
+				if ((this._RealStartDate != value))
+				{
+					this._RealStartDate = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsMileStone", DbType="Bit")]
+		public System.Nullable<bool> IsMileStone
+		{
+			get
+			{
+				return this._IsMileStone;
+			}
+			set
+			{
+				if ((this._IsMileStone != value))
+				{
+					this._IsMileStone = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanCost", DbType="Decimal(18,2)")]
+		public System.Nullable<decimal> PlanCost
+		{
+			get
+			{
+				return this._PlanCost;
+			}
+			set
+			{
+				if ((this._PlanCost != value))
+				{
+					this._PlanCost = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PreWorkCode", DbType="NVarChar(50)")]
+		public string PreWorkCode
+		{
+			get
+			{
+				return this._PreWorkCode;
+			}
+			set
+			{
+				if ((this._PreWorkCode != value))
+				{
+					this._PreWorkCode = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ShowId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string ShowId
+		{
+			get
+			{
+				return this._ShowId;
+			}
+			set
+			{
+				if ((this._ShowId != value))
+				{
+					this._ShowId = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
 		public string ProjectId
 		{