xiaju
/
SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
geh 2025-10-17 10:21:55 +08:00
parent aa6fef5cab
commit bc4d70bc63
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SUBQHSE/FineUIPro.Web/common/main.aspx
View File

@ -36,11 +36,11 @@
</div> </div>
<div class="org-box"> <div class="org-box">
<div class="org-box-value">{{form.org.projectSum}}</div> <div class="org-box-value">{{form.org.projectSum}}</div>
<div class="org-box-label">项目人数</div> <div class="org-box-label">项目安管人数</div>
</div> </div>
<div class="org-box"> <div class="org-box">
<div class="org-box-value">{{form.org.groupSum}}</div> <div class="org-box-value">{{form.org.groupSum}}</div>
<div class="org-box-label">企业总部人数</div> <div class="org-box-label">本部安管人员</div>
</div> </div>
<div class="org-box"> <div class="org-box">
<div class="org-box-value">{{form.org.director}}</div> <div class="org-box-value">{{form.org.director}}</div>

2
SUBQHSE/FineUIPro.Web/common/mainProject.aspx
View File

@ -29,7 +29,7 @@
<h5><span>总监</span><span>{{form.org.projectDirector}}</span></h5> <h5><span>总监</span><span>{{form.org.projectDirector}}</span></h5>
<h5><span>专职</span><span>{{form.org.projectFullTime}}</span></h5> <h5><span>专职</span><span>{{form.org.projectFullTime}}</span></h5>
<i></i> <i></i>
<h4><span>项目总数</span><span>{{form.org.projectSum}}</span></h4> <h4><span>工区/工段</span><span>{{form.org.WorkAreaNum}}</span></h4>
</div> </div>
<div class="o-box1"> <div class="o-box1">
<div class="org-row1"> <div class="org-row1">

5
SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs
View File

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