diff --git a/DataBase/版本日志/SGGLDB_V2023-09-07.sql b/DataBase/版本日志/SGGLDB_V2023-09-07.sql new file mode 100644 index 00000000..4b000fbf --- /dev/null +++ b/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 \ No newline at end of file diff --git a/DataBase/菜单初始化脚本/0-2大数据中心（Menu_DigData）.sql b/DataBase/菜单初始化脚本/0-2大数据中心（Menu_DigData）.sql index 6529578c..54a04811 100644 --- a/DataBase/菜单初始化脚本/0-2大数据中心（Menu_DigData）.sql +++ b/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Ϣ - 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) - 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 + --ĿHSEϢ + 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) + 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 + --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 diff --git a/DataBase/菜单初始化脚本/1-10大数据中心（Menu_PDigData）.sql b/DataBase/菜单初始化脚本/1-10大数据中心（Menu_PDigData）.sql index e9c1c558..694fba65 100644 --- a/DataBase/菜单初始化脚本/1-10大数据中心（Menu_PDigData）.sql +++ b/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 diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 6b379922..8cb0449e 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -340,6 +340,7 @@ + diff --git a/SGGL/BLL/DigData/HTGLDataDWService.cs b/SGGL/BLL/DigData/HTGLDataDWService.cs index e646a5c2..9d980c22 100644 --- a/SGGL/BLL/DigData/HTGLDataDWService.cs +++ b/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 diff --git a/SGGL/BLL/DigData/WBSAnalysisService.cs b/SGGL/BLL/DigData/WBSAnalysisService.cs new file mode 100644 index 00000000..69e53550 --- /dev/null +++ b/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 +{ + /// + /// WBS分析 + /// + public static class WBSAnalysisService + { + public static Model.SGGLDB db = Funs.DB; + + #region WBS分析 + /// + /// 记录数 + /// + public static int count + { + get; + set; + } + + /// + /// 定义变量 + /// + private static IQueryable getDataLists = from x in db.WBS_WorkPackageInit + select x; + + /// + /// 合同管理数据仓库 + /// + /// + /// + /// + /// + /// + public static IEnumerable getDataDWList(string level,string workPackageId, Grid Grid1) + { + var getDataList = getDataLists; + if (level == "0") + { + List listWork = new List(); + 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 + + } +} \ No newline at end of file diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs index 4b58db4f..77c8ddc5 100644 --- a/SGGL/BLL/ProjectData/ProjectService.cs +++ b/SGGL/BLL/ProjectData/ProjectService.cs @@ -464,6 +464,28 @@ } #endregion + /// + /// 获取项目各单位类型单位名称 + /// + /// + /// + /// + 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; + } + /// /// 获取项目各单位类型单位名称 /// @@ -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) { diff --git a/SGGL/FineUIPro.Web/Controls/WBSControl.ascx b/SGGL/FineUIPro.Web/Controls/WBSControl.ascx index bf5762d7..d981bc61 100644 --- a/SGGL/FineUIPro.Web/Controls/WBSControl.ascx +++ b/SGGL/FineUIPro.Web/Controls/WBSControl.ascx @@ -4,8 +4,8 @@ - + diff --git a/SGGL/FineUIPro.Web/Controls/WBSControl.ascx.cs b/SGGL/FineUIPro.Web/Controls/WBSControl.ascx.cs index 4f61fcf0..f9f42da1 100644 --- a/SGGL/FineUIPro.Web/Controls/WBSControl.ascx.cs +++ b/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 加载页面 /// /// 加载页面 @@ -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 /// 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); - } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Controls/WBSControl.ascx.designer.cs b/SGGL/FineUIPro.Web/Controls/WBSControl.ascx.designer.cs index e735160f..63114651 100644 --- a/SGGL/FineUIPro.Web/Controls/WBSControl.ascx.designer.cs +++ b/SGGL/FineUIPro.Web/Controls/WBSControl.ascx.designer.cs @@ -33,13 +33,13 @@ namespace FineUIPro.Web.Controls protected global::FineUIPro.Toolbar Toolbar1; /// - /// ckState 控件。 + /// ckLevel 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.RadioButtonList ckState; + protected global::FineUIPro.RadioButtonList ckLevel; /// /// trWBS 控件。 diff --git a/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx b/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx index a00b65f1..a4da4bcc 100644 --- a/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx +++ b/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx @@ -37,10 +37,9 @@ + EnableColumnLines="true" AllowPaging="false" PageSize="20" EnableTextSelection="True"> @@ -55,47 +54,8 @@ FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left"> - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.cs b/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.cs index b151d5dc..75c79984 100644 --- a/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.cs +++ b/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(); ///取合计值 } /// /// 计算合计 /// - private void OutputSummaryData( ) - { - int aCount1 = 0, aCount2 = 0, aCount3 = 0; - for (int i = 0; i < Grid1.Rows.Count(); i++) - { - 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()); - } + //private void OutputSummaryData( ) + //{ + // int aCount1 = 0; + // for (int i = 0; i < Grid1.Rows.Count(); i++) + // { + // aCount1 += Funs.GetNewIntOrZero(Grid1.Rows[i].Values[3].ToString()); + // } - JObject summary = new JObject - { - { "ProjectName", "合计" }, - { "Count1", aCount1.ToString() }, - { "Count2", aCount2.ToString() }, - { "Count3", aCount3.ToString() }, - }; - Grid1.SummaryData = summary; - } + // JObject summary = new JObject + // { + // { "ProjectName", "合计" }, + // { "Count1", aCount1.ToString() }, + // }; + // Grid1.SummaryData = summary; + //} /// diff --git a/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx b/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx new file mode 100644 index 00000000..2da39ca2 --- /dev/null +++ b/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" %> + + + + + WBS数据分析 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx.cs b/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx.cs new file mode 100644 index 00000000..a9015453 --- /dev/null +++ b/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 + { + /// + /// 加载页面 + /// + /// + /// + 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 + /// + /// 绑定数据Grid1 + /// + private void BindGrid() + { + var getData = WBSAnalysisService.getDataDWList(this.hdLevel.Text,this.hdWorkPackageCode.Text, this.Grid1); + Grid1.RecordCount = WBSAnalysisService.count; + Grid1.DataSource = getData; + Grid1.DataBind(); + } + + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 分页下拉选择事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx.designer.cs b/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx.designer.cs new file mode 100644 index 00000000..c308ef13 --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx.designer.cs @@ -0,0 +1,143 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DigData +{ + + + public partial class ProjectWBSAnalysis + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// ucTree 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Web.Controls.WBSControl ucTree; + + /// + /// hdWorkPackageCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox hdWorkPackageCode; + + /// + /// hdLevel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox hdLevel; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// labNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + } +} diff --git a/SGGL/FineUIPro.Web/DigData/WBSAnalysis.aspx b/SGGL/FineUIPro.Web/DigData/WBSAnalysis.aspx new file mode 100644 index 00000000..ba8ab06f --- /dev/null +++ b/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" %> + + + + + WBS数据分析 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/DigData/WBSAnalysis.aspx.cs b/SGGL/FineUIPro.Web/DigData/WBSAnalysis.aspx.cs new file mode 100644 index 00000000..d2a493eb --- /dev/null +++ b/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 + { + /// + /// 加载页面 + /// + /// + /// + 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 + /// + /// 绑定数据Grid1 + /// + private void BindGrid() + { + var getData = WBSAnalysisService.getDataDWList(this.hdLevel.Text,this.hdWorkPackageCode.Text, this.Grid1); + Grid1.RecordCount = WBSAnalysisService.count; + Grid1.DataSource = getData; + Grid1.DataBind(); + } + + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 分页下拉选择事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DigData/WBSAnalysis.aspx.designer.cs b/SGGL/FineUIPro.Web/DigData/WBSAnalysis.aspx.designer.cs new file mode 100644 index 00000000..470bca96 --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/WBSAnalysis.aspx.designer.cs @@ -0,0 +1,143 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DigData +{ + + + public partial class WBSAnalysis + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// ucTree 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Web.Controls.WBSControl ucTree; + + /// + /// hdWorkPackageCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox hdWorkPackageCode; + + /// + /// hdLevel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox hdLevel; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// labNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + } +} diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index e69de29b..9e8fc3d8 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/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 + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 03dc5e8f..1fdb7299 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -537,6 +537,8 @@ + + @@ -7692,6 +7694,20 @@ HSEDataCollect.aspx + + ProjectWBSAnalysis.aspx + ASPXCodeBehind + + + ProjectWBSAnalysis.aspx + + + WBSAnalysis.aspx + ASPXCodeBehind + + + WBSAnalysis.aspx + WBSDW.aspx ASPXCodeBehind @@ -14185,7 +14201,7 @@ True 0 / - http://localhost:8797/ + http://localhost:6422/ False False diff --git a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs index 2fa70f00..3c779396 100644 --- a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs +++ b/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; diff --git a/SGGL/FineUIPro.Web/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml index 3ac7eb46..8eb9b3df 100644 --- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml +++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml @@ -13,11 +13,15 @@ + + - + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_PDigData.xml b/SGGL/FineUIPro.Web/common/Menu_PDigData.xml index e9c0d7fc..678f0f7f 100644 --- a/SGGL/FineUIPro.Web/common/Menu_PDigData.xml +++ b/SGGL/FineUIPro.Web/common/Menu_PDigData.xml @@ -3,6 +3,6 @@ - + \ No newline at end of file