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

提交代码

This commit is contained in:
高飞 2024-02-01 16:50:35 +08:00
parent 8782bbff79
commit 79d0272455
8 changed files with 158 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/FineUIPro.Web/FineUIPro.Web.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>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>false</Use64BitIISExpress>
<IISExpressSSLPort />

2
SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
View File

@ -72,7 +72,7 @@ namespace FineUIPro.Web.Transfer.Chart
//查询当前日期中的system的具体数目，去除重复
var list = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
&& x.FDate >= sTime && x.FDate <= eTime).ToList();
var SystemList = (from x in list select x.SystemName).Distinct();
//先加载左侧system 树菜单

20
SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs
View File

@ -62,6 +62,9 @@ namespace FineUIPro.Web.Transfer.Chart
dtTime.Columns.Add("A数量", typeof(string));
dtTime.Columns.Add("B数量", typeof(string));
dtTime.Columns.Add("C数量", typeof(string));
dtTime.Columns.Add("Finished", typeof(string));
dtTime.Columns.Add("In Progress", typeof(string));
dtTime.Columns.Add("Not Start", typeof(string));
foreach (var item in list)
{
DataRow rowTime = dtTime.NewRow();
@ -72,9 +75,12 @@ namespace FineUIPro.Web.Transfer.Chart
rowTime["A数量"] = types.Where(x => x.Category == "A").Count();
rowTime["B数量"] = types.Where(x => x.Category == "B").Count();
rowTime["C数量"] = types.Where(x => x.Category == "C").Count();
rowTime["Finished"] = types.Where(x => x.PUNCH_ITEM_STATUS == "Finished").Count();
rowTime["In Progress"] = types.Where(x => x.PUNCH_ITEM_STATUS == "In Progress").Count();
rowTime["Not Start"] = types.Where(x => x.PUNCH_ITEM_STATUS == "Not Start").Count();
dtTime.Rows.Add(rowTime);
}
this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1100, 550, this.ckbShow.Checked));
this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1300, 550, this.ckbShow.Checked));
}
else //饼形图
{
@ -90,7 +96,7 @@ namespace FineUIPro.Web.Transfer.Chart
rowTime["总数量"] = types.Count();
dtTime.Rows.Add(rowTime);
}
this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1130, 550, this.ckbShow.Checked));
this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1300, 550, this.ckbShow.Checked));
}
#endregion
}
@ -107,6 +113,9 @@ namespace FineUIPro.Web.Transfer.Chart
dtTime.Columns.Add("A数量", typeof(string));
dtTime.Columns.Add("B数量", typeof(string));
dtTime.Columns.Add("C数量", typeof(string));
dtTime.Columns.Add("Finished", typeof(string));
dtTime.Columns.Add("In Progress", typeof(string));
dtTime.Columns.Add("Not Start", typeof(string));
foreach (var item in disciplines)
{
DataRow rowTime = dtTime.NewRow();
@ -117,10 +126,13 @@ namespace FineUIPro.Web.Transfer.Chart
rowTime["A数量"] = types.Where(x => x.Category == "A").Count();
rowTime["B数量"] = types.Where(x => x.Category == "B").Count();
rowTime["C数量"] = types.Where(x => x.Category == "C").Count();
rowTime["Finished"] = types.Where(x => x.PUNCH_ITEM_STATUS == "Finished").Count();
rowTime["In Progress"] = types.Where(x => x.PUNCH_ITEM_STATUS == "In Progress").Count();
rowTime["Not Start"] = types.Where(x => x.PUNCH_ITEM_STATUS == "Not Start").Count();
dtTime.Rows.Add(rowTime);
}
this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1100, 550, this.ckbShow.Checked));
this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1300, 550, this.ckbShow.Checked));
}
else //饼形图
{
@ -138,7 +150,7 @@ namespace FineUIPro.Web.Transfer.Chart
dtTime.Rows.Add(rowTime);
}
this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1100, 550, this.ckbShow.Checked));
this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1300, 550, this.ckbShow.Checked));
}
#endregion
}

41
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
View File

