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

增加数据穿透界面

Browse Source
This commit is contained in:
高飞
2023-06-07 18:55:33 +08:00
parent e66750312e
commit b592ccfe5e
358 changed files with 30974 additions and 2388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/Accident.aspx
+3 -3
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全事故" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"
@@ -66,8 +66,8 @@
SortField="UnitName" FieldType="String" HeaderText="责任单位" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="IdentityCard" DataField="IdentityCard"
SortField="IdentityCard" FieldType="String" HeaderText="人数" HeaderTextAlign="Center"
<f:RenderField Width="100px" ColumnID="PeopleNum" DataField="PeopleNum"
SortField="PeopleNum" FieldType="String" HeaderText="人数" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Info" DataField="Info"
SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
+3 -7
View File
@@ -27,6 +27,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "事故事件数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
@@ -53,19 +54,14 @@ namespace FineUIPro.Web.DataShow
if (rbType.SelectedValue == "0")
{
strSql += " AND AccidentType.AccidentTypeName LIKE @values";
listStr.Add(new SqlParameter("@values", "% 未遂%"));
}
else
{
strSql += " AND '未遂' NOT IN (AccidentType.AccidentTypeName)";
strSql += " AND Record.IsAttempt='1'";
}
}
else
{
strSql = @"SELECT Record.AccidentReportId AS ID,Record.ProjectId,Project.ProjectCode,Project.ProjectName,
Record.AccidentTypeId,ConstText AS AccidentTypeName,Record.AccidentDate
,Unit.UnitId,Unit.UnitName,Record.States, 1 AS PeopleNum
,Unit.UnitId,Unit.UnitName,Record.States, Record.PeopleNum
, Record.Abstract AS Info
FROM Accident_AccidentReport AS Record
LEFT JOIN Sys_Const AS AccidentType ON AccidentType.ConstValue = Record.AccidentTypeId AND GroupId='AccidentReportRegistration'
SGGL/FineUIPro.Web/DataShow/Check.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全监督检查" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
+1
View File
@@ -28,6 +28,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "安全监督检查数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="企业总部人员" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="CompanyBranchPersonId" DataIDField="CompanyBranchPersonId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
+3 -2
View File
@@ -21,8 +21,9 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格t
// 绑定表格
BindGrid();
this.Panel1.Title = "企业总部/分支机构安全人员（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
@@ -31,7 +32,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT Person.CompanyBranchPersonId,Unit.UnitName, Person.PersonName,case Person.Sex when '1' then '男' else '女' end as SexStr,Person.IdentityCard,WorkPost.WorkPostName,Person.Telephone,Person.IsOnJob,Person.Remark "
+ @" FROM Person_CompanyBranchPerson AS Person "
+ @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId "
SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx
+2 -2
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="施工机具" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"
@@ -62,7 +62,7 @@
FieldType="String" HeaderText="单位" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="EquipmentName" DataField="EquipmentName"
<f:RenderField Width="150px" ColumnID="SpecialEquipmentName" DataField="SpecialEquipmentName"
FieldType="String" HeaderText="设备" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs
+1
View File
@@ -26,6 +26,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "施工机具设备（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/EduTrain.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="教育培训" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="TrainingId" DataIDField="TrainingId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
+1
View File
@@ -23,6 +23,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "安全教育（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/Emergency.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="750px" ShowBorder="true"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server"
SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs
+1
View File
@@ -27,6 +27,7 @@ namespace FineUIPro.Web.DataShow
// 绑定表格t
BindGrid();
BindGrid2();
this.Panel1.Title = "应急管理数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
#endregion
SGGL/FineUIPro.Web/DataShow/Environmental.aspx
+3 -3
View File
@@ -12,7 +12,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="环保数据" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"
@@ -64,8 +64,8 @@
<f:RenderField Width="150px" ColumnID="IncomeComprehensiveEnergyConsumption" DataField="IncomeComprehensiveEnergyConsumption"
FieldType="Double" HeaderText="万元营业收入综合能耗(吨标准煤/万元)" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="TotalEnergyConsumption" DataField="TotalEnergyConsumption"
FieldType="Double" HeaderText="用新水量(万吨)" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="150px" ColumnID="CO2" DataField="CO2"
FieldType="Double" HeaderText="二氧化碳(万吨)" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="FillingDate" DataField="FillingDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM" HeaderText="填报日期"
SGGL/FineUIPro.Web/DataShow/Environmental.aspx.cs
+5 -4
View File
@@ -24,6 +24,7 @@ namespace FineUIPro.Web.DataShow
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格t
BindGrid();
this.Panel1.Title = "环保数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
@@ -40,8 +41,8 @@ namespace FineUIPro.Web.DataShow
,(SELECT ThisYearValue FROM Environmental_ChemicalReportItem WHERE SortIndex='01'
AND ChemicalReportId=Report.ChemicalReportId) AS TotalEnergyConsumption
,0 AS IncomeComprehensiveEnergyConsumption
,(SELECT ThisYearValue FROM Environmental_ChemicalReportItem WHERE SortIndex='25'
AND ChemicalReportId=Report.ChemicalReportId) AS TotalEnergyConsumption
,(SELECT ThisYearValue FROM Environmental_ChemicalReportItem WHERE SortIndex='70'
AND ChemicalReportId=Report.ChemicalReportId) AS CO2
FROM Environmental_ChemicalReport AS Report";
}
else
@@ -51,8 +52,8 @@ namespace FineUIPro.Web.DataShow
AND ArchitectureReportId=Report.ArchitectureReportId) AS TotalEnergyConsumption
,(SELECT ThisYearValue FROM Environmental_ArchitectureReportItem WHERE SortIndex='15'
AND ArchitectureReportId=Report.ArchitectureReportId) AS IncomeComprehensiveEnergyConsumption
,(SELECT ThisYearValue FROM Environmental_ArchitectureReportItem WHERE SortIndex='24'
AND ArchitectureReportId=Report.ArchitectureReportId) AS TotalEnergyConsumption
,(SELECT ThisYearValue FROM Environmental_ArchitectureReportItem WHERE SortIndex='38'
AND ArchitectureReportId=Report.ArchitectureReportId) AS CO2
FROM Environmental_ArchitectureReport AS Report
WHERE 1=1 ";
}
SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="缺陷分析" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs
+1
View File
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "焊接缺陷数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
#endregion
SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊工" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="WED_ID" DataIDField="WED_ID" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs
+1
View File
@@ -24,6 +24,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "焊工数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接数据" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
+3 -2
View File
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "焊接数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
@@ -172,7 +173,7 @@ namespace FineUIPro.Web.DataShow
{
foreach (var item in getD1)
{
cout1 += Funs.GetNewIntOrZero(item.TotalWeldQuantity);
cout1 += Funs.GetNewDecimalOrZero(item.TotalWeldQuantity);
}
}
}
@@ -202,7 +203,7 @@ namespace FineUIPro.Web.DataShow
{
foreach (var item in getD1)
{
cout1 += Funs.GetNewIntOrZero(item.TotalWeldQuantity);
cout1 += Funs.GetNewDecimalOrZero(item.TotalCompleted);
}
}
//if (datetime1.HasValue)
SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接数据" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="DayReportId" DataIDField="DayReportId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/HJGLWeldingItem.aspx.cs
+1
View File
@@ -27,6 +27,7 @@ namespace FineUIPro.Web.DataShow
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
BindGrid();
this.Panel1.Title = "焊接数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="隐患排查" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
+1
View File
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "隐患排查治理数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="隐患排查" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="HazardRegisterId" DataIDField="HazardRegisterId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs
+1
View File
@@ -55,6 +55,7 @@ namespace FineUIPro.Web.DataShow
// 绑定表格t
BindGrid();
this.Panel1.Title = "隐患排查治理数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="危大工程" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs
+1
View File
@@ -33,6 +33,7 @@ namespace FineUIPro.Web.DataShow
select x).ToList();
// 绑定表格t
BindGrid();
this.Panel1.Title = "危大工程数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="危大工程" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="HazardId" DataIDField="HazardId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/LargeEngineeringItem.aspx.cs
+1
View File
@@ -31,6 +31,7 @@ namespace FineUIPro.Web.DataShow
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格t
BindGrid();
this.Panel1.Title = "危大工程数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/License.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="施工机具" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="LicenseManagerId" DataIDField="LicenseManagerId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/License.aspx.cs
+1
View File
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "作业许可（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/Meeting.aspx
+2 -2
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="会议" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"
@@ -61,7 +61,7 @@
<f:RenderField Width="150px" ColumnID="MeetingName" DataField="MeetingName" FieldType="String"
HeaderText="标题" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MeetingDate" DataField="MeetingDate" FieldType="String"
<f:RenderField Width="150px" ColumnID="MeetingDate" DataField="MeetingDate" FieldType="Date" Renderer="Date"
HeaderText="日期" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="HostMan" DataField="HostMan" FieldType="String"
SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs
+1
View File
@@ -28,6 +28,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "安全会议（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/Project.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/Project.aspx.cs
+1
View File
@@ -23,6 +23,7 @@ namespace FineUIPro.Web.DataShow
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格t
BindGrid();
this.Panel1.Title = "项目信息（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工程划分" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs
+1
View File
@@ -26,6 +26,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "工程划分数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
#endregion
SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目人员" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="PersonId" DataIDField="PersonId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs
+1
View File
@@ -24,6 +24,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "项目现场人员（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量验收" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs
+2 -1
View File
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "质量验收数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
#endregion
@@ -36,7 +37,7 @@ namespace FineUIPro.Web.DataShow
private void BindGrid()
{
string strSql = @"select NEWID() as ID, v.ProjectId,v.ProjectCode,v.ProjectName,v.allcount,v.ccount,isnull(v.allCount,0)-ISNULL(v.cCount,0) as ucCount,
(case when isnull(v.allCount,0) > 0 then cast((isnull(v.allCount,0)-ISNULL(v.cCount,0)) *1.0 /isnull(v.allCount,0)*100 as decimal(18, 2))
(case when isnull(v.allCount,0) > 0 then cast(ISNULL(v.cCount,0) *1.0 /isnull(v.allCount,0)*100 as decimal(18, 2))
else 0 end) as rateV
from (select B.ProjectId,p.ProjectCode,p.ProjectName,COUNT(*) as allCount,
isnull((select COUNT(*)
SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量控制点" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs
+1
View File
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "质量控制点数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
#endregion
SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="计量器具" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs
+1
View File
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "计量器具数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="计量器具" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="InspectionMachineId" DataIDField="InspectionMachineId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/QualityInstrumentsItem.aspx.cs
+1
View File
@@ -27,6 +27,7 @@ namespace FineUIPro.Web.DataShow
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
BindGrid();
this.Panel1.Title = "计量器具数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量人员" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ID" DataIDField="ID" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs
+2 -1
View File
@@ -24,6 +24,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "质量管理人员数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
@@ -56,7 +57,7 @@ namespace FineUIPro.Web.DataShow
}
else
{
strSql = @"SELECT Person.PersonId AS ID,Unit.UnitName,Project.ProjectName,Person.PersonName,case Person.Sex when '1' then '男' else '女' end as SexStr,Person.IdentityCard,WorkPost.WorkPostName,Person.Telephone,Person.Remark
strSql = @"SELECT Person.PersonId AS ID,Unit.UnitName,Project.ProjectName,Person.PersonName,case Person.Sex when '1' then '男' when '2' then '女' else '男' end as SexStr,Person.IdentityCard,WorkPost.WorkPostName,Person.Telephone,Person.Remark
FROM SitePerson_Person AS Person
LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId
SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx
+21 -13
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量问题" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
@@ -53,18 +53,26 @@
<f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="UnitName" DataField="allcount" FieldType="Int"
HeaderText="问题数量" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ccount" DataField="ccount" FieldType="String"
HeaderText="整改数量" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ucCount" DataField="ucCount" FieldType="String"
HeaderText="未整改数量" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="rateV" DataField="rateV" FieldType="String" HeaderText="整改率（%）" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="Count1" Width="120px" HeaderText="问题数量" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="Count2" Width="120px" HeaderText="整改数量" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="Count3" Width="120px" HeaderText="未整改数量" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label4" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="Count4" Width="120px" HeaderText="整改率（%）" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label5" runat="server" Text='<%# Count4(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs
+115 -35
View File
@@ -3,6 +3,7 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.DataShow
{
@@ -24,6 +25,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "质量问题治理数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
@@ -32,50 +34,30 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select NEWID() as ID, v.ProjectId,v.ProjectCode,v.ProjectName,v.allcount,v.ccount,isnull(v.allCount,0)-ISNULL(v.cCount,0) as ucCount,
(case when isnull(v.allCount,0) > 0 then cast((isnull(v.allCount,0)-ISNULL(v.cCount,0)) *1.0 /isnull(v.allCount,0)*100 as decimal(18, 2))
else 0 end) as rateV
from (select h.ProjectId,p.ProjectCode,p.ProjectName,COUNT(*) as allCount,
isnull((select COUNT(*) from Check_CheckControl as c
where c.ProjectId=h.ProjectId and State =7
and '1' = @cpara
group by c.ProjectId),0) as cCount
from Check_CheckControl as h
left join Base_Project as p on h.ProjectId=p.ProjectId
where p.projectId is not null ";
string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
{
strSql += " AND h.projectId = @projectId"; ///状态为已完成
strSql += " AND projectId = @projectId"; ///状态为已完成
listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
cpara += " AND c.projectId ="+ this.drpProject.SelectedValue;
}
if (!string.IsNullOrEmpty(this.txtStartTime.Text))
{
strSql += " AND h.CheckDate >=@StartTime";
listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
//if (!string.IsNullOrEmpty(this.txtStartTime.Text))
//{
// strSql += " AND h.RegisterDate >=@StartTime";
// listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
cpara += " AND c.CheckDate >=" + this.txtStartTime.Text;
}
if (!string.IsNullOrEmpty(this.txtEndTime.Text))
{
strSql += " AND h.CheckDate <=@EndTime";
listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
// cpara += " AND c.RegisterDate >=" + this.txtStartTime.Text;
//}
//if (!string.IsNullOrEmpty(this.txtEndTime.Text))
//{
// strSql += " AND h.RegisterDate <=@EndTime";
// listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
// cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
//}
cpara += " AND c.CheckDate <=" + this.txtEndTime.Text;
}
if (!string.IsNullOrEmpty(cpara))
{
listStr.Add(new SqlParameter("@cpara"," '1' And "+ cpara));
}
else
{
listStr.Add(new SqlParameter("@cpara", "'1'"));
}
strSql += " group by h.ProjectId,p.ProjectCode,p.ProjectName) as v";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
@@ -172,5 +154,103 @@ namespace FineUIPro.Web.DataShow
{
EditData();
}
/// <summary>
/// 数量
/// </summary>
/// <param name="state"></param>
/// <returns></returns>
protected int Count1(object projectId)
{
int cout1 = 0;
if (projectId != null)
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getT = Funs.DB.Check_CheckControl.Where(x => x.ProjectId == projectId.ToString());
if (datetime1.HasValue)
{
getT = getT.Where(x => x.CheckDate >= datetime1);
}
if (datetime2.HasValue)
{
getT = getT.Where(x => x.CheckDate <= datetime2);
}
cout1 = getT.Count();
}
return cout1;
}
protected int Count2(object projectId)
{
int cout1 = 0;
if (projectId != null)
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getT = Funs.DB.Check_CheckControl.Where(x => x.ProjectId == projectId.ToString() && x.State == "7");
if (datetime1.HasValue)
{
getT = getT.Where(x => x.CheckDate >= datetime1);
}
if (datetime2.HasValue)
{
getT = getT.Where(x => x.CheckDate <= datetime2);
}
cout1 = getT.Count();
}
return cout1;
}
protected int Count3(object projectId)
{
int cout1 = 0;
if (projectId != null)
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getT = Funs.DB.Check_CheckControl.Where(x => x.ProjectId == projectId.ToString() && x.State != "7");
if (datetime1.HasValue)
{
getT = getT.Where(x => x.CheckDate >= datetime1);
}
if (datetime2.HasValue)
{
getT = getT.Where(x => x.CheckDate <= datetime2);
}
cout1 = getT.Count();
}
return cout1;
}
protected string Count4(object projectId)
{
string rate = string.Empty;
if (projectId != null)
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getALL = Funs.DB.Check_CheckControl.Where(x => x.ProjectId == projectId.ToString());
if (datetime1.HasValue)
{
getALL = getALL.Where(x => x.CheckDate >= datetime1);
}
if (datetime2.HasValue)
{
getALL = getALL.Where(x => x.CheckDate >= datetime1);
}
var getT = getALL.Where(x => x.ProjectId == projectId.ToString() && x.State == "7");
int coutall = getALL.Count();
int cout0 = getT.Count();
if (coutall > 0)
{
rate = Math.Round(cout0 * 1.0 / coutall * 100, 2).ToString();
}
}
return rate;
}
}
}
SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.designer.cs
Generated
+36
View File
@@ -113,6 +113,42 @@ namespace FineUIPro.Web.DataShow
/// </remarks>
protected global::System.Web.UI.WebControls.Label labNumber;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label4;
/// <summary>
/// Label5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label5;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量问题" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="CheckControlCode" DataIDField="CheckControlCode" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/QualityProblemItem.aspx.cs
+1
View File
@@ -31,6 +31,7 @@ namespace FineUIPro.Web.DataShow
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格t
BindGrid();
this.Panel1.Title = "质量问题治理数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量培训" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs
+1
View File
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "质量培训数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量培训" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="InspectionPersonId" DataIDField="InspectionPersonId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/QualityTrainingItem1.aspx.cs
+1
View File
@@ -27,6 +27,7 @@ namespace FineUIPro.Web.DataShow
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
BindGrid();
this.Panel1.Title = "人员报验数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="质量培训" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="DesignDetailsId" DataIDField="DesignDetailsId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/QualityTrainingItem2.aspx.cs
+1
View File
@@ -27,6 +27,7 @@ namespace FineUIPro.Web.DataShow
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
BindGrid();
this.Panel1.Title = "设计交底数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全费用" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="CostSmallDetailId" DataIDField="CostSmallDetailId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs
+1
View File
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "安全费用（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx
+4 -3
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全风险" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
@@ -53,7 +53,7 @@
<f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="Count1" Width="120px" HeaderText="低风险" HeaderTextAlign="Center" TextAlign="Right">
<f:TemplateField ColumnID="Count1" Width="120px" HeaderText="低风险" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
@@ -68,11 +68,12 @@
<asp:Label ID="Label4" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="Count3" Width="120px" HeaderText="重大风险" HeaderTextAlign="Center" TextAlign="Right">
<f:TemplateField ColumnID="Count4" Width="120px" HeaderText="重大风险" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label5" runat="server" Text='<%# Count4(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
+10 -9
View File
@@ -25,6 +25,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "安全风险数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
#endregion
@@ -183,12 +184,12 @@ namespace FineUIPro.Web.DataShow
/// <returns></returns>
protected int Count2(object projectId)
{
int cout1 = 0;
int cout2 = 0;
if (projectId != null)
{
cout1 = getcount(projectId.ToString(),2);
cout2 = getcount(projectId.ToString(),2);
}
return cout1;
return cout2;
}
/// <summary>
@@ -198,22 +199,22 @@ namespace FineUIPro.Web.DataShow
/// <returns></returns>
protected int Count3(object projectId)
{
int cout1 = 0;
int cout3 = 0;
if (projectId != null)
{
cout1= getcount(projectId.ToString(), 3);
cout3= getcount(projectId.ToString(), 3);
}
return cout1;
return cout3;
}
protected int Count4(object projectId)
{
int cout1 = 0;
int cout4 = 0;
if (projectId != null)
{
cout1 = getcount(projectId.ToString(), 4);
cout4 = getcount(projectId.ToString(), 4);
}
return cout1;
return cout4;
}
/// <summary>
/// 定义变量
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.designer.cs
Generated
+22 -24
View File
@@ -7,13 +7,11 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.DataShow
{
public partial class SecurityRisk
{
namespace FineUIPro.Web.DataShow {
public partial class SecurityRisk {
/// <summary>
/// form1 控件。
/// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// drpProject 控件。
/// </summary>
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject;
/// <summary>
/// btnClose 控件。
/// </summary>
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// labNumber 控件。
/// </summary>
@@ -85,7 +83,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labNumber;
/// <summary>
/// Label2 控件。
/// </summary>
@@ -94,7 +92,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Label1 控件。
/// </summary>
@@ -103,7 +101,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label4 控件。
/// </summary>
@@ -112,7 +110,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label4;
/// <summary>
/// Label5 控件。
/// </summary>
@@ -121,7 +119,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label5;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -130,7 +128,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -139,7 +137,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -148,7 +146,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -157,7 +155,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -166,7 +164,7 @@ namespace FineUIPro.Web.DataShow
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnView 控件。
/// </summary>
SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全工时" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="HazardSelectedItemId" DataIDField="HazardSelectedItemId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.cs
+2 -1
View File
@@ -33,6 +33,7 @@ namespace FineUIPro.Web.DataShow
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
BindGrid();
this.Panel1.Title = "安全风险数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
@@ -43,7 +44,7 @@ namespace FineUIPro.Web.DataShow
{
string strSql = @"select Item.HazardSelectedItemId,Item.HazardListId,List.IdentificationDate,List.WorkAreaName,Item.WorkStage,Item.HazardListTypeId
, Item.HazardListTypeId,Item.HazardId,Item.HazardItems,Item.DefectsType,Item.MayLeadAccidents
,Item.HelperMethod,Item.HazardJudge_L,Item.HazardJudge_E,Item.HazardJudge_C,Item.HazardJudge_E
,Item.HelperMethod,Item.HazardJudge_L,Item.HazardJudge_E,Item.HazardJudge_C,HazardJudge_D,Item.HazardJudge_E
,level.RiskLevelName,Item.ControlMeasures
from Hazard_HazardSelectedItem AS Item
LEFT JOIN Hazard_HazardList AS List on List.HazardListId = Item.HazardListId
SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全工时" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true"
SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs
+46 -42
View File
@@ -25,10 +25,11 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
this.Panel1.Title = "工时数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
/// <summary>
/// 绑定数据
/// </summary>
@@ -57,7 +58,7 @@ namespace FineUIPro.Web.DataShow
// cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
//}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
@@ -148,7 +149,7 @@ namespace FineUIPro.Web.DataShow
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WorkingHoursItem.aspx?projectId={0}", Grid1.SelectedRowID, "查看 - ")));
}
#endregion
protected void btnView_Click(object sender, EventArgs e)
{
@@ -168,25 +169,23 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getD1 = from x in Funs.DB.SitePerson_DayReport
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1
select x;
if (datetime1.HasValue)
var getAllPersonInOutList = from x in Funs.DB.SitePerson_PersonInOutNumber
where x.ProjectId == projectId.ToString()
select x;
if (getAllPersonInOutList.Count() > 0)
{
getD1 = getD1.Where(x => x.CompileDate >= datetime1);
}
if (datetime2.HasValue)
{
getD1 = getD1.Where(x => x.CompileDate <= datetime2);
}
var getC = from x in Funs.DB.SitePerson_DayReportDetail
join y in getD1 on x.DayReportId equals y.DayReportId
where y.ProjectId == projectId.ToString()
select x;
if (getC.Count() > 0)
{
cout1 = getC.Sum(x => x.PersonWorkTime ?? 0);
if (datetime1.HasValue)
{
getAllPersonInOutList = getAllPersonInOutList.Where(x => x.InOutDate >= datetime1);
}
if (datetime2.HasValue)
{
getAllPersonInOutList = getAllPersonInOutList.Where(x => x.InOutDate <= datetime2);
}
if (getAllPersonInOutList.Count() > 0)
{
cout1 = getAllPersonInOutList.Sum(x => x.WorkHours ?? 0);
}
}
}
return cout1;
@@ -206,11 +205,11 @@ namespace FineUIPro.Web.DataShow
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getD1 = from x in Funs.DB.Accident_AccidentHandle
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1
select x;
where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
select x;
var getD2 = from x in Funs.DB.Accident_AccidentReport
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1
where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
select x;
if (datetime1.HasValue)
{
@@ -246,48 +245,53 @@ namespace FineUIPro.Web.DataShow
{
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
var getC1 = from x in Funs.DB.SitePerson_DayReport
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1
select x;
var getAllPersonInOutList = from x in Funs.DB.SitePerson_PersonInOutNumber
where x.ProjectId == projectId.ToString()
select x;
if (getAllPersonInOutList.Count() > 0)
{
if (datetime1.HasValue)
{
getAllPersonInOutList = getAllPersonInOutList.Where(x => x.InOutDate >= datetime1);
}
if (datetime2.HasValue)
{
getAllPersonInOutList = getAllPersonInOutList.Where(x => x.InOutDate <= datetime2);
}
if (getAllPersonInOutList.Count() > 0)
{
cout1 = getAllPersonInOutList.Sum(x => x.WorkHours ?? 0);
}
}
var getD1 = from x in Funs.DB.Accident_AccidentHandle
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1
where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
select x;
var getD2 = from x in Funs.DB.Accident_AccidentReport
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
where y.ProjectState == Const.ProjectState_1
where y.ProjectState == Const.ProjectState_1 && x.ProjectId == projectId.ToString()
select x;
if (datetime1.HasValue)
{
getC1 = getC1.Where(x => x.CompileDate >= datetime1);
getD1 = getD1.Where(x => x.AccidentDate >= datetime1);
getD2 = getD2.Where(x => x.CompileDate >= datetime1);
}
if (datetime2.HasValue)
{
getC1 = getC1.Where(x => x.CompileDate <= datetime2);
getD1 = getD1.Where(x => x.AccidentDate <= datetime2);
getD2 = getD2.Where(x => x.CompileDate <= datetime2);
}
var getC = from x in Funs.DB.SitePerson_DayReportDetail
join y in getC1 on x.DayReportId equals y.DayReportId
where y.ProjectId == projectId.ToString()
select x;
if (getC.Count() > 0)
{
cout1 = getC.Sum(x => x.PersonWorkTime ?? 0);
}
if (getD1.Count() > 0)
{
cout1 = cout1 -getD1.Sum(x => x.WorkHoursLoss ?? 0);
cout1 = cout1 - getD1.Sum(x => x.WorkHoursLoss ?? 0);
}
if (getD2.Count() > 0)
{
cout1 = cout1- getD2.Sum(x => x.WorkingHoursLoss ?? 0);
cout1 = cout1 - getD2.Sum(x => x.WorkingHoursLoss ?? 0);
}
}
return cout1;
SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx
+2 -2
View File
@@ -13,7 +13,7 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全工时" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="DayReportId" DataIDField="DayReportId" AllowSorting="true"
@@ -53,7 +53,7 @@
<f:TemplateField ColumnID="tfWorkTime" Width="200px" HeaderText="当日人工时" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblWorkTime" runat="server" Text='<%# ConvertPersonWorkTimeSum(Eval("DayReportId")) %>'></asp:Label>
<asp:Label ID="lblWorkTime" runat="server" Text='<%# Eval("WorkHours") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
SGGL/FineUIPro.Web/DataShow/WorkingHoursItem.aspx.cs
+4 -3
View File
@@ -27,6 +27,7 @@ namespace FineUIPro.Web.DataShow
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
BindGrid();
this.Panel1.Title = "工时数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CWCEC) + "）";
}
}
@@ -35,19 +36,19 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select DayReportId,CompileDate,ProjectId from SitePerson_DayReport WHERE 1=1 ";
string strSql = @"select PersonInOutNumberId as DayReportId,InOutDate as CompileDate,ProjectId,WorkHours from SitePerson_PersonInOutNumber WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " AND ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
if (!string.IsNullOrEmpty(txtStartTime.Text.Trim()))
{
strSql += " AND CompileDate >= @StartTime";
strSql += " AND InOutDate >= @StartTime";
listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text.Trim()));
}
if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
{
strSql += " AND CompileDate <= @EndTime";
strSql += " AND InOutDate <= @EndTime";
listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim()));
}