Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

DataBase/版本日志/已更新脚本/SGGLDB_V2023-09-07.sql

@@ -0,0 +1,21 @@
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('A20E2443-A118-4C67-9084-FFEB685CA539','清单子目使用率及价格走势图','',20,'381A4608-2CDE-42AF-BC4D-FF554785B9F8','Menu_DigData',1,1,1)
+GO
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('6D1F3A3F-EFD1-420A-87E7-8CFAEF971165','日工效统计','',30,'381A4608-2CDE-42AF-BC4D-FF554785B9F8','Menu_DigData',1,1,1)
+GO
+
+update Sys_Menu set Url='DigData/WBSAnalysis.aspx' where MenuId='CFEF47C0-8EFA-46FF-8648-5B1922519DCC'
+GO
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('DD960B76-1F33-468B-9FEF-76328235C079','项目质量数据汇总','',20,'B146FC96-B199-426B-8504-4BE093C0DCB1','Menu_DigData',1,1,1)
+GO
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('A705738B-D0A2-41D2-A01A-18774B5AED49','项目施工数据汇总','',30,'B146FC96-B199-426B-8504-4BE093C0DCB1','Menu_DigData',1,1,1)
+GO
+
+update Sys_Menu set Url='DigData/ProjectWBSAnalysis.aspx' where MenuId='B6C1706F-685D-4BAF-B8F7-99C9561C8F5B'
+GO

DataBase/菜单初始化脚本/0-2大数据中心（Menu_DigData）.sql

@@ -55,6 +55,13 @@ GO
 			VALUES('ABC4323E-2F6F-4147-AA7A-8726131D7044','合同数据库','DigData/HTGLDataDW.aspx',10,'381A4608-2CDE-42AF-BC4D-FF554785B9F8','Menu_DigData',1,1,1)
 			GO
 
+			INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+			VALUES('A20E2443-A118-4C67-9084-FFEB685CA539','清单子目使用率及价格走势图','',20,'381A4608-2CDE-42AF-BC4D-FF554785B9F8','Menu_DigData',1,1,1)
+			GO
+
+			INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+			VALUES('6D1F3A3F-EFD1-420A-87E7-8CFAEF971165','日工效统计','',30,'381A4608-2CDE-42AF-BC4D-FF554785B9F8','Menu_DigData',1,1,1)
+			GO
 		--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
 		--VALUES('5BE7F83B-C02D-4481-815F-153279B44C39','劳务数据库','',50,'92B50285-30BD-4B62-9E23-A0D6B4BA1577','Menu_DigData',1,0,1)
 		--GO
@@ -63,19 +70,27 @@ INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffi
 VALUES('B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE','数据分析室','',50,'0','Menu_DigData',1,0,1)
 GO
 	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-	VALUES('CFEF47C0-8EFA-46FF-8648-5B1922519DCC','WBS数据分析','',10,'B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE','Menu_DigData',1,1,1)
+	VALUES('CFEF47C0-8EFA-46FF-8648-5B1922519DCC','WBS数据分析','DigData/WBSAnalysis.aspx',10,'B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE','Menu_DigData',1,1,1)
 	GO
 
 	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
 	VALUES('B146FC96-B199-426B-8504-4BE093C0DCB1','项目数据汇总分析','',20,'B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE','Menu_DigData',1,0,1)
 	GO
-	--项目HSE数据信息汇总
+		--项目HSE数据信息汇总
-	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+		INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-	VALUES('427AB060-2510-4568-B85B-AD6796EBE569','项目HSE数据汇总','DigData/HSEDataCollect.aspx',10,'B146FC96-B199-426B-8504-4BE093C0DCB1','Menu_DigData',1,1,1)
+		VALUES('427AB060-2510-4568-B85B-AD6796EBE569','项目HSE数据汇总','DigData/HSEDataCollect.aspx',10,'B146FC96-B199-426B-8504-4BE093C0DCB1','Menu_DigData',1,1,1)
-	GO
+		GO
-	--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+
-	--VALUES('AF5C32FD-F0CB-404E-B56D-C4AE79A8A050','人员功效分析','',10,'B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE','Menu_DigData',1,1,1)
+		INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-	--GO
+		VALUES('DD960B76-1F33-468B-9FEF-76328235C079','项目质量数据汇总','',20,'B146FC96-B199-426B-8504-4BE093C0DCB1','Menu_DigData',1,1,1)
-	--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+		GO
-	--VALUES('0DB6BB5F-B17A-4A38-AABB-278300EA9E39','员工产值分析','',20,'B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE','Menu_DigData',1,1,1)
+
-	--GO
+		INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+		VALUES('A705738B-D0A2-41D2-A01A-18774B5AED49','项目施工数据汇总','',30,'B146FC96-B199-426B-8504-4BE093C0DCB1','Menu_DigData',1,1,1)
+		GO
+		--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+		--VALUES('AF5C32FD-F0CB-404E-B56D-C4AE79A8A050','人员功效分析','',10,'B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE','Menu_DigData',1,1,1)
+		--GO
+		--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+		--VALUES('0DB6BB5F-B17A-4A38-AABB-278300EA9E39','员工产值分析','',20,'B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE','Menu_DigData',1,1,1)
+		--GO

