lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
gaofei 2022-03-26 18:08:11 +08:00
parent 39dd9da9a8 31691b2d1f
commit 274010da92
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
DataBase/版本日志/SGGLDB_V2022-03-20-001.sql → DataBase/版本日志/已更新脚本/SGGLDB_V2022-03-20-001.sql
View File

1
SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs
View File

@ -135,6 +135,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
/// <param name="e"></param> /// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{ {
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid(); BindGrid();
} }

1
SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.cs
View File

@ -186,6 +186,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
/// <param name="e"></param> /// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{ {
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid(); BindGrid();
} }
#endregion #endregion

4
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
View File

@ -87,7 +87,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
}; };
if (personLists.Count() > 0) 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(); && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)).ToList();
rootNode.ToolTip = "当前项目人员总数：" + personLists.Count() + "；在场人员数：" + personIn.Count() + "；离场人员数：" + (personLists.Count() - personIn.Count()); rootNode.ToolTip = "当前项目人员总数：" + personLists.Count() + "；在场人员数：" + personIn.Count() + "；离场人员数：" + (personLists.Count() - personIn.Count());
} }
@ -98,7 +98,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
rootNode.Expanded = true; rootNode.Expanded = true;
rootNode.EnableClickEvent = true; rootNode.EnableClickEvent = true;
this.tvProjectAndUnit.Nodes.Add(rootNode); this.tvProjectAndUnit.Nodes.Add(rootNode);
GetUnitLists(rootNode.Nodes, this.ProjectId, personLists); GetUnitLists(rootNode.Nodes, project.ProjectId, personLists);
} }
} }