diff --git a/DataBase/版本日志/SGGLDB_V2023-10-17.sql b/DataBase/版本日志/SGGLDB_V2023-10-17.sql
new file mode 100644
index 00000000..9f6f55a8
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2023-10-17.sql
@@ -0,0 +1,14 @@
+INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
+VALUES ( N'A9BBF623-83AC-4353-A010-07A5D4CEB7D1',N'��Чͳ��',50,N'0',N'Menu_PHTGL',0,0,1)
+Go
+		INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
+		VALUES ( N'118B3E91-073B-468C-BDE3-DD6DCF6034C6',N'�չ�Чͳ��',N'PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx',10,N'A9BBF623-83AC-4353-A010-07A5D4CEB7D1',N'Menu_PHTGL',0,1,1)
+		Go
+
+		INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
+		VALUES ( N'4EDB3CB9-9FB6-4D63-802F-83C3FB3CA6B1',N'��ƽ����Чͳ��',N'PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx',20,N'A9BBF623-83AC-4353-A010-07A5D4CEB7D1',N'Menu_PHTGL',0,1,1)
+		Go
+
+		INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
+		VALUES ( N'D791C4E1-7CF1-4F4E-9457-0CF91ACDB987',N'��Ŀƽ����Чͳ��',N'PZHGL/InformationProject/ProjectConstructionLogWorkEfficiencySum.aspx',30,N'A9BBF623-83AC-4353-A010-07A5D4CEB7D1',N'Menu_PHTGL',0,1,1)
+		Go
\ No newline at end of file
diff --git a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql
index e29a1926..d3683fea 100644
--- a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql
+++ b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql
@@ -238,4 +238,20 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],
 				VALUES ( N'1F7FDDC4-2746-4B65-9F65-37C71F11D342',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'����',4)
 				INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex])
 				VALUES ( N'D11BD092-6A18-44A3-8ABD-9CF9B95340E1',N'F545E899-B3B5-4B49-A741-DE19356553D5',N'����',1)
-			GO
\ No newline at end of file
+			GO
+			GO
+
+INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
+VALUES ( N'A9BBF623-83AC-4353-A010-07A5D4CEB7D1',N'��Чͳ��',50,N'0',N'Menu_PHTGL',0,0,1)
+Go
+		INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
+		VALUES ( N'118B3E91-073B-468C-BDE3-DD6DCF6034C6',N'�չ�Чͳ��',N'PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx',10,N'A9BBF623-83AC-4353-A010-07A5D4CEB7D1',N'Menu_PHTGL',0,1,1)
+		Go
+
+		INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
+		VALUES ( N'4EDB3CB9-9FB6-4D63-802F-83C3FB3CA6B1',N'��ƽ����Чͳ��',N'PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx',20,N'A9BBF623-83AC-4353-A010-07A5D4CEB7D1',N'Menu_PHTGL',0,1,1)
+		Go
+
+		INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) 
+		VALUES ( N'D791C4E1-7CF1-4F4E-9457-0CF91ACDB987',N'��Ŀƽ����Чͳ��',N'PZHGL/InformationProject/ProjectConstructionLogWorkEfficiencySum.aspx',30,N'A9BBF623-83AC-4353-A010-07A5D4CEB7D1',N'Menu_PHTGL',0,1,1)
+		Go
\ No newline at end of file
diff --git a/SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs b/SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs
index 52b80d4f..594e6508 100644
--- a/SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs
+++ b/SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs
@@ -189,7 +189,22 @@ namespace BLL
                     {
                         newItem.YearWorkTime = 0;
                     }
+
+                    var getMaxMonthReport = (from x in Funs.DB.SeDin_MonthReport
+                                            where x.ProjectId == projectId && x.ReporMonth < monthD
+                                             orderby x.ReporMonth descending
+                                            select x).FirstOrDefault();
+                    if (getMaxMonthReport != null)
+                    {
+                        var getMonthReport2 = Funs.DB.SeDin_MonthReport2.FirstOrDefault(x => x.MonthReportId == getMaxMonthReport.MonthReportId);
+                        if (getMonthReport2 != null)
+                        {
+                            newItem.YearWorkTime = getMonthReport2.YearWorkTime ?? 0;
+                            newItem.SafeWorkTime = getMonthReport2.SafeWorkTime ?? 0;
+                        }
+                    }
                 }
+
                 return newItem;
             }
         }
diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
index d27aa849..8f453806 100644
--- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
+++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
@@ -633,7 +633,7 @@ namespace BLL
         /// <returns></returns>
         public static Model.SitePerson_Person getSitePerson_PersonByRoleId(string projectId, string roleId)
         {
-            return Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == projectId && x.RoleIds.Contains(roleId));
+            return Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == projectId && x.RoleIds.Contains(roleId) && x.States == Const.ProjectPersonStates_1);
         }
 
         /// <summary>
diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
index e7c1eced..cf08d95d 100644
--- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs	
+++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs	
@@ -425,7 +425,7 @@ namespace BLL
                                 }
                                 for (int i = 0; i < workPostIds.Count; i++)
                                 {
-                                    var workEfficiency = workEfficiencys.FirstOrDefault(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId== item.Id);
+                                    var workEfficiency = workEfficiencys.FirstOrDefault(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id);
                                     if (workEfficiency != null)
                                     {
                                         if (workEfficiency.ConsumeHours != null)
@@ -464,6 +464,445 @@ namespace BLL
                 return table;
             }
         }
