/// HSE工程师岗位Id
diff --git a/SUBQHSE/FineUIPro.Web/common/main.aspx b/SUBQHSE/FineUIPro.Web/common/main.aspx
index cdce236..d8dbe75 100644
--- a/SUBQHSE/FineUIPro.Web/common/main.aspx
+++ b/SUBQHSE/FineUIPro.Web/common/main.aspx
@@ -454,7 +454,7 @@
-
安全工时
+
安全工时(万)
{{form.hsseEduTrain.safeWorkingHour}}h
diff --git a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx
index 91eb17e..d78d962 100644
--- a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx
+++ b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx
@@ -35,15 +35,15 @@
-
安管人员
-
{{form.org.projectSecurity}}
+
管理人员
+
{{form.org.ManagersPersonneNum}}
-
安全监护
-
{{form.org.projectSafetyMonitoring}}
+
项目人员
+
{{form.org.ProjectPersonnelNum}}
@@ -414,7 +414,7 @@
-
安全工时
+
安全工时(万)
{{form.hsseEduTrain.safeWorkingHour}}h
diff --git a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs
index 3eaad22..48041ff 100644
--- a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs
@@ -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,
},