xiaju
/
SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
geh 2025-11-29 14:35:49 +08:00
parent c7e265f71b
commit 7a6128c46f
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SUBQHSE/BLL/Common/Const.cs
View File

@ -972,7 +972,7 @@ namespace BLL
/// <summary>
/// 项目安全总监岗位Id
/// </summary>
public static string WorkPost_ProjectHSSEDirector = "5e6e259e-ea0a-4a63-8f52-df4a19a6c9fa";
public static string WorkPost_ProjectHSSEDirector = "7ff487fe-344c-4e36-b255-f882ed270b21";
/// <summary>
/// HSE工程师岗位Id

2
SUBQHSE/FineUIPro.Web/common/main.aspx
View File

@ -454,7 +454,7 @@
</div>
</div>
<div class="box1 a-box1">
<h6>安全工时</h6>
<h6>安全工时(万)</h6>
<p><span>{{form.hsseEduTrain.safeWorkingHour}}</span><span>h</span></p>
</div>
<div class="box1" style="align-items: flex-start;">

10
SUBQHSE/FineUIPro.Web/common/mainProject.aspx
View File

@ -35,15 +35,15 @@
<div class="org-row1">
<i></i>
<div class="row1-inner">
<div class="row1-tit">安管人员</div>
<h6>{{form.org.projectSecurity}}</h6>
<div class="row1-tit">管理人员</div>
<h6>{{form.org.ManagersPersonneNum}}</h6>
</div>
</div>
<div class="org-row1">
<i></i>
<div class="row1-inner">
<div class="row1-tit">安全监护</div>
<h6>{{form.org.projectSafetyMonitoring}}</h6>
<div class="row1-tit">项目人员</div>
<h6>{{form.org.ProjectPersonnelNum}}</h6>
</div>
</div>
<div class="org-row1">
@ -414,7 +414,7 @@
</div>
</div>
<div class="box1 a-box1">
<h6>安全工时</h6>
<h6>安全工时(万)</h6>
<p><span>{{form.hsseEduTrain.safeWorkingHour}}</span><span>h</span></p>
</div>
<div class="box1" style="align-items: flex-start;">

11
SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs
View File

@ -243,7 +243,9 @@ namespace FineUIPro.Web.common
#endregion
var personLists = BLL.PersonService.GetPersonList(projectId);
var ProjectPersonnelNum = personLists.Where(x => x.ProjectId == projectId && x.IsUsedType == "1").ToList();
var projectUsers = Funs.DB.Project_ProjectUser.Where(x => x.ProjectId == projectId).ToList();
// 构造返回数据
var returnData = new
{
@ -260,8 +262,11 @@ namespace FineUIPro.Web.common
// projectSum = (hsseData.ProjectInspectorGeneralNum ?? 0) + (hsseData.ProjectFullTimeNum ?? 0) + (hsseData.ProjectSafetyMonitorNum ?? 0),//项目总人数
projectDirector = hsseData.ProjectInspectorGeneralNum ?? 0,//项目总监
projectFullTime = hsseData.ProjectFullTimeNum ?? 0,//项目专职
projectSafetyMonitoring = hsseData.ProjectSafetyMonitorNum ?? 0,//项目安全监护
projectSecurity = 0,//项目安管人员【待汇总】
// projectSafetyMonitoring = hsseData.ProjectSafetyMonitorNum ?? 0,//项目安全监护
// projectSecurity = 0,//项目安管人员【待汇总】
ManagersPersonneNum = projectUsers.Count,//管理人员
ProjectPersonnelNum = ProjectPersonnelNum.Count,//项目人员
projectPersonRatio = "1:5",//项目安管人员与作业人员配比【待汇总】
WorkAreaNum = workAreaNum ?? 0,
},