From bd6b06af0e93733dd5592b153cd8b261fc4cfdb8 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Mon, 17 Nov 2025 20:26:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E7=BA=A7=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E9=9A=90=E6=82=A3=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataShow/HiddenRectification.aspx.cs | 16 +++++----- SGGL/FineUIPro.Web/common/main_new0.aspx.cs | 29 ++++++++++--------- .../PublishProfiles/FolderProfile.pubxml.user | 18 ++++++------ SGGL/WebAPI/WebAPI.csproj.user | 2 +- 4 files changed, 33 insertions(+), 32 deletions(-) diff --git a/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs index 807b68ff..0b96d3ac 100644 --- a/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs @@ -178,11 +178,11 @@ namespace FineUIPro.Web.DataShow } if (this.rbType.SelectedValue == "0") { - getT = getT.Where(x => x.Risk_Level == "重大"); + getT = getT.Where(x => x.Risk_Level == "重大事故隐患"); } else { - getT = getT.Where(x => x.Risk_Level == "一般"); + getT = getT.Where(x => x.Risk_Level == "一般事故隐患"); } cout1 = getT.Count(); } @@ -207,11 +207,11 @@ namespace FineUIPro.Web.DataShow } if (this.rbType.SelectedValue == "0") { - getT = getT.Where(x => x.Risk_Level == "重大"); + getT = getT.Where(x => x.Risk_Level == "重大事故隐患"); } else { - getT = getT.Where(x => x.Risk_Level == "一般"); + getT = getT.Where(x => x.Risk_Level == "一般事故隐患"); } cout1 = getT.Count(); } @@ -236,11 +236,11 @@ namespace FineUIPro.Web.DataShow } if (this.rbType.SelectedValue == "0") { - getT = getT.Where(x => x.Risk_Level == "重大"); + getT = getT.Where(x => x.Risk_Level == "重大事故隐患"); } else { - getT = getT.Where(x => x.Risk_Level == "一般"); + getT = getT.Where(x => x.Risk_Level == "一般事故隐患"); } cout1 = getT.Count(); } @@ -257,11 +257,11 @@ namespace FineUIPro.Web.DataShow var getALL = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "4"); if (this.rbType.SelectedValue == "0") { - getALL = getALL.Where(x => x.Risk_Level == "重大"); + getALL = getALL.Where(x => x.Risk_Level == "重大事故隐患"); } else { - getALL = getALL.Where(x => x.Risk_Level == "一般"); + getALL = getALL.Where(x => x.Risk_Level == "一般事故隐患"); } if (datetime1.HasValue) { diff --git a/SGGL/FineUIPro.Web/common/main_new0.aspx.cs b/SGGL/FineUIPro.Web/common/main_new0.aspx.cs index d5132376..0b79fed6 100644 --- a/SGGL/FineUIPro.Web/common/main_new0.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main_new0.aspx.cs @@ -338,31 +338,31 @@ namespace FineUIPro.Web.common //一般 allYhYb += "'" + ((from x in hazardRegisters - where x.ProjectId == item.ProjectId && x.Risk_Level == "一般" && x.States == "3" && + where x.ProjectId == item.ProjectId && x.Risk_Level == "一般事故隐患" && x.States == "3" && x.CheckTime > Const.DtmarkTime select x).Count() + (from x in hazardRegisters - where x.ProjectId == item.ProjectId && x.Risk_Level == "一般" && x.States != "3" && + where x.ProjectId == item.ProjectId && x.Risk_Level == "一般事故隐患" && x.States != "3" && x.CheckTime > Const.DtmarkTime select x).Count()) + "',"; dzgYhYb += "'" + (from x in hazardRegisters - where x.ProjectId == item.ProjectId && x.Risk_Level == "一般" && x.States != "3" && + where x.ProjectId == item.ProjectId && x.Risk_Level == "一般事故隐患" && x.States != "3" && x.CheckTime > Const.DtmarkTime select x).Count() + "',"; //重大 allYhZd += "'" + ((from x in hazardRegisters - where x.ProjectId == item.ProjectId && x.Risk_Level == "重大" && x.States == "3" && + where x.ProjectId == item.ProjectId && x.Risk_Level == "重大事故隐患" && x.States == "3" && x.CheckTime > Const.DtmarkTime select x).Count() + (from x in hazardRegisters - where x.ProjectId == item.ProjectId && x.Risk_Level == "重大" && x.States != "3" && + where x.ProjectId == item.ProjectId && x.Risk_Level == "重大事故隐患" && x.States != "3" && x.CheckTime > Const.DtmarkTime select x).Count()) + "',"; dzgYhZd += "'" + (from x in hazardRegisters - where x.ProjectId == item.ProjectId && x.Risk_Level == "重大" && x.States != "3" && + where x.ProjectId == item.ProjectId && x.Risk_Level == "重大事故隐患" && x.States != "3" && x.CheckTime > Const.DtmarkTime select x).Count() + "',"; @@ -559,7 +559,7 @@ namespace FineUIPro.Web.common if (pids == null) { var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister - where x.Risk_Level == "一般" && x.States == "3" && + where x.Risk_Level == "一般事故隐患" && x.States == "3" && x.CheckTime > Const.DtmarkTime select x).Count(); return result; @@ -567,7 +567,7 @@ namespace FineUIPro.Web.common else { var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister - where x.Risk_Level == "一般" && x.States == "3" && + where x.Risk_Level == "一般事故隐患" && x.States == "3" && x.CheckTime > Const.DtmarkTime && pids.Contains(x.ProjectId) select x).Count(); return result; @@ -584,7 +584,7 @@ namespace FineUIPro.Web.common if (pids == null) { var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister - where x.Risk_Level == "一般" && x.States != "3" && + where x.Risk_Level == "一般事故隐患" && x.States != "3" && x.CheckTime > Const.DtmarkTime select x).Count(); return result; @@ -592,7 +592,7 @@ namespace FineUIPro.Web.common else { var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister - where x.Risk_Level == "一般" && x.States != "3" && + where x.Risk_Level == "一般事故隐患" && x.States != "3" && x.CheckTime > Const.DtmarkTime && pids.Contains(x.ProjectId) select x).Count(); return result; @@ -606,6 +606,7 @@ namespace FineUIPro.Web.common public string GetGeneralZgl() { var num1 = Math.Round(100.0 * GetGeneralClosedNum() / (GetGeneralClosedNum() + GetGeneralNotClosedNum()), 0).ToString(); + if (num1 == "NaN") num1 = "0"; return num1; } @@ -618,7 +619,7 @@ namespace FineUIPro.Web.common if (pids == null) { var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister - where x.Risk_Level == "重大" && x.States == "3" && + where x.Risk_Level == "重大事故隐患" && x.States == "3" && x.CheckTime > Const.DtmarkTime select x).Count(); return result; @@ -626,7 +627,7 @@ namespace FineUIPro.Web.common else { var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister - where x.Risk_Level == "重大" && x.States == "3" && + where x.Risk_Level == "重大事故隐患" && x.States == "3" && x.CheckTime > Const.DtmarkTime && pids.Contains(x.ProjectId) select x).Count(); return result; @@ -642,7 +643,7 @@ namespace FineUIPro.Web.common if (pids == null) { var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister - where x.Risk_Level == "重大" && x.States != "3" && + where x.Risk_Level == "重大事故隐患" && x.States != "3" && x.CheckTime > Const.DtmarkTime select x).Count(); return result; @@ -650,7 +651,7 @@ namespace FineUIPro.Web.common else { var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister - where x.Risk_Level == "重大" && x.States != "3" && + where x.Risk_Level == "重大事故隐患" && x.States != "3" && x.CheckTime > Const.DtmarkTime && pids.Contains(x.ProjectId) select x).Count(); return result; diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index c06be778..bfecbe87 100644 --- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -6,7 +6,7 @@ <_PublishTargetUrl>G:\发布\五环WebApi - True|2025-11-17T04:28:22.9224307Z||;True|2025-11-17T11:17:50.1481769+08:00||;True|2025-11-07T14:46:56.1446809+08:00||;True|2025-11-05T09:32:06.4998794+08:00||;True|2025-11-04T16:39:28.2175670+08:00||;True|2025-11-04T16:39:02.3610432+08:00||;True|2025-11-04T15:44:06.1295264+08:00||;True|2025-10-31T16:41:11.6570385+08:00||;True|2025-10-30T15:58:05.2014433+08:00||;True|2025-10-29T16:22:27.7866967+08:00||;True|2025-10-29T11:19:32.1187038+08:00||;True|2025-10-24T15:59:19.4176668+08:00||;True|2025-10-23T10:17:32.2384443+08:00||;True|2025-10-23T10:09:35.0601937+08:00||;True|2025-10-23T09:59:27.2018799+08:00||;True|2025-09-29T15:39:36.8617347+08:00||;True|2025-09-29T11:28:10.9193152+08:00||;True|2025-09-29T10:59:58.2893583+08:00||;True|2025-09-23T16:56:39.6344263+08:00||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||; + True|2025-11-17T06:41:29.0529618Z||;True|2025-11-17T12:28:22.9224307+08:00||;True|2025-11-17T11:17:50.1481769+08:00||;True|2025-11-07T14:46:56.1446809+08:00||;True|2025-11-05T09:32:06.4998794+08:00||;True|2025-11-04T16:39:28.2175670+08:00||;True|2025-11-04T16:39:02.3610432+08:00||;True|2025-11-04T15:44:06.1295264+08:00||;True|2025-10-31T16:41:11.6570385+08:00||;True|2025-10-30T15:58:05.2014433+08:00||;True|2025-10-29T16:22:27.7866967+08:00||;True|2025-10-29T11:19:32.1187038+08:00||;True|2025-10-24T15:59:19.4176668+08:00||;True|2025-10-23T10:17:32.2384443+08:00||;True|2025-10-23T10:09:35.0601937+08:00||;True|2025-10-23T09:59:27.2018799+08:00||;True|2025-09-29T15:39:36.8617347+08:00||;True|2025-09-29T11:28:10.9193152+08:00||;True|2025-09-29T10:59:58.2893583+08:00||;True|2025-09-23T16:56:39.6344263+08:00||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||; @@ -86,22 +86,22 @@ 10/28/2024 14:02:50 - 11/17/2025 12:28:20 + 11/17/2025 14:41:27 - 11/17/2025 12:28:20 + 11/17/2025 14:41:27 12/06/2024 20:13:58 - 11/17/2025 12:28:10 + 11/17/2025 14:41:05 12/26/2024 09:46:52 - 11/17/2025 12:28:10 + 11/17/2025 14:41:05 12/18/2020 05:32:28 @@ -389,13 +389,13 @@ 02/09/2013 00:42:28 - 11/17/2025 12:28:11 + 11/17/2025 14:41:08 - 11/17/2025 12:28:11 + 11/17/2025 14:41:08 - 11/17/2025 12:28:11 + 11/17/2025 14:41:08 01/23/2014 21:57:34 @@ -479,7 +479,7 @@ 10/28/2024 14:02:50 - 11/17/2025 12:28:12 + 11/17/2025 14:41:10 10/28/2024 14:02:50 diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 1a1a9a6c..17978b44 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true