1

2025-10-17 10:21:55 +08:00
parent aa6fef5cab
commit bc4d70bc63
3 changed files with 6 additions and 5 deletions
@@ -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
                        {//预警警报【待汇总】