From ba6774dbae82f095df2db41c3f284957f9ec9009 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Thu, 31 Aug 2023 16:37:09 +0800 Subject: [PATCH] 20230831 WBS --- DataBase/版本日志/SGGLDB_V2023-09-01.sql | 48 +++ .../{ => 已更新脚本}/SGGLDB_V2023-07-11.sql | 0 .../{ => 已更新脚本}/SGGLDB_V2023-07-12.sql | 0 .../{ => 已更新脚本}/SGGLDB_V2023-07-20.sql | 0 .../{ => 已更新脚本}/SGGLDB_V2023-07-21.sql | 0 .../{ => 已更新脚本}/SGGLDB_V2023-07-23.sql | 0 .../{ => 已更新脚本}/SGGLDB_V2023-07-25.sql | 0 .../{ => 已更新脚本}/SGGLDB_V2023-08-01.sql | 0 .../{ => 已更新脚本}/SGGLDB_V2023-08-04.sql | 0 .../SGGLDB_V2023-08-22(大数据中心菜单修改).sql | 0 .../{ => 已更新脚本}/SGGLDB_V2023-08-22.sql | 0 .../{ => 已更新脚本}/SGGLDB_V2023-08-23.sql | 0 .../{ => 已更新脚本}/SGGLDB_V2023-08-25.sql | 0 .../{ => 已更新脚本}/SGGLDB_V2023-08-26.sql | 0 SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs | 4 + SGGL/BLL/CQMS/WBS/WorkPackageService.cs | 57 ++++ .../HSSE/Solution/ExpertArgumentService.cs | 2 + SGGL/BLL/ProjectData/ProjectService.cs | 2 +- SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx | 44 ++- .../DigData/ProjectWBSDW.aspx.cs | 133 +++++--- .../DigData/ProjectWBSDW.aspx.designer.cs | 65 +++- .../FineUIPro.Web/DigData/ShowProjectWBS.aspx | 6 +- .../DigData/ShowProjectWBS.aspx.cs | 87 ++++- .../DigData/ShowProjectWBS.aspx.designer.cs | 4 +- .../DigData/ShowProjectWBSPackage.aspx | 130 +++++++ .../DigData/ShowProjectWBSPackage.aspx.cs | 319 ++++++++++++++++++ .../ShowProjectWBSPackage.aspx.designer.cs | 134 ++++++++ SGGL/FineUIPro.Web/DigData/WBSDW.aspx | 31 +- SGGL/FineUIPro.Web/DigData/WBSDW.aspx.cs | 111 +++--- .../DigData/WBSDW.aspx.designer.cs | 63 ++++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 8 + .../HSSE/Solution/ExpertArgumentList.aspx | 2 +- .../HSSE/Solution/ExpertArgumentListEdit.aspx | 6 +- .../Solution/ExpertArgumentListEditItem.aspx | 32 +- .../ExpertArgumentListEditItem.aspx.cs | 44 ++- ...xpertArgumentListEditItem.aspx.designer.cs | 75 ++-- .../HSSE/Solution/LargerHazardView.aspx | 2 +- SGGL/FineUIPro.Web/Login.aspx.cs | 2 +- SGGL/FineUIPro.Web/common/Menu_DigData.xml | 61 +--- SGGL/FineUIPro.Web/common/Menu_HTGL.xml | 1 + SGGL/FineUIPro.Web/common/Menu_JDGL.xml | 6 +- SGGL/FineUIPro.Web/common/Menu_ZHGL.xml | 42 +++ SGGL/FineUIPro.Web/indexProject.aspx.cs | 9 +- SGGL/Model/Model.cs | 54 ++- 44 files changed, 1349 insertions(+), 235 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2023-09-01.sql rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-07-11.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-07-12.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-07-20.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-07-21.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-07-23.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-07-25.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-08-01.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-08-04.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-08-22(大数据中心菜单修改).sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-08-22.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-08-23.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-08-25.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-08-26.sql (100%) create mode 100644 SGGL/FineUIPro.Web/DigData/ShowProjectWBSPackage.aspx create mode 100644 SGGL/FineUIPro.Web/DigData/ShowProjectWBSPackage.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DigData/ShowProjectWBSPackage.aspx.designer.cs diff --git a/DataBase/版本日志/SGGLDB_V2023-09-01.sql b/DataBase/版本日志/SGGLDB_V2023-09-01.sql new file mode 100644 index 00000000..19dd2bc0 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-09-01.sql @@ -0,0 +1,48 @@ + +ALTER VIEW [dbo].[View_Solution_LargerHazardListItem] + AS +/*Σ󹤳嵥ϸбͼ*/ +SELECT Project.ProjectCode + ,ISNULL(Project.ShortName,Project.ProjectName) AS ProjectName + ,Project.ProjectId + ,list.HazardCode + ,list.RecordTime + ,list.RecardManId + ,list.Remark + ,list.States + ,list.VersionNo + ,Item.LargerHazardListItemId + ,Item.SortIndex + ,Item.LargerHazardListId + ,Item.UnitWorkId + ,(UnitWork.UnitWorkName+'('+(CASE WHEN UnitWork.ProjectType='1' THEN '' ELSE 'װ' END)+')') AS UnitWorkName + ,Item.WorkPackageId + ,WorkPackageName AS PackageContent + ,Item.WorkPackageSize + ,Item.ExpectedStartTime + ,Item.ExpectedEndTime + ,Item.IsArgument + ,(CASE WHEN Item.IsArgument=1 THEN '' ELSE '' END) AS IsArgumentName + ,Item.WorkStates + ,constw.ConstText AS WorkStatesName + ,Item.UnitId + ,Unit.UnitName + ,((CASE WHEN Item.ExpectedStartTime IS NULL THEN '' ELSE CONVERT(varchar(100), Item.ExpectedStartTime,23) END) + + ''+ (CASE WHEN Item.ExpectedEndTime IS NULL THEN '' ELSE CONVERT(varchar(100), Item.ExpectedEndTime,23) END)) AS ExpectedTime +FROM dbo.Solution_LargerHazardListItem AS Item +LEFT JOIN Solution_LargerHazardList AS list ON Item.LargerHazardListId=list.LargerHazardListId +LEFT JOIN Base_Project AS Project ON Project.ProjectId=list.ProjectId +LEFT JOIN WBS_UnitWork AS UnitWork ON Item.UnitWorkId=UnitWork.UnitWorkId +--LEFT JOIN WBS_WorkPackage AS Package ON Item.WorkPackageId=Package.WorkPackageId +LEFT JOIN Base_Unit AS Unit ON Item.UnitId=Unit.UnitId +LEFT JOIN Sys_Const AS constw ON Item.WorkStates=constw.ConstValue AND constw.GroupId='WorkStates' +GO + +ALTER TABLE Solution_LargerHazardListItem ALTER COLUMN WorkPackageId NVARCHAR(2000) NULL +GO +ALTER TABLE Solution_LargerHazardListItem ADD WorkPackageName NVARCHAR(2000) NULL +GO + +ALTER TABLE Check_SpotCheckDetail ADD WorkPackageId NVARCHAR(2000) NULL +GO + diff --git a/DataBase/版本日志/SGGLDB_V2023-07-11.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-11.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-07-11.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-11.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-07-12.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-12.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-07-12.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-12.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-07-20.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-20.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-07-20.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-20.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-07-21.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-21.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-07-21.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-21.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-07-23.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-23.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-07-23.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-23.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-07-25.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-25.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-07-25.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-25.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-08-01.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-01.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-08-01.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-01.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-08-04.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-04.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-08-04.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-04.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-08-22(大数据中心菜单修改).sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-22(大数据中心菜单修改).sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-08-22(大数据中心菜单修改).sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-22(大数据中心菜单修改).sql diff --git a/DataBase/版本日志/SGGLDB_V2023-08-22.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-22.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-08-22.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-22.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-08-23.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-23.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-08-23.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-23.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-08-25.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-25.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-08-25.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-25.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-08-26.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-26.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-08-26.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-08-26.sql diff --git a/SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs b/SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs index 4a0a6132..db46a066 100644 --- a/SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs +++ b/SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs @@ -41,6 +41,7 @@ namespace BLL newSpotCheckDetail.SpotCheckDetailId = SpotCheckDetail.SpotCheckDetailId; newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode; newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId; + newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(SpotCheckDetail.ControlItemAndCycleId); newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK; newSpotCheckDetail.IsOK = SpotCheckDetail.IsOK; newSpotCheckDetail.ConfirmDate = SpotCheckDetail.ConfirmDate; @@ -58,6 +59,7 @@ namespace BLL newSpotCheckDetail.SpotCheckDetailId = SpotCheckDetail.SpotCheckDetailId; newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode; newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId; + newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(SpotCheckDetail.ControlItemAndCycleId); newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK; newSpotCheckDetail.IsOK = SpotCheckDetail.IsOK; newSpotCheckDetail.ConfirmDate = SpotCheckDetail.ConfirmDate; @@ -80,6 +82,7 @@ namespace BLL { newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode; newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId; + newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(SpotCheckDetail.ControlItemAndCycleId); newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK; newSpotCheckDetail.IsOK = SpotCheckDetail.IsOK; newSpotCheckDetail.ConfirmDate = SpotCheckDetail.ConfirmDate; @@ -334,6 +337,7 @@ namespace BLL newSpotCheckDetail.SpotCheckCode = SpotCheckDetail.SpotCheckCode; if (!string.IsNullOrEmpty(SpotCheckDetail.ControlItemAndCycleId)) newSpotCheckDetail.ControlItemAndCycleId = SpotCheckDetail.ControlItemAndCycleId; + newSpotCheckDetail.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(SpotCheckDetail.ControlItemAndCycleId); if (SpotCheckDetail.IsOnesOK.HasValue) newSpotCheckDetail.IsOnesOK = SpotCheckDetail.IsOnesOK; if (SpotCheckDetail.IsOK.HasValue) diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs index 426d539e..c16b95d3 100644 --- a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs +++ b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs @@ -626,5 +626,62 @@ namespace BLL } } } + + #region 根据工作包ID获取wbs节点及父节点字符串 + /// + /// 根据工作包ID获取wbs节点及父节点字符串 + /// + /// + /// + public static string getWorkPageIdsByControlItemAndCycle(string controlItemAndCycleId) + { + string returnValues = string.Empty; + var getControlItemAndCycle = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ControlItemAndCycleId == controlItemAndCycleId); + if (getControlItemAndCycle != null) + { + var getWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == getControlItemAndCycle.WorkPackageId); + if (getWorkPackage != null) + { + returnValues = getSelectIds(getWorkPackage.WorkPackageId, getWorkPackage.WorkPackageId + "[" + getWorkPackage.InitWorkPackageCode + "]$" + controlItemAndCycleId); + } + } + + return returnValues; + } + + /// + /// id + /// + /// + /// + /// + public static string getSelectIds(string workPageId, string returnValues) + { + var getWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == workPageId); + if (getWorkPackage != null) + { + if (!string.IsNullOrEmpty(getWorkPackage.SuperWorkPackageId)) + { + var getSupWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == getWorkPackage.SuperWorkPackageId); + if (getSupWorkPackage != null) + { + returnValues = getWorkPackage.SuperWorkPackageId + "[" + getWorkPackage.InitWorkPackageCode + "]" + "|" + returnValues; + returnValues = getSelectIds(getWorkPackage.SuperWorkPackageId, returnValues); + } + + } + else + { + var getUnitWork = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == getWorkPackage.UnitWorkId); + if (getUnitWork != null) + { + returnValues = ("Type" + getUnitWork.ProjectType ?? "1") + "|" + getUnitWork.UnitWorkId + "|" + returnValues; + } + } + } + + return returnValues; + } + #endregion } } diff --git a/SGGL/BLL/HSSE/Solution/ExpertArgumentService.cs b/SGGL/BLL/HSSE/Solution/ExpertArgumentService.cs index c452ea2f..e4aec9b1 100644 --- a/SGGL/BLL/HSSE/Solution/ExpertArgumentService.cs +++ b/SGGL/BLL/HSSE/Solution/ExpertArgumentService.cs @@ -191,6 +191,7 @@ namespace BLL LargerHazardListId = LargerHazardListItem.LargerHazardListId, UnitWorkId = LargerHazardListItem.UnitWorkId, WorkPackageId = LargerHazardListItem.WorkPackageId, + WorkPackageName = LargerHazardListItem.WorkPackageName, WorkPackageSize = LargerHazardListItem.WorkPackageSize, ExpectedStartTime = LargerHazardListItem.ExpectedStartTime, ExpectedEndTime = LargerHazardListItem.ExpectedEndTime, @@ -215,6 +216,7 @@ namespace BLL newLargerHazardListItem.SortIndex = LargerHazardListItem.SortIndex; newLargerHazardListItem.UnitWorkId = LargerHazardListItem.UnitWorkId; newLargerHazardListItem.WorkPackageId = LargerHazardListItem.WorkPackageId; + newLargerHazardListItem.WorkPackageName = LargerHazardListItem.WorkPackageName; newLargerHazardListItem.WorkPackageSize = LargerHazardListItem.WorkPackageSize; newLargerHazardListItem.ExpectedStartTime = LargerHazardListItem.ExpectedStartTime; newLargerHazardListItem.ExpectedEndTime = LargerHazardListItem.ExpectedEndTime; diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs index a74ab175..4b58db4f 100644 --- a/SGGL/BLL/ProjectData/ProjectService.cs +++ b/SGGL/BLL/ProjectData/ProjectService.cs @@ -338,7 +338,7 @@ } var pcount = (from x in db.Sys_Log - where x.ProjectId != null && x.OperationTime > DateTime.Now.AddDays(-2) + where x.ProjectId != null && x.OperationTime > DateTime.Now.AddDays(-1) group x by x.ProjectId into g select new { g.First().ProjectId, count = g.Count() }).Distinct(); diff --git a/SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx b/SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx index bdddf9f7..5c528978 100644 --- a/SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx +++ b/SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx @@ -37,7 +37,8 @@ - + + @@ -45,19 +46,46 @@ - - + + - + diff --git a/SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx.cs b/SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx.cs index 8175292e..ea75f6e4 100644 --- a/SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx.cs +++ b/SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx.cs @@ -1,27 +1,15 @@ using BLL; +using FineUIPro.Web.CQMS.WBS; +using Model; using System; using System.Data; using System.Linq; +using System.Web.UI.WebControls; namespace FineUIPro.Web.DigData { public partial class ProjectWBSDW : PageBase { - /// - /// 主键 - /// - public string WorkPackageId - { - get - { - return (string)ViewState["WorkPackageId"]; - } - set - { - ViewState["WorkPackageId"] = value; - } - } - /// /// 项目ID /// @@ -50,23 +38,21 @@ namespace FineUIPro.Web.DigData ////权限按钮方法 // this.ucTree.WorkPackageCode = this.WorkPackageCode; this.ucTree.ProjectId = this.ProjectId; - - this.btnNew.OnClientClick = Window1.GetShowReference("ShowProjectWBS.aspx") + "return false;"; + this.btnNew.OnClientClick = Window1.GetShowReference("ShowProjectWBSPackage.aspx") + "return false;"; } } protected void changeTree(object sender, EventArgs e) { - this.WorkPackageId = this.ucTree.WorkPackageId; + this.hdWorkPackageId.Text = this.ucTree.WorkPackageId; initControlItem(); } - protected void changeTree2(object sender, EventArgs e) - { - string a = this.ucTree.WorkPackageId; - - } - + /// + /// + /// + /// + /// protected void ckType_SelectedIndexChanged(object sender, EventArgs e) { this.gpHSSE.Hidden = true; @@ -74,29 +60,7 @@ namespace FineUIPro.Web.DigData this.gpJDGL.Hidden = true; this.gpHTGL.Hidden = true; this.gpLW.Hidden = true; - foreach (var item in this.ckType.SelectedValueArray) - { - if (item == "HSSE") - { - this.gpHSSE.Hidden = false; - } - if (item == "CQMS") - { - this.gpCQMS.Hidden = false; - } - if (item == "JDGL") - { - this.gpJDGL.Hidden = false; - } - if (item == "HTGL") - { - this.gpHTGL.Hidden = false; - } - if (item == "LW") - { - this.gpLW.Hidden = false; - } - } + SetData(); } /// @@ -104,11 +68,80 @@ namespace FineUIPro.Web.DigData /// protected void initControlItem() { - var getControlItem = from x in Funs.DB.WBS_ControlItemAndCycle where x.WorkPackageId == this.WorkPackageId select x; - cblControlItem.DataValueField = "ControlItemCode"; + var getControlItem = from x in Funs.DB.WBS_ControlItemAndCycle + where x.WorkPackageId == this.hdWorkPackageId.Text + select x; + cblControlItem.DataValueField = "ControlItemAndCycleId"; cblControlItem.DataTextField = "ControlItemContent"; cblControlItem.DataSource = getControlItem; - cblControlItem.DataBind(); + cblControlItem.DataBind(); + SetData(); + } + + /// + /// + /// + /// + /// + protected void cblControlItem_SelectedIndexChanged(object sender, EventArgs e) + { + SetData(); + } + + /// + /// 数据展示 + /// + private void SetData() + { + string workPackageId = this.hdWorkPackageId.Text; + string controlItemAndCycleId = this.cblControlItem.SelectedValue; + if (workPackageId == "1" || workPackageId == "2") + { + workPackageId = "Type" + workPackageId; + } + if (!string.IsNullOrEmpty(workPackageId)) + { + foreach (var item in this.ckType.SelectedValueArray) + { + if (item == "HSSE") + { + this.gpHSSE.Hidden = false; + this.lbExpertArgument.Text = (from x in Funs.DB.Solution_LargerHazardListItem + join y in Funs.DB.Solution_LargerHazardList on x.LargerHazardListId equals y.LargerHazardListId + where y.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId) && y.States == Const.State_1 + && (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId)) + select x).Count().ToString(); + } + if (item == "CQMS") + { + this.gpCQMS.Hidden = false; + var getDetail = from x in Funs.DB.Check_SpotCheckDetail + join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode + where y.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId) //&& y.States == Const.State_1 + && (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId)) + select x; + int all = getDetail.Count(); + this.lbSpotCheck1.Text = all.ToString(); + + int okCount = getDetail.Where(x => x.IsOK == true).Count(); + this.lbSpotCheck2.Text= okCount.ToString(); + + this.lbSpotCheck.Text= all > 0 ? Math.Round(okCount * 1.0 / (all * 1.0)).ToString() : "0"; + } + if (item == "JDGL") + { + this.gpJDGL.Hidden = false; + } + if (item == "HTGL") + { + this.gpHTGL.Hidden = false; + } + if (item == "LW") + { + this.gpLW.Hidden = false; + } + } + } } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx.designer.cs b/SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx.designer.cs index 91ad0775..0bb5960b 100644 --- a/SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx.designer.cs @@ -95,6 +95,15 @@ namespace FineUIPro.Web.DigData /// protected global::FineUIPro.CheckBoxList ckType; + /// + /// hdWorkPackageId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox hdWorkPackageId; + /// /// btnNew 控件。 /// @@ -120,7 +129,7 @@ namespace FineUIPro.Web.DigData /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.CheckBoxList cblControlItem; + protected global::FineUIPro.RadioButtonList cblControlItem; /// /// gpHSSE 控件。 @@ -131,6 +140,24 @@ namespace FineUIPro.Web.DigData /// protected global::FineUIPro.GroupPanel gpHSSE; + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// lbExpertArgument 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbExpertArgument; + /// /// gpCQMS 控件。 /// @@ -140,6 +167,42 @@ namespace FineUIPro.Web.DigData /// protected global::FineUIPro.GroupPanel gpCQMS; + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// lbSpotCheck1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbSpotCheck1; + + /// + /// lbSpotCheck2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbSpotCheck2; + + /// + /// lbSpotCheck 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbSpotCheck; + /// /// gpJDGL 控件。 /// diff --git a/SGGL/FineUIPro.Web/DigData/ShowProjectWBS.aspx b/SGGL/FineUIPro.Web/DigData/ShowProjectWBS.aspx index b864a19e..6177e58d 100644 --- a/SGGL/FineUIPro.Web/DigData/ShowProjectWBS.aspx +++ b/SGGL/FineUIPro.Web/DigData/ShowProjectWBS.aspx @@ -14,8 +14,8 @@ - + @@ -29,7 +29,7 @@ - diff --git a/SGGL/FineUIPro.Web/DigData/ShowProjectWBS.aspx.cs b/SGGL/FineUIPro.Web/DigData/ShowProjectWBS.aspx.cs index 5505c902..3a9d573a 100644 --- a/SGGL/FineUIPro.Web/DigData/ShowProjectWBS.aspx.cs +++ b/SGGL/FineUIPro.Web/DigData/ShowProjectWBS.aspx.cs @@ -2,6 +2,7 @@ using System; using System.Data; using System.Linq; +using System.Text; namespace FineUIPro.Web.DigData { @@ -30,17 +31,25 @@ namespace FineUIPro.Web.DigData protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) - { ////加载树 + { + string level = Request.Params["level"]; + if (!string.IsNullOrEmpty(level)) + { + this.ckLevel.SelectedValue = level; + this.ckLevel.Readonly = true; + } + + ////加载树 SetSubUnitProjectTree(this.trWBS); + } } - #region 绑定分公司 单位-项目树 + #region 绑定WBS /// - /// 绑定分公司 单位-项目树 + /// 绑定WBS /// - /// - /// + /// public void SetSubUnitProjectTree(FineUIPro.Tree trWBS) { this.trWBS.Nodes.Clear(); @@ -81,8 +90,7 @@ namespace FineUIPro.Web.DigData /// /// protected void trWBS_NodeExpand(object sender, TreeNodeEventArgs e) - { - + { e.Node.Nodes.Clear(); if (e.Node.CommandName == "ProjectType") //展开工程类型 { @@ -98,9 +106,11 @@ namespace FineUIPro.Web.DigData newNode.Text = trUnitWorkItem.UnitWorkCode + "-" + trUnitWorkItem.UnitWorkName; newNode.NodeID = trUnitWorkItem.UnitWorkId; newNode.CommandName = "UnitWork"; + newNode.EnableExpandEvent = true; newNode.EnableClickEvent = true; e.Node.Nodes.Add(newNode); + if (BLL.WorkPackageService.GetWorkPackages1ByUnitWorkId(trUnitWorkItem.UnitWorkId.ToString()) != null) { TreeNode temp = new TreeNode(); @@ -119,6 +129,7 @@ namespace FineUIPro.Web.DigData TreeNode newNode = new TreeNode(); newNode.Text = workPackage.PackageContent; newNode.NodeID = workPackage.WorkPackageId; + newNode.ToolTip = "[" + workPackage.InitWorkPackageCode + "]"; newNode.CommandName = "WorkPackage"; newNode.EnableExpandEvent = true; newNode.EnableClickEvent = true; @@ -144,6 +155,7 @@ namespace FineUIPro.Web.DigData newNode.Text = workPackage.PackageContent; newNode.NodeID = workPackage.WorkPackageId; newNode.CommandName = "WorkPackage"; + newNode.ToolTip="["+ workPackage.InitWorkPackageCode+"]"; newNode.EnableExpandEvent = true; newNode.EnableClickEvent = true; e.Node.Nodes.Add(newNode); @@ -161,7 +173,7 @@ namespace FineUIPro.Web.DigData } #endregion - protected void ckState_SelectedIndexChanged(object sender, EventArgs e) + protected void ckLevel_SelectedIndexChanged(object sender, EventArgs e) { ////加载树 SetSubUnitProjectTree(this.trWBS); @@ -169,7 +181,66 @@ namespace FineUIPro.Web.DigData protected void btnSure_Click(object sender, EventArgs e) { + if (this.trWBS.SelectedNode != null) + { + ///Type1|0a1e39d1-693d-4b5f-a2f5-870dda8b9ff2|c0f20302-88e6-4415-9a86-06be5730c420[67]|c76e251e-d690-4d0e-959b-3b618701f6ff[6701]&建筑工程|083-全场管廊|框架/管廊|地基与基础 + ///返回 树 父节点ID+[初始WBS主键]+"|" +节点ID+[初始WBS主键]+"&"+树父节点名称+"|"+ 节点名称 + string selectValues = getSelectIds(this.trWBS.SelectedNode, this.trWBS.SelectedNodeID+this.trWBS.SelectedNode.ToolTip) + "&" + getSelectNames(this.trWBS.SelectedNode, this.trWBS.SelectedNode.Text); + if (!string.IsNullOrEmpty(selectValues)) + { + PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(selectValues) + ActiveWindow.GetHidePostBackReference()); + } + } + else + { + Alert.ShowInParent("请选择节点！", MessageBoxIcon.Warning); + } + } + /// + /// id + /// + /// + /// + /// + private string getSelectIds(TreeNode node,string id) + { + if (node.ParentNode != null) + { + if (node.ParentNode.NodeID == "1" || node.ParentNode.NodeID == "2") + { + id = "Type" + node.ParentNode.NodeID + "|" + id; + } + else + { + id = getSelectIds(node.ParentNode, node.ParentNode.NodeID + node.ParentNode.ToolTip + "|" + id); + } + } + + return id; + } + + /// + /// 名称 + /// + /// + /// + /// + private string getSelectNames(TreeNode node, string name) + { + if (node.ParentNode != null) + { + if (node.ParentNode.NodeID == "1" || node.ParentNode.NodeID == "2") + { + name = node.ParentNode.Text + "|" + name; + } + else + { + name = getSelectNames(node.ParentNode, node.ParentNode.Text + "|" + name); + } + } + + return name; } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DigData/ShowProjectWBS.aspx.designer.cs b/SGGL/FineUIPro.Web/DigData/ShowProjectWBS.aspx.designer.cs index c5e1e3ab..f30e7a9e 100644 --- a/SGGL/FineUIPro.Web/DigData/ShowProjectWBS.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/DigData/ShowProjectWBS.aspx.designer.cs @@ -51,13 +51,13 @@ namespace FineUIPro.Web.DigData protected global::FineUIPro.Toolbar Toolbar1; /// - /// ckState 控件。 + /// ckLevel 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.RadioButtonList ckState; + protected global::FineUIPro.RadioButtonList ckLevel; /// /// btnSure 控件。 diff --git a/SGGL/FineUIPro.Web/DigData/ShowProjectWBSPackage.aspx b/SGGL/FineUIPro.Web/DigData/ShowProjectWBSPackage.aspx new file mode 100644 index 00000000..f61046a3 --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/ShowProjectWBSPackage.aspx @@ -0,0 +1,130 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ShowProjectWBSPackage.aspx.cs" Inherits="FineUIPro.Web.DigData.ShowProjectWBSPackage" %> + + + + + + + 项目施工WBS + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/DigData/ShowProjectWBSPackage.aspx.cs b/SGGL/FineUIPro.Web/DigData/ShowProjectWBSPackage.aspx.cs new file mode 100644 index 00000000..6c1475ff --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/ShowProjectWBSPackage.aspx.cs @@ -0,0 +1,319 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using AspNet = System.Web.UI.WebControls; + +namespace FineUIPro.Web.DigData +{ + public partial class ShowProjectWBSPackage : PageBase + { + + /// + /// + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + + #region 页面加载 + /// + /// 页面加载 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ProjectId = this.CurrUser.LoginProjectId; + InitTreeMenu(); + } + } + #endregion + + #region 加载树 + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.trWBS.Nodes.Clear(); + this.trWBS.ShowBorder = false; + this.trWBS.ShowHeader = false; + this.trWBS.EnableIcons = true; + this.trWBS.AutoScroll = true; + this.trWBS.EnableSingleClickExpand = true; + + TreeNode rootNode1 = new TreeNode(); + rootNode1.Text = "建筑工程"; + rootNode1.NodeID = "1"; + rootNode1.CommandName = "ProjectType"; + rootNode1.EnableExpandEvent = true; + rootNode1.EnableClickEvent = true; + this.trWBS.Nodes.Add(rootNode1); + TreeNode emptyNode = new TreeNode(); + emptyNode.Text = ""; + emptyNode.NodeID = ""; + rootNode1.Nodes.Add(emptyNode); + + TreeNode rootNode2 = new TreeNode(); + rootNode2.Text = "安装工程"; + rootNode2.NodeID = "2"; + rootNode2.CommandName = "ProjectType"; + rootNode2.EnableExpandEvent = true; + rootNode2.EnableClickEvent = true; + this.trWBS.Nodes.Add(rootNode2); + rootNode2.Nodes.Add(emptyNode); + } + #endregion + + #region 展开树 + /// + /// 展开树 + /// + /// + /// + protected void trWBS_NodeExpand(object sender, TreeNodeEventArgs e) + { + e.Node.Nodes.Clear(); + if (e.Node.CommandName == "ProjectType") //展开工程类型 + { + var trUnitWork = from x in Funs.DB.WBS_UnitWork + where x.ProjectId == this.ProjectId && x.SuperUnitWork == null && x.ProjectType == e.Node.NodeID + select x; + trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode); + if (trUnitWork.Count() > 0) + { + foreach (var trUnitWorkItem in trUnitWork) + { + TreeNode newNode = new TreeNode(); + string uweights = string.Empty; + if (trUnitWorkItem.Weights != null) + { + uweights = "(" + Convert.ToDouble(trUnitWorkItem.Weights).ToString() + "%)"; + } + newNode.Text = trUnitWorkItem.UnitWorkCode + "-" + trUnitWorkItem.UnitWorkName + uweights; + newNode.NodeID = trUnitWorkItem.UnitWorkId; + newNode.CommandName = "UnitWork"; + newNode.EnableExpandEvent = true; + newNode.EnableClickEvent = true; + e.Node.Nodes.Add(newNode); + if (BLL.WorkPackageService.GetWorkPackages1ByUnitWorkId(trUnitWorkItem.UnitWorkId.ToString()) != null) + { + TreeNode temp = new TreeNode(); + temp.Text = "temp"; + temp.NodeID = "temp"; + newNode.Nodes.Add(temp); + } + } + } + } + else if (e.Node.CommandName == "UnitWork") //展开单位工程节点 + { + var workPackages = from x in Funs.DB.WBS_WorkPackage where x.UnitWorkId == e.NodeID && x.SuperWorkPack == null && x.IsApprove == true orderby x.WorkPackageCode select x; + foreach (var workPackage in workPackages) + { + TreeNode newNode = new TreeNode(); + string weights = string.Empty; + if (workPackage.Weights != null) + { + weights = "(" + Convert.ToDouble(workPackage.Weights).ToString() + "%)"; + } + newNode.Text = workPackage.PackageContent + weights; + newNode.NodeID = workPackage.WorkPackageId; + newNode.ToolTip = "[" + workPackage.InitWorkPackageCode + "]"; + newNode.CommandName = "WorkPackage"; + newNode.EnableExpandEvent = true; + newNode.EnableClickEvent = true; + e.Node.Nodes.Add(newNode); + var childWorkPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == workPackage.WorkPackageId && x.IsApprove == true select x; + if (childWorkPackages.Count() > 0) + { + TreeNode emptyNode = new TreeNode(); + emptyNode.Text = ""; + emptyNode.NodeID = ""; + newNode.Nodes.Add(emptyNode); + } + } + } + else if (e.Node.CommandName == "WorkPackage") //展开工作包节点 + { + var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode select x; + if (workPackages.Count() > 0) //存在子单位工程 + { + foreach (var workPackage in workPackages) + { + TreeNode newNode = new TreeNode(); + string weights = string.Empty; + if (workPackage.Weights != null) + { + weights = "(" + Convert.ToDouble(workPackage.Weights).ToString() + "%)"; + } + newNode.Text = workPackage.PackageContent + weights; + newNode.NodeID = workPackage.WorkPackageId; + newNode.ToolTip = "[" + workPackage.InitWorkPackageCode + "]"; + newNode.CommandName = "WorkPackage"; + newNode.EnableExpandEvent = true; + newNode.EnableClickEvent = true; + e.Node.Nodes.Add(newNode); + var childWorkPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == workPackage.WorkPackageId && x.IsApprove == true select x; + if (childWorkPackages.Count() > 0) + { + TreeNode emptyNode = new TreeNode(); + emptyNode.Text = ""; + emptyNode.NodeID = ""; + newNode.Nodes.Add(emptyNode); + } + } + } + } + } + #endregion + + #region Tree点击事件 + /// + /// Tree点击事件 + /// + /// + /// + protected void trWBS_NodeCommand(object sender, TreeCommandEventArgs e) + { + BindGrid(); + } + #endregion + + #region 绑定数据 + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// Grid1排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + /// + /// 分页下拉选择事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 加载Grid + /// + private void BindGrid() + { + string strSql = @"SELECT ControlItemAndCycleId,ControlItemAndCycleCode,InitControlItemCode,PlanCompleteDate,ControlItemContent,ControlPoint,ControlItemDef,Weights,HGForms,SHForms,Standard,ClauseNo,CheckNum" + + @" FROM WBS_ControlItemAndCycle "; + List listStr = new List(); + strSql += " where WorkPackageId = @WorkPackageId and IsApprove=1 "; + listStr.Add(new SqlParameter("@WorkPackageId", this.trWBS.SelectedNodeID)); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 保存事件 + /// + /// 保存 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + ///Type1|fda5ce7d-1d97-469c-9f43-9f7b2ec35ba8|000441b4-a471-4d1e-b851-19c950a5b61a[68]|ae650220-309f-42d4-acdc-6de91c9ec758[6801]&建筑工程|082-全场道路|道路|路基工程定位测量放线$24f40e7c-0b86-44b1-a498-08174113c36a + ///返回 树 父节点ID+[初始WBS主键]+"|" +节点ID+[初始WBS主键]+"&"+树父节点名称+"|"+ 节点名称+"|"+ 工作包名称+"$"+工作包ID + + string selectValues = string.Empty; + if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID) && this.trWBS.SelectedNode != null) + { + var getC = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ControlItemAndCycleId == this.Grid1.SelectedRowID); + if (getC != null) + { + selectValues = getSelectIds(this.trWBS.SelectedNode, this.trWBS.SelectedNodeID + this.trWBS.SelectedNode.ToolTip) + "&" + getSelectNames(this.trWBS.SelectedNode, this.trWBS.SelectedNode.Text) + getC .ControlItemContent+ "$" + this.Grid1.SelectedRowID; + } + PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(selectValues) + ActiveWindow.GetHidePostBackReference()); + } + else + { + Alert.ShowInParent("请选择工作包！", MessageBoxIcon.Warning); + } + } + #endregion + + /// + /// id + /// + /// + /// + /// + private string getSelectIds(TreeNode node, string id) + { + if (node.ParentNode != null) + { + if (node.ParentNode.NodeID == "1" || node.ParentNode.NodeID == "2") + { + id = "Type" + node.ParentNode.NodeID + "|" + id; + } + else + { + id = getSelectIds(node.ParentNode, node.ParentNode.NodeID + node.ParentNode.ToolTip + "|" + id); + } + } + + return id; + } + + /// + /// 名称 + /// + /// + /// + /// + private string getSelectNames(TreeNode node, string name) + { + if (node.ParentNode != null) + { + if (node.ParentNode.NodeID == "1" || node.ParentNode.NodeID == "2") + { + name = node.ParentNode.Text + "|" + name; + } + else + { + name = getSelectNames(node.ParentNode, node.ParentNode.Text + "|" + name); + } + } + + return name; + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DigData/ShowProjectWBSPackage.aspx.designer.cs b/SGGL/FineUIPro.Web/DigData/ShowProjectWBSPackage.aspx.designer.cs new file mode 100644 index 00000000..800c1745 --- /dev/null +++ b/SGGL/FineUIPro.Web/DigData/ShowProjectWBSPackage.aspx.designer.cs @@ -0,0 +1,134 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DigData +{ + + + public partial class ShowProjectWBSPackage + { + + /// + /// 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; + + /// + /// trWBS 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree trWBS; + + /// + /// hdSelectId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdSelectId; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// 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/WBSDW.aspx b/SGGL/FineUIPro.Web/DigData/WBSDW.aspx index e2b03ced..080db933 100644 --- a/SGGL/FineUIPro.Web/DigData/WBSDW.aspx +++ b/SGGL/FineUIPro.Web/DigData/WBSDW.aspx @@ -37,6 +37,7 @@ + @@ -50,12 +51,38 @@
- public string WorkPackageCode - { - get - { - return (string)ViewState["WorkPackageCode"]; - } - set - { - ViewState["WorkPackageCode"] = value; - } - } - + { /// /// 加载页面 /// @@ -30,15 +15,13 @@ namespace FineUIPro.Web.DigData protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) - { - ////权限按钮方法 - this.ucTree.WorkPackageCode = this.WorkPackageCode; + { } } protected void changeTree(object sender, EventArgs e) { - this.WorkPackageCode = this.ucTree.WorkPackageCode; + this.hdWorkPackageCode.Text = this.ucTree.WorkPackageCode; //新增UnitId //this.UnitId = this.ucTree.UnitId; ////判断 当有WorkPackageCode的时候单位id为空 @@ -58,29 +41,7 @@ namespace FineUIPro.Web.DigData this.gpJDGL.Hidden = true; this.gpHTGL.Hidden = true; this.gpLW.Hidden = true; - foreach (var item in this.ckType.SelectedValueArray) - { - if (item == "HSSE") - { - this.gpHSSE.Hidden = false; - } - if (item == "CQMS") - { - this.gpCQMS.Hidden = false; - } - if (item == "JDGL") - { - this.gpJDGL.Hidden = false; - } - if (item == "HTGL") - { - this.gpHTGL.Hidden = false; - } - if (item == "LW") - { - this.gpLW.Hidden = false; - } - } + SetData(); } /// @@ -88,11 +49,71 @@ namespace FineUIPro.Web.DigData /// protected void initControlItem() { - var getControlItem = from x in Funs.DB.WBS_ControlItemInit where x.WorkPackageCode == this.WorkPackageCode select x; + var getControlItem = from x in Funs.DB.WBS_ControlItemInit + where x.WorkPackageCode == this.hdWorkPackageCode.Text + select x; cblControlItem.DataValueField = "ControlItemCode"; cblControlItem.DataTextField = "ControlItemContent"; cblControlItem.DataSource = getControlItem; - cblControlItem.DataBind(); + cblControlItem.DataBind(); + SetData(); + } + + /// + /// 数据展示 + /// + private void SetData() + { + string workPackageId = this.hdWorkPackageCode.Text; + if (workPackageId == "1" || workPackageId == "2") + { + workPackageId = "Type" + workPackageId; + } + else + { + workPackageId="["+ workPackageId + "]"; + } + if (!string.IsNullOrEmpty(workPackageId)) + { + foreach (var item in this.ckType.SelectedValueArray) + { + if (item == "HSSE") + { + this.gpHSSE.Hidden = false; + this.lbExpertArgument.Text = (from x in Funs.DB.Solution_LargerHazardListItem + join y in Funs.DB.Solution_LargerHazardList on x.LargerHazardListId equals y.LargerHazardListId + where x.WorkPackageId.Contains(workPackageId) && y.States == Const.State_1 + select x).Count().ToString(); + } + if (item == "CQMS") + { + this.gpCQMS.Hidden = false; + var getDetail = from x in Funs.DB.Check_SpotCheckDetail + join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode + where x.WorkPackageId.Contains(workPackageId) //&& y.States == Const.State_1 + select x; + int all = getDetail.Count(); + this.lbSpotCheck1.Text = all.ToString(); + + int okCount = getDetail.Where(x => x.IsOK == true).Count(); + this.lbSpotCheck2.Text = okCount.ToString(); + + this.lbSpotCheck.Text = all > 0 ? Math.Round(okCount * 1.0 / (all * 1.0)).ToString() : "0"; + } + if (item == "JDGL") + { + this.gpJDGL.Hidden = false; + } + if (item == "HTGL") + { + this.gpHTGL.Hidden = false; + } + if (item == "LW") + { + this.gpLW.Hidden = false; + } + } + } } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DigData/WBSDW.aspx.designer.cs b/SGGL/FineUIPro.Web/DigData/WBSDW.aspx.designer.cs index a2ba83c7..6699abbe 100644 --- a/SGGL/FineUIPro.Web/DigData/WBSDW.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/DigData/WBSDW.aspx.designer.cs @@ -95,6 +95,15 @@ namespace FineUIPro.Web.DigData /// protected global::FineUIPro.CheckBoxList ckType; + /// + /// hdWorkPackageCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox hdWorkPackageCode; + /// /// Panel_CurrentApproval 控件。 /// @@ -122,6 +131,24 @@ namespace FineUIPro.Web.DigData /// protected global::FineUIPro.GroupPanel gpHSSE; + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// lbExpertArgument 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbExpertArgument; + /// /// gpCQMS 控件。 /// @@ -131,6 +158,42 @@ namespace FineUIPro.Web.DigData /// protected global::FineUIPro.GroupPanel gpCQMS; + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// lbSpotCheck1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbSpotCheck1; + + /// + /// lbSpotCheck2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbSpotCheck2; + + /// + /// lbSpotCheck 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbSpotCheck; + /// /// gpJDGL 控件。 /// diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index d00d86fc..6452ceb5 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -525,6 +525,7 @@ + @@ -7613,6 +7614,13 @@ ProjectWBSDW.aspx + + ShowProjectWBSPackage.aspx + ASPXCodeBehind + + + ShowProjectWBSPackage.aspx + TrainRecordAnalysis.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx index 1a594638..68611f2a 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentList.aspx @@ -85,7 +85,7 @@ diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEdit.aspx index 39d630cc..ee5f0053 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEdit.aspx @@ -64,7 +64,7 @@ - @@ -96,8 +96,8 @@
- + @@ -21,22 +21,30 @@ - + - - - - + + + + + + + <%-- + --%> + + + + + Label="预计施工开始时间" Required="true" LabelAlign="Right" EnableEdit="false"> + Label="预计施工结束时间" Required="true" LabelAlign="Right" EnableEdit="false"> @@ -72,6 +80,10 @@ + diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.cs index d571d40a..25f76274 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.cs @@ -51,7 +51,7 @@ namespace FineUIPro.Web.HSSE.Solution //单位工程 BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); //分部分项 - BLL.SpecialSchemeTypeService.InitSpecialSchemeTypeDropDownList(this.drpWorkPackageId, true); + // BLL.SpecialSchemeTypeService.InitSpecialSchemeTypeDropDownList(this.drpWorkPackageId, true); //是否需要专家论证 BLL.ConstValue.InitConstValueRadioButtonList(this.rblIsArgument, ConstValue.Group_0001, "False"); //作业状态 @@ -70,11 +70,15 @@ namespace FineUIPro.Web.HSSE.Solution { this.drpUnitWorkId.SelectedValue = getItem.UnitWorkId; } - if (!string.IsNullOrEmpty(getItem.WorkPackageId)) - { - this.drpWorkPackageId.SelectedValue = getItem.WorkPackageId; - } + //if (!string.IsNullOrEmpty(getItem.WorkPackageId)) + //{ + // this.drpWorkPackageId.SelectedValue = getItem.WorkPackageId; + //} this.txtWorkPackageSize.Text = getItem.WorkPackageSize; + + this.hdWorkPackageId.Text = getItem.WorkPackageId; + this.txtWorkPackageId.Text = getItem.PackageContent; + this.txtExpectedStartTime.Text = string.Format("{0:yyyy-MM-dd}", getItem.ExpectedStartTime); this.txtExpectedEndTime.Text = string.Format("{0:yyyy-MM-dd}", getItem.ExpectedEndTime); if (getItem.IsArgument == true) @@ -87,9 +91,9 @@ namespace FineUIPro.Web.HSSE.Solution } if (!string.IsNullOrEmpty(getItem.WorkStates)) { - this.rblIsArgument.SelectedValue = getItem.WorkStates; + this.rbWorkStates.SelectedValue = getItem.WorkStates; } - this.drpUnitId.SelectedValue = getItem.UnitId; + this.drpUnitId.SelectedValue = getItem.UnitId; } else { @@ -121,11 +125,13 @@ namespace FineUIPro.Web.HSSE.Solution ExpectedEndTime = Funs.GetNewDateTime(this.txtExpectedEndTime.Text), IsArgument = Convert.ToBoolean(this.rblIsArgument.SelectedValue), WorkStates = this.rbWorkStates.SelectedValue ?? "1", + WorkPackageId = this.hdWorkPackageId.Text, + WorkPackageName = this.txtWorkPackageId.Text, }; - if (this.drpWorkPackageId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpWorkPackageId.SelectedValue)) - { - newItem.WorkPackageId = this.drpWorkPackageId.SelectedValue; - } + //if (this.drpWorkPackageId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpWorkPackageId.SelectedValue)) + //{ + // newItem.WorkPackageId = this.drpWorkPackageId.SelectedValue; + //} if (this.drpUnitWorkId.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue)) { newItem.UnitWorkId = this.drpUnitWorkId.SelectedValue; @@ -150,5 +156,21 @@ namespace FineUIPro.Web.HSSE.Solution } } #endregion + + protected void btSearch_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdWorkPackageId.ClientID) + + Window1.GetShowReference(String.Format("~/DigData/ShowProjectWBS.aspx?levle={0}", 3, "选择WBS - "))); + } + + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + var getReturnValues = Funs.GetStrListByStr(this.hdWorkPackageId.Text,'&'); + if (getReturnValues.Count() > 1) + { + this.hdWorkPackageId.Text = getReturnValues[0].ToString(); + this.txtWorkPackageId.Text = getReturnValues[1].ToString(); + } + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.designer.cs index 04edd5d4..0563fd70 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Solution/ExpertArgumentListEditItem.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.Solution { - - - public partial class ExpertArgumentListEditItem { - +namespace FineUIPro.Web.HSSE.Solution +{ + + + public partial class ExpertArgumentListEditItem + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtSortIndex 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtSortIndex; - + /// /// drpUnitWorkId 控件。 /// @@ -56,16 +58,34 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWorkId; - + /// - /// drpWorkPackageId 控件。 + /// txtWorkPackageId 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpWorkPackageId; - + protected global::FineUIPro.Label txtWorkPackageId; + + /// + /// hdWorkPackageId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox hdWorkPackageId; + + /// + /// btSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btSearch; + /// /// txtWorkPackageSize 控件。 /// @@ -74,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkPackageSize; - + /// /// txtExpectedStartTime 控件。 /// @@ -83,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtExpectedStartTime; - + /// /// txtExpectedEndTime 控件。 /// @@ -92,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtExpectedEndTime; - + /// /// rbWorkStates 控件。 /// @@ -101,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rbWorkStates; - + /// /// rblIsArgument 控件。 /// @@ -110,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsArgument; - + /// /// drpUnitId 控件。 /// @@ -119,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitId; - + /// /// Toolbar1 控件。 /// @@ -128,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// lbTemp 控件。 /// @@ -137,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbTemp; - + /// /// ToolbarFill1 控件。 /// @@ -146,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSave 控件。 /// @@ -155,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnClose 控件。 /// @@ -164,5 +184,14 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; } } diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx index 6e0f931b..c5fb72e1 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx @@ -25,7 +25,7 @@ - + diff --git a/SGGL/FineUIPro.Web/Login.aspx.cs b/SGGL/FineUIPro.Web/Login.aspx.cs index 2ffd9111..f0493961 100644 --- a/SGGL/FineUIPro.Web/Login.aspx.cs +++ b/SGGL/FineUIPro.Web/Login.aspx.cs @@ -110,7 +110,7 @@ string url = ""; string PHTUrl = new Login().PHTUrl; string ProjectId = new Login().ProjectId; - if (LoginService.UserLogOn(user, pwd, true, this.Page)) + if (LoginService.UserLogOn(user.Trim(), pwd.Trim(), true, this.Page)) { //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../SysManage/UpdatePasswordEdit.aspx?userId={0}", this.CurrUser.PersonId, "编辑 - "))); if (!this.CurrUser.LastIsOffice.HasValue) diff --git a/SGGL/FineUIPro.Web/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml index 025b6757..bf060031 100644 --- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml +++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml @@ -1,66 +1,19 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml index 98260439..9b647aea 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml @@ -14,6 +14,7 @@ + diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml index fd6a0762..8d4aa005 100644 --- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml @@ -1,11 +1,7 @@  - + - - - - \ 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..342d91b8 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -48,6 +48,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs index f2ee8cab..f8a5b1d6 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx.cs +++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs @@ -296,7 +296,6 @@ namespace FineUIPro.Web if (!string.IsNullOrEmpty(Request.Params["PHTUrl"])) { this.drpProject.SelectedValue = Request.Params["projectId"]; - mainTabStrip.ShowTabHeader = true; PageContext.RegisterStartupScript("parent.removeActiveTab();"); //btnPHTGL_Click(null, null); @@ -349,10 +348,14 @@ namespace FineUIPro.Web this.drpProject.SelectedValue = getproject.ProjectId; } } - if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId) && this.drpProject.Items.Select(x => x.Value == this.CurrUser.LoginProjectId) != null) { this.drpProject.SelectedValue = this.CurrUser.LoginProjectId; } + else + { + this.CurrUser.LoginProjectId = this.drpProject.SelectedValue; + } this.InitMenuStyleButton(); @@ -578,7 +581,7 @@ namespace FineUIPro.Web /// protected void MenuSwitchMethod(string type) { - this.CurrUser.LoginProjectId = this.drpProject.SelectedValue; + // this.CurrUser.LoginProjectId = this.drpProject.SelectedValue; this.XmlDataSource1.DataFile = "common/Menu_Personal.xml"; this.leftPanel.Hidden = true; this.Tab1.IFrameUrl = "~/common/mainProject.aspx"; diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index f8da4e25..e3287e9e 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -56325,6 +56325,8 @@ namespace Model private System.Nullable _IsShow; + private string _WorkPackageId; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -56355,6 +56357,8 @@ namespace Model partial void OnHandleManChanged(); partial void OnIsShowChanging(System.Nullable value); partial void OnIsShowChanged(); + partial void OnWorkPackageIdChanging(string value); + partial void OnWorkPackageIdChanged(); #endregion public Check_SpotCheckDetail() @@ -56622,6 +56626,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] + public string WorkPackageId + { + get + { + return this._WorkPackageId; + } + set + { + if ((this._WorkPackageId != value)) + { + this.OnWorkPackageIdChanging(value); + this.SendPropertyChanging(); + this._WorkPackageId = value; + this.SendPropertyChanged("WorkPackageId"); + this.OnWorkPackageIdChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -230087,6 +230111,8 @@ namespace Model private string _WorkStates; + private string _WorkPackageName; + private EntityRef _Base_Unit; private EntityRef _Solution_LargerHazardList; @@ -230119,6 +230145,8 @@ namespace Model partial void OnUnitIdChanged(); partial void OnWorkStatesChanging(string value); partial void OnWorkStatesChanged(); + partial void OnWorkPackageNameChanging(string value); + partial void OnWorkPackageNameChanged(); #endregion public Solution_LargerHazardListItem() @@ -230217,7 +230245,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] public string WorkPackageId { get @@ -230361,6 +230389,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")] + public string WorkPackageName + { + get + { + return this._WorkPackageName; + } + set + { + if ((this._WorkPackageName != value)) + { + this.OnWorkPackageNameChanging(value); + this.SendPropertyChanging(); + this._WorkPackageName = value; + this.SendPropertyChanged("WorkPackageName"); + this.OnWorkPackageNameChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_LargerHazardListItem_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)] public Base_Unit Base_Unit { @@ -287668,7 +287716,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] public string WorkPackageId { get @@ -287684,7 +287732,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(2000)")] public string PackageContent { get