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

1

This commit is contained in:
夏菊 2025-11-24 11:01:34 +08:00
parent 447db93f9b
commit 83f1fdc8b9
2 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx
View File

@ -317,7 +317,7 @@
<div class="tab" data-value="4"> <div class="tab" data-value="4">
<div class="t-item active">施工分包商</div> <div class="t-item active">施工分包商</div>
<div class="spline"></div> <div class="spline"></div>
<div class="t-item">问题类别</div> <div class="t-item">隐患类型</div>
</div> </div>
</div> </div>
<div class="bw-item-content"> <div class="bw-item-content">
@ -981,7 +981,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
data: four2.series[0].data data: four2.series[0].data
}, { }, {
name: '全部', name: '全部',
data: four2.series[0].data, data: four2.series[1].data,
itemStyle: { normal: { color: 'rgba(174,75,37, 1)' } } itemStyle: { normal: { color: 'rgba(174,75,37, 1)' } }
}]; }];
} }

53
SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs
View File

@ -52,8 +52,8 @@ namespace FineUIPro.Web
/// </summary> /// </summary>
private void getSitePerson() private void getSitePerson()
{ {
//var getEmployInOutRecords = Funs.DB.T_d_EmployInOutRecord.Where(x => x.ProjectId == this.ProjectId && x.RecordDate.Value == DateTime.Now.Date).ToList(); //var getEmployInOutRecords = Funs.DB.T_d_EmployInOutRecord.Where(x => x.ProjectId == this.ProjectId && x.RecordDate.Value == DateTime.Now.Date).ToList();
// int AllCount = getEmployInOutRecords.Count(); // int AllCount = getEmployInOutRecords.Count();
var getallin = APIPageDataService.getPersonNum(ProjectId, DateTime.Now); var getallin = APIPageDataService.getPersonNum(ProjectId, DateTime.Now);
int AllCount = getallin.Count(); int AllCount = getallin.Count();
@ -61,14 +61,14 @@ namespace FineUIPro.Web
if (AllCount > 0) 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.person00.InnerHtml = ((AllCount % 1000) / 100).ToString();
this.person01.InnerHtml = ((AllCount % 100) / 10).ToString(); this.person01.InnerHtml = ((AllCount % 100) / 10).ToString();
this.person02.InnerHtml = (AllCount % 10).ToString(); this.person02.InnerHtml = (AllCount % 10).ToString();
} }
} }
#endregion #endregion
#region 项目安全人工时 #region 项目安全人工时
/// <summary> /// <summary>
/// 项目安全人工时 /// 项目安全人工时
@ -85,11 +85,11 @@ namespace FineUIPro.Web
List<double> listdata = new List<double>(); List<double> listdata = new List<double>();
Model.SingleSerie s2 = new Model.SingleSerie(); Model.SingleSerie s2 = new Model.SingleSerie();
List<double> listdata2= new List<double>(); List<double> listdata2 = new List<double>();
var getMonts= SitePerson_MonthReportService.getMonthReports(CurrUser.LoginProjectId,null); var getMonts = SitePerson_MonthReportService.getMonthReports(CurrUser.LoginProjectId, null);
foreach (var month in getMonts.OrderBy(x=>x.CompileDate)) 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())); listdata.Add(double.Parse((month.TotalPersonWorkTime ?? 0).ToString()));
listdata2.Add(double.Parse((month.DayWorkTime ?? 0).ToString())); listdata2.Add(double.Parse((month.DayWorkTime ?? 0).ToString()));
} }
@ -97,7 +97,7 @@ namespace FineUIPro.Web
series.Add(s); series.Add(s);
s2.data = listdata2; s2.data = listdata2;
series.Add(s2); series.Add(s2);
businessColumn.categories = listCategories; businessColumn.categories = listCategories;
businessColumn.series = series; businessColumn.series = series;
return JsonConvert.SerializeObject(businessColumn); return JsonConvert.SerializeObject(businessColumn);
} }
@ -118,11 +118,11 @@ namespace FineUIPro.Web
businessColumn.title = "作业许可数量统计"; businessColumn.title = "作业许可数量统计";
Model.SingleSerie s = new Model.SingleSerie(); Model.SingleSerie s = new Model.SingleSerie();
List<double> listdata = new List<double>(); List<double> listdata = new List<double>();
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); var getLicense = APILicenseDataService.getLicenseDataListByStates(this.ProjectId, Const.UnitId_CWCEC, null);
foreach (var itemStates in getStates) foreach (var itemStates in getStates)
{ {
listCategories.Add(itemStates.Text); listCategories.Add(itemStates.Text);
listdata.Add(getLicense.Where(x => x.States == itemStates.Value).Count()); listdata.Add(getLicense.Where(x => x.States == itemStates.Value).Count());
} }
s.data = listdata; s.data = listdata;
@ -173,7 +173,7 @@ namespace FineUIPro.Web
//listdata.Add(unitHazardRegisters.Count() - noW.Count()); //listdata.Add(unitHazardRegisters.Count() - noW.Count());
//listdata2.Add(unitHazardRegisters.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()); listdata2.Add(unitHazardRegisters.Count());
} }
} }
@ -219,17 +219,34 @@ namespace FineUIPro.Web
Model.SingleSerie s2 = new Model.SingleSerie(); Model.SingleSerie s2 = new Model.SingleSerie();
List<double> listdata2 = new List<double>(); List<double> listdata2 = new List<double>();
businessColumn.title = "安全检查问题统计"; 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) foreach (var item in getTypes)
{ {
listCategories.Add(item.RegisterTypesName); listCategories.Add(item.ConstText);
var unitHazardRegisters = getHazardRegisterLists.Where(x => x.RegisterTypesId == item.RegisterTypesId); var unitHazardRegisters = getHazardRegisterLists.Where(x => x.HiddenType == item.ConstValue);
//var noW = unitHazardRegisters.Where(x => x.States != "3"); //var noW = unitHazardRegisters.Where(x => x.States != "3");
//listdata.Add(unitHazardRegisters.Count() - noW.Count()); //listdata.Add(unitHazardRegisters.Count() - noW.Count());
listdata.Add(unitHazardRegisters.Where(x => x.States == "1").Count()); listdata.Add(unitHazardRegisters.Where(x => x.States == "1").Count());
listdata2.Add(unitHazardRegisters.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; s.data = listdata;
series.Add(s); series.Add(s);
s2.data = listdata2; s2.data = listdata2;
@ -279,7 +296,7 @@ namespace FineUIPro.Web
for (int i = 0; startTime.AddMonths(i) <= endTime; i++) for (int i = 0; startTime.AddMonths(i) <= endTime; i++)
{ {
listCategories.Add(string.Format("{0:yyyy-MM}", startTime.AddMonths(i))); listCategories.Add(string.Format("{0:yyyy-MM}", startTime.AddMonths(i)));
var getMontDetail = from x in getTrainRecordDetail var getMontDetail = from x in getTrainRecordDetail
join y in getTrainRecord on x.TrainingId equals y.TrainingId 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 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<Model.SingleSerie> series = new List<Model.SingleSerie>(); List<Model.SingleSerie> series = new List<Model.SingleSerie>();
Model.BusinessColumn businessColumn = new Model.BusinessColumn(); Model.BusinessColumn businessColumn = new Model.BusinessColumn();
Model.SingleSerie s = new Model.SingleSerie(); Model.SingleSerie s = new Model.SingleSerie();
List<double> listdata = new List<double>(); List<double> listdata = new List<double>();
@ -318,7 +335,7 @@ namespace FineUIPro.Web
var getAccident = from x in Funs.DB.Accident_AccidentReport var getAccident = from x in Funs.DB.Accident_AccidentReport
where x.ProjectId == this.ProjectId where x.ProjectId == this.ProjectId
select x; 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 == "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 == "5").Count());
listdata.Add(getAccident.Where(x => x.AccidentTypeId == "6" || x.AccidentTypeId == "7").Count()); listdata.Add(getAccident.Where(x => x.AccidentTypeId == "6" || x.AccidentTypeId == "7").Count());