lpf/xinjiang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

数据大屏优化

Browse Source
This commit is contained in:
夏菊
2026-09-23 17:55:18 +08:00
parent 147121cdb2
commit 4bb579d661
39 changed files with 2012 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/mainProject.aspx.cs
+17 -5
View File
@@ -38,11 +38,10 @@ namespace FineUIPro.Web.common
// 获取项目数据
var project = ProjectService.GetProjectByProjectId(projectId);
//项目总工期
int projectDays = 0;
int endDays = 0;
if (project.StartDate.HasValue && project.EndDate.HasValue)
if (project != null && project.StartDate.HasValue && project.EndDate.HasValue)
{
int pdays = (project.EndDate.Value - project.StartDate.Value).Days;
if (pdays >= 0)
@@ -70,12 +69,18 @@ namespace FineUIPro.Web.common
var list = AccidentWarningService.GetYearsTodayList();
var dateNow = DateTime.Now.ToString("yyyy-MM");
//风险
var getHazardFactorList = Funs.DB.Sp_HazardFactor_Statistics(dateNow.Split('-')[0], dateNow.Split('-')[1], projectId).ToList();
//安全危害因素
var getHazardFactorList = Funs.DB.Sp_HazardFactor_Statistics(dateNow.Split('-')[0], dateNow.Split('-')[1], string.Empty, projectId).ToList();
var lowRisk = getHazardFactorList.Where(x => x.Title == "低风险").FirstOrDefault();
var generalRisk = getHazardFactorList.Where(x => x.Title == "一般风险").FirstOrDefault();
var largerRisk = getHazardFactorList.Where(x => x.Title == "较大风险").FirstOrDefault();
var majorRisk = getHazardFactorList.Where(x => x.Title == "重大风险").FirstOrDefault();
//职业健康危害因素
var getHazardFactorOccHealthList = Funs.DB.Sp_HazardFactorOccHealth_Statistics(dateNow.Split('-')[0], dateNow.Split('-')[1], string.Empty, projectId).ToList();
var lowRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "低风险").FirstOrDefault();
var generalRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "一般风险").FirstOrDefault();
var largerRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "较大风险").FirstOrDefault();
var majorRiskOcc = getHazardFactorOccHealthList.Where(x => x.Title == "重大风险").FirstOrDefault();
// 构造返回数据
return new
@@ -90,7 +95,7 @@ namespace FineUIPro.Web.common
participateInNum = hsseData != null ? hsseData.JoinConstructionPersonNum ?? 0 : 0,
dangerousProject = hsseData != null ? hsseData.MajorProjectsUnderConstructionNum ?? 0 : 0,
projectDays = projectDays,//项目总工期
projectEndDate = project.EndDate != null ? string.Format("{0:yyyy-MM-dd}", project.EndDate) : string.Empty,//项目到期时间
projectEndDate = project != null && project.EndDate != null ? string.Format("{0:yyyy-MM-dd}", project.EndDate) : string.Empty,//项目到期时间
projectEndDays = endDays > 0 ? endDays : 0,//合同倒计时
},
hazardFactor = new
@@ -99,6 +104,13 @@ namespace FineUIPro.Web.common
generalRiskNum = generalRisk != null ? generalRisk.Num : 0,
largerRiskNum = largerRisk != null ? largerRisk.Num : 0,
majorRiskNum = majorRisk != null ? majorRisk.Num : 0,
},
hazardFactorOcc = new
{//职业健康危害因素
lowRiskNum = lowRiskOcc != null ? lowRiskOcc.Num : 0,
generalRiskNum = generalRiskOcc != null ? generalRiskOcc.Num : 0,
largerRiskNum = largerRiskOcc != null ? largerRiskOcc.Num : 0,
majorRiskNum = majorRiskOcc != null ? majorRiskOcc.Num : 0,
}
//meetAnEmergency = new
//{