@ -22,10 +22,11 @@
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" ID="txtPunch_No" Label="Punch_No" LabelWidth="80px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtPunch_No" Label="Punch_No" LabelWidth="80px" LabelAlign="Right" Width="150px"></f:TextBox>
<f:TextBox runat="server" ID="txtSYSTEM" Label="SYSTEM" LabelWidth="80px" LabelAlign="Right" Width="150px"></f:TextBox>
<f:TextBox runat="server" ID="txtSUBSYSTEM" Label="SUBSYSTEM" LabelWidth="100px" LabelAlign="Right" Width="170px"></f:TextBox>
<f:DatePicker runat="server" Label="PUNCH_ITEM_FINISH_DATE" ID="txtStarTime" LabelAlign="Right" LabelWidth="200px"
Width="280px">
Width="320px">
</f:DatePicker>
<f:Label ID="Label1" runat="server" Text="至">
</f:Label>
@ -43,6 +44,14 @@
</f:Button>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" ID="txtTestPackage" Label="Test Package" LabelWidth="105px" LabelAlign="Right" Width="300px"></f:TextBox>
<f:TextBox runat="server" ID="txtDiscipline" Label="Discipline" LabelWidth="80px" LabelAlign="Right" Width="150px"></f:TextBox>
<f:TextBox runat="server" ID="txtIdentified" Label="Identified during/by" LabelWidth="150px" LabelAlign="Right" Width="300px"></f:TextBox>
<f:TextBox runat="server" ID="txtCategory" Label="Select Punch List Category" LabelWidth="220px" LabelAlign="Right" Width="300px"></f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
@ -50,33 +59,33 @@
<Columns>
<f:BoundField Width="80px" TextAlign="Center" ColumnID="Item_No" DataField="Item_No" HeaderText="Item No." />
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Punch_No" DataField="Punch_No" HeaderText="Punch No" />
<f:BoundField Width="90px" TextAlign="Center" ColumnID="Punch_No" DataField="Punch_No" HeaderText="Punch No" />
<f:BoundField Width="120px" TextAlign="Center" ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" />
<f:BoundField Width="80px" TextAlign="Center" ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" />
<f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="SUBSYSTEM" TextAlign="Center"/>
<f:BoundField Width="108px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="SUBSYSTEM" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
<f:BoundField Width="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Discipline" DataField="Discipline" HeaderText="Discipline" TextAlign="Center"/>
<f:BoundField Width="85px" ColumnID="Discipline" DataField="Discipline" HeaderText="Discipline" TextAlign="Center"/>
<f:BoundField Width="250px" ColumnID="DESCRIPTION" DataField="DESCRIPTION" HeaderText="PUNCH LIST ITEM DESCRIPTION" TextAlign="Center"/>
<f:BoundField Width="180px" ColumnID="Identified" DataField="Identified" HeaderText="Identified during/by" TextAlign="Center"/>
<f:BoundField Width="145px" ColumnID="Identified" DataField="Identified" HeaderText="Identified during/by" TextAlign="Center"/>
<f:BoundField Width="250px" ColumnID="Category" DataField="Category" HeaderText="Select Punch List Category" TextAlign="Center"/>
<f:BoundField Width="110px" ColumnID="Category" DataField="Category" HeaderText="Select Punch<br/>List Category" TextAlign="Center"/>
<f:RenderField Width="200px" ColumnID="PUNCH_ITEM_FINISH_DATE" DataField="PUNCH_ITEM_FINISH_DATE"
HeaderText="PUNCH ITEM FINISH DATE" TextAlign="Center"
<f:RenderField Width="110px" ColumnID="PUNCH_ITEM_FINISH_DATE" DataField="PUNCH_ITEM_FINISH_DATE"
HeaderText="PUNCH ITEM<br/>FINISH DATE" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"/>
<f:BoundField Width="150px" ColumnID="Action_By" DataField="Action_By" HeaderText="Action By" TextAlign="Center"/>
<f:BoundField Width="100px" ColumnID="Action_By" DataField="Action_By" HeaderText="Action By" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Required_By" DataField="Required_By" HeaderText="Required By" TextAlign="Center"/>
<f:BoundField Width="100px" ColumnID="Required_By" DataField="Required_By" HeaderText="Required By" TextAlign="Center"/>
<f:BoundField Width="250px" ColumnID="PUNCH_ITEM_STATUS" DataField="PUNCH_ITEM_STATUS" HeaderText="PUNCH ITEM STATUS" TextAlign="Center"/>
<f:BoundField Width="110px" ColumnID="PUNCH_ITEM_STATUS" DataField="PUNCH_ITEM_STATUS" HeaderText="PUNCH ITEM<br/>STATUS" TextAlign="Center"/>
<f:BoundField Width="250px" ColumnID="Comments" DataField="Comments" HeaderText="Comments" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Comments" DataField="Comments" HeaderText="Comments" TextAlign="Center"/>
</Columns>
</f:GroupField>

