lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.cs
+3 -5
View File
@@ -1,15 +1,13 @@
using BLL;
using Model;
using NPOI.SS.Util;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using NPOI.SS.Util;
using System.Linq;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.HSSE.Hazard
{
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskCheckSee.aspx.cs
-1
View File
@@ -4,7 +4,6 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Threading.Tasks;
namespace FineUIPro.Web.HSSE.Hazard
{
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskControlCheck.aspx.cs
+7 -10
View File
@@ -1,20 +1,17 @@
using BLL;
using Org.BouncyCastle.Crypto;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace FineUIPro.Web.HSSE.Hazard
{
public partial class ConstructionRiskControlCheck : PageBase
{
#region 定义变量
/// <summary>
/// 项目主键
/// </summary>
public string ConstructionRiskCheckId
{
get
@@ -37,7 +34,7 @@ namespace FineUIPro.Web.HSSE.Hazard
ViewState["ConstructionRiskId"] = value;
}
}
#endregion
@@ -50,14 +47,14 @@ namespace FineUIPro.Web.HSSE.Hazard
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
{
string ConstructionRiskCheckId = Request["ConstructionRiskCheckId"];
if (!string.IsNullOrEmpty(ConstructionRiskCheckId))
{
this.ConstructionRiskCheckId = ConstructionRiskCheckId;
this.ConstructionRiskCheckId = ConstructionRiskCheckId;
}
this.ConstructionRiskId = Request["ConstructionRiskId"];
var constructionRiskCheck = Funs.DB.HSSE_ConstructionRiskCheck.FirstOrDefault(x=>x.ConstructionRiskCheckId == this.ConstructionRiskCheckId);
var constructionRiskCheck = Funs.DB.HSSE_ConstructionRiskCheck.FirstOrDefault(x => x.ConstructionRiskCheckId == this.ConstructionRiskCheckId);
if (constructionRiskCheck != null)
{
this.ConstructionRiskId = constructionRiskCheck.ConstructionRiskId;
@@ -170,7 +167,7 @@ namespace FineUIPro.Web.HSSE.Hazard
}
else
{
var projectUnit = BLL.ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.CurrUser.LoginProjectId,this.CurrUser.UnitId);
var projectUnit = BLL.ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.CurrUser.LoginProjectId, this.CurrUser.UnitId);
if (projectUnit != null && projectUnit.UnitType == BLL.Const.ProjectUnitType_2)
{
this.txtRectification.Hidden = false;
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskControlEdit.aspx.cs
+19 -21
View File
@@ -1,8 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace FineUIPro.Web.HSSE.Hazard
{
@@ -26,7 +24,7 @@ namespace FineUIPro.Web.HSSE.Hazard
/// <summary>
/// 项目主键
/// </summary>
public string ControlId
{
get
@@ -39,8 +37,8 @@ namespace FineUIPro.Web.HSSE.Hazard
}
}
#endregion
#endregion
#region 加载页面
/// <summary>
@@ -51,31 +49,31 @@ namespace FineUIPro.Web.HSSE.Hazard
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
{
this.ConstructionRiskId = Request.Params["ConstructionRiskId"];
this.ControlId = Request.Params["ControlId"];
var constructionRiskControl = Funs.DB.HSSE_ConstructionRiskControl.FirstOrDefault(x=>x.ControlId == this.ControlId);
var constructionRiskControl = Funs.DB.HSSE_ConstructionRiskControl.FirstOrDefault(x => x.ControlId == this.ControlId);
if (constructionRiskControl != null)
{
if (!string.IsNullOrEmpty(constructionRiskControl.Measures))
{
txtMeasures.Text = constructionRiskControl.Measures;
}
}
}
}
}
#endregion
#region 保存按钮
/// <summary>
@@ -99,26 +97,26 @@ namespace FineUIPro.Web.HSSE.Hazard
Model.HSSE_ConstructionRiskControl newConstructionRiskControl = new Model.HSSE_ConstructionRiskControl
{
ConstructionRiskId = this.ConstructionRiskId,
};
newConstructionRiskControl.Measures = this.txtMeasures.Text ;
newConstructionRiskControl.Measures = this.txtMeasures.Text;
if (!string.IsNullOrEmpty(this.ControlId))
{
newConstructionRiskControl.ControlId = this.ControlId;
BLL.ConstructionRiskListService.UpdateConstructionRiskControl(newConstructionRiskControl);
BLL.ConstructionRiskListService.UpdateConstructionRiskControl(newConstructionRiskControl);
BLL.LogService.AddSys_Log(this.CurrUser, newConstructionRiskControl.ConstructionRiskId, newConstructionRiskControl.ConstructionRiskId, BLL.Const.ProjectEnvironmentalRiskListMenuId, BLL.Const.BtnModify);
}
else
{
newConstructionRiskControl.ControlId = SQLHelper.GetNewID(typeof(Model.Hazard_EnvironmentalRiskList));
this.ControlId = newConstructionRiskControl.ControlId;
BLL.ConstructionRiskListService.AddConstructionRiskControl(newConstructionRiskControl);
BLL.ConstructionRiskListService.AddConstructionRiskControl(newConstructionRiskControl);
BLL.LogService.AddSys_Log(this.CurrUser, newConstructionRiskControl.ConstructionRiskId, newConstructionRiskControl.ConstructionRiskId, BLL.Const.ProjectEnvironmentalRiskListMenuId, BLL.Const.BtnAdd);
}
}
}
protected void rdCheckResult_SelectedIndexChanged(object sender, EventArgs e)
{
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskDataIn.aspx.cs
+1 -3
View File
@@ -1,6 +1,4 @@
using BLL;
using FineUIPro.Web.SysManage;
using Model;
using System;
using System.Collections.Generic;
using System.Data;
@@ -474,7 +472,7 @@ namespace FineUIPro.Web.HSSE.Hazard
newConstructionRisk.LicenseDes = licenseDes.Substring(0, licenseDes.Length - 1);
}
newConstructionRisk.RiskLevel = row8;
newConstructionRisk.States= BLL.Const.ConstructionRisk_Compile;
newConstructionRisk.States = BLL.Const.ConstructionRisk_Compile;
Funs.DB.HSSE_ConstructionRisk.InsertOnSubmit(newConstructionRisk);
string[] riskControls = row9.Split('|');
int a = 0;
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskMap.aspx.cs
+1 -2
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web.Services;
namespace FineUIPro.Web.ProjectData
@@ -100,7 +99,7 @@ namespace FineUIPro.Web.ProjectData
riskLevel += item + ",";
}
//strSql += " and RiskLevel='" + drpRiskLevel.SelectedValue + "' ";
strSql += " and '"+riskLevel+"' like '%'+RiskLevel+'%' ";
strSql += " and '" + riskLevel + "' like '%'+RiskLevel+'%' ";
}
strSql += " group by b.[MainItemId],b.[Coordinate],b.[MainItemName] ";
SqlParameter[] parameter = listStr.ToArray();
SGGL/FineUIPro.Web/HSSE/Hazard/LocationSelect.aspx.cs
+6 -7
View File
@@ -1,7 +1,6 @@
using BLL;
using System;
using System.Linq;
using System.Web.Services;
namespace FineUIPro.Web.HSSE.Hazard
{
@@ -24,8 +23,8 @@ namespace FineUIPro.Web.HSSE.Hazard
if (!IsPostBack)
{
ProjectCode = BLL.ProjectService.GetProjectCodeByProjectId(this.CurrUser.LoginProjectId);
ConstructionRiskId = Request.Params["ConstructionRiskId"] ;
if (!string.IsNullOrEmpty(Request.Params["type"]))
ConstructionRiskId = Request.Params["ConstructionRiskId"];
if (!string.IsNullOrEmpty(Request.Params["type"]))
{
this.btnSave.Hidden = true;
}
@@ -37,7 +36,7 @@ namespace FineUIPro.Web.HSSE.Hazard
}
}
}
#region 保存事件
/// <summary>
@@ -47,17 +46,17 @@ namespace FineUIPro.Web.HSSE.Hazard
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
var risk = Funs.DB.HSSE_ConstructionRisk.FirstOrDefault(x => x.ConstructionRiskId == ConstructionRiskId);
var risk = Funs.DB.HSSE_ConstructionRisk.FirstOrDefault(x => x.ConstructionRiskId == ConstructionRiskId);
if (risk != null)
{
risk.Coordinate=txtLoc.Text.Trim();
risk.Coordinate = txtLoc.Text.Trim();
Funs.DB.SubmitChanges();
}
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(txtLoc.Text.Trim())
+ ActiveWindow.GetHidePostBackReference());
}
#endregion
}
}
SGGL/FineUIPro.Web/HSSE/Hazard/ShowWBS.aspx.cs
-1
View File
@@ -4,7 +4,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;