diff --git a/DataBase/版本日志/SGGLDB_V2023-09-15.sql b/DataBase/版本日志/SGGLDB_V2023-09-15.sql new file mode 100644 index 00000000..11bc14c7 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-09-15.sql @@ -0,0 +1,3 @@ +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('70282169-C09D-4D46-BAA3-9457535EAEA2','ǰֳԱͳ','HSSE/SitePerson/SitePersonNowStatistic.aspx',62,'EE260447-028F-46AF-8864-9A5DC9DAA5BD','Menu_HSSE',0,1,1) +GO \ No newline at end of file diff --git a/DataBase/菜单初始化脚本/1-3安全管理（Menu_HSSE）.sql b/DataBase/菜单初始化脚本/1-3安全管理（Menu_HSSE）.sql index 6a91ac74..88d645b9 100644 --- a/DataBase/菜单初始化脚本/1-3安全管理（Menu_HSSE）.sql +++ b/DataBase/菜单初始化脚本/1-3安全管理（Menu_HSSE）.sql @@ -340,7 +340,10 @@ GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('7D36E853-CC79-48B9-9E7F-E34797B4E87E','ֳԱͳ','HSSE/SitePerson/PersonStatistic.aspx',60,'EE260447-028F-46AF-8864-9A5DC9DAA5BD','Menu_HSSE',0,1,1) GO - + + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('70282169-C09D-4D46-BAA3-9457535EAEA2','ǰֳԱͳ','HSSE/SitePerson/SitePersonNowStatistic.aspx',62,'EE260447-028F-46AF-8864-9A5DC9DAA5BD','Menu_HSSE',0,1,1) + GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('F291CAE4-2E53-48FC-BF44-382D42EA4DEC','ֳλ˹ʱͳ','HSSE/SitePerson/WorkPostStatistic.aspx',65,'EE260447-028F-46AF-8864-9A5DC9DAA5BD','Menu_HSSE',0,1,1) GO diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index b1cfa731..4c988148 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -341,6 +341,7 @@ + diff --git a/SGGL/BLL/DigData/ProjectWBSAnalysisService.cs b/SGGL/BLL/DigData/ProjectWBSAnalysisService.cs new file mode 100644 index 00000000..907dcbf9 --- /dev/null +++ b/SGGL/BLL/DigData/ProjectWBSAnalysisService.cs @@ -0,0 +1,123 @@ +using FineUIPro; +using NPOI.SS.Formula.Functions; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Web.Util; + +namespace BLL +{ + /// + /// WBS分析 + /// + public static class ProjectWBSAnalysisService + { + public static Model.SGGLDB db = Funs.DB; + + #region WBS分析 + /// + /// 记录数 + /// + public static int count + { + get; + set; + } + + /// + /// 定义变量 + /// + private static IQueryable getDataLists = from x in db.WBS_WorkPackage + where x.IsApprove == true + select x; + + /// + /// 合同管理数据仓库 + /// + /// + /// + /// + /// + /// + public static IEnumerable getDataDWList(string projectId, string workPackageId, Grid Grid1) + { + var getDataList = getDataLists.Where(x => x.ProjectId == projectId); + if (string.IsNullOrEmpty(workPackageId)) + { + List listWork = new List(); + Model.WBS_WorkPackage work1 = new Model.WBS_WorkPackage + { + WorkPackageCode = "1", + PackageContent = "建筑工程", + }; + listWork.Add(work1); + Model.WBS_WorkPackage work2 = new Model.WBS_WorkPackage + { + WorkPackageCode = "2", + PackageContent = "安装工程", + }; + listWork.Add(work2); + getDataList = listWork.AsQueryable(); + } + else + { + if (workPackageId != "1" && workPackageId != "2") + { + var getUnitWork = db.WBS_UnitWork.FirstOrDefault(x => x.ProjectId == projectId && x.UnitWorkId == workPackageId); + if (getUnitWork != null) + { + getDataList = getDataList.Where(x => x.UnitWorkId == workPackageId && x.SuperWorkPack == null); + } + else + { + getDataList = getDataList.Where(x => x.SuperWorkPack == workPackageId); + if (getDataList.Count() == 0) + { + getDataList = getDataLists.Where(x => x.WorkPackageId == workPackageId); + } + } + } + else + { + var getUnitWork = from x in db.WBS_UnitWork + where x.ProjectId == projectId && x.SuperUnitWork == null && x.ProjectType == workPackageId + select x; + List listWork = new List(); + foreach (var item in getUnitWork) + { + Model.WBS_WorkPackage workItem = new Model.WBS_WorkPackage + { + WorkPackageCode = item.UnitWorkId, + PackageContent = item.UnitWorkCode + "-" + item.UnitWorkName, + }; + listWork.Add(workItem); + } + + getDataList = listWork.AsQueryable(); + } + } + + 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/DigData/WBSAnalysisService.cs b/SGGL/BLL/DigData/WBSAnalysisService.cs index 69e53550..6ada1642 100644 --- a/SGGL/BLL/DigData/WBSAnalysisService.cs +++ b/SGGL/BLL/DigData/WBSAnalysisService.cs @@ -38,49 +38,39 @@ namespace BLL /// /// /// - public static IEnumerable getDataDWList(string level,string workPackageId, Grid Grid1) + public static IEnumerable getDataDWList(string workPackageId, Grid Grid1) { var getDataList = getDataLists; - if (level == "0") + if (string.IsNullOrEmpty(workPackageId) ) { List listWork = new List(); - if (string.IsNullOrEmpty(workPackageId) || workPackageId == "1") + Model.WBS_WorkPackageInit work1 = new Model.WBS_WorkPackageInit { - Model.WBS_WorkPackageInit work1 = new Model.WBS_WorkPackageInit - { - WorkPackageCode = "1", - PackageContent = "建筑工程", - }; - listWork.Add(work1); - } - if (string.IsNullOrEmpty(workPackageId) || workPackageId == "2") + WorkPackageCode = "1", + PackageContent = "建筑工程", + }; + listWork.Add(work1); + Model.WBS_WorkPackageInit work2 = new Model.WBS_WorkPackageInit { - Model.WBS_WorkPackageInit work2 = new Model.WBS_WorkPackageInit - { - WorkPackageCode = "2", - PackageContent = "安装工程", - }; - listWork.Add(work2); - } + WorkPackageCode = "2", + PackageContent = "安装工程", + }; + listWork.Add(work2); getDataList = listWork.AsQueryable(); } else { - if (level == "1") + if (workPackageId != "1" && workPackageId != "2") { - getDataList = getDataList.Where(x => x.SuperWorkPack == null); + getDataList = getDataList.Where(x => x.SuperWorkPack == workPackageId); + if (getDataList.Count() == 0) + { + getDataList = getDataLists.Where(x => x.WorkPackageCode == workPackageId); + } } - - if (!string.IsNullOrEmpty(workPackageId)) + else { - if (workPackageId != "1" && workPackageId != "2") - { - getDataList = getDataList.Where(x => x.SuperWorkPack == workPackageId); - } - else - { - getDataList = getDataList.Where(x => x.ProjectType == workPackageId); - } + getDataList = getDataList.Where(x => x.ProjectType == workPackageId && x.SuperWorkPack == null); } } diff --git a/SGGL/BLL/DropListService.cs b/SGGL/BLL/DropListService.cs index dfd1a25d..7874419e 100644 --- a/SGGL/BLL/DropListService.cs +++ b/SGGL/BLL/DropListService.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using BLL; +using System.Collections.Generic; namespace BLL { @@ -40,6 +41,10 @@ namespace BLL { dropName.DataSource = HSSE_getCertificateType(); } + else if (groupId == Group_ProjectPersonStates) + { + dropName.DataSource = HSSE_getProjectPersonStates(); + } dropName.DataBind(); if (isShowPlease) { @@ -74,7 +79,10 @@ namespace BLL { rblName.DataSource = HSSE_getContractType(); } - + else if (groupId == Group_ProjectPersonStates) + { + rblName.DataSource = HSSE_getProjectPersonStates(); + } rblName.DataBind(); if (!string.IsNullOrEmpty(selectValue)) { @@ -105,6 +113,10 @@ namespace BLL /// public const string Group_PersonType = "PersonType"; /// + /// 项目人员状态 组id + /// + public const string Group_ProjectPersonStates = "ProjectPersonStates"; + /// /// 合同类型 组id /// public const string Group_ContractType = "ContractType"; @@ -330,6 +342,39 @@ namespace BLL } #endregion + #region 人员类型 + /// + /// 人员类型 名称 + /// + /// + /// + public static string HSSE_getProjectPersonStates(string value) + { + string name = string.Empty; + var getType = HSSE_getProjectPersonStates().FirstOrDefault(x => x.Value == value); + if (getType != null) + { + name = getType.Text; + } + return name; + } + + + /// + /// 人员类型 + /// + /// + public static ListItem[] HSSE_getProjectPersonStates() + { + ListItem[] list = new ListItem[4]; + list[0] = new ListItem("在审", Const.ProjectPersonStates_0); + list[1] = new ListItem("在岗", Const.ProjectPersonStates_1); + list[2] = new ListItem("离岗", Const.ProjectPersonStates_2); + list[3] = new ListItem("打回", Const.ProjectPersonStates_R); + return list; + } + #endregion + #region 合同类型 /// /// 人员类型 名称 diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs index 09cd0116..7c164beb 100644 --- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs +++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs @@ -137,7 +137,7 @@ namespace BLL /// 页码 /// 每页数量 /// - public static IEnumerable getInPsersonListData(string projectId, string unitId, string personName, string identityCard, Grid Grid1) + public static IEnumerable getInPersonListData(string projectId, string unitId, string personName, string identityCard, Grid Grid1) { IQueryable getInPersonList = getInPersonLists.Where(x => x.ProjectId == projectId); if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null) @@ -183,6 +183,103 @@ namespace BLL } #endregion + #region 现场当前人员列表 + /// + /// 记录数 + /// + public static int nowCount + { + get; + set; + } + + /// + /// 定义变量 + /// + private static IQueryable getNowPersonLists = from x in db.SitePerson_PersonInOutNow + select x; + + /// + /// 获取分页列表 + /// + /// 页码 + /// 每页数量 + /// + public static IEnumerable getNowPersonListData(string projectId, string unitId, string workPostId, string personName, string identityCard, DateTime dateValue, Grid Grid1) + { + IQueryable getDayAll = getNowPersonLists.Where(x=>x.ProjectId == projectId + && x.ChangeTime.Value.Year == dateValue.Year && x.ChangeTime.Value.Month == dateValue.Month + && x.ChangeTime.Value.Day == dateValue.Day); + if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null) + { + getDayAll = getDayAll.Where(x => x.UnitId == unitId); + } + if (!string.IsNullOrEmpty(personName)) + { + getDayAll = getDayAll.Where(x => x.PersonName.Contains(personName)); + } + if (!string.IsNullOrEmpty(identityCard)) + { + getDayAll = getDayAll.Where(x => x.IdentityCard.Contains(identityCard)); + } + if (!string.IsNullOrEmpty(workPostId) && workPostId != Const._Null) + { + getDayAll = getDayAll.Where(x => x.WorkPostId == workPostId); + } + + if (getDayAll.Count() > 0) + { + var getInMaxs = from x in getDayAll + group x by x.PersonId into g + select new + { + ProjectId = g.First().ProjectId, + PersonId = g.First().PersonId, + personName = g.First().PersonName, + identityCard = g.First().IdentityCard, + UnitId = g.First().UnitId, + UnitName = g.First().UnitName, + WorkPostName = g.First().WorkPostName, + ChangeTime = g.Max(x => x.ChangeTime), + IsIn = g.First().IsIn, + PostType = g.First().PostType, + WorkPostId = g.First().WorkPostId, + }; + + if (getInMaxs.Count() > 0) + { + getInMaxs = getInMaxs.Where(x => x.IsIn == true); + } + inCount = getInMaxs.Count(); + if (inCount == 0) + { + return null; + } + + getInMaxs = SortConditionHelper.SortingAndPaging(getInMaxs, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + return from x in getInMaxs + select new + { + x.PersonId, + x.personName, + x.identityCard, + CardNo =db.SitePerson_Person.First(p=>p.PersonId == x.PersonId && p.ProjectId ==x.ProjectId).CardNo, + x.UnitName, + x.UnitId, + x.WorkPostId, + x.WorkPostName, + TeamGroupName=TeamGroupService.GetTeamGroupNameByPersonId(x.ProjectId,x.PersonId), + x.ChangeTime, + }; + } + else + { + inCount =0; + return null; + } + } + #endregion + #region 获取项目人员 -- 按条件查询 #region 根据现场人员主键获取现场人员信息 /// diff --git a/SGGL/BLL/ProjectData/TeamGroupService.cs b/SGGL/BLL/ProjectData/TeamGroupService.cs index 6eaa579c..f4ef60c2 100644 --- a/SGGL/BLL/ProjectData/TeamGroupService.cs +++ b/SGGL/BLL/ProjectData/TeamGroupService.cs @@ -167,5 +167,20 @@ namespace BLL } return name; } + + public static string GetTeamGroupNameByPersonId(string projectId, string personId) + { + string name = string.Empty; + var getSitePerson = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == projectId && x.PersonId == personId); + if (getSitePerson != null) + { + var TeamGroup = Funs.DB.ProjectData_TeamGroup.FirstOrDefault(x => x.TeamGroupId == getSitePerson.TeamGroupId); + if (TeamGroup != null) + { + name = TeamGroup.TeamGroupName; + } + } + return name; + } } } diff --git a/SGGL/FineUIPro.Web/Controls/ProjectWBSControl.ascx.cs b/SGGL/FineUIPro.Web/Controls/ProjectWBSControl.ascx.cs index 811c7fa3..a32cb52e 100644 --- a/SGGL/FineUIPro.Web/Controls/ProjectWBSControl.ascx.cs +++ b/SGGL/FineUIPro.Web/Controls/ProjectWBSControl.ascx.cs @@ -23,6 +23,13 @@ namespace FineUIPro.Web.Controls } } + public bool IsShowLevel + { + get; + set; + } = true; + + /// /// 项目ID /// @@ -48,7 +55,8 @@ namespace FineUIPro.Web.Controls protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) - { + { + this.Toolbar1.Hidden = !IsShowLevel; ////加载树 SetSubUnitProjectTree(this.trWBS); } diff --git a/SGGL/FineUIPro.Web/Controls/WBSControl.ascx.cs b/SGGL/FineUIPro.Web/Controls/WBSControl.ascx.cs index f9f42da1..425edc6b 100644 --- a/SGGL/FineUIPro.Web/Controls/WBSControl.ascx.cs +++ b/SGGL/FineUIPro.Web/Controls/WBSControl.ascx.cs @@ -19,19 +19,7 @@ namespace FineUIPro.Web.Controls } } - public string Level - { - get - { - return (string)ViewState["Level"]; - } - set - { - ViewState["Level"] = value; - } - } - - public bool IsShowAll + public bool IsShowLevel { get; set; @@ -48,12 +36,7 @@ namespace FineUIPro.Web.Controls { if (!IsPostBack) { - if (!IsShowAll) - { - this.ckLevel.Items.Remove(this.ckLevel.Items[0]); - this.ckLevel.SelectedIndex = 0; - } - + this.Toolbar1.Hidden = !IsShowLevel; ////加载树 SetSubUnitProjectTree(this.trWBS); @@ -68,7 +51,7 @@ namespace FineUIPro.Web.Controls /// protected void trWBS_NodeCommand(object sender, TreeCommandEventArgs e) { - this.Level = this.ckLevel.SelectedValue; + //this.Level = this.ckLevel.SelectedValue; if (this.trWBS != null && !string.IsNullOrEmpty(this.trWBS.SelectedNodeID)) { this.WorkPackageCode = this.trWBS.SelectedNodeID; @@ -79,26 +62,18 @@ 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; + protected void ckLevel_SelectedIndexChanged(object sender, EventArgs e) + { + ////加载树 + SetSubUnitProjectTree(this.trWBS); + } + + #region 绑定分公司 单位-项目树 /// /// 绑定分公司 单位-项目树 diff --git a/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx b/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx index 2da39ca2..1230a48d 100644 --- a/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx +++ b/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx @@ -1,6 +1,6 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectWBSAnalysis.aspx.cs" Inherits="FineUIPro.Web.DigData.ProjectWBSAnalysis" %> -<%@ Register Src="~/Controls/WBSControl.ascx" TagName="WBSControl" TagPrefix="uc1" %> +<%@ Register Src="~/Controls/ProjectWBSControl.ascx" TagName="WBSControl" TagPrefix="uc1" %> diff --git a/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx.cs b/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx.cs index a9015453..a728c737 100644 --- a/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx.cs +++ b/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx.cs @@ -8,7 +8,22 @@ using System.Linq; namespace FineUIPro.Web.DigData { public partial class ProjectWBSAnalysis : PageBase - { + { + /// + /// 项目ID + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + /// /// 加载页面 /// @@ -17,17 +32,17 @@ namespace FineUIPro.Web.DigData protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) - { - this.ucTree.IsShowAll = false; - this.ucTree.Level= this.hdLevel.Text = "0"; + { + this.ProjectId = this.CurrUser.LoginProjectId; + this.ucTree.ProjectId = this.ProjectId; + this.ucTree.IsShowLevel = false; BindGrid(); } } protected void changeTree(object sender, EventArgs e) { - this.hdWorkPackageCode.Text = this.ucTree.WorkPackageCode; - this.hdLevel.Text = this.ucTree.Level; + this.hdWorkPackageCode.Text = this.ucTree.WorkPackageId; BindGrid(); } @@ -37,8 +52,8 @@ namespace FineUIPro.Web.DigData /// private void BindGrid() { - var getData = WBSAnalysisService.getDataDWList(this.hdLevel.Text,this.hdWorkPackageCode.Text, this.Grid1); - Grid1.RecordCount = WBSAnalysisService.count; + var getData = ProjectWBSAnalysisService.getDataDWList(this.ProjectId, this.hdWorkPackageCode.Text, this.Grid1); + Grid1.RecordCount = ProjectWBSAnalysisService.count; Grid1.DataSource = getData; Grid1.DataBind(); } diff --git a/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx.designer.cs b/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx.designer.cs index c308ef13..86c4d0d7 100644 --- a/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/DigData/ProjectWBSAnalysis.aspx.designer.cs @@ -66,7 +66,7 @@ namespace FineUIPro.Web.DigData /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Web.Controls.WBSControl ucTree; + protected global::FineUIPro.Web.Controls.ProjectWBSControl ucTree; /// /// hdWorkPackageCode 控件。 diff --git a/SGGL/FineUIPro.Web/DigData/WBSAnalysis.aspx.cs b/SGGL/FineUIPro.Web/DigData/WBSAnalysis.aspx.cs index d2a493eb..48e9e431 100644 --- a/SGGL/FineUIPro.Web/DigData/WBSAnalysis.aspx.cs +++ b/SGGL/FineUIPro.Web/DigData/WBSAnalysis.aspx.cs @@ -18,8 +18,7 @@ namespace FineUIPro.Web.DigData { if (!IsPostBack) { - this.ucTree.IsShowAll = false; - this.ucTree.Level= this.hdLevel.Text = "0"; + this.ucTree.IsShowLevel = false; BindGrid(); } } @@ -27,7 +26,6 @@ namespace FineUIPro.Web.DigData protected void changeTree(object sender, EventArgs e) { this.hdWorkPackageCode.Text = this.ucTree.WorkPackageCode; - this.hdLevel.Text = this.ucTree.Level; BindGrid(); } @@ -37,7 +35,7 @@ namespace FineUIPro.Web.DigData /// private void BindGrid() { - var getData = WBSAnalysisService.getDataDWList(this.hdLevel.Text,this.hdWorkPackageCode.Text, this.Grid1); + var getData = WBSAnalysisService.getDataDWList(this.hdWorkPackageCode.Text, this.Grid1); Grid1.RecordCount = WBSAnalysisService.count; Grid1.DataSource = getData; Grid1.DataBind(); diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 18eb3fcb..e69de29b 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1,171 +0,0 @@ - -错误信息开始=====> -错误类型: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 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web.CQMS.Check.EditCheckMonth.Page_Load(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\CQMS\Check\EditCheckMonth.aspx.cs:行号 39 - 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) - 在 System.EventHandler.Invoke(Object sender, EventArgs e) - 在 System.Web.UI.Control.OnLoad(EventArgs e) - 在 System.Web.UI.Control.LoadRecursive() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:09/11/2023 11:02:10 -出错文件:http://localhost:6422/CQMS/Check/EditCheckMonth.aspx?months=2023-09-01 -IP地址:::1 - -出错时间:09/11/2023 11:02:10 - - -错误信息开始=====> -错误类型:HttpRequestValidationException -错误信息:从客户端(Panel1$Grid1$ctl04$txtUnit="m³")中检测到有潜在危险的 Request.Form 值。 -错误堆栈: - 在 System.Web.HttpRequest.ValidateString(String value, String collectionKey, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.ValidateHttpValueCollection(HttpValueCollection collection, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.get_Form() - 在 System.Web.HttpRequest.get_HasForm() - 在 System.Web.UI.Page.GetCollectionBasedOnMethod(Boolean dontReturnNull) - 在 System.Web.UI.Page.DeterminePostBackMode() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest() - 在 System.Web.UI.Page.ProcessRequestWithNoAssert(HttpContext context) - 在 System.Web.UI.Page.ProcessRequest(HttpContext context) - 在 ASP.jdgl_check_planset_aspx.ProcessRequest(HttpContext context) - 在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() - 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) - 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) -出错时间:09/12/2023 09:47:37 -出错文件:http://localhost:6422/JDGL/Check/PlanSet.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/12/2023 09:47:37 - - -错误信息开始=====> -错误类型:HttpRequestValidationException -错误信息:从客户端(Panel1$Grid1$ctl04$txtUnit="m³")中检测到有潜在危险的 Request.Form 值。 -错误堆栈: - 在 System.Web.HttpRequest.ValidateString(String value, String collectionKey, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.ValidateHttpValueCollection(HttpValueCollection collection, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.get_Form() - 在 System.Web.HttpRequest.get_HasForm() - 在 System.Web.UI.Page.GetCollectionBasedOnMethod(Boolean dontReturnNull) - 在 System.Web.UI.Page.DeterminePostBackMode() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest() - 在 System.Web.UI.Page.ProcessRequestWithNoAssert(HttpContext context) - 在 System.Web.UI.Page.ProcessRequest(HttpContext context) - 在 ASP.jdgl_check_planset_aspx.ProcessRequest(HttpContext context) - 在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() - 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) - 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) -出错时间:09/12/2023 09:47:40 -出错文件:http://localhost:6422/JDGL/Check/PlanSet.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/12/2023 09:47:40 - - -错误信息开始=====> -错误类型:HttpRequestValidationException -错误信息:从客户端(Panel1$Grid1$ctl04$txtUnit="m³")中检测到有潜在危险的 Request.Form 值。 -错误堆栈: - 在 System.Web.HttpRequest.ValidateString(String value, String collectionKey, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.ValidateHttpValueCollection(HttpValueCollection collection, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.get_Form() - 在 System.Web.HttpRequest.get_HasForm() - 在 System.Web.UI.Page.GetCollectionBasedOnMethod(Boolean dontReturnNull) - 在 System.Web.UI.Page.DeterminePostBackMode() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest() - 在 System.Web.UI.Page.ProcessRequestWithNoAssert(HttpContext context) - 在 System.Web.UI.Page.ProcessRequest(HttpContext context) - 在 ASP.jdgl_check_planset_aspx.ProcessRequest(HttpContext context) - 在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() - 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) - 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) -出错时间:09/12/2023 09:47:42 -出错文件:http://localhost:6422/JDGL/Check/PlanSet.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/12/2023 09:47:42 - - -错误信息开始=====> -错误类型:HttpRequestValidationException -错误信息:从客户端(Panel1$Grid1$ctl04$txtUnit="m³")中检测到有潜在危险的 Request.Form 值。 -错误堆栈: - 在 System.Web.HttpRequest.ValidateString(String value, String collectionKey, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.ValidateHttpValueCollection(HttpValueCollection collection, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.get_Form() - 在 System.Web.HttpRequest.get_HasForm() - 在 System.Web.UI.Page.GetCollectionBasedOnMethod(Boolean dontReturnNull) - 在 System.Web.UI.Page.DeterminePostBackMode() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest() - 在 System.Web.UI.Page.ProcessRequestWithNoAssert(HttpContext context) - 在 System.Web.UI.Page.ProcessRequest(HttpContext context) - 在 ASP.jdgl_check_planset_aspx.ProcessRequest(HttpContext context) - 在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() - 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) - 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) -出错时间:09/12/2023 09:48:38 -出错文件:http://localhost:6422/JDGL/Check/PlanSet.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/12/2023 09:48:38 - - -错误信息开始=====> -错误类型:HttpRequestValidationException -错误信息:从客户端(Panel1$Grid1$ctl04$txtUnit="m³")中检测到有潜在危险的 Request.Form 值。 -错误堆栈: - 在 System.Web.HttpRequest.ValidateString(String value, String collectionKey, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.ValidateHttpValueCollection(HttpValueCollection collection, RequestValidationSource requestCollection) - 在 System.Web.HttpRequest.get_Form() - 在 System.Web.HttpRequest.get_HasForm() - 在 System.Web.UI.Page.GetCollectionBasedOnMethod(Boolean dontReturnNull) - 在 System.Web.UI.Page.DeterminePostBackMode() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) - 在 System.Web.UI.Page.ProcessRequest() - 在 System.Web.UI.Page.ProcessRequestWithNoAssert(HttpContext context) - 在 System.Web.UI.Page.ProcessRequest(HttpContext context) - 在 ASP.jdgl_check_planset_aspx.ProcessRequest(HttpContext context) - 在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() - 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) - 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) -出错时间:09/12/2023 09:48:39 -出错文件:http://localhost:6422/JDGL/Check/PlanSet.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/12/2023 09:48:39 - diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 84ad8832..e59c9ab6 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1058,6 +1058,7 @@ + @@ -11319,6 +11320,13 @@ PersonOut.aspx + + SitePersonNowStatistic.aspx + ASPXCodeBehind + + + SitePersonNowStatistic.aspx + WorkPostStatistic.aspx ASPXCodeBehind @@ -14225,7 +14233,7 @@ True 0 / - http://localhost:6422/ + http://localhost:8513/ False False diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx index 772f491e..0ce3fb53 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQuality.aspx @@ -1,4 +1,5 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EquipmentPersonQuality.aspx.cs" Inherits="FineUIPro.Web.HSSE.QualityAudit.EquipmentPersonQuality" %> + @@ -7,75 +8,75 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%-- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- @@ -87,43 +88,43 @@ FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="审核时间" HeaderTextAlign="Center" TextAlign="Center"> --%> - <%-- --%> - - <%-- --%> - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs index ada9fa71..25ef1724 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.cs @@ -44,6 +44,8 @@ namespace FineUIPro.Web.HSSE.QualityAudit { this.ProjectId = Request.Params["projectId"]; } + DropListService.InitConstDropDownList(this.drpPersonStates, DropListService.Group_ProjectPersonStates, true); + this.drpPersonStates.SelectedValue = Const.ProjectPersonStates_1; BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true); if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId)) { @@ -94,6 +96,11 @@ namespace FineUIPro.Web.HSSE.QualityAudit strSql += " AND WorkPost.WorkPostName LIKE @WorkPostName"; listStr.Add(new SqlParameter("@WorkPostName", "%" + this.txtWorkPostName.Text.Trim() + "%")); } + if (this.drpPersonStates.SelectedValue != Const._Null && !string.IsNullOrEmpty(this.drpPersonStates.SelectedValue)) + { + strSql += " AND Person.States =@States "; + listStr.Add(new SqlParameter("@States", this.drpPersonStates.SelectedValue)); + } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.designer.cs index 3370ee0e..1ac00e54 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQuality.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.QualityAudit { - - - public partial class SafePersonQuality { - +namespace FineUIPro.Web.HSSE.QualityAudit +{ + + + public partial class SafePersonQuality + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar2 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// txtCardNo 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCardNo; - + /// /// drpUnitId 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitId; - + /// /// txtPersonName 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPersonName; - + /// /// txtWorkPostName 控件。 /// @@ -92,7 +94,16 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWorkPostName; - + + /// + /// drpPersonStates 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpPersonStates; + /// /// ToolbarFill1 控件。 /// @@ -101,7 +112,16 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + + /// + /// btSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btSearch; + /// /// btnOut 控件。 /// @@ -110,7 +130,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOut; - + /// /// lblNumber 控件。 /// @@ -119,7 +139,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblNumber; - + /// /// ToolbarSeparator1 控件。 /// @@ -128,7 +148,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -137,7 +157,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -146,7 +166,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -155,7 +175,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// WindowAtt 控件。 /// @@ -164,7 +184,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowAtt; - + /// /// Menu1 控件。 /// @@ -173,7 +193,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuEdit 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonUnitList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonUnitList.aspx.cs index 7f972f89..b112e73a 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonUnitList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonUnitList.aspx.cs @@ -60,7 +60,7 @@ namespace FineUIPro.Web.HSSE.SitePerson ///
private void BindGrid() { - var getData = SitePerson_PersonService.getInPsersonListData(this.ProjectId, this.drpUnit.SelectedValue, this.txtPersonName.Text.Trim(), this.txtIdentityCard.Text.Trim(), Grid1); + var getData = SitePerson_PersonService.getInPersonListData(this.ProjectId, this.drpUnit.SelectedValue, this.txtPersonName.Text.Trim(), this.txtIdentityCard.Text.Trim(), Grid1); Grid1.RecordCount = SitePerson_PersonService.inCount; Grid1.DataSource = getData; Grid1.DataBind(); diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx new file mode 100644 index 00000000..8748b642 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx @@ -0,0 +1,90 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SitePersonNowStatistic.aspx.cs" Inherits="FineUIPro.Web.HSSE.SitePerson.SitePersonNowStatistic" %> + + + + + 当前人员统计 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.cs new file mode 100644 index 00000000..cccd2a25 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.cs @@ -0,0 +1,116 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; + +namespace FineUIPro.Web.HSSE.SitePerson +{ + public partial class SitePersonNowStatistic : PageBase + { + /// + /// 项目id + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + Funs.DropDownPageSize(this.ddlPageSize); + this.ProjectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId) + { + this.ProjectId = Request.Params["projectId"]; + } + UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); + this.drpUnit.SelectedValue = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_SEDIN : this.CurrUser.UnitId; + if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId)) + { + this.drpUnit.Enabled = false; + } + WorkPostService.InitWorkPostDropDownList(this.drpWorkPost, true); + this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + // 绑定表格 + this.BindGrid(); + } + } + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid() + { + var getData = SitePerson_PersonService.getNowPersonListData(this.ProjectId, this.drpUnit.SelectedValue, this.drpWorkPost.SelectedValue + , this.txtPersonName.Text.Trim(),this.txtIdcard.Text.Trim(),Funs.GetNewDateTimeOrNow(this.txtStartDate.Text), Grid1); + Grid1.RecordCount = SitePerson_PersonService.nowCount; + Grid1.DataSource = getData; + Grid1.DataBind(); + } + #endregion + + protected void btnSearch_Click(object sender, EventArgs e) + { + // 绑定表格 + this.BindGrid(); + } + + #region 分页选择下拉改变事件 + /// + /// 分页选择下拉改变事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + #endregion + + #region 页索引改变事件 + /// + /// 页索引改变事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + #endregion + + #region 导出按钮 + /// 导出按钮 + ///
+ /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + Response.ClearContent(); + string filename = Funs.GetNewFileName(); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("现场岗位人工时统计" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + this.Grid1.PageSize = this.Grid1.RecordCount; + this.BindGrid(); + Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + #endregion + + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.designer.cs new file mode 100644 index 00000000..0dcfb8f4 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.designer.cs @@ -0,0 +1,161 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.SitePerson +{ + + + public partial class SitePersonNowStatistic + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// drpUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnit; + + /// + /// drpWorkPost 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpWorkPost; + + /// + /// txtPersonName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPersonName; + + /// + /// txtIdcard 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtIdcard; + + /// + /// txtStartDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartDate; + + /// + /// btnSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSearch; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// 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/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml index b532a9bb..b3d0385c 100644 --- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml +++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml @@ -3,7 +3,7 @@ - + @@ -12,7 +12,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml index 5ce095a2..2edfbe00 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml @@ -31,6 +31,7 @@ + diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml index b241c0a1..8d4aa005 100644 --- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml @@ -1,6 +1,6 @@  - + diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 8cc2c0a1..342d91b8 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -1,8 +1,12 @@  - - + + + + + + @@ -15,11 +19,19 @@ - + - + + + + + + + + + @@ -78,4 +90,9 @@ + + + + + \ No newline at end of file