diff --git a/SUBQHSE/FineUIPro.Web/common/main.aspx b/SUBQHSE/FineUIPro.Web/common/main.aspx index 03d1d5c..cdce236 100644 --- a/SUBQHSE/FineUIPro.Web/common/main.aspx +++ b/SUBQHSE/FineUIPro.Web/common/main.aspx @@ -36,11 +36,11 @@
{{form.org.projectSum}}
-
项目人数
+
项目安管人数
{{form.org.groupSum}}
-
企业总部人数
+
本部安管人员
{{form.org.director}}
diff --git a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx index aab1678..91eb17e 100644 --- a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx +++ b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx @@ -29,7 +29,7 @@
总监{{form.org.projectDirector}}
专职{{form.org.projectFullTime}}
-

项目总数{{form.org.projectSum}}

+

工区/工段{{form.org.WorkAreaNum}}

diff --git a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs index 4495207..3eaad22 100644 --- a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs @@ -36,7 +36,7 @@ namespace FineUIPro.Web.common string userId = page.CurrUser.UserId; string projectId = page.CurrUser.LoginProjectId; MainSevice mainSevice = new MainSevice(userId, projectId); - + int? workAreaNum = Funs.DB.ProjectData_WorkArea.Where(x => x.ProjectId == projectId).Count(); var project = ProjectService.GetProjectByProjectId(projectId); //获取HSSE数据 var hsseData = Task.Run(() => mainSevice.GetHsseDataAsync()).Result; @@ -257,12 +257,13 @@ namespace FineUIPro.Web.common checkIdx = 0, org = new {//组织机构人员 - projectSum = (hsseData.ProjectInspectorGeneralNum ?? 0) + (hsseData.ProjectFullTimeNum ?? 0) + (hsseData.ProjectSafetyMonitorNum ?? 0),//项目总人数 + // projectSum = (hsseData.ProjectInspectorGeneralNum ?? 0) + (hsseData.ProjectFullTimeNum ?? 0) + (hsseData.ProjectSafetyMonitorNum ?? 0),//项目总人数 projectDirector = hsseData.ProjectInspectorGeneralNum ?? 0,//项目总监 projectFullTime = hsseData.ProjectFullTimeNum ?? 0,//项目专职 projectSafetyMonitoring = hsseData.ProjectSafetyMonitorNum ?? 0,//项目安全监护 projectSecurity = 0,//项目安管人员【待汇总】 projectPersonRatio = "1:5",//项目安管人员与作业人员配比【待汇总】 + WorkAreaNum = workAreaNum ?? 0, }, warning = new {//预警警报【待汇总】