From 7a6128c46fb9980ab19f45ccbc015037b68564be Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Sat, 29 Nov 2025 14:35:49 +0800
Subject: [PATCH] 1

---
 SUBQHSE/BLL/Common/Const.cs                      |  2 +-
 SUBQHSE/FineUIPro.Web/common/main.aspx           |  2 +-
 SUBQHSE/FineUIPro.Web/common/mainProject.aspx    | 10 +++++-----
 SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs | 11 ++++++++---
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/SUBQHSE/BLL/Common/Const.cs b/SUBQHSE/BLL/Common/Const.cs
index 2877f97..4c6d0ba 100644
--- a/SUBQHSE/BLL/Common/Const.cs
+++ b/SUBQHSE/BLL/Common/Const.cs
@@ -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
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 @@
                                 </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;">
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 @@
                             <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;">
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,
                         },