diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 812532a3..6d345475 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1327,3 +1327,41 @@ IP地址:::1 出错时间:05/19/2023 16:50:21 + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 FineUIPro.Web.BaseInfo.TrainType.GetButtonPower() 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\BaseInfo\TrainType.aspx.cs:行号 260 + 在 FineUIPro.Web.BaseInfo.TrainType.Page_Load(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\BaseInfo\TrainType.aspx.cs:行号 15 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:05/21/2023 16:18:53 +出错文件:http://localhost:1295/BaseInfo/TrainType.aspx +IP地址:::1 + +出错时间:05/21/2023 16:18:53 + + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 FineUIPro.Web.HSSE.HiddenInspection.HiddenRectificationList.GetGridTableHtml(Grid grid) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\HiddenInspection\HiddenRectificationList.aspx.cs:行号 723 + 在 FineUIPro.Web.HSSE.HiddenInspection.HiddenRectificationList.btnOut_Click(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\HiddenInspection\HiddenRectificationList.aspx.cs:行号 684 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:05/21/2023 16:29:44 +出错文件:http://localhost:1295/HSSE/HiddenInspection/HiddenRectificationList.aspx +IP地址:::1 +操作人员:JT + +出错时间:05/21/2023 16:29:44 + diff --git a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx index f1f5375c..d5978ab1 100644 --- a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx +++ b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx @@ -65,7 +65,7 @@ - - + - + 0) { - if (this.drpStates.SelectedValue == "1") + string strSqlTemp = ""; + + + if (this.drpStates.SelectedValueArray.Contains("1")) { - strSql += " AND States = '1' and RectificationPeriod > getdate()"; - } - else if (this.drpStates.SelectedValue == "2") + strSqlTemp += " ( States = '1' and RectificationPeriod > getdate() ) OR"; + } + if (this.drpStates.SelectedValueArray.Contains("2")) { - strSql += " AND States in( '2','3') and RectificationPeriod > RectificationTime"; + strSqlTemp += " ( States in( '2','3') and RectificationPeriod > RectificationTime) OR"; } - else if (this.drpStates.SelectedValue == "3") + if (this.drpStates.SelectedValueArray.Contains("3")) { - strSql += " AND States in( '2','3') and RectificationPeriod < RectificationTime"; + strSqlTemp += " (States in( '2','3') and RectificationPeriod < RectificationTime ) OR"; } - else if (this.drpStates.SelectedValue == "4") + if (this.drpStates.SelectedValueArray.Contains("4")) { - strSql += " AND States ='1' and RectificationPeriod < getdate()"; - } - + strSqlTemp += " ( States ='1' and RectificationPeriod < getdate() ) OR"; + } + if (this.drpStates.SelectedValueArray.Contains("-1")) + { + strSqlTemp += " States ='-1' OR"; + } + if (!string.IsNullOrEmpty(strSqlTemp)) + { + strSql += " and (" + strSqlTemp.TrimEnd('R').TrimEnd('O') + ") "; + } } if (!CommonService.IsMainUnitOrAdmin(this.CurrUser.UserId)) { @@ -626,7 +640,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString()); if (registration != null) { - url = BLL.UploadAttachmentService.ShowImage("../../", registration.RectificationImageUrl); + url = BLL.UploadAttachmentService.ShowImage(ConfigurationManager.AppSettings["SGGLUrl"], registration.RectificationImageUrl); } } return url; @@ -655,6 +669,9 @@ namespace FineUIPro.Web.HSSE.HiddenInspection else if (registration.States =="1" && registration. RectificationPeriod.Value "); foreach (GridColumn column in grid.Columns) { - if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "tfImageUrl1" && column.ColumnID != "tfImageUrl2" && column.ColumnID != "Punish" && column.ColumnID != "Del") + if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "tfImageUrl1" && column.ColumnID != "lbImageUrl2" && column.ColumnID != "Punish" && column.ColumnID != "Del") { sb.AppendFormat("{0}", column.HeaderText); + }else if (column.ColumnID == "tfImageUrl1" || column.ColumnID == "lbImageUrl2") + { + sb.AppendFormat("
{0}
", column.HeaderText); + } } sb.Append(""); @@ -711,29 +732,29 @@ namespace FineUIPro.Web.HSSE.HiddenInspection sb.Append(""); foreach (GridColumn column in grid.Columns) { - if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "tfImageUrl1" && column.ColumnID != "tfImageUrl2" && column.ColumnID != "Punish" && column.ColumnID != "Del") + if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "Punish" && column.ColumnID != "Del") { string html = row.Values[column.ColumnIndex].ToString(); if (column.ColumnID == "tfPageIndex") { html = (row.FindControl("lblPageIndex") as AspNet.Label).Text; } - if (column.ColumnID == "tfImageUrl") + if (column.ColumnID == "tfImageUrl1") { - html = (row.FindControl("lbtnImageUrl") as AspNet.LinkButton).Text; + html = (row.FindControl("lbImageUrl1") as AspNet.Label).Text; } - if (column.ColumnID == "tfRectificationImageUrl") + if (column.ColumnID == "tfImageUrl2") { - html = (row.FindControl("lbtnRectificationImageUrl") as AspNet.LinkButton).Text; + html = (row.FindControl("lbImageUrl2") as AspNet.Label).Text; } if (column.ColumnID == "ProblemTypes") { html = (row.FindControl("lbProblemTypes") as AspNet.Label).Text; } - //if (column.ColumnID == "tfCutPayment") - //{ - // html = (row.FindControl("lbtnCutPayment") as AspNet.LinkButton).Text; - //} + if (column.ColumnID == "State") + { + html = (row.FindControl("Label1") as AspNet.Label).Text; + } sb.AppendFormat("{0}", html); } } diff --git a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.designer.cs index a7d5a8a0..605ebe37 100644 --- a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.designer.cs @@ -222,22 +222,22 @@ namespace FineUIPro.Web.HSSE.HiddenInspection protected global::System.Web.UI.WebControls.Label lbProblemTypes; /// - /// lbImageUrl 控件。 + /// lbImageUrl1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::System.Web.UI.WebControls.Label lbImageUrl; + protected global::System.Web.UI.WebControls.Label lbImageUrl1; /// - /// Label2 控件。 + /// lbImageUrl2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::System.Web.UI.WebControls.Label Label2; + protected global::System.Web.UI.WebControls.Label lbImageUrl2; /// /// Label1 控件。 diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 6a71d1cb..cdb07384 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -17,7 +17,7 @@ - +