DataBase/菜单初始化脚本/1-10大数据中心（Menu_PDigData）.sql

@@ -14,7 +14,7 @@ INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffi
 VALUES('D9252E0B-3956-473A-8ECC-12C0933469C3','数据分析室','',30,'0','Menu_PDigData',1,0,1)
 GO
 	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-	VALUES('B6C1706F-685D-4BAF-B8F7-99C9561C8F5B','WBS数据分析','',10,'D9252E0B-3956-473A-8ECC-12C0933469C3','Menu_PDigData',1,1,1)
+	VALUES('B6C1706F-685D-4BAF-B8F7-99C9561C8F5B','WBS数据分析','DigData/ProjectWBSAnalysis.aspx',10,'D9252E0B-3956-473A-8ECC-12C0933469C3','Menu_PDigData',1,1,1)
 	GO
 
 

SGGL/BLL/BLL.csproj

@@ -340,6 +340,7 @@
     <Compile Include="CQMS\WBS\WorkPackageProjectService.cs" />
     <Compile Include="CQMS\WBS\WorkPackageService.cs" />
     <Compile Include="DigData\CQMSDataDWService .cs" />
+    <Compile Include="DigData\WBSAnalysisService.cs" />
     <Compile Include="DigData\HTGLDataDWService.cs" />
     <Compile Include="DigData\JDGLDataDWService.cs" />
     <Compile Include="DigData\HSEDataDWService.cs" />

SGGL/BLL/DigData/HTGLDataDWService.cs

@@ -57,19 +57,6 @@ namespace BLL
                        x.ProjectName,
                        x.ProjectCode,
                        Count1=0, 
-                       Count2 =0, 
-                       Count3 =0,
-                       Count4 = 0,
-                       Count5 = 0,
-                       Count6 = 0,
-                       Count7 = 0,
-                       Count8 = 0,
-                       Count9 = 0,
-                       Count10 = 0,
-                       Count11 = 0,
-                       Count12 = 0,
-                       Count13 = 0,
-                       Count14 = 0,
                    };
         }
         #endregion

SGGL/BLL/DigData/WBSAnalysisService.cs

@@ -0,0 +1,109 @@
+using FineUIPro;
+using NPOI.SS.Formula.Functions;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// WBS分析
+    /// </summary>
+    public static class WBSAnalysisService
+    {
+        public static Model.SGGLDB db = Funs.DB;
+
+        #region WBS分析
+        /// <summary>
+        /// 记录数
+        /// </summary>
+        public static int count
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 定义变量
+        /// </summary>
+        private static IQueryable<Model.WBS_WorkPackageInit> getDataLists = from x in db.WBS_WorkPackageInit
+                                                                     select x;
+
+        /// <summary>
+        /// 合同管理数据仓库
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <param name="Grid1"></param>
+        /// <returns></returns>
+        public static IEnumerable getDataDWList(string level,string workPackageId, Grid Grid1)
+        {           
+            var getDataList = getDataLists;
+            if (level == "0")
+            {
+                List<Model.WBS_WorkPackageInit> listWork = new List<Model.WBS_WorkPackageInit>();
+                if (string.IsNullOrEmpty(workPackageId) ||  workPackageId == "1")
+                {
+                    Model.WBS_WorkPackageInit work1 = new Model.WBS_WorkPackageInit
+                    {
+                        WorkPackageCode = "1",
+                        PackageContent = "建筑工程",
+                    };
+                    listWork.Add(work1);
+                }
+                if (string.IsNullOrEmpty(workPackageId) || workPackageId == "2")
+                {
+                    Model.WBS_WorkPackageInit work2 = new Model.WBS_WorkPackageInit
+                    {
+                        WorkPackageCode = "2",
+                        PackageContent = "安装工程",
+                    }; 
+                    listWork.Add(work2);
+                }             
+                getDataList = listWork.AsQueryable();
+            }
+            else
+            {
+                if (level == "1")
+                {
+                    getDataList = getDataList.Where(x => x.SuperWorkPack == null);
+                }
+
+                if (!string.IsNullOrEmpty(workPackageId))
+                {
+                    if (workPackageId != "1" && workPackageId != "2")
+                    {
+                        getDataList = getDataList.Where(x => x.SuperWorkPack == workPackageId);
+                    }
+                    else
+                    {
+                        getDataList = getDataList.Where(x => x.ProjectType == workPackageId);
+                    }
+                }
+            }
+
+            count = getDataList.Count();
+            if (count == 0)
+            {
+                return null;
+            }
+            getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
+            return from x in getDataList
+                   select new
+                   {
+                       x.WorkPackageCode,
+                       x.PackageContent,
+                       Count1=0,
+                       Count2 = 0,
+                       Count3 = 0,
+                       Count4 = 0,
+                       Count5 = 0,
+                       Count6 = 0,
+                   };
+        }
+        #endregion
+
+    }
+}

SGGL/BLL/ProjectData/ProjectService.cs

@@ -464,6 +464,28 @@
         }
         #endregion
 
+        /// <summary>
+        ///  获取项目各单位类型单位名称
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="unitType"></param>
+        /// <returns></returns>
+        public static string getProjectUnitIdByUnitType(string projectId, string unitType)
+        {
+            string unitId = string.Empty;
+            if (!string.IsNullOrEmpty(projectId))
+            {
+                var getUnit = from x in Funs.DB.Project_ProjectUnit
+                                  where x.ProjectId == projectId && x.UnitType == unitType
+                                  select x.UnitId;
+                if (getUnit.Count() > 0)
+                {
+                    unitId = Funs.GetStringByArray(getUnit.ToArray());
+                }
+            }
+            return unitId;
+        }
+
         /// <summary>
         ///  获取项目各单位类型单位名称
         /// </summary>
@@ -477,7 +499,7 @@
             {
                 var getUnitName = from x in Funs.DB.Project_ProjectUnit
                                   join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
-                                  where x.ProjectId == projectId.ToString() && x.UnitType == unitType
+                                  where x.ProjectId == projectId && x.UnitType == unitType
                                   select y.UnitName;
                 if (getUnitName.Count() > 0)
                 {
@@ -500,7 +522,7 @@
             {
                 var getShortUnitName = from x in Funs.DB.Project_ProjectUnit
                                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
-                                       where x.ProjectId == projectId.ToString() && x.UnitType == unitType
+                                       where x.ProjectId == projectId && x.UnitType == unitType
                                        select y.ShortUnitName;
                 if (getShortUnitName.Count() > 0)
                 {

SGGL/FineUIPro.Web/Controls/WBSControl.ascx

@@ -4,8 +4,8 @@
     <Toolbars>
         <f:Toolbar ID="Toolbar1" Position="Top" runat="server">
             <Items>
-                <f:RadioButtonList runat="server" ID="ckState" Width="350px"  AutoColumnWidth="true"
+                <f:RadioButtonList runat="server" ID="ckLevel" Width="350px"  AutoColumnWidth="true"
-                    AutoPostBack="true" OnSelectedIndexChanged="ckState_SelectedIndexChanged">
+                    AutoPostBack="true" OnSelectedIndexChanged="ckLevel_SelectedIndexChanged">
                     <f:RadioItem Text="全部" Value="-1" Selected="true"/>
                      <f:RadioItem Text="0级" Value="0"  />
                     <f:RadioItem Text="1级" Value="1"  />

SGGL/FineUIPro.Web/Controls/WBSControl.ascx.cs

@@ -19,6 +19,25 @@ namespace FineUIPro.Web.Controls
             }
         }
 
+        public string Level
+        {
+            get
+            {
+                return (string)ViewState["Level"];
+            }
+            set
+            {
+                ViewState["Level"] = value;
+            }
+        }
+
+        public bool IsShowAll
+        {
+            get;
+            set;
+        } = true;
+
+
         #region 加载页面
         /// <summary>
         /// 加载页面
@@ -29,8 +48,15 @@ namespace FineUIPro.Web.Controls
         {
             if (!IsPostBack)
             {
+                if (!IsShowAll)
+                {
+                    this.ckLevel.Items.Remove(this.ckLevel.Items[0]);
+                    this.ckLevel.SelectedIndex = 0;
+                }
+              
                 ////加载树
                 SetSubUnitProjectTree(this.trWBS);
+               
             }
         }
         #endregion
@@ -42,6 +68,7 @@ namespace FineUIPro.Web.Controls
         /// <param name="e"></param>
         protected void trWBS_NodeCommand(object sender, TreeCommandEventArgs e)
         {
+            this.Level = this.ckLevel.SelectedValue;
             if (this.trWBS != null && !string.IsNullOrEmpty(this.trWBS.SelectedNodeID))
             {
                 this.WorkPackageCode = this.trWBS.SelectedNodeID;
@@ -52,6 +79,21 @@ namespace FineUIPro.Web.Controls
             }
         }
 
+        protected void ckLevel_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.Level = this.ckLevel.SelectedValue;
+            if (this.trWBS != null && !string.IsNullOrEmpty(this.trWBS.SelectedNodeID))
+            {
+                this.WorkPackageCode = this.trWBS.SelectedNodeID;
+            }
+                ////加载树
+                SetSubUnitProjectTree(this.trWBS);
+            if (this.change != null)
+            {
+                this.change(this, e);
+            }
+        }
+
         public delegate void userEvent(object sender, EventArgs arg);
 
         public event userEvent change;
@@ -153,11 +195,5 @@ namespace FineUIPro.Web.Controls
             }
         }
         #endregion
-
-        protected void ckState_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            ////加载树
-            SetSubUnitProjectTree(this.trWBS);
-        }
     }
 }

SGGL/FineUIPro.Web/Controls/WBSControl.ascx.designer.cs

@@ -33,13 +33,13 @@ namespace FineUIPro.Web.Controls
         protected global::FineUIPro.Toolbar Toolbar1;
 
         /// <summary>
-        /// ckState 控件。
+        /// ckLevel 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.RadioButtonList ckState;
+        protected global::FineUIPro.RadioButtonList ckLevel;
 
         /// <summary>
         /// trWBS 控件。

SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx

@@ -37,10 +37,9 @@
             </Toolbars>
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="合同数据库"
-                    runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId"
+                    runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" ForceFit="true"
                     AllowSorting="true" SortField="ProjectName" SortDirection="DESC" OnSort="Grid1_Sort" AllowCellEditing="true"
-                    EnableColumnLines="true" AllowPaging="false" PageSize="20" EnableTextSelection="True"
+                    EnableColumnLines="true" AllowPaging="false" PageSize="20" EnableTextSelection="True">
-                    EnableSummary="true" SummaryPosition="Flow">
                     <Columns>
                         <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
                             EnableLock="true" Locked="False">
@@ -55,47 +54,8 @@
                             FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="150px" ColumnID="Count1" DataField="Count1"
-                            FieldType="Int" HeaderText="合同签约价" HeaderTextAlign="Center" TextAlign="Right">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="Count2" DataField="Count2"
-                            FieldType="Int" HeaderText="概算" HeaderTextAlign="Center" TextAlign="Right">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="Count3" DataField="Count3"
-                            FieldType="Int" HeaderText="单合同毛利" HeaderTextAlign="Center" TextAlign="Right">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="Count4" DataField="Count4"
                             FieldType="Int" HeaderText="项目总体毛利" HeaderTextAlign="Center" TextAlign="Right">
                         </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="Count5" DataField="Count5"
-                            FieldType="Int" HeaderText="合同进度百分比" HeaderTextAlign="Center" TextAlign="Right">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="Count6" DataField="Count6"
-                            FieldType="Int" HeaderText="工程款支付百分比" HeaderTextAlign="Center" TextAlign="Right">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="Count7" DataField="Count7"
-                            FieldType="Int" HeaderText="合同结算价" HeaderTextAlign="Center" TextAlign="Right">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="Count8" DataField="Count8"
-                            FieldType="Int" HeaderText="合同变更率" HeaderTextAlign="Center" TextAlign="Right">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="Count9" DataField="Count9"
-                            FieldType="Int" HeaderText="合同签证率" HeaderTextAlign="Center" TextAlign="Right">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="Count10" DataField="Count10"
-                            FieldType="Int" HeaderText="工程量清单库" HeaderTextAlign="Center" TextAlign="Right">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="Count11" DataField="Count11"
-                            FieldType="Int" HeaderText="清单子目使用率" HeaderTextAlign="Center" TextAlign="Right">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="Count12" DataField="Count12"
-                            FieldType="Int" HeaderText="清单子目价格走势图" HeaderTextAlign="Center" TextAlign="Right">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="Count13" DataField="Count13"
-                            FieldType="Int" HeaderText="日工效统计" HeaderTextAlign="Center" TextAlign="Right">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="Count14" DataField="Count14"
-                            FieldType="Int" HeaderText="实际工效投入" HeaderTextAlign="Center" TextAlign="Right">
-                        </f:RenderField>
                     </Columns>
                     <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">

SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.cs

@@ -38,31 +38,27 @@ namespace FineUIPro.Web.DigData
             Grid1.RecordCount = HTGLDataDWService.count;
             Grid1.DataSource = getData;
             Grid1.DataBind();
-            this.OutputSummaryData(); ///取合计值
+            //this.OutputSummaryData(); ///取合计值
         }
 
         /// <summary>
         /// 计算合计
         /// </summary>
-        private void OutputSummaryData( )
+        //private void OutputSummaryData( )
-        {
+        //{
-            int aCount1 = 0, aCount2 = 0, aCount3 = 0;
+        //    int aCount1 = 0;
-            for (int i = 0; i < Grid1.Rows.Count(); i++)
+        //    for (int i = 0; i < Grid1.Rows.Count(); i++)
-            {
+        //    {
-                aCount1 += Funs.GetNewIntOrZero(Grid1.Rows[i].Values[3].ToString());
+        //        aCount1 += Funs.GetNewIntOrZero(Grid1.Rows[i].Values[3].ToString());
-                aCount2 += Funs.GetNewIntOrZero(Grid1.Rows[i].Values[4].ToString());
+        //    }
-                aCount3 += Funs.GetNewIntOrZero(Grid1.Rows[i].Values[5].ToString());
-            }
            
-            JObject summary = new JObject
+        //    JObject summary = new JObject
-                {
+        //        {
-                    { "ProjectName", "合计" },
+        //            { "ProjectName", "合计" },
-                    { "Count1", aCount1.ToString() },
+        //            { "Count1", aCount1.ToString() },
-                    { "Count2", aCount2.ToString() },
+        //        };
-                    { "Count3", aCount3.ToString() },
+        //    Grid1.SummaryData = summary;
-                };
+        //}
-            Grid1.SummaryData = summary;
-        }
 
 
         /// <summary>

SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx

@@ -0,0 +1,93 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectWBSAnalysis.aspx.cs" Inherits="FineUIPro.Web.DigData.ProjectWBSAnalysis" %>
+
+<%@ Register Src="~/Controls/WBSControl.ascx" TagName="WBSControl" TagPrefix="uc1" %>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>WBS数据分析</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="350" Title="WBS" TitleToolTip="WBS" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:WBSControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                        <f:TextBox ID="hdWorkPackageCode" runat="server" Hidden="true"></f:TextBox>
+                         <f:TextBox ID="hdLevel" runat="server" Hidden="true"></f:TextBox>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="WBS数据分析"
+                    TitleToolTip="WBS数据分析" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据分析"
+                            runat="server" BoxFlex="1" DataKeyNames="WorkPackageCode" DataIDField="WorkPackageCode" ForceFit="true"
+                            AllowSorting="true" SortField="WorkPackageCode" SortDirection="ASC" OnSort="Grid1_Sort" AllowCellEditing="true"
+                            EnableColumnLines="true" AllowPaging="false" PageSize="20" EnableTextSelection="True">
+                            <Columns>
+                                <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="110px" ColumnID="PackageContent" DataField="PackageContent"
+                                    FieldType="String" HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="Count1" DataField="Count1"
+                                    FieldType="Int" HeaderText="危大工程数量" HeaderTextAlign="Center" TextAlign="Right">
+                                </f:RenderField>
+                                  <f:RenderField Width="120px" ColumnID="Count2" DataField="Count2"
+                                    FieldType="Int" HeaderText="安全事故数量" HeaderTextAlign="Center" TextAlign="Right">
+                                </f:RenderField>
+                                  <f:RenderField Width="160px" ColumnID="Count3" DataField="Count3"
+                                    FieldType="Int" HeaderText="安全巡检问题总数" HeaderTextAlign="Center" TextAlign="Right">
+                                </f:RenderField>
+                                  <f:RenderField Width="160px" ColumnID="Count4" DataField="Count4"
+                                    FieldType="Int" HeaderText="实体验收一次合格率" HeaderTextAlign="Center" TextAlign="Right">
+                                </f:RenderField>
+                                  <f:RenderField Width="130px" ColumnID="Count5" DataField="Count5"
+                                    FieldType="Int" HeaderText="施工资料同步率" HeaderTextAlign="Center" TextAlign="Right">
+                                </f:RenderField>
+                                  <f:RenderField Width="110px" ColumnID="Count6" DataField="Count6"
+                                    FieldType="Int" HeaderText="质量问题数" HeaderTextAlign="Center" TextAlign="Right">
+                                </f:RenderField>
+                            </Columns>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+    </form>
+    <script type="text/javascript">
+        <%--var menuID = '<%= Menu1.ClientID %>';--%>
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            //  F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>

SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx.cs

@@ -0,0 +1,79 @@
+using BLL;
+using FineUIPro.Web.CQMS.WBS;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+
+namespace FineUIPro.Web.DigData
+{
+    public partial class ProjectWBSAnalysis : PageBase
+    {       
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {           
+                this.ucTree.IsShowAll = false;
+               this.ucTree.Level=  this.hdLevel.Text = "0";
+                BindGrid();
+            }
+        }
+
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.hdWorkPackageCode.Text = this.ucTree.WorkPackageCode;
+            this.hdLevel.Text = this.ucTree.Level;
+            BindGrid();
+        }
+
+        #region 绑定数据Grid1
+        /// <summary>
+        /// 绑定数据Grid1
+        /// </summary>
+        private void BindGrid()
+        {   
+            var getData = WBSAnalysisService.getDataDWList(this.hdLevel.Text,this.hdWorkPackageCode.Text, this.Grid1);
+            Grid1.RecordCount = WBSAnalysisService.count;
+            Grid1.DataSource = getData;
+            Grid1.DataBind();
+        }
+
+        /// <summary>
+        /// 改变索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页下拉选择事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+    }
+}

SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx.designer.cs

@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DigData
+{
+
+
+    public partial class ProjectWBSAnalysis
+    {
+
+        /// <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>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.WBSControl ucTree;
+
+        /// <summary>
+        /// hdWorkPackageCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox hdWorkPackageCode;
+
+        /// <summary>
+        /// hdLevel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox hdLevel;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}

SGGL/FineUIPro.Web/DigData/WBSAnalysis.aspx

@@ -0,0 +1,93 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WBSAnalysis.aspx.cs" Inherits="FineUIPro.Web.DigData.WBSAnalysis" %>
+
+<%@ Register Src="~/Controls/WBSControl.ascx" TagName="WBSControl" TagPrefix="uc1" %>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>WBS数据分析</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="350" Title="WBS" TitleToolTip="WBS" ShowBorder="true"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                            BodyPadding="0px">
+                            <uc1:WBSControl ID="ucTree" runat="server" Onchange="changeTree" />
+                        </f:ContentPanel>
+                        <f:TextBox ID="hdWorkPackageCode" runat="server" Hidden="true"></f:TextBox>
+                         <f:TextBox ID="hdLevel" runat="server" Hidden="true"></f:TextBox>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="WBS数据分析"
+                    TitleToolTip="WBS数据分析" AutoScroll="true">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据分析"
+                            runat="server" BoxFlex="1" DataKeyNames="WorkPackageCode" DataIDField="WorkPackageCode" ForceFit="true"
+                            AllowSorting="true" SortField="WorkPackageCode" SortDirection="ASC" OnSort="Grid1_Sort" AllowCellEditing="true"
+                            EnableColumnLines="true" AllowPaging="false" PageSize="20" EnableTextSelection="True">
+                            <Columns>
+                                <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:RenderField Width="110px" ColumnID="PackageContent" DataField="PackageContent"
+                                    FieldType="String" HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="Count1" DataField="Count1"
+                                    FieldType="Int" HeaderText="危大工程数量" HeaderTextAlign="Center" TextAlign="Right">
+                                </f:RenderField>
+                                  <f:RenderField Width="120px" ColumnID="Count2" DataField="Count2"
+                                    FieldType="Int" HeaderText="安全事故数量" HeaderTextAlign="Center" TextAlign="Right">
+                                </f:RenderField>
+                                  <f:RenderField Width="160px" ColumnID="Count3" DataField="Count3"
+                                    FieldType="Int" HeaderText="安全巡检问题总数" HeaderTextAlign="Center" TextAlign="Right">
+                                </f:RenderField>
+                                  <f:RenderField Width="160px" ColumnID="Count4" DataField="Count4"
+                                    FieldType="Int" HeaderText="实体验收一次合格率" HeaderTextAlign="Center" TextAlign="Right">
+                                </f:RenderField>
+                                  <f:RenderField Width="130px" ColumnID="Count5" DataField="Count5"
+                                    FieldType="Int" HeaderText="施工资料同步率" HeaderTextAlign="Center" TextAlign="Right">
+                                </f:RenderField>
+                                  <f:RenderField Width="110px" ColumnID="Count6" DataField="Count6"
+                                    FieldType="Int" HeaderText="质量问题数" HeaderTextAlign="Center" TextAlign="Right">
+                                </f:RenderField>
+                            </Columns>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+    </form>
+    <script type="text/javascript">
+        <%--var menuID = '<%= Menu1.ClientID %>';--%>
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            //  F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>

SGGL/FineUIPro.Web/DigData/WBSAnalysis.aspx.cs

@@ -0,0 +1,79 @@
+using BLL;
+using FineUIPro.Web.CQMS.WBS;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+
+namespace FineUIPro.Web.DigData
+{
+    public partial class WBSAnalysis : PageBase
+    {       
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {           
+                this.ucTree.IsShowAll = false;
+               this.ucTree.Level=  this.hdLevel.Text = "0";
+                BindGrid();
+            }
+        }
+
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.hdWorkPackageCode.Text = this.ucTree.WorkPackageCode;
+            this.hdLevel.Text = this.ucTree.Level;
+            BindGrid();
+        }
+
+        #region 绑定数据Grid1
+        /// <summary>
+        /// 绑定数据Grid1
+        /// </summary>
+        private void BindGrid()
+        {   
+            var getData = WBSAnalysisService.getDataDWList(this.hdLevel.Text,this.hdWorkPackageCode.Text, this.Grid1);
+            Grid1.RecordCount = WBSAnalysisService.count;
+            Grid1.DataSource = getData;
+            Grid1.DataBind();
+        }
+
+        /// <summary>
+        /// 改变索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页下拉选择事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+    }
+}

SGGL/FineUIPro.Web/DigData/WBSAnalysis.aspx.designer.cs

@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DigData
+{
+
+
+    public partial class WBSAnalysis
+    {
+
+        /// <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>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.WBSControl ucTree;
+
+        /// <summary>
+        /// hdWorkPackageCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox hdWorkPackageCode;
+
+        /// <summary>
+        /// hdLevel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox hdLevel;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}

SGGL/FineUIPro.Web/ErrLog.txt

@@ -0,0 +1,19 @@
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 (TreeNode )
+   在 FineUIPro.TreeCommandEventArgs..ctor(TreeNode node, String commandName, String commandArgument)
+   在 (TreeNode , String , String )
+   在 FineUIPro.Tree.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/07/2023 21:53:15
+出错文件:http://localhost:6422/DigData/WBSAnalysis.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/07/2023 21:53:15
+

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -537,6 +537,8 @@
     <Content Include="DigData\RectifyProblemAnalysis.aspx" />
     <Content Include="DigData\DailyProblemAnalysis.aspx" />
     <Content Include="DigData\HSEDataCollect.aspx" />
+    <Content Include="DigData\ProjectWBSAnalysis.aspx" />
+    <Content Include="DigData\WBSAnalysis.aspx" />
     <Content Include="DigData\WBSDW.aspx" />
     <Content Include="FakesAssemblies\Apache.NMS.Fakes.dll" />
     <Content Include="FakesAssemblies\Apache.NMS.Fakes.xml" />
@@ -7692,6 +7694,20 @@
     <Compile Include="DigData\HSEDataCollect.aspx.designer.cs">
       <DependentUpon>HSEDataCollect.aspx</DependentUpon>
     </Compile>
+    <Compile Include="DigData\ProjectWBSAnalysis.aspx.cs">
+      <DependentUpon>ProjectWBSAnalysis.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DigData\ProjectWBSAnalysis.aspx.designer.cs">
+      <DependentUpon>ProjectWBSAnalysis.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="DigData\WBSAnalysis.aspx.cs">
+      <DependentUpon>WBSAnalysis.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DigData\WBSAnalysis.aspx.designer.cs">
+      <DependentUpon>WBSAnalysis.aspx</DependentUpon>
+    </Compile>
     <Compile Include="DigData\WBSDW.aspx.cs">
       <DependentUpon>WBSDW.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -10427,7 +10443,6 @@
     </Compile>
     <Compile Include="HSSE\InformationProject\EPSummaryReport.aspx.cs">
       <DependentUpon>EPSummaryReport.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="HSSE\InformationProject\EPSummaryReport.aspx.designer.cs">
       <DependentUpon>EPSummaryReport.aspx</DependentUpon>
@@ -14185,7 +14200,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>0</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8797/</IISUrl>
+          <IISUrl>http://localhost:6422/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs

@@ -404,9 +404,9 @@ namespace FineUIPro.Web.Person
             }
             else
             {
-                this.drpUnit.SelectedValue = this.CurrUser.UnitId ?? Const.UnitId_SEDIN;
+                this.drpUnit.SelectedValue = this.CurrUser.UnitId ?? ProjectService.getProjectUnitIdByUnitType(this.drpProject.SelectedValue, Const.ProjectUnitType_1);
             }
-            Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAuditor, this.drpProject.SelectedValue, Const.UnitId_SEDIN, BLL.Const.HSSEManager + "," + BLL.Const.HSSEAssistantManager, false);
+            Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpAuditor, this.drpProject.SelectedValue, ProjectService.getProjectUnitIdByUnitType(this.drpProject.SelectedValue,Const.ProjectUnitType_1), BLL.Const.HSSEManager + "," + BLL.Const.HSSEAssistantManager, false);
             TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroup, this.drpProject.SelectedValue, this.drpUnit.SelectedValue, false);
             gvWorkArea.DataSource = UnitWorkService.GetUnitWorkLists(this.drpProject.SelectedValue);
             gvWorkArea.DataBind();//单位工程 
@@ -453,7 +453,7 @@ namespace FineUIPro.Web.Person
         protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
         {
             //  this.trRole.Hidden = true;
-            if (this.drpUnit.SelectedValue == BLL.Const.UnitId_SEDIN)
+            if (this.drpUnit.SelectedValue == ProjectService.getProjectUnitIdByUnitType(this.drpProject.SelectedValue, Const.ProjectUnitType_1))
             {
                 //    this.trRole.Hidden = false;
                 this.txtIdentityCard.Required = false;

SGGL/FineUIPro.Web/Personal/PersonalSet.aspx.cs

@@ -256,8 +256,8 @@ namespace FineUIPro.Web.Personal
                     return;
                 }
 
-                //BLL.Person_PersonsService.UpdatePassword(user.PersonId, this.txtNewPassword.Text);
+                BLL.Person_PersonsService.UpdatePassword(user.PersonId, this.txtNewPassword.Text);
-                //BLL.LogService.AddSys_Log(this.CurrUser, user.UserCode, user.PersonId, BLL.Const.UserMenuId, BLL.Const.BtnModify);
+                BLL.LogService.AddSys_Log(this.CurrUser, user.JobNum, user.PersonId, BLL.Const.UserMenuId, BLL.Const.BtnModify);
                 PageContext.RegisterStartupScript(ActiveWindow.GetHideReference());
             }
         }

SGGL/FineUIPro.Web/common/Menu_DigData.xml

@@ -13,11 +13,15 @@
 <TreeNode id="E7F7BC38-7357-49C0-9242-68289031F618" Text="进度数据库" NavigateUrl=""><TreeNode id="44D51E89-267D-4D72-AB6D-1F4CA4E7D19D" Text="进度数据库" NavigateUrl="DigData/JDGLDataDW.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="381A4608-2CDE-42AF-BC4D-FF554785B9F8" Text="合同数据库" NavigateUrl=""><TreeNode id="ABC4323E-2F6F-4147-AA7A-8726131D7044" Text="合同数据库" NavigateUrl="DigData/HTGLDataDW.aspx"></TreeNode>
+<TreeNode id="A20E2443-A118-4C67-9084-FFEB685CA539" Text="清单子目使用率及价格走势图" NavigateUrl=""></TreeNode>
+<TreeNode id="6D1F3A3F-EFD1-420A-87E7-8CFAEF971165" Text="日工效统计" NavigateUrl=""></TreeNode>
 </TreeNode>
 </TreeNode>
 </TreeNode>
-<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="CFEF47C0-8EFA-46FF-8648-5B1922519DCC" Text="WBS数据分析" 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=""></TreeNode>
+<TreeNode id="A705738B-D0A2-41D2-A01A-18774B5AED49" Text="项目施工数据汇总" NavigateUrl=""></TreeNode>
 </TreeNode>
 </TreeNode>
 </Tree>

SGGL/FineUIPro.Web/common/Menu_PDigData.xml

@@ -3,6 +3,6 @@
   <TreeNode id="5704B651-2172-45D3-8206-448612C5BA11" Text="WBS数据仓库" NavigateUrl="DigData/ProjectWBSDW.aspx">
   </TreeNode>
 <TreeNode id="775A5D3C-CB1C-4EC8-A7E1-F4FCD77E85DC" Text="项目数据仓库" NavigateUrl="DigData/ProjectDataDW.aspx"></TreeNode>
-<TreeNode id="D9252E0B-3956-473A-8ECC-12C0933469C3" Text="数据分析室" NavigateUrl=""><TreeNode id="B6C1706F-685D-4BAF-B8F7-99C9561C8F5B" Text="WBS数据分析" NavigateUrl=""></TreeNode>
+<TreeNode id="D9252E0B-3956-473A-8ECC-12C0933469C3" Text="数据分析室" NavigateUrl=""><TreeNode id="B6C1706F-685D-4BAF-B8F7-99C9561C8F5B" Text="WBS数据分析" NavigateUrl="DigData/ProjectWBSAnalysis.aspx"></TreeNode>
 </TreeNode>
 </Tree>