This commit is contained in:
jackchenyang
2024-05-26 11:28:05 +08:00
parent eedac73a48
commit 80ad2474a5
6 changed files with 218 additions and 105 deletions
@@ -48,9 +48,9 @@ namespace FineUIPro.Web.WeldingProcess.PMI
WorkAreaCode,
PipelineCode,
PMINum,
(convert(float,PMIBySNum)/NULLIF(convert(float,PMINum),0)*100) as RateBys,
isnull((convert(float,PMIBySNum)/NULLIF(convert(float,PMINum),0)*100),0) as RateBys,
PMIBySNum,
(convert(float,PMIByFNum)/NULLIF(convert(float,PMINum),0)*100) as RateByf,
isnull( (convert(float,PMIByFNum)/NULLIF(convert(float,PMINum),0)*100),0) as RateByf,
PMIByFNum
from (
select
@@ -79,7 +79,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
left join Project_Installation as b on a.InstallationId=b.InstallationId
left join Project_WorkArea as c on a.WorkAreaId=c.WorkAreaId
) as t
) as H where projectId=@projectId and RateBys>0 ";
) as H where projectId=@projectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
@@ -92,9 +92,9 @@ namespace FineUIPro.Web.WeldingProcess.PMI
sql += " and WorkAreaId=@workAreaId";
listStr.Add(new SqlParameter("@workAreaId", this.drpWorkAreaId.SelectedValue));
}
if (this.drpIsALl.SelectedValue!="全部")
if (this.drpIsALl.SelectedValue=="报警")
{
sql += " and RateBys<=2";
sql += " and RateBys>0 and RateBys<=2";
}
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text))
{
@@ -139,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
if (itemLable !=null && !string.IsNullOrEmpty(itemLable.Text))
{
itemLable.Text = rates.ToString() + "%";
if (rates <= 2)
if (rates>0 && rates <= 2)
{
itemLable.ForeColor = Color.Red;
}
@@ -148,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
if(labRateByf!=null && !string.IsNullOrEmpty(labRateByf.Text))
{
labRateByf.Text= ratef.ToString() + "%";
if (ratef <= 2)
if (ratef>0 && ratef <= 2)
{
labRateByf.ForeColor = Color.Red;
}