+
+        /// <summary>
+        /// 获取模拟树表格
+        /// </summary>
+        /// <returns></returns>
+        public static DataTable GetProjectAllTreeDataTable(string projectId, string IsOut, List<string> contractNoList, List<string> professionalList, List<string> workPostIds, List<string> machineIds, string compileDate)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var pros = BLL.PHTGL_QuantityService.GetMajorItems();
+                List<string> proNames = new List<string>();
+                foreach (var item in professionalList)
+                {
+                    var pro = pros.FirstOrDefault(x => x.Text == item);
+                    if (pro != null)
+                    {
+                        proNames.Add(pro.Value);
+                    }
+                }
+                proNames = proNames.Distinct().ToList();
+                IQueryable<Model.PHTGL_ContractTrack> getContractTracks = from x in db.PHTGL_ContractTrack
+                                                                          where x.ProjectId == projectId && contractNoList.Contains(x.ContractId) && proNames.Contains(x.MajorName)
+                                                                          orderby x.ProjectCode, x.ProjectName
+                                                                          select x;
+                DateTime date = Funs.GetNewDateTimeOrNow(compileDate);
+                var personLogIds = (from x in db.ZHGL_ConstructionLog
+                                    where x.ProjectId == projectId && x.CompileDate == date
+                                    orderby x.CompileDate descending
+                                    select x.ConstructionLogId).ToList();
+                IQueryable<Model.ZHGL_ConstructionLogWorkEfficiency> workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency
+                                                                                       where personLogIds.Contains(x.ConstructionLogId)
+                                                                                       select x;
+                var unitWorks = (from x in getContractTracks
+                                 select new { MainItemCode = x.MainItemCode, MainItemName = x.MainItemName }).Distinct().ToList();
+
+                DataTable table = new DataTable();
+                table.Columns.Add(new DataColumn("Id", typeof(String)));
+                table.Columns.Add(new DataColumn("Code", typeof(String)));
+                table.Columns.Add(new DataColumn("ProjectCode", typeof(String)));
+                table.Columns.Add(new DataColumn("ProjectName", typeof(String)));
+                table.Columns.Add(new DataColumn("UnitOfMeasurement", typeof(String)));
+                table.Columns.Add(new DataColumn("PhysicalCompletionQuantity", typeof(String)));
+                table.Columns.Add(new DataColumn("MaterialConsumption", typeof(String)));
+                table.Columns.Add(new DataColumn("ShowId", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours0", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency0", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours1", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency1", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours2", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency2", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours3", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency3", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours4", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency4", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours5", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency5", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours6", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency6", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours7", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency7", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours8", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency8", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours9", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency9", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours10", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency10", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours11", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency11", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours12", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency12", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours13", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency13", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours14", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency14", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours15", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency15", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours16", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency16", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours17", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency17", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours18", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency18", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours19", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency19", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours0", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency0", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours1", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency1", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours2", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency2", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours3", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency3", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours4", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency4", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours5", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency5", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours6", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency6", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours7", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency7", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours8", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency8", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours9", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency9", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours10", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency10", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours11", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency11", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours12", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency12", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours13", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency13", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours14", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency14", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours15", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency15", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours16", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency16", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours17", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency17", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours18", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency18", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours19", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency19", typeof(String)));
+                DataRow row;
+                int a = 1;
+                foreach (var unitWork in unitWorks)
+                {
+                    row = table.NewRow();
+                    row[0] = unitWork.MainItemCode;
+                    row[1] = a;
+                    row[2] = string.Empty;
+                    row[3] = unitWork.MainItemName;
+                    table.Rows.Add(row);
+                    int b = 1;
+                    foreach (var proName in proNames)
+                    {
+                        row = table.NewRow();
+                        row[0] = unitWork.MainItemCode + b.ToString();
+                        row[1] = a + "." + b;
+                        row[2] = string.Empty;
+                        row[3] = proName;
+                        table.Rows.Add(row);
+                        int c = 1;
+                        var contractTracks = getContractTracks.Where(x => x.MainItemCode == unitWork.MainItemCode && x.MajorName == proName);
+                        foreach (Model.PHTGL_ContractTrack item in contractTracks)
+                        {
+                            row = table.NewRow();
+                            row[0] = item.Id;
+                            row[1] = a + "." + b + "." + c;
+                            row[2] = item.ProjectCode;
+                            row[3] = item.ProjectName;
+                            row[4] = item.UnitOfMeasurement;
+                            row[7] = item.Id;
+                            if (workEfficiencys.Count() > 0)
+                            {
+                                var we = workEfficiencys.FirstOrDefault(x => x.ContractTrackId == item.Id);
+                                if (we != null)
+                                {
+                                    row[5] = we.PhysicalCompletionQuantity;
+                                    row[6] = we.MaterialConsumption;
+                                }
+                                for (int i = 0; i < workPostIds.Count; i++)
+                                {
+                                    var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id);
+                                    if (workEfficiencyList.Count() > 0)
+                                    {
+                                        decimal d = 0;
+                                        foreach (var workEfficiency in workEfficiencyList)
+                                        {
+                                            if (workEfficiency.ConsumeHours != null)
+                                            {
+                                                d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
+                                            }
+                                        }
+                                        if (d > 0)
+                                        {
+                                            row[8 + i * 2] = decimal.Round(d, 2);
+                                            if (we.PhysicalCompletionQuantity != null && we.PhysicalCompletionQuantity > 0)
+                                            {
+                                                row[9 + i * 2] = decimal.Round(Convert.ToDecimal(we.PhysicalCompletionQuantity / d), 2);
+                                            }
+                                        }
+                                    }
+                                }
+                                for (int i = 0; i < machineIds.Count; i++)
+                                {
+                                    var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id);
+                                    if (workEfficiencyList.Count() > 0)
+                                    {
+                                        decimal d = 0;
+                                        foreach (var workEfficiency in workEfficiencyList)
+                                        {
+                                            if (workEfficiency.ConsumeHours != null)
+                                            {
+                                                d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
+                                            }
+                                        }
+                                        if (d > 0)
+                                        {
+                                            row[48 + i * 2] = decimal.Round(d, 2);
+                                            if (we.PhysicalCompletionQuantity != null && we.PhysicalCompletionQuantity > 0)
+                                            {
+                                                row[49 + i * 2] = decimal.Round(Convert.ToDecimal(we.PhysicalCompletionQuantity / d), 2);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            table.Rows.Add(row);
+                            c++;
+                        }
+                        b++;
+                    }
+                    a++;
+                }
+                return table;
+            }
+        }
+
+        /// <summary>
+        /// 获取模拟树表格
+        /// </summary>
+        /// <returns></returns>
+        public static DataTable GetMonthProjectAllTreeDataTable(string projectId, string IsOut, List<string> contractNoList, List<string> professionalList, List<string> workPostIds, List<string> machineIds, DateTime startDate, DateTime endDate)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var pros = BLL.PHTGL_QuantityService.GetMajorItems();
+                List<string> proNames = new List<string>();
+                foreach (var item in professionalList)
+                {
+                    var pro = pros.FirstOrDefault(x => x.Text == item);
+                    if (pro != null)
+                    {
+                        proNames.Add(pro.Value);
+                    }
+                }
+                proNames = proNames.Distinct().ToList();
+                IQueryable<Model.PHTGL_ContractTrack> getContractTracks = from x in db.PHTGL_ContractTrack
+                                                                          where x.ProjectId == projectId && contractNoList.Contains(x.ContractId) && proNames.Contains(x.MajorName)
+                                                                          orderby x.ProjectCode, x.ProjectName
+                                                                          select x;
+                var personLogIds = (from x in db.ZHGL_ConstructionLog
+                                    where x.ProjectId == projectId && x.CompileDate >= startDate && x.CompileDate < endDate
+                                    orderby x.CompileDate descending
+                                    select x.ConstructionLogId).ToList();
+                IQueryable<Model.ZHGL_ConstructionLogWorkEfficiency> workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency
+                                                                                       where personLogIds.Contains(x.ConstructionLogId)
+                                                                                       select x;
+                var unitWorks = (from x in getContractTracks
+                                 select new { MainItemCode = x.MainItemCode, MainItemName = x.MainItemName }).Distinct().ToList();
+
+                DataTable table = new DataTable();
+                table.Columns.Add(new DataColumn("Id", typeof(String)));
+                table.Columns.Add(new DataColumn("Code", typeof(String)));
+                table.Columns.Add(new DataColumn("ProjectCode", typeof(String)));
+                table.Columns.Add(new DataColumn("ProjectName", typeof(String)));
+                table.Columns.Add(new DataColumn("UnitOfMeasurement", typeof(String)));
+                table.Columns.Add(new DataColumn("PhysicalCompletionQuantity", typeof(String)));
+                table.Columns.Add(new DataColumn("MaterialConsumption", typeof(String)));
+                table.Columns.Add(new DataColumn("ShowId", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours0", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency0", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours1", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency1", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours2", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency2", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours3", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency3", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours4", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency4", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours5", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency5", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours6", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency6", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours7", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency7", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours8", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency8", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours9", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency9", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours10", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency10", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours11", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency11", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours12", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency12", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours13", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency13", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours14", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency14", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours15", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency15", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours16", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency16", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours17", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency17", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours18", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency18", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonConsumeHours19", typeof(String)));
+                table.Columns.Add(new DataColumn("PersonWorkEfficiency19", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours0", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency0", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours1", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency1", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours2", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency2", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours3", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency3", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours4", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency4", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours5", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency5", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours6", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency6", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours7", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency7", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours8", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency8", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours9", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency9", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours10", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency10", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours11", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency11", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours12", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency12", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours13", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency13", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours14", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency14", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours15", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency15", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours16", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency16", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours17", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency17", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours18", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency18", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineConsumeHours19", typeof(String)));
+                table.Columns.Add(new DataColumn("MachineWorkEfficiency19", typeof(String)));
+                DataRow row;
+                int a = 1;
+                foreach (var unitWork in unitWorks)
+                {
+                    row = table.NewRow();
+                    row[0] = unitWork.MainItemCode;
+                    row[1] = a;
+                    row[2] = string.Empty;
+                    row[3] = unitWork.MainItemName;
+                    table.Rows.Add(row);
+                    int b = 1;
+                    foreach (var proName in proNames)
+                    {
+                        row = table.NewRow();
+                        row[0] = unitWork.MainItemCode + b.ToString();
+                        row[1] = a + "." + b;
+                        row[2] = string.Empty;
+                        row[3] = proName;
+                        table.Rows.Add(row);
+                        int c = 1;
+                        var contractTracks = getContractTracks.Where(x => x.MainItemCode == unitWork.MainItemCode && x.MajorName == proName);
+                        foreach (Model.PHTGL_ContractTrack item in contractTracks)
+                        {
+                            row = table.NewRow();
+                            row[0] = item.Id;
+                            row[1] = a + "." + b + "." + c;
+                            row[2] = item.ProjectCode;
+                            row[3] = item.ProjectName;
+                            row[4] = item.UnitOfMeasurement;
+                            row[7] = item.Id;
+                            if (workEfficiencys.Count() > 0)
+                            {
+                                var we = workEfficiencys.FirstOrDefault(x => x.ContractTrackId == item.Id);
+                                if (we != null)
+                                {
+                                    row[5] = we.PhysicalCompletionQuantity;
+                                    row[6] = we.MaterialConsumption;
+                                }
+                                for (int i = 0; i < workPostIds.Count; i++)
+                                {
+                                    var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id);
+                                    if (workEfficiencyList.Count() > 0)
+                                    {
+                                        decimal d = 0;
+                                        foreach (var workEfficiency in workEfficiencyList)
+                                        {
+                                            if (workEfficiency.ConsumeHours != null)
+                                            {
+                                                d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
+                                            }
+                                        }
+                                        if (d > 0)
+                                        {
+                                            row[8 + i * 2] = decimal.Round(d, 2);
+                                            if (we.PhysicalCompletionQuantity != null && we.PhysicalCompletionQuantity > 0)
+                                            {
+                                                row[9 + i * 2] = decimal.Round(Convert.ToDecimal(we.PhysicalCompletionQuantity / d), 2);
+                                            }
+                                        }
+                                    }
+                                }
+                                for (int i = 0; i < machineIds.Count; i++)
+                                {
+                                    var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id);
+                                    if (workEfficiencyList.Count() > 0)
+                                    {
+                                        decimal d = 0;
+                                        foreach (var workEfficiency in workEfficiencyList)
+                                        {
+                                            if (workEfficiency.ConsumeHours != null)
+                                            {
+                                                d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
+                                            }
+                                        }
+                                        if (d > 0)
+                                        {
+                                            row[48 + i * 2] = decimal.Round(d, 2);
+                                            if (we.PhysicalCompletionQuantity != null && we.PhysicalCompletionQuantity > 0)
+                                            {
+                                                row[49 + i * 2] = decimal.Round(Convert.ToDecimal(we.PhysicalCompletionQuantity / d), 2);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            table.Rows.Add(row);
+                            c++;
+                        }
+                        b++;
+                    }
+                    a++;
+                }
+                return table;
+            }
+        }
+
+
     }
     public class PHTGL_ContractTrackDtoIn
     {
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 9f17ed3c..4ce286b6 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1332,10 +1332,13 @@
     <Content Include="PZHGL\InformationProject\ConstructionReport.aspx" />
     <Content Include="PZHGL\InformationProject\ConstructionReportEdit.aspx" />
     <Content Include="PZHGL\InformationProject\ConstructionReportView.aspx" />
+    <Content Include="PZHGL\InformationProject\DayConstructionLogWorkEfficiency.aspx" />
+    <Content Include="PZHGL\InformationProject\MonthConstructionLogWorkEfficiencySum.aspx" />
     <Content Include="PZHGL\InformationProject\Picture.aspx" />
     <Content Include="PZHGL\InformationProject\PictureEdit.aspx" />
     <Content Include="PZHGL\InformationProject\PictureView.aspx" />
     <Content Include="PZHGL\InformationProject\ProjectConstructionLog.aspx" />
+    <Content Include="PZHGL\InformationProject\ProjectConstructionLogWorkEfficiency.aspx" />
     <Content Include="PZHGL\InformationProject\ReceiveFileManager.aspx" />
     <Content Include="PZHGL\InformationProject\ReceiveFileManagerEdit.aspx" />
     <Content Include="PZHGL\InformationProject\ReceiveFileManagerView.aspx" />
@@ -12893,6 +12896,20 @@
     <Compile Include="PZHGL\InformationProject\ConstructionReportView.aspx.designer.cs">
       <DependentUpon>ConstructionReportView.aspx</DependentUpon>
     </Compile>
+    <Compile Include="PZHGL\InformationProject\DayConstructionLogWorkEfficiency.aspx.cs">
+      <DependentUpon>DayConstructionLogWorkEfficiency.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="PZHGL\InformationProject\DayConstructionLogWorkEfficiency.aspx.designer.cs">
+      <DependentUpon>DayConstructionLogWorkEfficiency.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="PZHGL\InformationProject\MonthConstructionLogWorkEfficiencySum.aspx.cs">
+      <DependentUpon>MonthConstructionLogWorkEfficiencySum.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="PZHGL\InformationProject\MonthConstructionLogWorkEfficiencySum.aspx.designer.cs">
+      <DependentUpon>MonthConstructionLogWorkEfficiencySum.aspx</DependentUpon>
+    </Compile>
     <Compile Include="PZHGL\InformationProject\Picture.aspx.cs">
       <DependentUpon>Picture.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -12921,6 +12938,13 @@
     <Compile Include="PZHGL\InformationProject\ProjectConstructionLog.aspx.designer.cs">
       <DependentUpon>ProjectConstructionLog.aspx</DependentUpon>
     </Compile>
+    <Compile Include="PZHGL\InformationProject\ProjectConstructionLogWorkEfficiency.aspx.cs">
+      <DependentUpon>ProjectConstructionLogWorkEfficiency.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="PZHGL\InformationProject\ProjectConstructionLogWorkEfficiency.aspx.designer.cs">
+      <DependentUpon>ProjectConstructionLogWorkEfficiency.aspx</DependentUpon>
+    </Compile>
     <Compile Include="PZHGL\InformationProject\ReceiveFileManager.aspx.cs">
       <DependentUpon>ReceiveFileManager.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx
index 3422560f..f6590952 100644
--- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx
@@ -111,12 +111,12 @@
     </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="1300px" Height="600px">
+        Width="1300px" Height="600px" Maximized="true">
     </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">
+                Text="编辑" Icon="Pencil" OnClick="btnMenuModify_Click" >
             </f:MenuButton>
                <f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server" 
                     Text="导出" Icon="Printer" OnClick="btnPrinter_Click" EnableAjax="false" DisableControlBeforePostBack="false">
diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.cs
index cb27259e..4298f4d5 100644
--- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.cs
@@ -214,6 +214,14 @@ namespace FineUIPro.Web.HSSE.Manager
                 Alert.ShowInTop("当前月份的月报已存在！", MessageBoxIcon.Warning);
                 return;
             }
+
+            var getNMonthReport = Funs.DB.SeDin_MonthReport.FirstOrDefault(x =>x.ProjectId == this.CurrUser.LoginProjectId &&  x.States != Const.State_3);
+            if (getNMonthReport != null)
+            {
+                Alert.ShowInTop("存在未完成月报，请先办理完成！", MessageBoxIcon.Warning);
+                return;
+            }
+
             PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ManagerMonth_SeDinEdit.aspx?Month={0}", txtMonth.Text.Trim()), "添加月报表"));
         }
         #endregion
diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx
index c50acea0..27de9647 100644
--- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx
@@ -126,7 +126,8 @@
                         <f:Panel ID="SeDinMonthReport3Item" Layout="Block" CssClass="blockpanel myblockform" BlockMD="12"
                             BlockConfigSpace="10px" BodyPadding="5px" Title="2、项目安全工时统计" EnableCollapse="true" runat="server">
                             <Items>
-                                <f:TextBox ID="MonthWorkTime" runat="server" Label="当月安全人工时" LabelAlign="Right" LabelWidth="160px" BlockMD="4" MaxLength="50">
+                                <f:TextBox ID="MonthWorkTime" runat="server" Label="当月安全人工时"  EnableBlurEvent="true" OnBlur="MonthWorkTime_Blur"
+                                    LabelAlign="Right" LabelWidth="160px" BlockMD="4" MaxLength="50">
                                 </f:TextBox>
                                 <f:TextBox ID="YearWorkTime" runat="server" Label="年度累计安全人工时" LabelAlign="Right" BlockMD="4" LabelWidth="160px" MaxLength="50">
                                 </f:TextBox>
diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.cs
index 6a9a8af1..d427f429 100644
--- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.cs
@@ -713,7 +713,6 @@ namespace FineUIPro.Web.HSSE.Manager
             newItem.MonthReportId = MonthReportId;
             newItem.MonthWorkTime = Funs.GetNewDecimalOrZero(MonthWorkTime.Text);
             newItem.YearWorkTime = Funs.GetNewDecimalOrZero(YearWorkTime.Text);
-            newItem.YearWorkTime = Funs.GetNewDecimalOrZero(YearWorkTime.Text);
             newItem.TotalLostTime = Funs.GetNewDecimalOrZero(TotalLostTime.Text);
             newItem.MillionLossRate = MillionLossRate.Text;
             newItem.ProjectWorkTime = Funs.GetNewDecimalOrZero(ProjectWorkTime.Text);
@@ -1439,5 +1438,28 @@ namespace FineUIPro.Web.HSSE.Manager
         {
             SetStepDrp();
         }
+
+        protected void MonthWorkTime_Blur(object sender, EventArgs e)
+        {
+            var monthWorkTimeValue = Funs.GetNewDecimalOrZero(this.MonthWorkTime.Text);
+            decimal hdYearWorkTimeValue =0;
+            decimal hdSafeWorkTimeValue =0;
+            DateTime month=Funs.GetNewDateTimeOrNow(this.ReporMonth.Text);
+
+            var getMaxMonthReport = (from x in Funs.DB.SeDin_MonthReport where x.ProjectId == this.ProjectId  && x.ReporMonth < month
+                                     orderby x.ReporMonth descending select x).FirstOrDefault();
+            if (getMaxMonthReport != null)
+            {
+                var getMonthReport2 = Funs.DB.SeDin_MonthReport2.FirstOrDefault(x => x.MonthReportId == getMaxMonthReport.MonthReportId);
+                if (getMonthReport2 != null)
+                {
+                    hdYearWorkTimeValue = getMonthReport2.YearWorkTime ?? 0;
+                    hdSafeWorkTimeValue = getMonthReport2.SafeWorkTime ?? 0;
+                }
+            }
+
+            this.YearWorkTime.Text = (monthWorkTimeValue + hdYearWorkTimeValue).ToString();
+            this.SafeWorkTime.Text = (monthWorkTimeValue + hdSafeWorkTimeValue).ToString();
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityEdit.aspx b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityEdit.aspx
index a743aae7..a966adf7 100644
--- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityEdit.aspx
@@ -42,7 +42,7 @@
             </f:FormRow>
             <f:FormRow>
                 <Items>
-                    <f:TextBox ID="txtFactoryCode" runat="server" Label="出厂编号" LabelAlign="Right"  LabelWidth="110px"
+                    <f:TextBox ID="txtFactoryCode" runat="server" Label="编号" LabelAlign="Right"  LabelWidth="110px"
                         MaxLength="50" ShowRedStar="true" Required="true">
                     </f:TextBox>
                     <f:TextBox ID="txtCertificateCode" runat="server" Label="合格证编号" LabelAlign="Right"
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx
index d5e18b1a..148b95e8 100644
--- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx
@@ -351,7 +351,7 @@
                 </f:Panel>
             </Items>
         </f:Panel>
-        <f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="false"
+        <f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
             Width="1300px" Height="650px">
         </f:Window>
@@ -374,7 +374,7 @@
             </f:MenuButton>
         </f:Menu>
         <f:Menu ID="Menu2" runat="server">
-            <f:MenuButton ID="btnMenuDelete2" OnClick="btnMenuDelete2_Click" EnablePostBack="true"
+            <f:MenuButton ID="btnMenuDelete2" OnClick="btnMenuDelete2_Click" EnablePostBack="true" Hidden="true"
                 Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server"
                 Text="删除">
             </f:MenuButton>
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs
index 7ef3688c..8c107946 100644
--- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLog.aspx.cs
@@ -205,7 +205,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
                 {
                     this.btnMenuAdd.Hidden = true;
                     this.btnMenuEdit.Hidden = false;
-                    this.btnMenuDown.Hidden = false;
+                    //this.btnMenuDown.Hidden = false;
                     this.btnMenuDelete.Hidden = false;
                 }
             }
@@ -677,6 +677,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
         /// <param name="e"></param>
         protected void btnMenuDown_Click(object sender, EventArgs e)
         {
+
         }
         #endregion
 
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx
index 8f4f0083..949d9e69 100644
--- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx
@@ -78,9 +78,11 @@
                                                                 <f:DropDownList ID="drpProfessional" runat="server" Label="专业工程" LabelAlign="Right" Readonly="true" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px"></f:DropDownList>
                                                             </Items>
                                                         </f:FormRow>
-                                                        <f:FormRow ColumnWidths="33% 67%">
+                                                        <f:FormRow ColumnWidths="13% 20% 67%">
                                                             <Items>
-                                                                <f:TextBox ID="txtState" Label="填报状态" runat="server" LabelAlign="Right" LabelWidth="120px" Readonly="true"></f:TextBox>
+                                                                <f:Label runat="server" Text="填报状态：" EncodeText="false" ShowRedStar="true" Label="附件：" CssStyle="padding-left:42px" Width="110px" CssClass="marginr" ShowLabel="false" ></f:Label>
+                                                                <f:Button ID="btnWorkEfficiency" Text="未填报" ToolTip="填报工效数据" Icon="TableCell" OnClick="btnWorkEfficiency_Click" runat="server">
+                                                    </f:Button>
                                                                 <f:TextBox ID="txtRemark" Label="备注" runat="server" LabelAlign="Right" Readonly="true" LabelWidth="120px"></f:TextBox>
                                                             </Items>
                                                         </f:FormRow>
@@ -304,9 +306,9 @@
                 </f:Panel>
             </Items>
         </f:Panel>
-        <f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="false"
+        <f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
-            Width="1300px" Height="680px">
+            Width="1300px" Height="650px">
         </f:Window>
         <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx.cs
index 2745eb8a..0bce8cac 100644
--- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx.cs
@@ -211,7 +211,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
             {
                 if (this.GetButtonPower(BLL.Const.BtnModify))
                 {
-                    this.btnMenuDown.Hidden = false;
+                    //this.btnMenuDown.Hidden = false;
                 }
             }
             this.ConstructionLogId = this.tvControlItem.SelectedNodeID;
@@ -303,6 +303,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
                 this.txtCQMSTomorrowPlanRemark.Text = log.CQMSTomorrowPlanRemark;
                 var persons = BLL.ConstructionLogPersonService.GetConstructionLogPersonsByConstructionLogId(ConstructionLogId);
                 List<string> unitWorkList = Funs.GetStrListByStr(log.UnitWorks, ',');
+                ChangeText();
                 List<Model.ConstructionLogPersonItem> personItems = new List<Model.ConstructionLogPersonItem>();
                 if (persons.Count > 0)
                 {
@@ -622,7 +623,6 @@ namespace FineUIPro.Web.PZHGL.InformationProject
                     }
                 }
             }
-            this.txtState.Text = string.Empty;
             this.txtRemark.Text = string.Empty;
             this.txtHSETodaySummary.Text = string.Empty;
             this.txtHSETodaySummaryRemark.Text = string.Empty;
@@ -657,7 +657,6 @@ namespace FineUIPro.Web.PZHGL.InformationProject
             this.drpContractNo.SelectedIndex = 0;
             this.drpUnitWork.SelectedIndex = 0;
             this.drpProfessional.SelectedIndex = 0;
-            this.txtState.Text = string.Empty;
             this.txtRemark.Text = string.Empty;
             this.txtHSETodaySummary.Text = string.Empty;
             this.txtHSETodaySummaryRemark.Text = string.Empty;
@@ -926,7 +925,22 @@ namespace FineUIPro.Web.PZHGL.InformationProject
         /// <param name="e"></param>
         protected void Window1_Close(object sender, WindowCloseEventArgs e)
         {
+            ChangeText();
+        }
 
+        private void ChangeText()
+        {
+            var workEfficiencys = from x in Funs.DB.ZHGL_ConstructionLogWorkEfficiency
+                                  where x.ConstructionLogId == this.tvControlItem.SelectedNodeID
+                                  select x;
+            if (workEfficiencys.Count() > 0)
+            {
+                this.btnWorkEfficiency.Text = "已填报";
+            }
+            else
+            {
+                this.btnWorkEfficiency.Text = "未填报";
+            }
         }
         #endregion
 
@@ -1249,5 +1263,41 @@ namespace FineUIPro.Web.PZHGL.InformationProject
         {
             TextNew();
         }
+
+        protected void btnWorkEfficiency_Click(object sender, EventArgs e)
+        {
+            string contractNo = string.Empty;
+            foreach (var item in this.drpContractNo.SelectedValueArray)
+            {
+                if (item != BLL.Const._Null)
+                {
+                    contractNo += item + ",";
+                }
+            }
+            if (!string.IsNullOrEmpty(contractNo))
+            {
+                contractNo = contractNo.Substring(0, contractNo.Length - 1);
+            }
+            string professional = string.Empty;
+            foreach (var item in this.drpProfessional.SelectedValueArray)
+            {
+                if (item != BLL.Const._Null)
+                {
+                    professional += item + ",";
+                }
+            }
+            if (!string.IsNullOrEmpty(professional))
+            {
+                professional = professional.Substring(0, professional.Length - 1);
+            }
+            if (!string.IsNullOrEmpty(contractNo) && !string.IsNullOrEmpty(professional))
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ConstructionLogWorkEfficiency.aspx?ConstructionLogId={0}&contractNo={1}&professional={2}&WorkPostId={3}&MachineId={4}&View=View", this.ConstructionLogId, contractNo, professional, hdWorkPostId.Text, hdMachineId.Text, "导入 - ")));
+            }
+            else
+            {
+                Alert.ShowInTop("请选择合同编号和专业工程！", MessageBoxIcon.Warning);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx.designer.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx.designer.cs
index e0621219..4469893b 100644
--- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogFileCabinet.aspx.designer.cs
@@ -229,13 +229,13 @@ namespace FineUIPro.Web.PZHGL.InformationProject {
         protected global::FineUIPro.DropDownList drpProfessional;
         
         /// <summary>
-        /// txtState 控件。
+        /// btnWorkEfficiency 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtState;
+        protected global::FineUIPro.Button btnWorkEfficiency;
         
         /// <summary>
         /// txtRemark 控件。
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogWorkEfficiency.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogWorkEfficiency.aspx.cs
index 6a21f06a..7a340691 100644
--- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogWorkEfficiency.aspx.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogWorkEfficiency.aspx.cs
@@ -126,6 +126,10 @@ namespace FineUIPro.Web.PZHGL.InformationProject
                 string contractNo = Request.Params["contractNo"];
                 string professional = Request.Params["professional"];
                 string constructionLogId = Request.Params["ConstructionLogId"];
+                if (!string.IsNullOrEmpty(Request.Params["View"]))
+                {
+                    this.btnSave.Hidden = true;
+                }
                 List<string> contractNoList = Funs.GetStrListByStr(contractNo, ',');
                 List<string> professionalList = Funs.GetStrListByStr(professional, ',');
                 List<string> workPostIds = Funs.GetStrListByStr(Request.Params["WorkPostId"], ',');
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx b/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx
new file mode 100644
index 00000000..734901a9
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx
@@ -0,0 +1,80 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DayConstructionLogWorkEfficiency.aspx.cs" Inherits="FineUIPro.Web.PZHGL.InformationProject.DayConstructionLogWorkEfficiency" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>工效录入</title>
+    <style type="text/css">
+        .f-grid-row.noEdit {
+            pointer-events: none;
+        }
+
+        .f-grid-colheader-text {
+            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="工效情况" BoxFlex="1" AllowColumnLocking="true"
+                    runat="server" EnableCollapse="true" DataKeyNames="Id,ProjectName,ShowId" EnableTree="true" EnableColumnLines="true" ClicksToEdit="1" AllowCellEditing="true"
+                    DataIDField="Id">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                            <Items>
+                                <f:DatePicker ID="txtCompileDate" runat="server" Label="日期" LabelAlign="Right" LabelWidth="120px" AutoPostBack="true" OnTextChanged="txtCompileDate_TextChanged"></f:DatePicker>
+                                <f:TextBox runat="server" ID="hdId" Hidden="true"></f:TextBox>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RenderField Width="60px" ColumnID="Code" DataField="Code" FieldType="String" EnableLock="true" Locked="true"
+                            HeaderText="序号" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="项目编码" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="UnitOfMeasurement" DataField="UnitOfMeasurement" SortField="UnitOfMeasurement" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="单位" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="PhysicalCompletionQuantity" DataField="PhysicalCompletionQuantity" FieldType="Double" EnableLock="true" Locked="true"
+                            HeaderText="实物完成量" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="MaterialConsumption" DataField="MaterialConsumption" FieldType="Double" EnableLock="true" Locked="true"
+                            HeaderText="材料消耗量（净量+损耗量）" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="afteredit" Handler="onGridAfterEdit" />
+                    </Listeners>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+    <script type="text/javascript">
+        var hdIdClientID = '<%= hdId.ClientID %>';
+
+        function onGridAfterEdit(event, value, params) {
+            var me = this, columnId = params.columnId, rowId = params.rowId;
+            if (columnId.indexOf('ConsumeHours') != -1) {
+                var physicalCompletionQuantity = me.getCellValue(rowId, 'PhysicalCompletionQuantity');
+                var hours = me.getCellValue(rowId, columnId);
+                var workEfficiencyId = columnId.replace('ConsumeHours', 'WorkEfficiency');
+                if (physicalCompletionQuantity.toString() != "" && hours.toString() != "") {
+                    me.updateCellValue(rowId, workEfficiencyId, (physicalCompletionQuantity / hours).toFixed(2));
+                }
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.cs
new file mode 100644
index 00000000..86fef980
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.cs
@@ -0,0 +1,196 @@
+using BLL;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.PZHGL.InformationProject
+{
+    public partial class DayConstructionLogWorkEfficiency : PageBase
+    {
+        /// <summary>
+        /// 加载表头
+        /// </summary>
+        protected void Page_Init(object sender, EventArgs e)
+        {
+            InitGrid();
+        }
+
+        #region 表头
+        /// <summary>
+        /// 表头
+        /// </summary>
+        private void InitGrid()
+        {
+            Model.SGGLDB db = Funs.DB;
+            var workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency
+                                  join y in db.ZHGL_ConstructionLog on x.ConstructionLogId equals y.ConstructionLogId
+                                  where y.ProjectId == this.CurrUser.LoginProjectId
+                                  select x;
+            List<string> workPostIds = (from x in workEfficiencys
+                                        where x.Type == "Person"
+                                        select x.TypeId).Distinct().ToList();
+            List<string> machineIds = (from x in workEfficiencys
+                                       where x.Type == "Machine"
+                                       select x.TypeId).Distinct().ToList();
+            GroupField gf1 = new GroupField();
+            gf1.ColumnID = "Person";
+            gf1.HeaderText = "人工消耗（工·h）";
+            gf1.HeaderTextAlign = TextAlign.Center;
+            for (int i = 0; i < workPostIds.Count; i++)
+            {
+                GroupField gf = new GroupField();
+                gf.ColumnID = "Person" + i.ToString();
+                gf.HeaderText = BLL.WorkPostService.getWorkPostNameById(workPostIds[i]);
+                gf.HeaderTextAlign = TextAlign.Center;
+                RenderField rd1 = new RenderField();
+                rd1.ColumnID = "PersonConsumeHours" + i.ToString();
+                rd1.Width = Unit.Pixel(100);
+                rd1.DataField = "PersonConsumeHours" + i.ToString();
+                rd1.FieldType = FieldType.Double;
+                rd1.HeaderText = "消耗工时";
+                rd1.HeaderTextAlign = TextAlign.Center;
+                gf.Columns.Add(rd1);
+                RenderField rd2 = new RenderField();
+                rd2.ColumnID = "PersonWorkEfficiency" + i.ToString();
+                rd2.Width = Unit.Pixel(100);
+                rd2.DataField = "PersonWorkEfficiency" + i.ToString();
+                rd2.FieldType = FieldType.Double;
+                rd2.HeaderText = "工效";
+                rd2.HeaderTextAlign = TextAlign.Center;
+                gf.Columns.Add(rd2);
+                gf1.Columns.Add(gf);
+            }
+            Grid1.Columns.Add(gf1);
+            GroupField gf2 = new GroupField();
+            gf2.ColumnID = "Machine";
+            gf2.HeaderText = "机械消耗（台·h）";
+            gf2.HeaderTextAlign = TextAlign.Center;
+            for (int i = 0; i < machineIds.Count; i++)
+            {
+                GroupField gf = new GroupField();
+                gf.ColumnID = "Machine" + i.ToString();
+                gf.HeaderText = BLL.SpecialEquipmentService.GetSpecialEquipmentNameById(machineIds[i]);
+                gf.HeaderTextAlign = TextAlign.Center;
+                RenderField rd1 = new RenderField();
+                rd1.ColumnID = "MachineConsumeHours" + i.ToString();
+                rd1.Width = Unit.Pixel(100);
+                rd1.DataField = "MachineConsumeHours" + i.ToString();
+                rd1.FieldType = FieldType.Double;
+                rd1.HeaderText = "消耗台时";
+                rd1.HeaderTextAlign = TextAlign.Center;
+                gf.Columns.Add(rd1);
+                RenderField rd2 = new RenderField();
+                rd2.ColumnID = "MachineWorkEfficiency" + i.ToString();
+                rd2.Width = Unit.Pixel(100);
+                rd2.DataField = "MachineWorkEfficiency" + i.ToString();
+                rd2.FieldType = FieldType.Double;
+                rd2.HeaderText = "工效";
+                rd2.HeaderTextAlign = TextAlign.Center;
+                gf.Columns.Add(rd2);
+                gf2.Columns.Add(gf);
+            }
+            Grid1.Columns.Add(gf2);
+        }
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                GetData();
+            }
+        }
+        #endregion
+
+        private void GetData()
+        {
+            Model.SGGLDB db = Funs.DB;
+            string contractNo = string.Empty, professional = string.Empty;
+            var personLogs = from x in db.ZHGL_ConstructionLog
+                             where x.ProjectId == this.CurrUser.LoginProjectId && x.CompileDate == Funs.GetNewDateTime(this.txtCompileDate.Text.Trim())
+                             orderby x.CompileDate descending
+                             select x;
+            if (personLogs.Count() > 0)
+            {
+                foreach (var personLog in personLogs)
+                {
+                    if (!string.IsNullOrEmpty(personLog.ContractNo))
+                    {
+                        contractNo += "," + personLog.ContractNo;
+                    }
+                    if (!string.IsNullOrEmpty(personLog.Professional))
+                    {
+                        professional += "," + personLog.Professional;
+                    }
+                }
+            }
+            List<string> contractNoList = Funs.GetStrListByStr(contractNo, ',');
+            List<string> professionalList = Funs.GetStrListByStr(professional, ',');
+            var workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency
+                                  join y in db.ZHGL_ConstructionLog on x.ConstructionLogId equals y.ConstructionLogId
+                                  where y.ProjectId == this.CurrUser.LoginProjectId
+                                  select x;
+            List<string> workPostIds = (from x in workEfficiencys
+                                        where x.Type == "Person"
+                                        select x.TypeId).Distinct().ToList();
+            List<string> machineIds = (from x in workEfficiencys
+                                       where x.Type == "Machine"
+                                       select x.TypeId).Distinct().ToList();
+            DataTable table = BLL.PhtglContractTrackService.GetProjectAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty, contractNoList, professionalList, workPostIds, machineIds, this.txtCompileDate.Text.Trim());
+            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()))
+                {
+                    foreach (GridColumn column in Grid1.Columns)
+                    {
+                        if (column.ColumnIndex != 0 && column.ColumnIndex != 1 && column.ColumnIndex != 2)
+                        {
+                            if (column.ColumnIndex > 5)
+                            {
+                                GroupField gf1 = column as GroupField;
+                                foreach (var column1 in gf1.Columns)
+                                {
+                                    GroupField gf2 = column1 as GroupField;
+                                    foreach (var column2 in gf2.Columns)
+                                    {
+                                        this.Grid1.Rows[i].CellCssClasses[column2.ColumnIndex] = "f-grid-cell-uneditable";
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                this.Grid1.Rows[i].CellCssClasses[column.ColumnIndex] = "f-grid-cell-uneditable";
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        protected void txtCompileDate_TextChanged(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.txtCompileDate.Text.Trim()))
+            {
+                GetData();
+            }
+            else
+            {
+                Grid1.DataSource = null;
+                Grid1.DataBind();
+                Alert.ShowInTop("请选择日期！", MessageBoxIcon.Warning);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.designer.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.designer.cs
new file mode 100644
index 00000000..68913b12
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.designer.cs
@@ -0,0 +1,78 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.PZHGL.InformationProject {
+    
+    
+    public partial class DayConstructionLogWorkEfficiency {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// txtCompileDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtCompileDate;
+        
+        /// <summary>
+        /// hdId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox hdId;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx b/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx
new file mode 100644
index 00000000..0026bdea
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx
@@ -0,0 +1,80 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthConstructionLogWorkEfficiencySum.aspx.cs" Inherits="FineUIPro.Web.PZHGL.InformationProject.MonthConstructionLogWorkEfficiencySum" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>工效录入</title>
+    <style type="text/css">
+        .f-grid-row.noEdit {
+            pointer-events: none;
+        }
+
+        .f-grid-colheader-text {
+            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="工效情况" BoxFlex="1" AllowColumnLocking="true"
+                    runat="server" EnableCollapse="true" DataKeyNames="Id,ProjectName,ShowId" EnableTree="true" EnableColumnLines="true" ClicksToEdit="1" AllowCellEditing="true"
+                    DataIDField="Id">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                            <Items>
+                                <f:DatePicker ID="txtMonth" runat="server" Label="月份" LabelAlign="Right" DateFormatString="yyyy-MM" LabelWidth="120px" AutoPostBack="true" OnTextChanged="txtMonth_TextChanged"></f:DatePicker>
+                                <f:TextBox runat="server" ID="hdId" Hidden="true"></f:TextBox>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RenderField Width="60px" ColumnID="Code" DataField="Code" FieldType="String" EnableLock="true" Locked="true"
+                            HeaderText="序号" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="项目编码" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="UnitOfMeasurement" DataField="UnitOfMeasurement" SortField="UnitOfMeasurement" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="单位" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="PhysicalCompletionQuantity" DataField="PhysicalCompletionQuantity" FieldType="Double" EnableLock="true" Locked="true"
+                            HeaderText="实物完成量" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="MaterialConsumption" DataField="MaterialConsumption" FieldType="Double" EnableLock="true" Locked="true"
+                            HeaderText="材料消耗量（净量+损耗量）" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="afteredit" Handler="onGridAfterEdit" />
+                    </Listeners>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+    <script type="text/javascript">
+        var hdIdClientID = '<%= hdId.ClientID %>';
+
+        function onGridAfterEdit(event, value, params) {
+            var me = this, columnId = params.columnId, rowId = params.rowId;
+            if (columnId.indexOf('ConsumeHours') != -1) {
+                var physicalCompletionQuantity = me.getCellValue(rowId, 'PhysicalCompletionQuantity');
+                var hours = me.getCellValue(rowId, columnId);
+                var workEfficiencyId = columnId.replace('ConsumeHours', 'WorkEfficiency');
+                if (physicalCompletionQuantity.toString() != "" && hours.toString() != "") {
+                    me.updateCellValue(rowId, workEfficiencyId, (physicalCompletionQuantity / hours).toFixed(2));
+                }
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx.cs
new file mode 100644
index 00000000..6ac0fce6
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx.cs
@@ -0,0 +1,198 @@
+using BLL;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.PZHGL.InformationProject
+{
+    public partial class MonthConstructionLogWorkEfficiencySum : PageBase
+    {
+        /// <summary>
+        /// 加载表头
+        /// </summary>
+        protected void Page_Init(object sender, EventArgs e)
+        {
+            InitGrid();
+        }
+
+        #region 表头
+        /// <summary>
+        /// 表头
+        /// </summary>
+        private void InitGrid()
+        {
+            Model.SGGLDB db = Funs.DB;
+            var workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency
+                                  join y in db.ZHGL_ConstructionLog on x.ConstructionLogId equals y.ConstructionLogId
+                                  where y.ProjectId == this.CurrUser.LoginProjectId
+                                  select x;
+            List<string> workPostIds = (from x in workEfficiencys
+                                        where x.Type == "Person"
+                                        select x.TypeId).Distinct().ToList();
+            List<string> machineIds = (from x in workEfficiencys
+                                       where x.Type == "Machine"
+                                       select x.TypeId).Distinct().ToList();
+            GroupField gf1 = new GroupField();
+            gf1.ColumnID = "Person";
+            gf1.HeaderText = "人工消耗（工·h）";
+            gf1.HeaderTextAlign = TextAlign.Center;
+            for (int i = 0; i < workPostIds.Count; i++)
+            {
+                GroupField gf = new GroupField();
+                gf.ColumnID = "Person" + i.ToString();
+                gf.HeaderText = BLL.WorkPostService.getWorkPostNameById(workPostIds[i]);
+                gf.HeaderTextAlign = TextAlign.Center;
+                RenderField rd1 = new RenderField();
+                rd1.ColumnID = "PersonConsumeHours" + i.ToString();
+                rd1.Width = Unit.Pixel(100);
+                rd1.DataField = "PersonConsumeHours" + i.ToString();
+                rd1.FieldType = FieldType.Double;
+                rd1.HeaderText = "消耗工时";
+                rd1.HeaderTextAlign = TextAlign.Center;
+                gf.Columns.Add(rd1);
+                RenderField rd2 = new RenderField();
+                rd2.ColumnID = "PersonWorkEfficiency" + i.ToString();
+                rd2.Width = Unit.Pixel(100);
+                rd2.DataField = "PersonWorkEfficiency" + i.ToString();
+                rd2.FieldType = FieldType.Double;
+                rd2.HeaderText = "工效";
+                rd2.HeaderTextAlign = TextAlign.Center;
+                gf.Columns.Add(rd2);
+                gf1.Columns.Add(gf);
+            }
+            Grid1.Columns.Add(gf1);
+            GroupField gf2 = new GroupField();
+            gf2.ColumnID = "Machine";
+            gf2.HeaderText = "机械消耗（台·h）";
+            gf2.HeaderTextAlign = TextAlign.Center;
+            for (int i = 0; i < machineIds.Count; i++)
+            {
+                GroupField gf = new GroupField();
+                gf.ColumnID = "Machine" + i.ToString();
+                gf.HeaderText = BLL.SpecialEquipmentService.GetSpecialEquipmentNameById(machineIds[i]);
+                gf.HeaderTextAlign = TextAlign.Center;
+                RenderField rd1 = new RenderField();
+                rd1.ColumnID = "MachineConsumeHours" + i.ToString();
+                rd1.Width = Unit.Pixel(100);
+                rd1.DataField = "MachineConsumeHours" + i.ToString();
+                rd1.FieldType = FieldType.Double;
+                rd1.HeaderText = "消耗台时";
+                rd1.HeaderTextAlign = TextAlign.Center;
+                gf.Columns.Add(rd1);
+                RenderField rd2 = new RenderField();
+                rd2.ColumnID = "MachineWorkEfficiency" + i.ToString();
+                rd2.Width = Unit.Pixel(100);
+                rd2.DataField = "MachineWorkEfficiency" + i.ToString();
+                rd2.FieldType = FieldType.Double;
+                rd2.HeaderText = "工效";
+                rd2.HeaderTextAlign = TextAlign.Center;
+                gf.Columns.Add(rd2);
+                gf2.Columns.Add(gf);
+            }
+            Grid1.Columns.Add(gf2);
+        }
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.txtMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
+                GetData();
+            }
+        }
+        #endregion
+
+        private void GetData()
+        {
+            Model.SGGLDB db = Funs.DB;
+            DateTime startDate = Funs.GetNewDateTimeOrNow(this.txtMonth.Text.Trim() + "-01");
+            DateTime endDate = startDate.AddMonths(1);
+            string contractNo = string.Empty, professional = string.Empty;
+            var personLogs = from x in db.ZHGL_ConstructionLog
+                             where x.ProjectId == this.CurrUser.LoginProjectId && x.CompileDate >= startDate && x.CompileDate < endDate
+                             orderby x.CompileDate descending
+                             select x;
+            if (personLogs.Count() > 0)
+            {
+                foreach (var personLog in personLogs)
+                {
+                    if (!string.IsNullOrEmpty(personLog.ContractNo))
+                    {
+                        contractNo += "," + personLog.ContractNo;
+                    }
+                    if (!string.IsNullOrEmpty(personLog.Professional))
+                    {
+                        professional += "," + personLog.Professional;
+                    }
+                }
+            }
+            List<string> contractNoList = Funs.GetStrListByStr(contractNo, ',');
+            List<string> professionalList = Funs.GetStrListByStr(professional, ',');
+            var workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency
+                                  join y in db.ZHGL_ConstructionLog on x.ConstructionLogId equals y.ConstructionLogId
+                                  where y.ProjectId == this.CurrUser.LoginProjectId
+                                  select x;
+            List<string> workPostIds = (from x in workEfficiencys
+                                        where x.Type == "Person"
+                                        select x.TypeId).Distinct().ToList();
+            List<string> machineIds = (from x in workEfficiencys
+                                       where x.Type == "Machine"
+                                       select x.TypeId).Distinct().ToList();
+            DataTable table = BLL.PhtglContractTrackService.GetMonthProjectAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty, contractNoList, professionalList, workPostIds, machineIds, startDate, endDate);
+            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()))
+                {
+                    foreach (GridColumn column in Grid1.Columns)
+                    {
+                        if (column.ColumnIndex != 0 && column.ColumnIndex != 1 && column.ColumnIndex != 2)
+                        {
+                            if (column.ColumnIndex > 5)
+                            {
+                                GroupField gf1 = column as GroupField;
+                                foreach (var column1 in gf1.Columns)
+                                {
+                                    GroupField gf2 = column1 as GroupField;
+                                    foreach (var column2 in gf2.Columns)
+                                    {
+                                        this.Grid1.Rows[i].CellCssClasses[column2.ColumnIndex] = "f-grid-cell-uneditable";
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                this.Grid1.Rows[i].CellCssClasses[column.ColumnIndex] = "f-grid-cell-uneditable";
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        protected void txtMonth_TextChanged(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.txtMonth.Text.Trim()))
+            {
+                GetData();
+            }
+            else
+            {
+                Grid1.DataSource = null;
+                Grid1.DataBind();
+                Alert.ShowInTop("请选择月份！", MessageBoxIcon.Warning);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx.designer.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx.designer.cs
new file mode 100644
index 00000000..6a7d9127
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx.designer.cs
@@ -0,0 +1,78 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.PZHGL.InformationProject {
+    
+    
+    public partial class MonthConstructionLogWorkEfficiencySum {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// txtMonth 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtMonth;
+        
+        /// <summary>
+        /// hdId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox hdId;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx
index a76f6998..8a3671ed 100644
--- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx
@@ -80,9 +80,11 @@
                                                                 <f:DropDownList ID="drpProfessional" runat="server" Label="专业工程" LabelAlign="Right" EnableEdit="true" Readonly="true" EnableCheckBoxSelect="true" EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelWidth="120px"></f:DropDownList>
                                                             </Items>
                                                         </f:FormRow>
-                                                        <f:FormRow ColumnWidths="33% 67%">
+                                                        <f:FormRow ColumnWidths="13% 20% 67%">
                                                             <Items>
-                                                                <f:TextBox ID="txtState" Label="填报状态" runat="server" LabelAlign="Right" LabelWidth="120px" Readonly="true"></f:TextBox>
+                                                                <f:Label runat="server" Text="填报状态：" EncodeText="false" ShowRedStar="true" Label="附件：" CssStyle="padding-left:42px" Width="110px" CssClass="marginr" ShowLabel="false" ></f:Label>
+                                                                <f:Button ID="btnWorkEfficiency" Text="未填报" ToolTip="填报工效数据" Icon="TableCell" OnClick="btnWorkEfficiency_Click" runat="server">
+                                                    </f:Button>
                                                                 <f:TextBox ID="txtRemark" Label="备注" runat="server" LabelAlign="Right" LabelWidth="120px"></f:TextBox>
                                                             </Items>
                                                         </f:FormRow>
@@ -382,9 +384,9 @@
         </f:Panel>
         </Items>
         </f:Panel>
-        <f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="false"
+        <f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
-            Width="1300px" Height="680px">
+            Width="1300px" Height="650px">
         </f:Window>
         <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs
index 442d46f6..55ce0406 100644
--- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs
@@ -69,7 +69,9 @@ namespace FineUIPro.Web.PZHGL.InformationProject
             this.hdWorkPostId.Text = workPostId;
             this.hdMachineId.Text = machineId;
             List<string> list = Funs.GetStrListByStr(this.hdWorkPostId.Text, ',');
-            list.Distinct();
+            list = list.Distinct().ToList();
+            workPostId = Funs.GetStrListByList(list);
+            this.hdWorkPostId.Text = workPostId;
             for (int i = 0; i < list.Count; i++)
             {
                 RenderField rdPlan = new RenderField();
@@ -86,7 +88,9 @@ namespace FineUIPro.Web.PZHGL.InformationProject
                 Grid1.Columns.Add(rdPlan);
             }
             List<string> list2 = Funs.GetStrListByStr(this.hdMachineId.Text, ',');
-            list2.Distinct();
+            list2 = list2.Distinct().ToList();
+            machineId = Funs.GetStrListByList(list2);
+            this.hdMachineId.Text = machineId;
             for (int i = 0; i < list2.Count; i++)
             {
                 RenderField rdPlan = new RenderField();
@@ -233,7 +237,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
                 {
                     this.btnMenuAdd.Hidden = true;
                     this.btnMenuEdit.Hidden = false;
-                    this.btnMenuDown.Hidden = false;
+                    //this.btnMenuDown.Hidden = false;
                     this.btnMenuDelete.Hidden = false;
                 }
             }
@@ -329,6 +333,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
                     this.GridCQMSTomorrowPlan.DataSource = cqmss;
                     this.GridCQMSTomorrowPlan.DataBind();
                 }
+                ChangeText();
             }
         }
 
@@ -461,7 +466,6 @@ namespace FineUIPro.Web.PZHGL.InformationProject
                     }
                 }
             }
-            this.txtState.Text = string.Empty;
             this.txtRemark.Text = string.Empty;
             this.Grid1.DataSource = null;
             this.Grid1.DataBind();
@@ -474,6 +478,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject
             this.Grid5.DataSource = null;
             this.Grid5.DataBind();
             drpUnitWork_SelectedIndexChanged(null, null);
+            ChangeText();
         }
 
         private void TextEmpty()
@@ -488,7 +493,6 @@ namespace FineUIPro.Web.PZHGL.InformationProject
             this.drpContractNo.SelectedIndex = 0;
             this.drpUnitWork.SelectedIndex = 0;
             this.drpProfessional.SelectedIndex = 0;
-            this.txtState.Text = string.Empty;
             this.txtRemark.Text = string.Empty;
             this.Grid1.DataSource = null;
             this.Grid1.DataBind();
@@ -669,7 +673,32 @@ namespace FineUIPro.Web.PZHGL.InformationProject
         /// <param name="e"></param>
         protected void Window1_Close(object sender, WindowCloseEventArgs e)
         {
+            ChangeText();
+        }
 
+        private void ChangeText()
+        {
+            DateTime today = DateTime.Now.Date;
+            if (!string.IsNullOrEmpty(this.txtCompileDate.Text.Trim()))
+            {
+                today = Convert.ToDateTime(this.txtCompileDate.Text.Trim()).Date;
+            }
+            var personLogIds = (from x in Funs.DB.ZHGL_ConstructionLog
+                                where x.ProjectId == this.CurrUser.LoginProjectId && x.CompileDate == today
+                                orderby x.CompileDate descending
+                                select x.ConstructionLogId).ToList();
+
+            var workEfficiencys = from x in Funs.DB.ZHGL_ConstructionLogWorkEfficiency
+                                  where personLogIds.Contains(x.ConstructionLogId)
+                                  select x;
+            if (workEfficiencys.Count() > 0)
+            {
+                this.btnWorkEfficiency.Text = "已填报";
+            }
+            else
+            {
+                this.btnWorkEfficiency.Text = "未填报";
+            }
         }
         #endregion
 
@@ -1205,5 +1234,46 @@ namespace FineUIPro.Web.PZHGL.InformationProject
         {
             TextNew();
         }
+
+        protected void btnWorkEfficiency_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(this.txtCompileDate.Text.Trim()))
+            {
+                Alert.ShowInTop("请选择日期！", MessageBoxIcon.Warning);
+                return;
+            }
+            string contractNo = string.Empty;
+            foreach (var item in this.drpContractNo.SelectedValueArray)
+            {
+                if (item != BLL.Const._Null)
+                {
+                    contractNo += item + ",";
+                }
+            }
+            if (!string.IsNullOrEmpty(contractNo))
+            {
+                contractNo = contractNo.Substring(0, contractNo.Length - 1);
+            }
+            string professional = string.Empty;
+            foreach (var item in this.drpProfessional.SelectedValueArray)
+            {
+                if (item != BLL.Const._Null)
+                {
+                    professional += item + ",";
+                }
+            }
+            if (!string.IsNullOrEmpty(professional))
+            {
+                professional = professional.Substring(0, professional.Length - 1);
+            }
+            if (!string.IsNullOrEmpty(contractNo) && !string.IsNullOrEmpty(professional))
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectConstructionLogWorkEfficiency.aspx?CompileDate={0}&contractNo={1}&professional={2}&WorkPostId={3}&MachineId={4}", this.txtCompileDate.Text.Trim(), contractNo, professional, hdWorkPostId.Text, hdMachineId.Text, "导入 - ")));
+            }
+            else
+            {
+                Alert.ShowInTop("请选择合同编号和专业工程！", MessageBoxIcon.Warning);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.designer.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.designer.cs
index ba54786d..4c5d2bef 100644
--- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.designer.cs
@@ -238,13 +238,13 @@ namespace FineUIPro.Web.PZHGL.InformationProject {
         protected global::FineUIPro.DropDownList drpProfessional;
         
         /// <summary>
-        /// txtState 控件。
+        /// btnWorkEfficiency 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtState;
+        protected global::FineUIPro.Button btnWorkEfficiency;
         
         /// <summary>
         /// txtRemark 控件。
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiency.aspx b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiency.aspx
new file mode 100644
index 00000000..27241ced
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiency.aspx
@@ -0,0 +1,79 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectConstructionLogWorkEfficiency.aspx.cs" Inherits="FineUIPro.Web.PZHGL.InformationProject.ProjectConstructionLogWorkEfficiency" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>工效录入</title>
+    <style type="text/css">
+        .f-grid-row.noEdit {
+            pointer-events: none;
+        }
+
+        .f-grid-colheader-text {
+            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="工效情况" BoxFlex="1" AllowColumnLocking="true"
+                    runat="server" EnableCollapse="true" DataKeyNames="Id,ProjectName,ShowId" EnableTree="true" EnableColumnLines="true" ClicksToEdit="1" AllowCellEditing="true"
+                    DataIDField="Id">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                            <Items>
+                                <f:TextBox runat="server" ID="hdId" Hidden="true"></f:TextBox>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RenderField Width="60px" ColumnID="Code" DataField="Code" FieldType="String" EnableLock="true" Locked="true"
+                            HeaderText="序号" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="项目编码" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="项目名称" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="UnitOfMeasurement" DataField="UnitOfMeasurement" SortField="UnitOfMeasurement" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="单位" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="PhysicalCompletionQuantity" DataField="PhysicalCompletionQuantity" FieldType="Double" EnableLock="true" Locked="true"
+                            HeaderText="实物完成量" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="MaterialConsumption" DataField="MaterialConsumption" FieldType="Double" EnableLock="true" Locked="true"
+                            HeaderText="材料消耗量（净量+损耗量）" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="afteredit" Handler="onGridAfterEdit" />
+                    </Listeners>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+    <script type="text/javascript">
+        var hdIdClientID = '<%= hdId.ClientID %>';
+
+        function onGridAfterEdit(event, value, params) {
+            var me = this, columnId = params.columnId, rowId = params.rowId;
+            if (columnId.indexOf('ConsumeHours') != -1) {
+                var physicalCompletionQuantity = me.getCellValue(rowId, 'PhysicalCompletionQuantity');
+                var hours = me.getCellValue(rowId, columnId);
+                var workEfficiencyId = columnId.replace('ConsumeHours', 'WorkEfficiency');
+                if (physicalCompletionQuantity.toString() != "" && hours.toString() != "") {
+                    me.updateCellValue(rowId, workEfficiencyId, (physicalCompletionQuantity / hours).toFixed(2));
+                }
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiency.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiency.aspx.cs
new file mode 100644
index 00000000..535348e4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiency.aspx.cs
@@ -0,0 +1,160 @@
+using BLL;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.PZHGL.InformationProject
+{
+    public partial class ProjectConstructionLogWorkEfficiency : PageBase
+    {
+        #region 定义变量
+        /// <summary>
+        /// 列数量
+        /// </summary>
+        public int ColumnNum
+        {
+            get
+            {
+                return (int)ViewState["ColumnNum"];
+            }
+            set
+            {
+                ViewState["ColumnNum"] = value;
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 加载表头
+        /// </summary>
+        protected void Page_Init(object sender, EventArgs e)
+        {
+            InitGrid();
+        }
+
+        #region 表头
+        /// <summary>
+        /// 表头
+        /// </summary>
+        private void InitGrid()
+        {
+            ColumnNum = 0;
+            List<string> workPostIds = Funs.GetStrListByStr(Request.Params["WorkPostId"], ',');
+            List<string> machineIds = Funs.GetStrListByStr(Request.Params["MachineId"], ',');
+            GroupField gf1 = new GroupField();
+            gf1.ColumnID = "Person";
+            gf1.HeaderText = "人工消耗（工·h）";
+            gf1.HeaderTextAlign = TextAlign.Center;
+            for (int i = 0; i < workPostIds.Count; i++)
+            {
+                GroupField gf = new GroupField();
+                gf.ColumnID = "Person" + i.ToString();
+                gf.HeaderText = BLL.WorkPostService.getWorkPostNameById(workPostIds[i]);
+                gf.HeaderTextAlign = TextAlign.Center;
+                RenderField rd1 = new RenderField();
+                rd1.ColumnID = "PersonConsumeHours" + i.ToString();
+                rd1.Width = Unit.Pixel(100);
+                rd1.DataField = "PersonConsumeHours" + i.ToString();
+                rd1.FieldType = FieldType.Double;
+                rd1.HeaderText = "消耗工时";
+                rd1.HeaderTextAlign = TextAlign.Center;
+                gf.Columns.Add(rd1);
+                RenderField rd2 = new RenderField();
+                rd2.ColumnID = "PersonWorkEfficiency" + i.ToString();
+                rd2.Width = Unit.Pixel(100);
+                rd2.DataField = "PersonWorkEfficiency" + i.ToString();
+                rd2.FieldType = FieldType.Double;
+                rd2.HeaderText = "工效";
+                rd2.HeaderTextAlign = TextAlign.Center;
+                gf.Columns.Add(rd2);
+                gf1.Columns.Add(gf);
+            }
+            Grid1.Columns.Add(gf1);
+            GroupField gf2 = new GroupField();
+            gf2.ColumnID = "Machine";
+            gf2.HeaderText = "机械消耗（台·h）";
+            gf2.HeaderTextAlign = TextAlign.Center;
+            for (int i = 0; i < machineIds.Count; i++)
+            {
+                GroupField gf = new GroupField();
+                gf.ColumnID = "Machine" + i.ToString();
+                gf.HeaderText = BLL.SpecialEquipmentService.GetSpecialEquipmentNameById(machineIds[i]);
+                gf.HeaderTextAlign = TextAlign.Center;
+                RenderField rd1 = new RenderField();
+                rd1.ColumnID = "MachineConsumeHours" + i.ToString();
+                rd1.Width = Unit.Pixel(100);
+                rd1.DataField = "MachineConsumeHours" + i.ToString();
+                rd1.FieldType = FieldType.Double;
+                rd1.HeaderText = "消耗台时";
+                rd1.HeaderTextAlign = TextAlign.Center;
+                gf.Columns.Add(rd1);
+                RenderField rd2 = new RenderField();
+                rd2.ColumnID = "MachineWorkEfficiency" + i.ToString();
+                rd2.Width = Unit.Pixel(100);
+                rd2.DataField = "MachineWorkEfficiency" + i.ToString();
+                rd2.FieldType = FieldType.Double;
+                rd2.HeaderText = "工效";
+                rd2.HeaderTextAlign = TextAlign.Center;
+                gf.Columns.Add(rd2);
+                gf2.Columns.Add(gf);
+            }
+            Grid1.Columns.Add(gf2);
+        }
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string contractNo = Request.Params["contractNo"];
+                string professional = Request.Params["professional"];
+                string compileDate = Request.Params["CompileDate"];
+                List<string> contractNoList = Funs.GetStrListByStr(contractNo, ',');
+                List<string> professionalList = Funs.GetStrListByStr(professional, ',');
+                List<string> workPostIds = Funs.GetStrListByStr(Request.Params["WorkPostId"], ',');
+                List<string> machineIds = Funs.GetStrListByStr(Request.Params["MachineId"], ',');
+                DataTable table = BLL.PhtglContractTrackService.GetProjectAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty, contractNoList, professionalList, workPostIds, machineIds, compileDate);
+                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()))
+                    {
+                        foreach (GridColumn column in Grid1.Columns)
+                        {
+                            if (column.ColumnIndex != 0 && column.ColumnIndex != 1 && column.ColumnIndex != 2)
+                            {
+                                if (column.ColumnIndex > 5)
+                                {
+                                    GroupField gf1 = column as GroupField;
+                                    foreach (var column1 in gf1.Columns)
+                                    {
+                                        GroupField gf2 = column1 as GroupField;
+                                        foreach (var column2 in gf2.Columns)
+                                        {
+                                            this.Grid1.Rows[i].CellCssClasses[column2.ColumnIndex] = "f-grid-cell-uneditable";
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    this.Grid1.Rows[i].CellCssClasses[column.ColumnIndex] = "f-grid-cell-uneditable";
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiency.aspx.designer.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiency.aspx.designer.cs
new file mode 100644
index 00000000..1c8d00eb
--- /dev/null
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiency.aspx.designer.cs
@@ -0,0 +1,69 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.PZHGL.InformationProject {
+    
+    
+    public partial class ProjectConstructionLogWorkEfficiency {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// hdId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox hdId;
+    }
+}
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_PHTGL.xml b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
index 3ccb32ac..4e56de27 100644
--- a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml
@@ -35,8 +35,9 @@
 <TreeNode id="48216E20-7103-48AB-A12F-237E28605952" Text="消防电信" NavigateUrl=""></TreeNode>
 <TreeNode id="5EB73242-63F0-402C-A42B-2BCDC0AC2229" Text="临建设施" NavigateUrl=""></TreeNode>
 </TreeNode>
-<TreeNode id="D9BAB30E-3255-4EA0-8631-EF15C9203EFD" Text="合同价格信息" NavigateUrl="PHTGL/ContractCompile/ContractTrackList.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 id="D9BAB30E-3255-4EA0-8631-EF15C9203EFD" Text="合同执行跟踪" NavigateUrl="PHTGL/ContractCompile/ContractTrackList.aspx"></TreeNode>
+<TreeNode id="A9BBF623-83AC-4353-A010-07A5D4CEB7D1" Text="工效统计" NavigateUrl=""><TreeNode id="118B3E91-073B-468C-BDE3-DD6DCF6034C6" Text="日工效统计" NavigateUrl="PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx"></TreeNode>
+<TreeNode id="4EDB3CB9-9FB6-4D63-802F-83C3FB3CA6B1" Text="月平均工效统计" NavigateUrl="PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx"></TreeNode>
+<TreeNode id="D791C4E1-7CF1-4F4E-9457-0CF91ACDB987" Text="项目平均工效统计" NavigateUrl="PZHGL/InformationProject/ProjectConstructionLogWorkEfficiencySum.aspx"></TreeNode>
+</TreeNode>
 </Tree>
\ No newline at end of file
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>