From 83f1fdc8b90770aeaeebd4349f985a0dff116619 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Mon, 24 Nov 2025 11:01:34 +0800 Subject: [PATCH] 1 --- SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx | 4 +- .../common/mainMenu_HSSE.aspx.cs | 53 ++++++++++++------- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx index e282734b..b50a9508 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx +++ b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx @@ -317,7 +317,7 @@
施工分包商
-
问题类别
+
隐患类型
@@ -981,7 +981,7 @@ var basePath = '<%= ResolveUrl("~/") %>'; data: four2.series[0].data }, { name: '全部', - data: four2.series[0].data, + data: four2.series[1].data, itemStyle: { normal: { color: 'rgba(174,75,37, 1)' } } }]; } diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs index 91e5464f..11da9c87 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs @@ -52,8 +52,8 @@ namespace FineUIPro.Web /// private void getSitePerson() { - //var getEmployInOutRecords = Funs.DB.T_d_EmployInOutRecord.Where(x => x.ProjectId == this.ProjectId && x.RecordDate.Value == DateTime.Now.Date).ToList(); - // int AllCount = getEmployInOutRecords.Count(); + //var getEmployInOutRecords = Funs.DB.T_d_EmployInOutRecord.Where(x => x.ProjectId == this.ProjectId && x.RecordDate.Value == DateTime.Now.Date).ToList(); + // int AllCount = getEmployInOutRecords.Count(); var getallin = APIPageDataService.getPersonNum(ProjectId, DateTime.Now); int AllCount = getallin.Count(); @@ -61,14 +61,14 @@ namespace FineUIPro.Web if (AllCount > 0) { ////总人数 - this.divperson.InnerHtml= ((AllCount % 10000) / 1000).ToString(); + this.divperson.InnerHtml = ((AllCount % 10000) / 1000).ToString(); this.person00.InnerHtml = ((AllCount % 1000) / 100).ToString(); this.person01.InnerHtml = ((AllCount % 100) / 10).ToString(); this.person02.InnerHtml = (AllCount % 10).ToString(); } } #endregion - + #region 项目安全人工时 /// /// 项目安全人工时 @@ -85,11 +85,11 @@ namespace FineUIPro.Web List listdata = new List(); Model.SingleSerie s2 = new Model.SingleSerie(); - List listdata2= new List(); - var getMonts= SitePerson_MonthReportService.getMonthReports(CurrUser.LoginProjectId,null); - foreach (var month in getMonts.OrderBy(x=>x.CompileDate)) + List listdata2 = new List(); + var getMonts = SitePerson_MonthReportService.getMonthReports(CurrUser.LoginProjectId, null); + foreach (var month in getMonts.OrderBy(x => x.CompileDate)) { - listCategories.Add(string.Format("{0:yyyy-MM}", month.CompileDate)); + listCategories.Add(string.Format("{0:yyyy-MM}", month.CompileDate)); listdata.Add(double.Parse((month.TotalPersonWorkTime ?? 0).ToString())); listdata2.Add(double.Parse((month.DayWorkTime ?? 0).ToString())); } @@ -97,7 +97,7 @@ namespace FineUIPro.Web series.Add(s); s2.data = listdata2; series.Add(s2); - businessColumn.categories = listCategories; + businessColumn.categories = listCategories; businessColumn.series = series; return JsonConvert.SerializeObject(businessColumn); } @@ -118,11 +118,11 @@ namespace FineUIPro.Web businessColumn.title = "作业许可数量统计"; Model.SingleSerie s = new Model.SingleSerie(); List listdata = new List(); - var getStates = LicensePublicService.drpStatesItem().Where(x=>x.Value != Const._Null); + var getStates = LicensePublicService.drpStatesItem().Where(x => x.Value != Const._Null); var getLicense = APILicenseDataService.getLicenseDataListByStates(this.ProjectId, Const.UnitId_CWCEC, null); foreach (var itemStates in getStates) { - listCategories.Add(itemStates.Text); + listCategories.Add(itemStates.Text); listdata.Add(getLicense.Where(x => x.States == itemStates.Value).Count()); } s.data = listdata; @@ -173,7 +173,7 @@ namespace FineUIPro.Web //listdata.Add(unitHazardRegisters.Count() - noW.Count()); //listdata2.Add(unitHazardRegisters.Count()); - listdata.Add(unitHazardRegisters.Where(x=>x.States=="1").Count()); + listdata.Add(unitHazardRegisters.Where(x => x.States == "1").Count()); listdata2.Add(unitHazardRegisters.Count()); } } @@ -219,17 +219,34 @@ namespace FineUIPro.Web Model.SingleSerie s2 = new Model.SingleSerie(); List listdata2 = new List(); businessColumn.title = "安全检查问题统计"; - var getTypes = HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("1"); + + //隐患类型 + var getTypes = (from x in Funs.DB.Sys_Const + where x.GroupId == "Hiddendangertype" && (x.ConstValue == "其他伤害" || x.ConstValue == "起重伤害") + orderby x.SortIndex + select x).ToList(); foreach (var item in getTypes) { - listCategories.Add(item.RegisterTypesName); - var unitHazardRegisters = getHazardRegisterLists.Where(x => x.RegisterTypesId == item.RegisterTypesId); + listCategories.Add(item.ConstText); + var unitHazardRegisters = getHazardRegisterLists.Where(x => x.HiddenType == item.ConstValue); //var noW = unitHazardRegisters.Where(x => x.States != "3"); //listdata.Add(unitHazardRegisters.Count() - noW.Count()); listdata.Add(unitHazardRegisters.Where(x => x.States == "1").Count()); listdata2.Add(unitHazardRegisters.Count()); } + //问题类别 + //var getTypes = HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("1"); + //foreach (var item in getTypes) + //{ + // listCategories.Add(item.RegisterTypesName); + // var unitHazardRegisters = getHazardRegisterLists.Where(x => x.RegisterTypesId == item.RegisterTypesId); + // //var noW = unitHazardRegisters.Where(x => x.States != "3"); + // //listdata.Add(unitHazardRegisters.Count() - noW.Count()); + // listdata.Add(unitHazardRegisters.Where(x => x.States == "1").Count()); + // listdata2.Add(unitHazardRegisters.Count()); + //} + s.data = listdata; series.Add(s); s2.data = listdata2; @@ -279,7 +296,7 @@ namespace FineUIPro.Web for (int i = 0; startTime.AddMonths(i) <= endTime; i++) { listCategories.Add(string.Format("{0:yyyy-MM}", startTime.AddMonths(i))); - + var getMontDetail = from x in getTrainRecordDetail join y in getTrainRecord on x.TrainingId equals y.TrainingId where y.TrainStartDate.Value.Year == startTime.AddMonths(i).Year && y.TrainStartDate.Value.Month == startTime.AddMonths(i).Month @@ -310,7 +327,7 @@ namespace FineUIPro.Web { List series = new List(); Model.BusinessColumn businessColumn = new Model.BusinessColumn(); - + Model.SingleSerie s = new Model.SingleSerie(); List listdata = new List(); @@ -318,7 +335,7 @@ namespace FineUIPro.Web var getAccident = from x in Funs.DB.Accident_AccidentReport where x.ProjectId == this.ProjectId select x; - + listdata.Add(getAccident.Where(x => x.AccidentTypeId == "1" || x.AccidentTypeId == "2" || x.AccidentTypeId == "3" || x.AccidentTypeId == "4").Count()); listdata.Add(getAccident.Where(x => x.AccidentTypeId == "5").Count()); listdata.Add(getAccident.Where(x => x.AccidentTypeId == "6" || x.AccidentTypeId == "7").Count());