HSE巡检统计图表,补充按隐患类型统计
This commit is contained in:
@@ -98,23 +98,24 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
|
||||
}
|
||||
else
|
||||
{
|
||||
#region 按检查项
|
||||
#region 按隐患类型
|
||||
|
||||
var types = from x in Funs.DB.Sys_Const where x.GroupId == "Hiddendangertype" orderby x.SortIndex select x;
|
||||
if (this.drpChartType.SelectedValue != "Pie") //非饼形图
|
||||
{
|
||||
///按检查项
|
||||
///按隐患类型
|
||||
DataTable dtTime = new DataTable();
|
||||
dtTime.Columns.Add("检查项", typeof(string));
|
||||
dtTime.Columns.Add("隐患类型", typeof(string));
|
||||
dtTime.Columns.Add("总数量", typeof(string));
|
||||
dtTime.Columns.Add("待整改", typeof(string));
|
||||
dtTime.Columns.Add("已整改", typeof(string));
|
||||
|
||||
var types = from x in Funs.DB.HSSE_Hazard_HazardRegisterTypes where x.HazardRegisterType == "1" orderby x.TypeCode select x;
|
||||
foreach (var item in types)
|
||||
{
|
||||
DataRow rowTime = dtTime.NewRow();
|
||||
Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
|
||||
rowTime["检查项"] = item.RegisterTypesName;
|
||||
var typeHazad = hazardRegisters.Where(x => x.RegisterTypesId == item.RegisterTypesId);
|
||||
rowTime["隐患类型"] = item.ConstValue;
|
||||
var typeHazad = hazardRegisters.Where(x => x.HiddenType == item.ConstValue);
|
||||
rowTime["总数量"] = typeHazad.Count();
|
||||
rowTime["待整改"] = typeHazad.Where(x => x.States == "1" || x.States == null).Count();
|
||||
rowTime["已整改"] = typeHazad.Where(x => x.States == "3" || x.States == "2").Count();
|
||||
@@ -127,22 +128,70 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
|
||||
{
|
||||
///按问题类型
|
||||
DataTable dtTime = new DataTable();
|
||||
dtTime.Columns.Add("检查项", typeof(string));
|
||||
dtTime.Columns.Add("隐患类型", typeof(string));
|
||||
dtTime.Columns.Add("总数量", typeof(string));
|
||||
|
||||
var types = from x in Funs.DB.HSSE_Hazard_HazardRegisterTypes where x.HazardRegisterType == "1" orderby x.TypeCode select x;
|
||||
foreach (var item in types)
|
||||
{
|
||||
DataRow rowTime = dtTime.NewRow();
|
||||
Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
|
||||
rowTime["检查项"] = item.RegisterTypesName;
|
||||
var typeHazad = hazardRegisters.Where(x => x.RegisterTypesId == item.RegisterTypesId);
|
||||
rowTime["隐患类型"] = item.ConstValue;
|
||||
var typeHazad = hazardRegisters.Where(x => x.HiddenType == item.ConstValue);
|
||||
rowTime["总数量"] = typeHazad.Count();
|
||||
dtTime.Rows.Add(rowTime);
|
||||
}
|
||||
|
||||
this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "巡检问题分析", this.drpChartType.SelectedValue, 1100, 330, this.ckbShow.Checked));
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
#region 按检查项
|
||||
//if (this.drpChartType.SelectedValue != "Pie") //非饼形图
|
||||
//{
|
||||
// ///按检查项
|
||||
// DataTable dtTime = new DataTable();
|
||||
// dtTime.Columns.Add("检查项", typeof(string));
|
||||
// dtTime.Columns.Add("总数量", typeof(string));
|
||||
// dtTime.Columns.Add("待整改", typeof(string));
|
||||
// dtTime.Columns.Add("已整改", typeof(string));
|
||||
|
||||
// var types = from x in Funs.DB.HSSE_Hazard_HazardRegisterTypes where x.HazardRegisterType == "1" orderby x.TypeCode select x;
|
||||
// foreach (var item in types)
|
||||
// {
|
||||
// DataRow rowTime = dtTime.NewRow();
|
||||
// Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
|
||||
// rowTime["检查项"] = item.RegisterTypesName;
|
||||
// var typeHazad = hazardRegisters.Where(x => x.RegisterTypesId == item.RegisterTypesId);
|
||||
// rowTime["总数量"] = typeHazad.Count();
|
||||
// rowTime["待整改"] = typeHazad.Where(x => x.States == "1" || x.States == null).Count();
|
||||
// rowTime["已整改"] = typeHazad.Where(x => x.States == "3" || x.States == "2").Count();
|
||||
// dtTime.Rows.Add(rowTime);
|
||||
// }
|
||||
|
||||
// this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "巡检问题分析", this.drpChartType.SelectedValue, 1100, 330, this.ckbShow.Checked));
|
||||
//}
|
||||
//else //饼形图
|
||||
//{
|
||||
// ///按问题类型
|
||||
// DataTable dtTime = new DataTable();
|
||||
// dtTime.Columns.Add("检查项", typeof(string));
|
||||
// dtTime.Columns.Add("总数量", typeof(string));
|
||||
|
||||
// var types = from x in Funs.DB.HSSE_Hazard_HazardRegisterTypes where x.HazardRegisterType == "1" orderby x.TypeCode select x;
|
||||
// foreach (var item in types)
|
||||
// {
|
||||
// DataRow rowTime = dtTime.NewRow();
|
||||
// Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
|
||||
// rowTime["检查项"] = item.RegisterTypesName;
|
||||
// var typeHazad = hazardRegisters.Where(x => x.RegisterTypesId == item.RegisterTypesId);
|
||||
// rowTime["总数量"] = typeHazad.Count();
|
||||
// dtTime.Rows.Add(rowTime);
|
||||
// }
|
||||
|
||||
// this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "巡检问题分析", this.drpChartType.SelectedValue, 1100, 330, this.ckbShow.Checked));
|
||||
//}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user