lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20240416 质量月报

This commit is contained in:
毕文静 2024-04-16 22:18:09 +08:00
parent 81e7c7d034
commit 905b46105a
2 changed files with 24 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
View File

@ -2260,12 +2260,18 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
numberIndex = 1;
int? num1 = 0, num2 = 0;
int MonthsCountstring = 0, ProjectCountstring = 0;
decimal? num1 = 0, num2 = 0;
decimal MonthsCountstring = 0, ProjectCountstring = 0;
foreach (var item in InspectionDataInspection)
{
MonthsCountstring = Convert.ToInt32(item.RectificationRate.Replace("%", ""));
ProjectCountstring = Convert.ToInt32(item.TotationRate.Replace("%", ""));
if (!string.IsNullOrEmpty(item.RectificationRate))
{
MonthsCountstring = Convert.ToDecimal(item.RectificationRate.Replace("%", ""));
}
if (!string.IsNullOrEmpty(item.TotationRate))
{
ProjectCountstring = Convert.ToDecimal(item.TotationRate.Replace("%", ""));
}
//创建行
Row row = new Row(doc);
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width));
@ -2832,8 +2838,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#endregion
#region 23.施工照片
string imageUrl = "res/images/R-C.png";
var imageUrl1 = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl;
if (!string.IsNullOrWhiteSpace(imageUrl1))
if (!string.IsNullOrWhiteSpace(imageUrl1) && imageUrl1 != imageUrl)
{
string rootPathUrl = rootPath.Replace("\\", "/");
string url = rootPathUrl + imageUrl1;
@ -2856,7 +2863,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
var imageUrl2 = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl;
if (!string.IsNullOrWhiteSpace(imageUrl2))
if (!string.IsNullOrWhiteSpace(imageUrl2) && imageUrl2 != imageUrl)
{
string rootPathUrl = rootPath.Replace("\\", "/");
string url = rootPathUrl + imageUrl2;
@ -2879,7 +2886,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
var imageUrl3 = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl;
if (!string.IsNullOrWhiteSpace(imageUrl3))
if (!string.IsNullOrWhiteSpace(imageUrl3) && imageUrl3 != imageUrl)
{
string rootPathUrl = rootPath.Replace("\\", "/");
string url = rootPathUrl + imageUrl3;
@ -2902,7 +2909,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
var imageUrl4 = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl;
if (!string.IsNullOrWhiteSpace(imageUrl4))
if (!string.IsNullOrWhiteSpace(imageUrl4) && imageUrl4 != imageUrl)
{
string rootPathUrl = rootPath.Replace("\\", "/");
string url = rootPathUrl + imageUrl4;
@ -2925,7 +2932,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
var imageUrl5 = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl;
if (!string.IsNullOrWhiteSpace(imageUrl5))
if (!string.IsNullOrWhiteSpace(imageUrl5) && imageUrl5 != imageUrl)
{
string rootPathUrl = rootPath.Replace("\\", "/");
string url = rootPathUrl + imageUrl5;
@ -2948,7 +2955,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
var imageUrl6 = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl;
if (!string.IsNullOrWhiteSpace(imageUrl6))
if (!string.IsNullOrWhiteSpace(imageUrl6) && imageUrl6 != imageUrl)
{
string rootPathUrl = rootPath.Replace("\\", "/");
string url = rootPathUrl + imageUrl6;

24
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
View File

@ -188,44 +188,22 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText;
string url = "~/res/images/R-C.png";
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl!= url)
{
imgPhoto.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl;
}
txtPhotoContent1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText;
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl != url)
{
imgPhoto2.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl;
}
txtPhotoContent2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText;
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl!= url)
{
imgPhoto3.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl;
}
txtPhotoContent3.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText;
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl!= url)
{
imgPhoto4.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl;
}
txtPhotoContent4.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText;
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl!= url)
{
imgPhoto5.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl;
}
txtPhotoContent5.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText;
if (txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl!= url)
{
imgPhoto6.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl;
}
txtPhotoContent6.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText;
#endregion
//加载所有grid
lodAllGrid("1");
}
else
{
@ -3884,7 +3862,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
imgage5.Id = Guid.NewGuid().ToString();
imgage5.ReportId = ReportId;
imgage5.ContentType = "23-5";
imgage5.ContentText = txtPhotoContent2.Text;
imgage5.ContentText = txtPhotoContent5.Text;
imgage5.ImageUrl = imgPhoto5.ImageUrl.Substring(imgPhoto5.ImageUrl.IndexOf("/") + 1);
ImageLists.Add(imgage5);