zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并最新

Browse Source
This commit is contained in:
李超
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
+13 -17
View File
@@ -64,7 +64,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
//handleSteps.Add(handleStep4);
this.drpStates.DataSource = handleSteps; ;
this.drpStates.DataBind();
Funs.FineUIPleaseSelect(this.drpStates);
Funs.FineUIPleaseSelect(this.drpStates,"按状态");
ListItem[] ProblemTypes = new ListItem[2];
ProblemTypes[0] = new ListItem("日常巡检", "1");
ProblemTypes[1] = new ListItem("专项巡检", "2");
@@ -72,7 +72,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
this.drpProblemTypes.DataTextField = "Text";
this.drpProblemTypes.DataSource = ProblemTypes;
this.drpProblemTypes.DataBind();
Funs.FineUIPleaseSelect(this.drpProblemTypes);
Funs.FineUIPleaseSelect(this.drpProblemTypes, "按检查类型");
// 绑定表格
BindGrid();
}
@@ -83,7 +83,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
/// </summary>
private void BindGrid()
{
string strSql = "SELECT * FROM View_Hazard_HazardRegister WHERE ProblemTypes in ('1' ,'2') ";
string strSql = "SELECT * FROM View_Hazard_HazardRegister WHERE ProblemTypes ='1' "; //ProblemTypes in ('1' ,'2')
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
@@ -110,11 +110,11 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
strSql += " AND Risk_Level = @Risk_Level";
listStr.Add(new SqlParameter("@Risk_Level", this.dpRiskLevel.SelectedText) );
}
//if (this.ckType.SelectedValue != "0")
//{
// strSql += " AND CheckCycle=@CheckCycle";
// listStr.Add(new SqlParameter("@CheckCycle", this.ckType.SelectedValue));
//}
if (!string.IsNullOrEmpty(this.drpType.SelectedValue.Trim()))
{
strSql += " AND CheckCycle=@CheckCycle";
listStr.Add(new SqlParameter("@CheckCycle", this.drpType.SelectedValue));
}
if (!string.IsNullOrEmpty(this.txtResponsibilityUnitName.Text.Trim()))
{
strSql += " AND ResponsibilityUnitName LIKE @ResponsibilityUnitName";
@@ -462,18 +462,14 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
string rowID = Grid1.DataKeys[rowIndex][0].ToString();
Model.HSSE_Hazard_HazardRegister hazardRegister = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(rowID);
if (hazardRegister.States == Const.State_3 || this.CurrUser.UserId == BLL.Const.hfnbdId) //待整改
var hazardRegister = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(rowID);
if (hazardRegister != null)
{
BLL.LogService.AddSys_Log(this.CurrUser, hazardRegister.HazardCode, hazardRegister.HazardRegisterId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnDelete);
BLL.HSSE_Hazard_HazardRegisterService.DeleteHazardRegisterByHazardRegisterId(rowID);
}
else
{
Alert.ShowInTop("已闭环，无法删除！", MessageBoxIcon.Warning);
return;
}
}
BindGrid();
ShowNotify("删除成功!", MessageBoxIcon.Success);
}
@@ -536,7 +532,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString());
if (registration != null)
{
url = BLL.UploadAttachmentService.ShowImage(ConfigurationManager.AppSettings["CEMS_IMG_URL"], registration.ImageUrl);
url = BLL.UploadAttachmentService.ShowImage(ConfigurationManager.AppSettings["SGGLUrl"], registration.ImageUrl);
}
}
return url;
@@ -555,7 +551,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString());
if (registration != null)
{
url = BLL.UploadAttachmentService.ShowAttachment(ConfigurationManager.AppSettings["CEMS_IMG_URL"], registration.RectificationImageUrl);
url = BLL.UploadAttachmentService.ShowAttachment(ConfigurationManager.AppSettings["SGGLUrl"], registration.RectificationImageUrl);
}
}
return url;