30
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
View File

@ -40,6 +40,16 @@ namespace FineUIPro.Web.Transfer
strSql += " AND Punch_No like @Punch_No";
listStr.Add(new SqlParameter("@Punch_No", "%" + this.txtPunch_No.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtSYSTEM.Text.Trim()))
{
strSql += " AND SystemName like @SystemName";
listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSYSTEM.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtSUBSYSTEM.Text.Trim()))
{
strSql += " AND Subsystem like @Subsystem";
listStr.Add(new SqlParameter("@Subsystem", "%" + this.txtSUBSYSTEM.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
{
strSql += " AND PUNCH_ITEM_FINISH_DATE >= @InspectionDateA";
@ -50,6 +60,26 @@ namespace FineUIPro.Web.Transfer
strSql += " AND PUNCH_ITEM_FINISH_DATE <= @InspectionDateZ";
listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
}
if (!string.IsNullOrEmpty(this.txtTestPackage.Text.Trim()))
{
strSql += " AND Test_Package like @Test_Package";
listStr.Add(new SqlParameter("@Test_Package", "%" + this.txtTestPackage.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtDiscipline.Text.Trim()))
{
strSql += " AND Discipline like @Discipline";
listStr.Add(new SqlParameter("@Discipline", "%" + this.txtDiscipline.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtIdentified.Text.Trim()))
{
strSql += " AND Identified like @Identified";
listStr.Add(new SqlParameter("@Identified", "%" + this.txtIdentified.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtCategory.Text.Trim()))
{
strSql += " AND Category like @Category";
listStr.Add(new SqlParameter("@Category", "%" + this.txtCategory.Text.Trim() + "%"));
}
strSql += " order by Punch_No ";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

105
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs generated
View File

@ -7,13 +7,11 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Transfer
{
public partial class PunchlistFrom
{
namespace FineUIPro.Web.Transfer {
public partial class PunchlistFrom {
/// <summary>
/// form1 控件。
/// </summary>
@ -22,7 +20,7 @@ namespace FineUIPro.Web.Transfer
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -31,7 +29,7 @@ namespace FineUIPro.Web.Transfer
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -40,7 +38,7 @@ namespace FineUIPro.Web.Transfer
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -49,7 +47,7 @@ namespace FineUIPro.Web.Transfer
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolSearch 控件。
/// </summary>
@ -58,7 +56,7 @@ namespace FineUIPro.Web.Transfer
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar ToolSearch;
/// <summary>
/// txtPunch_No 控件。
/// </summary>
@ -67,7 +65,25 @@ namespace FineUIPro.Web.Transfer
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPunch_No;
/// <summary>
/// txtSYSTEM 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSYSTEM;
/// <summary>
/// txtSUBSYSTEM 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSUBSYSTEM;
/// <summary>
/// txtStarTime 控件。
/// </summary>
@ -76,7 +92,7 @@ namespace FineUIPro.Web.Transfer
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStarTime;
/// <summary>
/// Label1 控件。
/// </summary>
@ -85,7 +101,7 @@ namespace FineUIPro.Web.Transfer
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// txtEndTime 控件。
/// </summary>
@ -94,7 +110,7 @@ namespace FineUIPro.Web.Transfer
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// btnSearch 控件。
/// </summary>
@ -103,7 +119,7 @@ namespace FineUIPro.Web.Transfer
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// btnImport 控件。
/// </summary>
@ -112,7 +128,52 @@ namespace FineUIPro.Web.Transfer
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtTest Package 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTestPackage;
/// <summary>
/// txtDiscipline 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDiscipline;
/// <summary>
/// txtIdentified 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtIdentified;
/// <summary>
/// txtCategory 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCategory;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -121,7 +182,7 @@ namespace FineUIPro.Web.Transfer
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@ -130,7 +191,7 @@ namespace FineUIPro.Web.Transfer
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window2 控件。
/// </summary>
@ -139,7 +200,7 @@ namespace FineUIPro.Web.Transfer
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Menu1 控件。
/// </summary>
@ -148,7 +209,7 @@ namespace FineUIPro.Web.Transfer
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuDel 控件。
/// </summary>

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

@ -77,7 +77,7 @@
<add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
</httpHandlers>
<compilation debug="true" targetFramework="4.6.1"/>
<compilation debug="false" targetFramework="4.6.1"/>
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
<authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>

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>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />