zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-07-03

Browse Source
This commit is contained in:
李超
2023-07-03 14:46:37 +08:00
parent cba6685973
commit e575463176
26 changed files with 517 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx
+7 -3
View File
@@ -18,14 +18,18 @@
<Items>
<f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
<Rows>
<f:FormRow ColumnWidths="20% 3% 20% 30% 15% 10%">
<f:FormRow ColumnWidths="15% 15% 15% 2% 15% 30% 15% 10%">
<Items>
<f:DatePicker ID="txtStartRectificationTime" runat="server" Label="检查时间" LabelAlign="Right"
<f:DropDownList runat="server" Label="责任单位" ID="drpUnit" LabelWidth="80px" Width="150px"> </f:DropDownList>
<f:DropDownList runat="server" Label="问题类别" ID="drpQuestionType" LabelWidth="80px" Width="150px"> </f:DropDownList>
<f:DatePicker ID="txtStartRectificationTime" runat="server" Label="检查时间" LabelAlign="Right" Width="100px"
LabelWidth="80px">
</f:DatePicker>
<f:Label ID="Label3" runat="server" Text="至" Width="5px">
</f:Label>
<f:DatePicker ID="txtEndRectificationTime" runat="server">
<f:DatePicker ID="txtEndRectificationTime" runat="server" Width="100px">
</f:DatePicker>
<f:RadioButtonList ID="rblState" runat="server" Label="分析类型" LabelWidth="80px" Width="250px"
AutoPostBack="true" OnSelectedIndexChanged="drpChartType_SelectedIndexChanged">
SGGL/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.cs
+17 -3
View File
@@ -19,10 +19,11 @@ namespace FineUIPro.Web.CQMS.Check
{
if (!IsPostBack)
{
this.txtStartRectificationTime.Text = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd");
this.txtEndRectificationTime.Text = DateTime.Now.ToString("yyyy-MM-dd");
UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
QualityQuestionTypeService.InitQualityQuestionTypeDownList(drpQuestionType, true);
}
this.AnalyseData();
this.AnalyseData();
}
#endregion
@@ -66,6 +67,10 @@ namespace FineUIPro.Web.CQMS.Check
{
strSql += " and CheckDate <'" + DateTime.Parse( this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' ";
}
if (drpUnit.SelectedValue != BLL.Const._Null)
{
strSql += " and UnitId='" + drpUnit.SelectedValue + "' ";
}
strSql += " group by UnitId,unitName ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
@@ -138,6 +143,15 @@ namespace FineUIPro.Web.CQMS.Check
{
strSql += " and CheckDate <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' ";
}
if (drpUnit.SelectedValue != BLL.Const._Null)
{
strSql += " and UnitId='" + drpUnit.SelectedValue + "' ";
}
if (drpQuestionType.SelectedValue != Const._Null)
{
strSql += " AND QuestionType='"+ drpQuestionType.SelectedValue + "' ";
}
strSql += " group by QuestionDef,QuestionTypeStr ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
SGGL/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.designer.cs
Generated
+18
View File
@@ -50,6 +50,24 @@ namespace FineUIPro.Web.CQMS.Check
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpQuestionType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpQuestionType;
/// <summary>
/// txtStartRectificationTime 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx
+3 -3
View File
@@ -5,7 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>超过一定规模的危大施工方案</title>
<title>超危大工程施工方案清单</title>
</head>
<body>
<form id="form1" runat="server">
@@ -13,7 +13,7 @@
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="超过一定规模的危大施工方案" EnableCollapse="true"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="超危大工程施工方案清单" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="MajorPlanApprovalId" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="MajorPlanApprovalId" AllowSorting="true" SortField="PlanCode"
SortDirection="DESC" OnSort="Grid1_Sort"
@@ -98,7 +98,7 @@
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="超过一定规模的危大施工方案" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Window1" Title="超危大工程施工方案清单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="900px" Height="460px">
</f:Window>
SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionFinal.aspx
+3 -3
View File
@@ -6,7 +6,7 @@
<head runat="server">
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>施工组织设计及施工方案</title>
<title>施工方案定稿文件</title>
<style type="text/css">
.labcenter {
text-align: center;
@@ -137,10 +137,10 @@
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="WindowAtt" Title="施工方案定稿文件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px"></f:Window>
<f:Window ID="Window1" Title="施工组织设计及施工方案" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Window1" Title="施工方案定稿文件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="750px" Height="330px">
</f:Window>