From f590c95d94769d4aca3b1220bf5d6c3a7de63ec2 Mon Sep 17 00:00:00 2001 From: 10191 <506754232@qq.com> Date: Wed, 3 Jan 2024 14:12:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE=E5=8F=AA?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9C=AC=E5=B9=B4=E4=BB=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HiddenInspection/RiskAnalysisChart.aspx | 34 +- .../RiskAnalysisChart.aspx.cs | 323 +++++++++++++----- SGGL/FineUIPro.Web/common/main.aspx.cs | 33 +- SGGL/FineUIPro.Web/common/mainProject.aspx | 2 +- SGGL/FineUIPro.Web/common/mainProject.aspx.cs | 25 +- SGGL/WebAPI/Common/PersonKqSocketServices.cs | 4 +- 6 files changed, 291 insertions(+), 130 deletions(-) diff --git a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx index 6e086516..f3c7660a 100644 --- a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx +++ b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx @@ -35,7 +35,9 @@ + + @@ -115,22 +117,22 @@ series: series }; - if (xAxis.length > 5) { - option.dataZoom = [{ - type: 'slider', - show: true, - startValue: 0, - endValue: 4, - height: '10', - backgroundColor: '#aed0ea', - fillerColor: '#107f8b', - bottom: '10%', - zoomLock: true, - moveOnMouseWheel: true, - brushSelect: true, - showDetail: false, - }] - } + //if (xAxis.length > 5) { + // option.dataZoom = [{ + // type: 'slider', + // show: true, + // startValue: 0, + // endValue: 4, + // height: '10', + // backgroundColor: '#aed0ea', + // fillerColor: '#107f8b', + // bottom: '10%', + // zoomLock: true, + // moveOnMouseWheel: true, + // brushSelect: true, + // showDetail: false, + // }] + //} var myChart = echarts.init(document.getElementById("divAccidentTime")); myChart.setOption(option); diff --git a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx.cs index 5b340bcf..0175483e 100644 --- a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx.cs @@ -73,7 +73,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection } if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim())) { - strSql += " and CheckTime <'" + DateTime.Parse( this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' "; + strSql += " and CheckTime <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' "; } if (drpUnit.SelectedValue != BLL.Const._Null) @@ -156,56 +156,205 @@ namespace FineUIPro.Web.HSSE.HiddenInspection }, data: " + series3 + @" }]"; - - string strSql1 = @" select r.RegisterTypesId,t.RegisterTypesName, + + string strSql1 = @" select r.RegisterTypesId,t.RegisterTypesName, count(*) as allnum, Sum(case when States= 1 or States is null then 1 else 0 end) as todo, Sum(case when States= 3 or States =2 then 1 else 0 end) as finish from HSSE_Hazard_HazardRegister r left join HSSE_Hazard_HazardRegisterTypes t on r.RegisterTypesId=t.RegisterTypesId where ProjectId=@ProjectId and States != '4' and ProblemTypes = '1' "; - if (!string.IsNullOrEmpty(this.txtStartRectificationTime.Text.Trim())) - { - strSql1 += " and CheckTime >='" + this.txtStartRectificationTime.Text.Trim() + "' "; - } - if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim())) - { - strSql1 += " and CheckTime <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' "; - } + if (!string.IsNullOrEmpty(this.txtStartRectificationTime.Text.Trim())) + { + strSql1 += " and CheckTime >='" + this.txtStartRectificationTime.Text.Trim() + "' "; + } + if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim())) + { + strSql1 += " and CheckTime <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' "; + } - if (drpUnit.SelectedValue != BLL.Const._Null) - { - strSql1 += " and r.ResponsibleUnit='" + drpUnit.SelectedValue + "' "; - } - if (drpRegisterTypes.SelectedValue != BLL.Const._Null) - { - strSql1 += " and r.RegisterTypesId='" + drpRegisterTypes.SelectedValue + "' "; - } - strSql1 += " group by r.RegisterTypesId,t.RegisterTypesName "; - List listStr1 = new List(); - listStr1.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + if (drpUnit.SelectedValue != BLL.Const._Null) + { + strSql1 += " and r.ResponsibleUnit='" + drpUnit.SelectedValue + "' "; + } + if (drpRegisterTypes.SelectedValue != BLL.Const._Null) + { + strSql1 += " and r.RegisterTypesId='" + drpRegisterTypes.SelectedValue + "' "; + } + strSql1 += " group by r.RegisterTypesId,t.RegisterTypesName "; + List listStr1 = new List(); + listStr1.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - SqlParameter[] parameter1 = listStr1.ToArray(); - DataTable tb1 = SQLHelper.GetDataTableRunText(strSql1, parameter1); - if (tb1 != null) - { - xPieAxis = "["; - seriesPie = "["; - - foreach (DataRow dr in tb1.Rows) - { - xPieAxis += " '" + dr["RegisterTypesName"].ToString() + "' ,"; - seriesPie += " { name:'" + dr["RegisterTypesName"].ToString() + "', value:" + dr["allnum"].ToString() + "} ,"; + SqlParameter[] parameter1 = listStr1.ToArray(); + DataTable tb1 = SQLHelper.GetDataTableRunText(strSql1, parameter1); + if (tb1 != null) + { + xPieAxis = "["; + seriesPie = "["; - } - xPieAxis=xPieAxis.TrimEnd(','); - seriesPie=seriesPie.TrimEnd(','); - xPieAxis += "]"; - seriesPie += "]"; - } - } - else + foreach (DataRow dr in tb1.Rows) + { + xPieAxis += " '" + dr["RegisterTypesName"].ToString() + "' ,"; + seriesPie += " { name:'" + dr["RegisterTypesName"].ToString() + "', value:" + dr["allnum"].ToString() + "} ,"; + + } + xPieAxis = xPieAxis.TrimEnd(','); + seriesPie = seriesPie.TrimEnd(','); + xPieAxis += "]"; + seriesPie += "]"; + } + } + else if (this.rblState.SelectedValue == "2") + { + + + string strSql = @" select a.CheckManId,b.UserName, + count(*) as allnum, + Sum(case when States= 1 or States is null then 1 else 0 end) as todo, + Sum(case when States= 3 or States =2 then 1 else 0 end) as finish + from HSSE_Hazard_HazardRegister a left join Sys_User b on a.CheckManId = b.UserId + where a.ProjectId=@ProjectId and States != '4' and ProblemTypes = '1' + "; + if (!string.IsNullOrEmpty(this.txtStartRectificationTime.Text.Trim())) + { + strSql += " and CheckTime >='" + this.txtStartRectificationTime.Text.Trim() + "' "; + } + if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim())) + { + strSql += " and CheckTime <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' "; + } + + if (drpUnit.SelectedValue != BLL.Const._Null) + { + strSql += " and a.ResponsibleUnit='" + drpUnit.SelectedValue + "' "; + } + if (drpRegisterTypes.SelectedValue != BLL.Const._Null) + { + strSql += " and a.RegisterTypesId='" + drpRegisterTypes.SelectedValue + "' "; + } + strSql += " group by a.CheckManId,b.UserName "; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + legend = "[\"全部\", \"待整改\", \"已整改\"]"; + xAxis = "["; + + string series1 = "["; + string series2 = "["; + string series3 = "["; + foreach (DataRow dr in tb.Rows) + { + xAxis += "\"" + dr["UserName"].ToString() + "\","; + series1 += "" + dr["allnum"].ToString() + ","; + series2 += "" + dr["todo"].ToString() + ","; + series3 += "" + dr["finish"].ToString() + ","; + + + } + xAxis = xAxis.TrimEnd(','); + xAxis += "]"; + series1 = series1.TrimEnd(','); + series1 += "]"; + series2 = series2.TrimEnd(','); + series2 += "]"; + series3 = series3.TrimEnd(','); + series3 += "]"; + + series = @"[{ + name: '全部', + type: 'bar', + label: { + show: true, + position: 'top' + }, + barWidth: 20, + barGap:'5%', + emphasis: { + focus: 'series' + }, + data: " + series1 + @" + }, + { + name: '待整改', + type: 'bar', + barWidth: 20, + barGap:'5%', + label: { + show: true, + position: 'top' + }, + emphasis: { + focus: 'series' + }, + data: " + series2 + @" + }, + { + name: '已整改', + type: 'bar', + barWidth: 20, + barGap:'5%', + label: { + show: true, + position: 'top' + }, + emphasis: { + focus: 'series' + }, + data: " + series3 + @" + }]"; + + + string strSql1 = @" select r.RegisterTypesId,t.RegisterTypesName, + count(*) as allnum, + Sum(case when States= 1 or States is null then 1 else 0 end) as todo, + Sum(case when States= 3 or States =2 then 1 else 0 end) as finish + from HSSE_Hazard_HazardRegister r left join HSSE_Hazard_HazardRegisterTypes t on r.RegisterTypesId=t.RegisterTypesId + where ProjectId=@ProjectId and States != '4' and ProblemTypes = '1' + "; + if (!string.IsNullOrEmpty(this.txtStartRectificationTime.Text.Trim())) + { + strSql1 += " and CheckTime >='" + this.txtStartRectificationTime.Text.Trim() + "' "; + } + if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim())) + { + strSql1 += " and CheckTime <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' "; + } + + if (drpUnit.SelectedValue != BLL.Const._Null) + { + strSql1 += " and r.ResponsibleUnit='" + drpUnit.SelectedValue + "' "; + } + if (drpRegisterTypes.SelectedValue != BLL.Const._Null) + { + strSql1 += " and r.RegisterTypesId='" + drpRegisterTypes.SelectedValue + "' "; + } + strSql1 += " group by r.RegisterTypesId,t.RegisterTypesName "; + List listStr1 = new List(); + listStr1.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + + SqlParameter[] parameter1 = listStr1.ToArray(); + DataTable tb1 = SQLHelper.GetDataTableRunText(strSql1, parameter1); + if (tb1 != null) + { + xPieAxis = "["; + seriesPie = "["; + + foreach (DataRow dr in tb1.Rows) + { + xPieAxis += " '" + dr["RegisterTypesName"].ToString() + "' ,"; + seriesPie += " { name:'" + dr["RegisterTypesName"].ToString() + "', value:" + dr["allnum"].ToString() + "} ,"; + + } + xPieAxis = xPieAxis.TrimEnd(','); + seriesPie = seriesPie.TrimEnd(','); + xPieAxis += "]"; + seriesPie += "]"; + } + } + else { string strSql = @" select u.UnitId,u.unitName,r.RegisterTypesId,t.RegisterTypesName, count(*) as allnum, @@ -254,14 +403,14 @@ namespace FineUIPro.Web.HSSE.HiddenInspection Dictionary temp = null; if (!data.ContainsKey(dr["unitName"].ToString())) { - data.Add(dr["unitName"].ToString(), new Dictionary()); + data.Add(dr["unitName"].ToString(), new Dictionary()); } temp = data[dr["unitName"].ToString()]; if (!temp.ContainsKey(dr["RegisterTypesName"].ToString())) { - temp.Add(dr["RegisterTypesName"].ToString(),"0"); + temp.Add(dr["RegisterTypesName"].ToString(), "0"); } - temp[dr["RegisterTypesName"].ToString()]=dr["allnum"].ToString(); + temp[dr["RegisterTypesName"].ToString()] = dr["allnum"].ToString(); } foreach (string types in xdic) @@ -295,7 +444,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection } series += @"{ - name: '"+ unit + @"[全部]', + name: '" + unit + @"[全部]', type: 'bar', stack: '全部', barWidth: 10, @@ -309,11 +458,11 @@ namespace FineUIPro.Web.HSSE.HiddenInspection data: [" + tempseries.TrimEnd(',') + @"] },"; } - data = new Dictionary>(); + data = new Dictionary>(); foreach (DataRow dr in tb.Rows) { xdic.Add(dr["RegisterTypesName"].ToString()); - Dictionary temp = null; + Dictionary temp = null; if (!data.ContainsKey(dr["unitName"].ToString())) { data.Add(dr["unitName"].ToString(), new Dictionary()); @@ -323,7 +472,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection { temp.Add(dr["RegisterTypesName"].ToString(), "0"); } - temp[dr["RegisterTypesName"].ToString()]=dr["todo"].ToString(); + temp[dr["RegisterTypesName"].ToString()] = dr["todo"].ToString(); } foreach (string unit in data.Keys) { @@ -369,7 +518,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection { temp.Add(dr["RegisterTypesName"].ToString(), "0"); } - temp[dr["RegisterTypesName"].ToString()]=dr["finish"].ToString(); + temp[dr["RegisterTypesName"].ToString()] = dr["finish"].ToString(); } foreach (string unit in data.Keys) { @@ -407,56 +556,56 @@ namespace FineUIPro.Web.HSSE.HiddenInspection - string strSql1 = @" select r.RegisterTypesId,t.RegisterTypesName, + string strSql1 = @" select r.RegisterTypesId,t.RegisterTypesName, count(*) as allnum, Sum(case when States= 1 or States is null then 1 else 0 end) as todo, Sum(case when States= 3 or States =2 then 1 else 0 end) as finish from HSSE_Hazard_HazardRegister r left join HSSE_Hazard_HazardRegisterTypes t on r.RegisterTypesId=t.RegisterTypesId where ProjectId=@ProjectId and States != '4' and ProblemTypes = '1' "; - if (!string.IsNullOrEmpty(this.txtStartRectificationTime.Text.Trim())) - { - strSql1 += " and CheckTime >='" + this.txtStartRectificationTime.Text.Trim() + "' "; - } - if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim())) - { - strSql1 += " and CheckTime <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' "; - } + if (!string.IsNullOrEmpty(this.txtStartRectificationTime.Text.Trim())) + { + strSql1 += " and CheckTime >='" + this.txtStartRectificationTime.Text.Trim() + "' "; + } + if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim())) + { + strSql1 += " and CheckTime <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' "; + } - if (drpUnit.SelectedValue != BLL.Const._Null) - { - strSql1 += " and r.ResponsibleUnit='" + drpUnit.SelectedValue + "' "; - } - if (drpRegisterTypes.SelectedValue != BLL.Const._Null) - { - strSql1 += " and r.RegisterTypesId='" + drpRegisterTypes.SelectedValue + "' "; - } - strSql1 += " group by r.RegisterTypesId,t.RegisterTypesName "; - List listStr1 = new List(); - listStr1.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + if (drpUnit.SelectedValue != BLL.Const._Null) + { + strSql1 += " and r.ResponsibleUnit='" + drpUnit.SelectedValue + "' "; + } + if (drpRegisterTypes.SelectedValue != BLL.Const._Null) + { + strSql1 += " and r.RegisterTypesId='" + drpRegisterTypes.SelectedValue + "' "; + } + strSql1 += " group by r.RegisterTypesId,t.RegisterTypesName "; + List listStr1 = new List(); + listStr1.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - SqlParameter[] parameter1 = listStr1.ToArray(); - DataTable tb1 = SQLHelper.GetDataTableRunText(strSql1, parameter1); - if (tb1 != null) - { - xPieAxis = "["; - seriesPie = "["; + SqlParameter[] parameter1 = listStr1.ToArray(); + DataTable tb1 = SQLHelper.GetDataTableRunText(strSql1, parameter1); + if (tb1 != null) + { + xPieAxis = "["; + seriesPie = "["; - foreach (DataRow dr in tb1.Rows) - { - xPieAxis += " '" + dr["RegisterTypesName"].ToString() + "' ,"; - seriesPie += " { name:'" + dr["RegisterTypesName"].ToString() + "', value:" + dr["allnum"].ToString() + "} ,"; + foreach (DataRow dr in tb1.Rows) + { + xPieAxis += " '" + dr["RegisterTypesName"].ToString() + "' ,"; + seriesPie += " { name:'" + dr["RegisterTypesName"].ToString() + "', value:" + dr["allnum"].ToString() + "} ,"; - } - xPieAxis = xPieAxis.TrimEnd(','); - seriesPie = seriesPie.TrimEnd(','); - xPieAxis += "]"; - seriesPie += "]"; - } - + } + xPieAxis = xPieAxis.TrimEnd(','); + seriesPie = seriesPie.TrimEnd(','); + xPieAxis += "]"; + seriesPie += "]"; + } - } + + } // this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "单位巡检分析", this.drpChartType.SelectedValue, 1130, 450, this.ckbShow.Checked)); //#endregion diff --git a/SGGL/FineUIPro.Web/common/main.aspx.cs b/SGGL/FineUIPro.Web/common/main.aspx.cs index 8859fce1..2c6d6d97 100644 --- a/SGGL/FineUIPro.Web/common/main.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main.aspx.cs @@ -123,8 +123,9 @@ namespace FineUIPro.Web.common var ProjectTotal1 = (from x in Funs.DB.HSSE_MonthReportItem join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId - where ("成达公司HSE管理人数" == x.ReportItem || "分包商HSE管理人数" == x.ReportItem) && y.Years == DateTime.Now.Year - select x.YearTotal).Sum(); + //where ("成达公司HSE管理人数" == x.ReportItem || "分包商HSE管理人数" == x.ReportItem) && y.Years == DateTime.Now.Year + where ("成达公司现场人数" == x.ReportItem ) && y.Years == DateTime.Now.Year + select x.YearTotal).Sum(); if (ProjectTotal1.HasValue) { @@ -133,14 +134,16 @@ namespace FineUIPro.Web.common var ProjectTotal2 = (from x in Funs.DB.HSSE_MonthReportItem join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId - where ("成达公司现场人数" == x.ReportItem || "分包商现场人数" == x.ReportItem) && y.Years == DateTime.Now.Year - select x.YearTotal).Sum(); + //where ("成达公司现场人数" == x.ReportItem || "分包商现场人数" == x.ReportItem) && y.Years == DateTime.Now.Year + where ( "分包商现场人数" == x.ReportItem) && y.Years == DateTime.Now.Year + select x.YearTotal).Sum(); - if (ProjectTotal2.HasValue && ProjectTotal1.HasValue) - { - this.divZYPerson.InnerHtml = (ProjectTotal2.Value - ProjectTotal1.Value).ToString(); - } - else if (ProjectTotal2.HasValue) + //if (ProjectTotal2.HasValue && ProjectTotal1.HasValue) + //{ + // this.divZYPerson.InnerHtml = (ProjectTotal2.Value - ProjectTotal1.Value).ToString(); + //} + //else + if (ProjectTotal2.HasValue) { this.divZYPerson.InnerHtml = ProjectTotal2.Value.ToString(); } @@ -202,9 +205,9 @@ namespace FineUIPro.Web.common // this.divRectifyRate.InnerHtml = Math.Round(ccount * 1.0 / allcout * 100, 1).ToString(); //} - + DateTime time = DateTime.Parse(DateTime.Now.ToString("yyyy-01-01")); var getRectify = from x in Funs.DB.View_Hazard_HazardRegister - where x.States != Const.State_0 && x.States != Const.State_R && x.States != null + where x.States != Const.State_0 && x.States != Const.State_R && x.States != null && x.RegisterDate>= time group x by x.States into g select new { g.Key, Count = g.Count() }; var allcout = getRectify.ToList(); @@ -269,13 +272,17 @@ namespace FineUIPro.Web.common /// private void getCQMSProblem() { + DateTime time = DateTime.Parse(DateTime.Now.ToString("yyyy-01-01")); ///整改率 CRectificationRate = 0; ///合格率 CQualifiedRate = 0; var getJointCheckDetail = from x in Funs.DB.Check_JointCheckDetail + where x.CreateDate >= time select x; - var getCheckControl = from x in Funs.DB.Check_CheckControl select x; + var getCheckControl = from x in Funs.DB.Check_CheckControl + where x.CheckDate >= time + select x; ///问题总数 int AllCount = getJointCheckDetail.Count() + getCheckControl.Count(); this.divCQMSAllNum.InnerHtml = AllCount.ToString(); @@ -293,7 +300,7 @@ namespace FineUIPro.Web.common CRectificationRate = Math.Round(CCount * 1.0 / AllCount * 100, 1); } } - var inspectionManagements = from x in Funs.DB.View_CQMS_InspectionManagementDetail select x; + var inspectionManagements = from x in Funs.DB.View_CQMS_InspectionManagementDetail where x.CheckDate>=time select x; if (inspectionManagements.Count() > 0) { int okInspectionManagements = inspectionManagements.Where(x => x.IsOnceQualified == true).Count(); diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx b/SGGL/FineUIPro.Web/common/mainProject.aspx index d36ad3a9..1d86ffe7 100644 --- a/SGGL/FineUIPro.Web/common/mainProject.aspx +++ b/SGGL/FineUIPro.Web/common/mainProject.aspx @@ -280,7 +280,7 @@
-
劳务数据
+
劳务数据(累计)
diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs index bd2b5021..6f3c4037 100644 --- a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs @@ -184,7 +184,8 @@ namespace FineUIPro.Web.common //} var ProjectTotal1 = (from x in Funs.DB.HSSE_MonthReportItem join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId - where ("成达公司HSE管理人数" == x.ReportItem || "分包商HSE管理人数" == x.ReportItem) && y.Years == DateTime.Now.Year && y.ProjectId==CurrUser.LoginProjectId + // where ("成达公司HSE管理人数" == x.ReportItem || "分包商HSE管理人数" == x.ReportItem) && y.Years == DateTime.Now.Year && y.ProjectId==CurrUser.LoginProjectId + where ("成达公司现场人数" == x.ReportItem ) && y.Years == DateTime.Now.Year && y.ProjectId==CurrUser.LoginProjectId select x.YearTotal).Sum(); @@ -194,24 +195,26 @@ namespace FineUIPro.Web.common var ProjectTotal2 = (from x in Funs.DB.HSSE_MonthReportItem join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId - where ("成达公司现场人数" == x.ReportItem || "分包商现场人数" == x.ReportItem) && y.Years == DateTime.Now.Year && y.ProjectId == CurrUser.LoginProjectId + // where ("成达公司现场人数" == x.ReportItem || "分包商现场人数" == x.ReportItem) && y.Years == DateTime.Now.Year && y.ProjectId == CurrUser.LoginProjectId + where ( "分包商现场人数" == x.ReportItem) && y.Years == DateTime.Now.Year && y.ProjectId == CurrUser.LoginProjectId select x.YearTotal).Sum(); if (ProjectTotal1.HasValue) { - this.divGLPerson.InnerHtml = ProjectTotal1.Value.ToString(); + this.divGLPerson.InnerHtml = ProjectTotal1.Value.ToString() + "人月"; } - if (ProjectTotal2.HasValue) + if (ProjectTotal2.HasValue&& ProjectTotal1.HasValue) { - this.divALLPerson.InnerHtml = ProjectTotal2.Value.ToString(); + this.divALLPerson.InnerHtml = (ProjectTotal1.Value + ProjectTotal2.Value).ToString() + "人月"; } - if (ProjectTotal1.HasValue && ProjectTotal2.HasValue) - { - this.divZYPerson.InnerHtml = (ProjectTotal2.Value - ProjectTotal1.Value).ToString(); - } - else if(ProjectTotal2.HasValue) + //if (ProjectTotal1.HasValue && ProjectTotal2.HasValue) + //{ + // this.divZYPerson.InnerHtml = (ProjectTotal2.Value - ProjectTotal1.Value).ToString(); + //} + //else + if(ProjectTotal2.HasValue) { - this.divZYPerson.InnerHtml = ProjectTotal2.Value .ToString(); + this.divZYPerson.InnerHtml = ProjectTotal2.Value .ToString()+"人月"; } diff --git a/SGGL/WebAPI/Common/PersonKqSocketServices.cs b/SGGL/WebAPI/Common/PersonKqSocketServices.cs index 853ca2fe..5a38cd5b 100644 --- a/SGGL/WebAPI/Common/PersonKqSocketServices.cs +++ b/SGGL/WebAPI/Common/PersonKqSocketServices.cs @@ -17,8 +17,8 @@ namespace WebAPI.Common public static void init(int port) { allSockets = new Dictionary(); - webSocketServer = new WebSocketServer("wss://0.0.0.0:" + port); - //webSocketServer.Certificate = new X509Certificate2("MyCert.pfx",""); + webSocketServer = new WebSocketServer("wss://127.0.0.1:" + port); + webSocketServer.Certificate = new X509Certificate2("D:\\project\\vs\\sggl_cd\\SGGL\\WebAPI\\bin\\wzgl.hfnbd.com.pfx", "1y1fib61"); webSocketServer.Start(socket => {