diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index b7656cc..76ab9b6 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx index 59e66d5..8f72e81 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx @@ -6,6 +6,21 @@ PMI检测报告 +
@@ -19,7 +34,7 @@ SortField="WorkAreaCode,PipelineCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" - OnRowDataBound="Grid1_RowDataBound" + OnRowDataBound="Grid1_RowDataBound" EnableTextSelection="True"> @@ -31,9 +46,9 @@ LabelAlign="Right" Width="280px"> - + - + @@ -64,13 +79,23 @@ - + + + + + + - + + + + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs index e67a31c..3f3df02 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs @@ -27,7 +27,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); BLL.Base_UnitService.InitProjectUnitDropDownList(this.drpUnitId, true, this.CurrUser.LoginProjectId, BLL.Const.UnitType_5, Resources.Lan.PleaseSelect);//单位 BLL.Project_WorkAreaService.InitWorkAreaDropDownList(this.drpWorkAreaId, true, this.CurrUser.LoginProjectId, string.Empty, this.drpUnitId.SelectedValue, string.Empty, Resources.Lan.PleaseSelect);//区域 - + this.BindGrid(); } } @@ -89,12 +89,12 @@ namespace FineUIPro.Web.WeldingProcess.PMI } if (this.drpWorkAreaId.SelectedValue != BLL.Const._Null) { - sql += " and WorkAreaId=@workAreaId"; + sql += " and WorkAreaId=@workAreaId "; listStr.Add(new SqlParameter("@workAreaId", this.drpWorkAreaId.SelectedValue)); } if (this.drpIsALl.SelectedValue=="报警") { - sql += " and RateBys<=2 and PMIBySNum<=2"; + sql += " and ((RateBys<=2 and PMIBySNum<=2) or RateByf<=2 and PMIByFNum<=2)"; } if (!string.IsNullOrEmpty(this.txtPipelineCode.Text)) { @@ -136,22 +136,17 @@ namespace FineUIPro.Web.WeldingProcess.PMI decimal rates =Math.Round(Convert.ToDecimal(row["RateBys"]),2); decimal ratef = Math.Round(Convert.ToDecimal(row["RateByf"]), 2); AspNet.Label itemLable = e.Row.FindControl("labRateBys") as AspNet.Label; - if (itemLable !=null && !string.IsNullOrEmpty(itemLable.Text)) - { - itemLable.Text = rates.ToString() + "%"; - if (rates>0 && rates <= 2) - { - itemLable.ForeColor = Color.Red; - } - } + AspNet.Label labPMIBySNum = e.Row.FindControl("labPMIBySNum") as AspNet.Label; + AspNet.Label labRateByf = e.Row.FindControl("labRateByf") as AspNet.Label; - if(labRateByf!=null && !string.IsNullOrEmpty(labRateByf.Text)) + AspNet.Label labPMIByFNum = e.Row.FindControl("labPMIByFNum") as AspNet.Label; + int PMIBySNum = Convert.ToInt32(labPMIBySNum.Text); + itemLable.Text = rates.ToString() + "%"; + int PMIByFNum = Convert.ToInt32(labPMIByFNum.Text); + labRateByf.Text = ratef.ToString() + "%"; + if ((rates <= 2 && PMIBySNum <= 2) || (ratef <= 2 && PMIByFNum <= 2)) { - labRateByf.Text= ratef.ToString() + "%"; - if (ratef>0 && ratef <= 2) - { - labRateByf.ForeColor = Color.Red; - } + e.RowCssClass = "color1"; } } diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.designer.cs index 9fb2bda..6a5fe13 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.designer.cs @@ -140,6 +140,15 @@ namespace FineUIPro.Web.WeldingProcess.PMI /// protected global::System.Web.UI.WebControls.Label labNumber; + /// + /// labPMIBySNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labPMIBySNum; + /// /// labRateBys 控件。 /// @@ -149,6 +158,15 @@ namespace FineUIPro.Web.WeldingProcess.PMI /// protected global::System.Web.UI.WebControls.Label labRateBys; + /// + /// labPMIByFNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labPMIByFNum; + /// /// labRateByf 控件。 /// diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx index cc846cc..e94aa20 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx @@ -29,6 +29,9 @@ Width="265px" LabelWidth="100px" DisplayType="Month" DateFormatString="yyyy-MM" LabelAlign="Right"> + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs index b013712..49300a9 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs @@ -68,6 +68,15 @@ namespace FineUIPro.Web.WeldingProcess.PMI /// protected global::FineUIPro.DatePicker txtNDEDateMonth; + /// + /// Toolbar4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar4; + /// /// Toolbar5 控件。 ///