From bc4d70bc63b4c3d9f6c0b39d4e7ad3c193e27a81 Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Fri, 17 Oct 2025 10:21:55 +0800
Subject: [PATCH] 1

---
 SUBQHSE/FineUIPro.Web/common/main.aspx           | 4 ++--
 SUBQHSE/FineUIPro.Web/common/mainProject.aspx    | 2 +-
 SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

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 @@
                             </div>
                             <div class="org-box">
                                 <div class="org-box-value">{{form.org.projectSum}}</div>
-                                <div class="org-box-label">项目人数</div>
+                                <div class="org-box-label">项目安管人数</div>
                             </div>
                             <div class="org-box">
                                 <div class="org-box-value">{{form.org.groupSum}}</div>
-                                <div class="org-box-label">企业总部人数</div>
+                                <div class="org-box-label">本部安管人员</div>
                             </div>
                             <div class="org-box">
                                 <div class="org-box-value">{{form.org.director}}</div>
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 @@
                             <h5><span>总监</span><span>{{form.org.projectDirector}}</span></h5>
                             <h5><span>专职</span><span>{{form.org.projectFullTime}}</span></h5>
                             <i></i>
-                            <h4><span>项目总数</span><span>{{form.org.projectSum}}</span></h4>
+                            <h4><span>工区/工段</span><span>{{form.org.WorkAreaNum}}</span></h4>
                         </div>
                         <div class="o-box1">
                             <div class="org-row1">
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
                         {//预警警报【待汇总】