From 84d4439f84bd13f62801ddf0ec514c4353eca607 Mon Sep 17 00:00:00 2001 From: Frane Date: Fri, 25 Mar 2022 14:57:05 +0800 Subject: [PATCH] =?UTF-8?q?20220325=20=E5=88=97=E8=A1=A8=E7=BF=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => 已更新脚本}/SGGLDB_V2022-03-20-001.sql | 0 SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs | 1 + SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.cs | 1 + SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs | 4 ++-- 4 files changed, 4 insertions(+), 2 deletions(-) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-03-20-001.sql (100%) diff --git a/DataBase/版本日志/SGGLDB_V2022-03-20-001.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-03-20-001.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-03-20-001.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-03-20-001.sql diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs index 31153661..f8fe7138 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs @@ -135,6 +135,7 @@ namespace FineUIPro.Web.HSSE.EduTrain /// protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); BindGrid(); } diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.cs index c798cce9..30cced77 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.cs @@ -186,6 +186,7 @@ namespace FineUIPro.Web.HSSE.EduTrain /// protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); BindGrid(); } #endregion diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs index b2d86771..3d1bc261 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs @@ -87,7 +87,7 @@ namespace FineUIPro.Web.HSSE.SitePerson }; if (personLists.Count() > 0) { - var personIn = personLists.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true + var personIn = personLists.Where(x => x.ProjectId == project.ProjectId && x.IsUsed == true && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)).ToList(); rootNode.ToolTip = "当前项目人员总数：" + personLists.Count() + "；在场人员数：" + personIn.Count() + "；离场人员数：" + (personLists.Count() - personIn.Count()); } @@ -98,7 +98,7 @@ namespace FineUIPro.Web.HSSE.SitePerson rootNode.Expanded = true; rootNode.EnableClickEvent = true; this.tvProjectAndUnit.Nodes.Add(rootNode); - GetUnitLists(rootNode.Nodes, this.ProjectId, personLists); + GetUnitLists(rootNode.Nodes, project.ProjectId, personLists); } }