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

质量月报、周报调整

This commit is contained in:
夏菊 2025-03-24 21:46:11 +08:00
parent 0bfcdc0f9f
commit 7ed0eaea38
5 changed files with 54 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2691,6 +2691,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 23.施工照片
protected void filePhoto_FileSelected(object sender, EventArgs e)
{
string fileUrl = "~/upload/MonthReport/";
if (filePhoto.HasFile)
{
string fileName = filePhoto.ShortFileName;
@ -2704,9 +2705,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto.SaveAs(Server.MapPath("~/upload/" + fileName));
filePhoto.SaveAs(Server.MapPath(fileUrl + fileName));
imgPhoto.ImageUrl = "~/upload/" + fileName;
imgPhoto.ImageUrl = fileUrl + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto.Reset();
@ -2725,9 +2726,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto2.SaveAs(Server.MapPath("~/upload/" + fileName));
filePhoto2.SaveAs(Server.MapPath(fileUrl + fileName));
imgPhoto2.ImageUrl = "~/upload/" + fileName;
imgPhoto2.ImageUrl = fileUrl + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto2.Reset();
@ -2746,9 +2747,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto3.SaveAs(Server.MapPath("~/upload/" + fileName));
filePhoto3.SaveAs(Server.MapPath(fileUrl + fileName));
imgPhoto3.ImageUrl = "~/upload/" + fileName;
imgPhoto3.ImageUrl = fileUrl + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto3.Reset();
@ -2767,9 +2768,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto4.SaveAs(Server.MapPath("~/upload/" + fileName));
filePhoto4.SaveAs(Server.MapPath(fileUrl + fileName));
imgPhoto4.ImageUrl = "~/upload/" + fileName;
imgPhoto4.ImageUrl = fileUrl + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto4.Reset();
@ -2788,9 +2789,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto5.SaveAs(Server.MapPath("~/upload/" + fileName));
filePhoto5.SaveAs(Server.MapPath(fileUrl + fileName));
imgPhoto5.ImageUrl = "~/upload/" + fileName;
imgPhoto5.ImageUrl = fileUrl + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto5.Reset();
@ -2809,9 +2810,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto6.SaveAs(Server.MapPath("~/upload/" + fileName));
filePhoto6.SaveAs(Server.MapPath(fileUrl + fileName));
imgPhoto6.ImageUrl = "~/upload/" + fileName;
imgPhoto6.ImageUrl = fileUrl + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto6.Reset();
@ -3138,8 +3139,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
saveConstructionProblems();
//保存19.下月质量控制重点
saveNextQualityControl();
//保存23.施工照片
saveImages();
////保存23.施工照片
//saveImages();
//保存文本框
saveTxtContent();
@ -3571,6 +3573,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
TextBoxContentService.Delete(ReportId);
db.Report_TextBoxContent.InsertAllOnSubmit(txtContentList);
db.SubmitChanges();
//保存23.施工照片
saveImages();
}
catch (Exception)
{

52
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
View File

@ -2643,6 +2643,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 23.施工照片
protected void filePhoto_FileSelected(object sender, EventArgs e)
{
string fileUrl = "~/upload/WeekReport/";
if (filePhoto.HasFile)
{
string fileName = filePhoto.ShortFileName;
@ -2656,9 +2657,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto.SaveAs(Server.MapPath("~/upload/" + fileName));
filePhoto.SaveAs(Server.MapPath(fileUrl + fileName));
imgPhoto.ImageUrl = "~/upload/" + fileName;
imgPhoto.ImageUrl = fileUrl + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto.Reset();
@ -2677,9 +2678,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto2.SaveAs(Server.MapPath("~/upload/" + fileName));
filePhoto2.SaveAs(Server.MapPath(fileUrl + fileName));
imgPhoto2.ImageUrl = "~/upload/" + fileName;
imgPhoto2.ImageUrl = fileUrl + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto2.Reset();
@ -2698,9 +2699,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto3.SaveAs(Server.MapPath("~/upload/" + fileName));
filePhoto3.SaveAs(Server.MapPath(fileUrl + fileName));
imgPhoto3.ImageUrl = "~/upload/" + fileName;
imgPhoto3.ImageUrl = fileUrl + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto3.Reset();
@ -2719,9 +2720,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto4.SaveAs(Server.MapPath("~/upload/" + fileName));
filePhoto4.SaveAs(Server.MapPath(fileUrl + fileName));
imgPhoto4.ImageUrl = "~/upload/" + fileName;
imgPhoto4.ImageUrl = fileUrl + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto4.Reset();
@ -2740,9 +2741,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto5.SaveAs(Server.MapPath("~/upload/" + fileName));
filePhoto5.SaveAs(Server.MapPath(fileUrl + fileName));
imgPhoto5.ImageUrl = "~/upload/" + fileName;
imgPhoto5.ImageUrl = fileUrl + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto5.Reset();
@ -2761,9 +2762,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto6.SaveAs(Server.MapPath("~/upload/" + fileName));
filePhoto6.SaveAs(Server.MapPath(fileUrl + fileName));
imgPhoto6.ImageUrl = "~/upload/" + fileName;
imgPhoto6.ImageUrl = fileUrl + fileName;
// 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！）
filePhoto6.Reset();
@ -2811,7 +2812,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ShowNotify("类似项目管理经验教训应对措施及跟踪字符长度不能大于2000！", MessageBoxIcon.Warning);
return;
}
if (this.txtAre22.Text.Length>2000)
if (this.txtAre22.Text.Length > 2000)
{
ShowNotify("附件字符长度不能大于2000！", MessageBoxIcon.Warning);
return;
@ -3075,8 +3076,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//保存19.下月质量控制重点
saveNextQualityControl();
//保存23.施工照片
saveImages();
////保存23.施工照片
//saveImages();
//保存文本框
saveTxtContent();
@ -3219,7 +3220,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
return;
}
}
}
@ -3396,7 +3397,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
catch (Exception)
{
return;
}
}
}
}
#endregion
@ -3442,7 +3443,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
catch (Exception)
{
return;
}
}
}
}
#endregion
@ -3510,6 +3511,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
TextBoxContentService.Delete(ReportId);
db.Report_TextBoxContent.InsertAllOnSubmit(txtContentList);
db.SubmitChanges();
//保存23.施工照片
saveImages();
}
catch (Exception)
{
@ -3604,11 +3608,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
catch (Exception)
{
return;
}
}
}
}
void saveSbInspection() //检验批统计:设备
{
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvSb.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3652,7 +3656,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
void saveGDInspection() //检验批统计:管道
{
{
List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
JArray teamGroupData = GvGD.GetMergedData();
foreach (JObject teamGroupRow in teamGroupData)
@ -3692,7 +3696,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
catch (Exception)
{
return;
}
}
}
}
@ -3737,7 +3741,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
catch (Exception)
{
return;
}
}
}
}
void saveYBInspection() //检验批统计:仪表
@ -4336,7 +4340,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Model.Report_NextQualityControl newDetail = new Model.Report_NextQualityControl
{
//NextQualityControlId = values.Value<string>("NextQualityControlId"),
NextQualityControlId= SQLHelper.GetNewID(),
NextQualityControlId = SQLHelper.GetNewID(),
ReportId = ReportId,
NextQualityControlContent = values.Value<string>("NextQualityControlContent")
};

13
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs
View File

@ -78,24 +78,11 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
if (state == "0")
{
//Grid1.Rows[i].RowCssClass = "green";
Grid1.Rows[i].CellCssClasses[6] = "green";
}
else if (state == "2" || state == "3")
{
Grid1.Rows[i].CellCssClasses[6] = "blue";
//if (DateTime.Now > dtCompleteDate.AddDays(1))
//{
// //Grid1.Rows[i].RowCssClass = "red";
// Grid1.Rows[i].CellCssClasses[6] = "red";
// //var ssss = Grid1.Rows[i].;
// //Grid1.Rows[i].Cells[6].Text = "超期";
//}
//else
//{
// //Grid1.Rows[i].RowCssClass = "blue";
// Grid1.Rows[i].CellCssClasses[6] = "blue";
//}
}
else if (state == "4")
{

19
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs
View File

@ -124,29 +124,22 @@ namespace FineUIPro.Web.PZHGL.GJSX
{
for (int i = 0; i < Grid1.Rows.Count; i++)
{
var state = tb.Rows[i]["state"].ToString().Trim();
var state = tb.Rows[i]["state2"].ToString().Trim();
var completeDate = tb.Rows[i]["CompleteDate"].ToString();
DateTime dtCompleteDate = Convert.ToDateTime(completeDate);
if (Grid1.Rows[i].DataKeys[0] != null && !string.IsNullOrWhiteSpace(state))
{
if (state == "0")
{
//Grid1.Rows[i].RowCssClass = "green";
Grid1.Rows[i].CellCssClasses[6] = "green";
}
else if (state == "2" || state == "3")
{
if (DateTime.Now > dtCompleteDate.AddDays(1))
{
//Grid1.Rows[i].RowCssClass = "red";
Grid1.Rows[i].CellCssClasses[6] = "red";
//Grid1.Rows[i].Cells[5].Text = "red";
}
else
{
//Grid1.Rows[i].RowCssClass = "blue";
Grid1.Rows[i].CellCssClasses[6] = "blue";
}
Grid1.Rows[i].CellCssClasses[6] = "blue";
}
else if (state == "4")
{
Grid1.Rows[i].CellCssClasses[6] = "red";
}
}
}

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />