xiaju
/
SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:1

This commit is contained in:
geh 2025-05-29 09:11:51 +08:00
parent cd67e71e38
commit 4926935d71
9 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SUBQHSE/BLL/API/APIIndexService.cs
View File

@ -130,6 +130,7 @@ namespace BLL.API
ProjectShortName = gg.Key.ShortName, ProjectShortName = gg.Key.ShortName,
ProNum = gg.Count(y => y.States != "4" && y.States != "-1"), ProNum = gg.Count(y => y.States != "4" && y.States != "-1"),
RecNum = gg.Count(y => y.States == "3"), RecNum = gg.Count(y => y.States == "3"),
RCNum = gg.Count(y => y.States == "2"),
NoRecNum = gg.Count(y => y.States != "3" && y.States != "-1"), NoRecNum = gg.Count(y => y.States != "3" && y.States != "-1"),
RecRate = gg.Count(y => y.States != "4" && y.States != "-1") == 0 ? "0" : RecRate = gg.Count(y => y.States != "4" && y.States != "-1") == 0 ? "0" :
Math.Round((decimal)gg.Count(y => y.States == "3") / Math.Round((decimal)gg.Count(y => y.States == "3") /

4
SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.cs
View File

@ -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") if (Request.Params["value"] == "0")
{ {
return; return;

2
SUBQHSE/FineUIPro.Web/common/main2024.aspx
View File

@ -181,7 +181,7 @@
<div class="mod1"> <div class="mod1">
<%--<div class="mod1-icon dcdb"></div> <%--<div class="mod1-icon dcdb"></div>
<div class="mod1-val">督查督办</div>--%> <div class="mod1-val">督查督办</div>--%>
<f:Button ID="BtnDCDB" IconUrl="~/res/image/01.png" IconAlign="Top" CssClass="SetBtn" Text="督查督办" runat="server" /> <f:Button ID="BtnDCDB" IconUrl="~/res/image/01.png" IconAlign="Top" CssClass="SetBtn" Text="督查督办" runat="server" EnableAjax="False" OnClick="BtnBBZX_OnClick"/>
</div> </div>
<div class="mod1"> <div class="mod1">
<f:Button ID="BtnFXYJ" IconUrl="~/res/image/02.png" IconAlign="Top" CssClass="SetBtn" Text="风险预警" runat="server" EnableAjax="False" OnClick="BtnFXYJ_OnClick" /> <f:Button ID="BtnFXYJ" IconUrl="~/res/image/02.png" IconAlign="Top" CssClass="SetBtn" Text="风险预警" runat="server" EnableAjax="False" OnClick="BtnFXYJ_OnClick" />

5
SUBQHSE/FineUIPro.Web/common/main2024.aspx.cs
View File

@ -420,7 +420,8 @@ namespace FineUIPro.Web.common
/// <param name="e"></param> /// <param name="e"></param>
protected void BtnSJKB_Click(object sender, EventArgs e) 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)) if (!string.IsNullOrEmpty(url))
{ {
Response.Write("<script>window.open('" + url + "','_blank')</script>"); Response.Write("<script>window.open('" + url + "','_blank')</script>");
@ -459,7 +460,7 @@ namespace FineUIPro.Web.common
/// <param name="e"></param> /// <param name="e"></param>
protected void BtnBBZX_OnClick(object sender, EventArgs e) 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)) if (!string.IsNullOrEmpty(url))
{ {
Response.Write("<script>window.open('" + url + "','_blank')</script>"); Response.Write("<script>window.open('" + url + "','_blank')</script>");

2
SUBQHSE/FineUIPro.Web/index.aspx
View File

@ -230,7 +230,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="logo-tit" style="position: relative;">建投公司智慧工地管理信息系统 <div class="logo-tit" style="position: relative;">建投公司项目管理数字化平台
<f:Button runat="server" CssClass="bgbtn3" EnablePostBack="true" OnClick="btnHome_Click" <f:Button runat="server" CssClass="bgbtn3" EnablePostBack="true" OnClick="btnHome_Click"
EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHome" OnClientClick="parent.removeActiveTab();"> EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHome" OnClientClick="parent.removeActiveTab();">
</f:Button> </f:Button>

2
SUBQHSE/FineUIPro.Web/indexProject.aspx
View File

@ -504,7 +504,7 @@
</div> </div>
</div> </div>
<div class="logo-tit" style="position: relative;"> <div class="logo-tit" style="position: relative;">
建投公司智慧工地管理信息系统 建投公司项目管理数字化平台
<f:Button runat="server" CssClass="bgbtn3" EnablePostBack="true" OnClick="btnHome_Click" <f:Button runat="server" CssClass="bgbtn3" EnablePostBack="true" OnClick="btnHome_Click"
EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHome" OnClientClick="parent.removeActiveTab();"> EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHome" OnClientClick="parent.removeActiveTab();">
</f:Button> </f:Button>

1
SUBQHSE/FineUIPro.Web/res/css/2024index.css
View File

@ -178,6 +178,7 @@ html::-webkit-scrollbar {
height: .5rem; height: .5rem;
padding: .125rem .25rem; padding: .125rem .25rem;
position: relative; position: relative;
font-size: .25rem;
} }
.navs > .nav-active { .navs > .nav-active {

4
SUBQHSE/Model/ZHGL/DataSync/HiddenRectificationOutput.cs
View File

@ -15,6 +15,10 @@
/// </summary> /// </summary>
public int RecNum { get; set; } public int RecNum { get; set; }
/// <summary> /// <summary>
/// 已整改待确认数量
/// </summary>
public int RCNum { get; set; }
/// <summary>
/// 未整改数量 /// 未整改数量
/// </summary> /// </summary>
public int NoRecNum { get; set; } public int NoRecNum { get; set; }

8
SUBQHSE/WebAPI/Controllers/Customization/ZJ/UnitHazardRegisterController.cs
View File

@ -22,7 +22,13 @@ namespace WebAPI
var responeData = new Model.ResponeData(); var responeData = new Model.ResponeData();
try 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) catch (Exception ex)
{ {