From 4926935d7104200ef737ca851bc54212bdc5025c Mon Sep 17 00:00:00 2001 From: geh <1923421292@qq.com> Date: Thu, 29 May 2025 09:11:51 +0800 Subject: [PATCH] fix:1 --- SUBQHSE/BLL/API/APIIndexService.cs | 1 + .../HiddenInspection/UnitHiddenRectificationList.aspx.cs | 4 ++++ SUBQHSE/FineUIPro.Web/common/main2024.aspx | 2 +- SUBQHSE/FineUIPro.Web/common/main2024.aspx.cs | 5 +++-- SUBQHSE/FineUIPro.Web/index.aspx | 2 +- SUBQHSE/FineUIPro.Web/indexProject.aspx | 2 +- SUBQHSE/FineUIPro.Web/res/css/2024index.css | 1 + SUBQHSE/Model/ZHGL/DataSync/HiddenRectificationOutput.cs | 4 ++++ .../Customization/ZJ/UnitHazardRegisterController.cs | 8 +++++++- 9 files changed, 23 insertions(+), 6 deletions(-) diff --git a/SUBQHSE/BLL/API/APIIndexService.cs b/SUBQHSE/BLL/API/APIIndexService.cs index dc3508d..0148a0a 100644 --- a/SUBQHSE/BLL/API/APIIndexService.cs +++ b/SUBQHSE/BLL/API/APIIndexService.cs @@ -130,6 +130,7 @@ namespace BLL.API ProjectShortName = gg.Key.ShortName, ProNum = gg.Count(y => y.States != "4" && y.States != "-1"), RecNum = gg.Count(y => y.States == "3"), + RCNum = gg.Count(y => y.States == "2"), NoRecNum = gg.Count(y => y.States != "3" && y.States != "-1"), RecRate = gg.Count(y => y.States != "4" && y.States != "-1") == 0 ? "0" : Math.Round((decimal)gg.Count(y => y.States == "3") / diff --git a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.cs b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.cs index 4367e26..b3d7fef 100644 --- a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.cs @@ -841,6 +841,10 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection } }*/ + if (this.CurrUser.UserId == BLL.Const.hfnbdId || this.CurrUser.UserId == BLL.Const.sysglyId) + { + this.btnMenuDelete.Hidden = false; + } if (Request.Params["value"] == "0") { return; diff --git a/SUBQHSE/FineUIPro.Web/common/main2024.aspx b/SUBQHSE/FineUIPro.Web/common/main2024.aspx index 704b39b..e3bba42 100644 --- a/SUBQHSE/FineUIPro.Web/common/main2024.aspx +++ b/SUBQHSE/FineUIPro.Web/common/main2024.aspx @@ -181,7 +181,7 @@
<%--
督查督办
--%> - +
diff --git a/SUBQHSE/FineUIPro.Web/common/main2024.aspx.cs b/SUBQHSE/FineUIPro.Web/common/main2024.aspx.cs index e2651cc..8e50f05 100644 --- a/SUBQHSE/FineUIPro.Web/common/main2024.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/common/main2024.aspx.cs @@ -420,7 +420,8 @@ namespace FineUIPro.Web.common /// protected void BtnSJKB_Click(object sender, EventArgs e) { - string url = Funs.SGGLUrl + "/common/main.aspx"; + // string url = Funs.SGGLUrl + "/common/main.aspx"; + string url = Funs.SGGLUrl + "/index.aspx"; if (!string.IsNullOrEmpty(url)) { Response.Write(""); @@ -459,7 +460,7 @@ namespace FineUIPro.Web.common /// protected void BtnBBZX_OnClick(object sender, EventArgs e) { - string url = Funs.SGGLUrl + "/index.aspx?menuType=Menu_GroupReport" ; + string url = Funs.SGGLUrl + "/index.aspx?menuType=Menu_SJTB" ; if (!string.IsNullOrEmpty(url)) { Response.Write(""); diff --git a/SUBQHSE/FineUIPro.Web/index.aspx b/SUBQHSE/FineUIPro.Web/index.aspx index aefaef3..cc1d086 100644 --- a/SUBQHSE/FineUIPro.Web/index.aspx +++ b/SUBQHSE/FineUIPro.Web/index.aspx @@ -230,7 +230,7 @@
-
建投公司智慧工地管理信息系统 +
建投公司项目管理数字化平台 diff --git a/SUBQHSE/FineUIPro.Web/indexProject.aspx b/SUBQHSE/FineUIPro.Web/indexProject.aspx index b6b2472..f12f2f6 100644 --- a/SUBQHSE/FineUIPro.Web/indexProject.aspx +++ b/SUBQHSE/FineUIPro.Web/indexProject.aspx @@ -504,7 +504,7 @@
- 建投公司智慧工地管理信息系统 + 建投公司项目管理数字化平台 diff --git a/SUBQHSE/FineUIPro.Web/res/css/2024index.css b/SUBQHSE/FineUIPro.Web/res/css/2024index.css index dbd92ed..def065f 100644 --- a/SUBQHSE/FineUIPro.Web/res/css/2024index.css +++ b/SUBQHSE/FineUIPro.Web/res/css/2024index.css @@ -178,6 +178,7 @@ html::-webkit-scrollbar { height: .5rem; padding: .125rem .25rem; position: relative; +font-size: .25rem; } .navs > .nav-active { diff --git a/SUBQHSE/Model/ZHGL/DataSync/HiddenRectificationOutput.cs b/SUBQHSE/Model/ZHGL/DataSync/HiddenRectificationOutput.cs index 20f9dd3..059e986 100644 --- a/SUBQHSE/Model/ZHGL/DataSync/HiddenRectificationOutput.cs +++ b/SUBQHSE/Model/ZHGL/DataSync/HiddenRectificationOutput.cs @@ -15,6 +15,10 @@ /// public int RecNum { get; set; } /// + /// 已整改待确认数量 + /// + public int RCNum { get; set; } + /// /// 未整改数量 /// public int NoRecNum { get; set; } diff --git a/SUBQHSE/WebAPI/Controllers/Customization/ZJ/UnitHazardRegisterController.cs b/SUBQHSE/WebAPI/Controllers/Customization/ZJ/UnitHazardRegisterController.cs index f363fb9..5404b9b 100644 --- a/SUBQHSE/WebAPI/Controllers/Customization/ZJ/UnitHazardRegisterController.cs +++ b/SUBQHSE/WebAPI/Controllers/Customization/ZJ/UnitHazardRegisterController.cs @@ -22,7 +22,13 @@ namespace WebAPI var responeData = new Model.ResponeData(); try { - responeData.data = BLL.APIUnitHazardRegisterService.getHazardRegisterByHazardRegisterId(hazardRegisterId); + var hazardRegisterItem = BLL.APIUnitHazardRegisterService.getHazardRegisterByHazardRegisterId(hazardRegisterId); + var project = ProjectService.GetProjectByProjectId(hazardRegisterItem.ProjectId); + if (project!=null) + { + hazardRegisterItem.ProjectName = project.ProjectName; + } + responeData.data = hazardRegisterItem; } catch (Exception ex) {