From 16038d4776117b4bb64c33dd852ed2936516472e Mon Sep 17 00:00:00 2001 From: jackchenyang <874821510@qq.com> Date: Sun, 26 May 2024 12:37:39 +0800 Subject: [PATCH] 122121 --- HJGL/.vs/HJGL/v17/.suo | Bin 899072 -> 901120 bytes .../PMI/PMIDelegationReport.aspx | 35 +++++++++++++++--- .../PMI/PMIDelegationReport.aspx.cs | 29 ++++++--------- .../PMI/PMIDelegationReport.aspx.designer.cs | 18 +++++++++ .../WeldingProcess/PMI/PMIDetectionEntry.aspx | 3 ++ .../PMI/PMIDetectionEntry.aspx.designer.cs | 9 +++++ 6 files changed, 72 insertions(+), 22 deletions(-) diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index b7656cc87f601f0100195bc9e9a260c20cf9aa69..76ab9b60cf79ce75ebe35709e9b8043bcde69e9f 100644 GIT binary patch delta 8483 zcmeI0e{@vUwa4e2xpU^;`4K`0Aqhhmk}(V+fh2?gDUBlpL_`P!Qlt?=L_~`kXh2aU z0TB=pLvEc-5jCXr1}Vmv#2kv&hLpv#lt!d2k7`PR0<}nOO4U9Q$@`u_p6C;wuJzV> zf4ttcK6jtr=iIaR*>~St(UDtGF`{zxxC=I$%?B=Zc6LJ870;f@y1~~_^0@AG4;>+hCq1kP= zQIKOm0#L)+P*#ZaE#T%WWx0@ioNt!EhKorL^&Pz5exKBbR4fvR5$ zxeVL^VjMP`)BLHUe{cChwaYBBDUdnATXs{T}0BVx&K+XgwK{og*g2c8GjU>i__{Rnb9`0+PI_ou#*qI)i4}mNyMs5wfn&ik?}`;>=|q4s8tjK5(19$iT~;=61Ib zyYN&#WX+}D^NY-XYY z&A3B#{ranM#=$yq$<7Q`z|3FpEGiqyHZ)|ipk(J*U*71Ob;@0{fY(%T%0A&*-?;vs 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 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 控件。 ///