From 371164075639882fbfc980dfd928782740d711e4 Mon Sep 17 00:00:00 2001 From: geh <1923421292@qq.com> Date: Fri, 1 Aug 2025 11:21:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=A1=B5=E9=9D=A2=E7=A9=BF=E9=80=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataShow/ProjectDivision.aspx.cs | 23 +- SUBQHSE/FineUIPro.Web/common/main.aspx | 220 +++++++++++++++--- 2 files changed, 208 insertions(+), 35 deletions(-) diff --git a/SUBQHSE/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs b/SUBQHSE/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs index 7b1ca3a..cb6c64c 100644 --- a/SUBQHSE/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs @@ -43,7 +43,7 @@ namespace FineUIPro.Web.DataShow BindGrid(); //合计 - OutputSummaryData(); + // OutputSummaryData(); this.Panel1.Title = "工程划分数据(" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + ")"; } } @@ -68,11 +68,11 @@ namespace FineUIPro.Web.DataShow p.ProjectId, p.ProjectCode, p.ProjectName, - Count1 = db.Project_Installation.Count(a => a.ProjectId == p.ProjectId && a.SuperInstallationId == "0"), - Count2 = db.WBS_UnitWork.Count(b => b.ProjectId == p.ProjectId), - Count3 = db.WBS_DivisionProject.Count(c => c.ProjectId == p.ProjectId && c.SubItemType == "1"), - Count4 = db.WBS_DivisionProject.Count(d => d.ProjectId == p.ProjectId && d.SubItemType == "3"), - Count5 = db.WBS_BreakdownProject.Count(e => e.ProjectId == p.ProjectId) + count1 = db.Project_Installation.Count(a => a.ProjectId == p.ProjectId && a.SuperInstallationId == "0"), + count2 = db.WBS_UnitWork.Count(b => b.ProjectId == p.ProjectId), + count3 = db.WBS_DivisionProject.Count(c => c.ProjectId == p.ProjectId && c.SubItemType == "1" && c.IsSelected == true), + count4 = db.WBS_DivisionProject.Count(d => d.ProjectId == p.ProjectId && d.SubItemType == "3" && d.IsSelected == true), + count5 = db.WBS_BreakdownProject.Count(e => e.ProjectId == p.ProjectId) }).ToList(); if (!string.IsNullOrEmpty(this.ucTree.SelectedNodeID)) @@ -98,9 +98,18 @@ namespace FineUIPro.Web.DataShow //{ // strSql += " AND h.RegisterDate <=@EndTime"; // listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text)); - //}Grid1.RecordCount =model.Count; + //} + Grid1.RecordCount = model.Count; Grid1.DataSource = model.OrderBy(x => x.ProjectId); Grid1.DataBind(); + JObject summary = new JObject(); + summary.Add("ProjectName", "合计:"); + summary.Add("count1", model.Sum(x => x.count1)); + summary.Add("count2", model.Sum(x => x.count2)); + summary.Add("count3", model.Sum(x => x.count3)); + summary.Add("count4", model.Sum(x => x.count4)); + summary.Add("count5", model.Sum(x => x.count5)); + Grid1.SummaryData = summary; } #endregion diff --git a/SUBQHSE/FineUIPro.Web/common/main.aspx b/SUBQHSE/FineUIPro.Web/common/main.aspx index 3d6746c..03d1d5c 100644 --- a/SUBQHSE/FineUIPro.Web/common/main.aspx +++ b/SUBQHSE/FineUIPro.Web/common/main.aspx @@ -29,7 +29,7 @@
组织机构人员
-
+
{{form.org.branchSum}}
分支结构人数
@@ -51,7 +51,7 @@
专职
-
+
分支机构
@@ -61,7 +61,7 @@
-
+
注安师
@@ -70,7 +70,7 @@
-
+
项目人数
@@ -81,7 +81,7 @@
-
+
三类人员
@@ -97,7 +97,7 @@
预警警报
-
+
水电监测
{{form.warning.hydropower}}吨
@@ -123,7 +123,7 @@
安全检查
质量检查
-
+
问题
{{form.hsseCheck.generalNum}}
@@ -141,7 +141,7 @@
{{form.hsseCheck.rectificationRate}}%
-