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

20241225 质量周报月报修改

This commit is contained in:
毕文静 2024-12-25 10:07:39 +08:00
parent 281fbb3b25
commit 5c045bd911
12 changed files with 155 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/BLL/BLL.csproj
View File

@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BLL</RootNamespace>
<AssemblyName>BLL</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>

2
SGGL/BLL/app.config
View File

@ -61,4 +61,4 @@
</wsHttpBinding>
</bindings>
</system.serviceModel>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

18
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
View File

@ -163,7 +163,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
<Items>
<f:Button ID="Button3" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid1_Click">
<f:Button ID="Button3" Icon="Add" runat="server" ToolTip="新增" Text="新增" OnClick="btnAddGrid1_Click">
</f:Button>
</Items>
</f:Toolbar>
@ -248,7 +248,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre0" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@ -265,7 +265,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre1" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@ -282,7 +282,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre2" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@ -675,7 +675,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
<Items>
<f:Button ID="Button4" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid9_Click">
<f:Button ID="Button4" Icon="Add" runat="server" ToolTip="新增" Text="新增" OnClick="btnAddGrid9_Click">
</f:Button>
</Items>
</f:Toolbar>
@ -861,7 +861,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre8" EmptyText="请填写内容" Text="本月报验的主要材料钢筋、水泥、预应力xxx等，其中现场抽检xx批，合格xx批"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@ -1856,7 +1856,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre20" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@ -1873,7 +1873,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre21" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@ -1891,7 +1891,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre22" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>

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

@ -437,6 +437,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 本月质量目标管理情况 Grid1方法
protected void btnAddGrid1_Click(object sender, EventArgs e)
{
SaveMethod();
Grid1.Hidden = false;
JArray teamGroupData = Grid1.GetMergedData();
@ -1072,6 +1074,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 7.2 PQR/WPS报验情况 Grid9方法
protected void btnAddGrid9_Click(object sender, EventArgs e)
{
SaveMethod();
Grid9.Hidden = false;
JArray teamGroupData = Grid9.GetMergedData();
@ -2521,6 +2524,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnRowMaterialProblem_Click(object sender, EventArgs e)
{
SaveMethod();
gvRowMaterialProblem.Hidden = false;
JArray teamGroupData = gvRowMaterialProblem.GetMergedData();
@ -2575,6 +2579,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnAddConstructionProblems_Click(object sender, EventArgs e)
{
SaveMethod();
gvConstructionProblems.Hidden = false;
JArray teamGroupData = gvConstructionProblems.GetMergedData();
@ -2643,6 +2648,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnAddNextControl_Click(object sender, EventArgs e)
{
SaveMethod();
gvNextQualityControl.Hidden = false;
JArray teamGroupData = gvNextQualityControl.GetMergedData();
@ -2677,6 +2683,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 23.施工照片
protected void filePhoto_FileSelected(object sender, EventArgs e)
{
SaveMethod();
if (filePhoto.HasFile)
{
string fileName = filePhoto.ShortFileName;
@ -2818,6 +2825,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ShowNotify("周期不能为空！", MessageBoxIcon.Warning);
return;
}
SaveMethod();
ShowNotify("编辑成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
private void SaveMethod()
{
Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New();
report.Id = ReportId;
report.ProjectId = this.CurrUser.LoginProjectId;
@ -2923,7 +2938,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
saveConstructionProblems();
//保存19.下月质量控制重点
saveNextQualityControl();
//保存23.施工照片
saveImages();
@ -2939,9 +2953,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
WeekAndMonthReportNewService.Update(report);
}
ShowNotify("编辑成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#region 保存本月质量目标管理情况
@ -4006,5 +4017,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#endregion
#endregion
protected void Text_TextChanged(object sender, EventArgs e)
{
SaveMethod();
}
}
}

18
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
View File

@ -162,7 +162,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
<Items>
<f:Button ID="Button3" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid1_Click">
<f:Button ID="Button3" Icon="Add" runat="server" ToolTip="新增" Text="新增" OnClick="btnAddGrid1_Click">
</f:Button>
</Items>
</f:Toolbar>
@ -247,7 +247,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre0" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@ -264,7 +264,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre1" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@ -281,7 +281,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre2" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@ -674,7 +674,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
<Items>
<f:Button ID="Button4" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid9_Click">
<f:Button ID="Button4" Icon="Add" runat="server" ToolTip="新增" Text="新增" OnClick="btnAddGrid9_Click">
</f:Button>
</Items>
</f:Toolbar>
@ -860,7 +860,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre8" EmptyText="请填写内容" Text="本周报验的主要材料钢筋、水泥、预应力xxx等，其中现场抽检xx批，合格xx批"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@ -1855,7 +1855,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre20" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@ -1872,7 +1872,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre21" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>
@ -1890,7 +1890,7 @@
<f:FormRow>
<Items>
<f:TextArea runat="server" ID="txtAre22" EmptyText="请填写内容"
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
</f:TextArea>
</Items>
</f:FormRow>

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

@ -378,6 +378,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 本月质量目标管理情况 Grid1方法
protected void btnAddGrid1_Click(object sender, EventArgs e)
{
SaveMethod();
Grid1.Hidden = false;
JArray teamGroupData = Grid1.GetMergedData();
@ -1003,6 +1004,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 7.2 PQR/WPS报验情况 Grid9方法
protected void btnAddGrid9_Click(object sender, EventArgs e)
{
SaveMethod();
Grid9.Hidden = false;
JArray teamGroupData = Grid9.GetMergedData();
@ -2457,6 +2459,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnRowMaterialProblem_Click(object sender, EventArgs e)
{
SaveMethod();
gvRowMaterialProblem.Hidden = false;
JArray teamGroupData = gvRowMaterialProblem.GetMergedData();
@ -2511,6 +2514,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnAddConstructionProblems_Click(object sender, EventArgs e)
{
SaveMethod();
gvConstructionProblems.Hidden = false;
JArray teamGroupData = gvConstructionProblems.GetMergedData();
@ -2579,6 +2583,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnAddNextControl_Click(object sender, EventArgs e)
{
SaveMethod();
gvNextQualityControl.Hidden = false;
JArray teamGroupData = gvNextQualityControl.GetMergedData();
@ -2613,6 +2618,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 23.施工照片
protected void filePhoto_FileSelected(object sender, EventArgs e)
{
SaveMethod();
if (filePhoto.HasFile)
{
string fileName = filePhoto.ShortFileName;
@ -2754,6 +2760,17 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ShowNotify("周期不能为空！", MessageBoxIcon.Warning);
return;
}
SaveMethod();
ShowNotify("编辑成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#region 保存方法
/// <summary>
/// 保存方法
/// </summary>
private void SaveMethod()
{
Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New();
report.Id = ReportId;
report.ProjectId = this.CurrUser.LoginProjectId;
@ -2875,10 +2892,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
WeekAndMonthReportNewService.Update(report);
}
ShowNotify("编辑成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#endregion
#region 保存本月质量目标管理情况
void saveTarget()
@ -3939,8 +3954,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
db.Report_TextBoxContent.InsertAllOnSubmit(ImageLists);
db.SubmitChanges();
}
#endregion
#endregion
protected void Text_TextChanged(object sender, EventArgs e)
{
SaveMethod();
}
}
}

7
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -12,7 +12,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FineUIPro.Web</RootNamespace>
<AssemblyName>FineUIPro.Web</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress>
<SccProjectName>
</SccProjectName>
@ -104,8 +104,7 @@
<HintPath>..\FineUIPro\Reference BLL\Microsoft.QualityTools.Testing.Fakes.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.dll</HintPath>
@ -19321,7 +19320,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

6
SGGL/FineUIPro.Web/Web.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
有关如何配置 ASP.NET 应用程序的详细消息，请访问
@ -12,7 +12,7 @@
<appSettings>
<!--连接字符串-->
<!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200" />
<!--系统名称-->
<add key="SystemName" value="智慧施工管理信息系统V1.0" />
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;" />
@ -188,7 +188,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="13.0.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

2
SGGL/FineUIPro.Web/packages.config
View File

@ -3,7 +3,7 @@
<package id="Apache.NMS" version="1.8.0" targetFramework="net40" />
<package id="Apache.NMS.ActiveMQ" version="1.7.2" targetFramework="net40" />
<package id="Microsoft.Office.Interop.Word" version="15.0.4797.1004" targetFramework="net461" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net40" requireReinstallation="true" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net461" />
<package id="NPOI" version="2.5.5" targetFramework="net461" />
<package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net461" />
<package id="RestSharp" version="106.15.0" targetFramework="net461" />

2
SGGL/Model/Model.csproj
View File

@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Model</RootNamespace>
<AssemblyName>Model</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>

2
SGGL/SgManager.AI/SgManager.AI.csproj
View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SgManager.AI</RootNamespace>
<AssemblyName>SgManager.AI</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>

2
SGGL/WebAPI/WebAPI.csproj
View File

@ -14,7 +14,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WebAPI</RootNamespace>
<AssemblyName>WebAPI</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />