lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-03-09 合同归档修改，安全首页修改

Browse Source
This commit is contained in:
李鹏飞
2023-03-09 15:02:06 +08:00
parent b76821201b
commit ffa50f752f
21 changed files with 1042 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx
+2 -8
View File
@@ -23,14 +23,8 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList runat="server" ID="DropDownList1" Label="数据来源">
<f:ListItem Text="施工管理部" Value="Value1" />
<f:ListItem Text="环境工程事业部" Value="Value2" />
<f:ListItem Text="基础设施事业部" Value="Value3" />
<f:ListItem Text="运营管理部" Value="Value4" />
<f:ListItem Text="宁波公司" Value="Value5" />
<f:ListItem Text="焦化公司" Value="Value6" />
</f:DropDownList>
<f:DropDownList ID="drpDepartId" runat="server" Label="主办部门" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
<f:TextBox runat="server" Label="合同名称" ID="txtContractName" EmptyText="输入查询条件" Width="300px" LabelWidth="90px"
LabelAlign="right">
</f:TextBox>
SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx.cs
+8
View File
@@ -20,6 +20,8 @@ namespace FineUIPro.Web.PHTGL.Filing
if (!IsPostBack)
{
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.DepartService.InitDepartDropDownList(this.drpDepartId, false);
BindGrid();
}
}
@@ -105,6 +107,12 @@ namespace FineUIPro.Web.PHTGL.Filing
strSql += " AND Con.ContractName LIKE @ContractName";
listStr.Add(new SqlParameter("@ContractName", "%" + this.txtContractName.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(drpDepartId.SelectedValue))
{
strSql += " AND Con.DepartId = @DepartId";
listStr.Add(new SqlParameter("@DepartId", drpDepartId.SelectedValue));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx.designer.cs
Generated
+2 -2
View File
@@ -60,13 +60,13 @@ namespace FineUIPro.Web.PHTGL.Filing
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// DropDownList1 控件。
/// drpDepartId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList1;
protected global::FineUIPro.DropDownList drpDepartId;
/// <summary>
/// txtContractName 控件。
SGGL/FineUIPro.Web/PHTGL/Filing/Files.aspx
+32 -28
View File
@@ -13,9 +13,9 @@
<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" EnableAjax="false"
runat="server" BoxFlex="1" DataKeyNames="ActionPlanReviewId" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="ActionPlanReviewId" AllowSorting="true" SortField="CreateTime" OnSort="Grid1_Sort"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="基本信息" EnableCollapse="true" EnableAjax="false"
runat="server" BoxFlex="1" DataKeyNames="ContractReviewId" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="ContractReviewId" AllowSorting="true" SortField="ContractNum" OnSort="Grid1_Sort"
SortDirection="DESC" EnableColumnLines="true" OnPageIndexChange="Grid1_PageIndexChange"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" ForceFit="true" OnRowCommand="Grid1_RowCommand" EnableRowClickEvent="true"
EnableRowDoubleClickEvent="true"
@@ -23,25 +23,23 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList runat="server" ID="DropDownList1" Label="数据来源">
<f:ListItem Text="施工管理部" Value="Value1" />
<f:ListItem Text="环境工程事业部" Value="Value2" />
<f:ListItem Text="基础设施事业部" Value="Value3" />
<f:ListItem Text="运营管理部" Value="Value4" />
<f:ListItem Text="宁波公司" Value="Value5" />
<f:ListItem Text="焦化公司" Value="Value6" />
</f:DropDownList>
<f:TextBox runat="server" Label="总承包合同编号" ID="txtActionPlanCode" EmptyText="输入查询条件" Width="300px" LabelWidth="140px"
LabelAlign="left">
<f:DropDownList ID="drpDepartId" runat="server" Label="主办部门" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
<f:TextBox runat="server" Label="合同名称" ID="txtContractName" EmptyText="输入查询条件" Width="300px" LabelWidth="90px"
LabelAlign="right">
</f:TextBox>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnQuery" OnClick="btnSearch_Click" ToolTip="查询" Text="查询" Icon="SystemSearch" EnablePostBack="true" runat="server">
</f:Button>
<f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置" Text="重置" Icon="ArrowUndo" EnablePostBack="true" runat="server">
</f:Button>
</Items>
<f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置" Text="重置" Icon="ArrowUndo" EnablePostBack="true" runat="server">
</f:Button>
<f:Button ID="btnPrinter" EnablePostBack="true" runat="server"
Text="导出评审单" Icon="Printer" OnClick="btnPrinter_Click1" EnableAjax="false" DisableControlBeforePostBack="true">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
@@ -50,17 +48,23 @@
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField ColumnID="Name" DataField="Name" Width="120px" FieldType="String" HeaderText="项目名称" TextAlign="Center"
<f:RenderField ColumnID="EPCCode" EnableLock="true" Locked="true" DataField="EPCCode" Width="120px" FieldType="String" HeaderText="总承包合同编号" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="EPCCode" DataField="EPCCode" Width="120px" FieldType="String" HeaderText="总承包合同编号" TextAlign="Center"
<f:RenderField ColumnID="ProjectShortName" EnableLock="true" Locked="true" DataField="ProjectShortName" Width="180px" FieldType="String" HeaderText="项目名称" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:LinkButtonField ColumnID="export" HeaderText="导出" Width="60px" Icon="ArrowUp" CommandName="export" />
<f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />
<f:RenderField ColumnID="ContractName" EnableLock="true" Locked="true" DataField="ContractName" Width="180px" FieldType="String" HeaderText="合同名称" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractNum" EnableLock="true" Locked="true" DataField="ContractNum" Width="180px" FieldType="String" HeaderText="合同编号" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<%-- <f:LinkButtonField ColumnID="export" HeaderText="导出" Width="60px" Icon="ArrowUp" CommandName="export" />
<f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />--%>
</Columns>
<PageItems>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
@@ -81,10 +85,10 @@
Target="Parent" EnableResize="false" runat="server" IsModal="true"
Width="700px" Height="500px">
</f:Window>
</form>
<script type="text/javascript">
</script>
</script>
</body>
</html>
</html>
SGGL/FineUIPro.Web/PHTGL/Filing/Files.aspx.cs
+101 -18
View File
@@ -20,6 +20,8 @@ namespace FineUIPro.Web.PHTGL.Filing
{
if (!IsPostBack)
{
BLL.DepartService.InitDepartDropDownList(this.drpDepartId, false);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
GetButtonPower();
BindGrid();
@@ -34,8 +36,96 @@ namespace FineUIPro.Web.PHTGL.Filing
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT Rev.ContractReviewId,
Con.ContractId,
Con.ProjectId,
Con.ContractName,
Con.ContractNum,
Con.Parties,
Con.Currency,
Con.ContractAmount,
Con.DepartId,
Con.Agent,
(CASE Con.ContractType WHEN '1' THEN '施工总承包分包合同'
WHEN '2' THEN '施工专业分包合同'
WHEN '3' THEN '施工劳务分包合同'
WHEN '4' THEN '试车服务合同'
WHEN '5' THEN 'ds' END) AS ContractType,
( CASE Rev.State
WHEN @ContractCreating THEN '编制中'
WHEN @Contract_countersign THEN '会签中'
WHEN @ContractReviewing THEN '审批中'
WHEN @ContractReview_Complete THEN '审批成功'
WHEN @ContractReview_Refuse THEN '审批被拒' END) AS State ,
Con.Remarks,
Con.EPCCode,
Con.ProjectShortName,
Con.[OpeningBank-TT] as OpeningBank_TT ,
Con.[OpeningBank-electrophore] as OpeningBank_electrophore,
Con.[BankAccount-TT] as BankAccount_TT,
Con.[BankAccount-electrophore] as BankAccount_electrophore,
Con.[LineNumber-electrophore] as LineNumber_electrophore,
Con.Retentionmoney,
(CASE Con.Status WHEN '0' THEN '已签订'
WHEN '1' THEN '已完毕' END) as Status,
Con.ContactUnitOfPartyA,
Con.ContactPersonOfPartyA,
Con.ContactPersonOfPartyB,
Con.ContactPersonPhoneOfPartyB,
Con.ContactPersonEmailOfPartyB,
Con.ContractAmountExcludingTax,
Con.PriceMethod,
CONVERT(varchar(100), SignedOnDate, 111) as SignedOnDate,
CONVERT(varchar(100), ContractStartDate, 111) as ContractStartDate,
CONVERT(varchar(100), ContractEndDate, 111) as ContractEndDate,
Con.PricingBasis,
(CASE Con.SubcontractingMethod WHEN '1' then '内部分包'
WHEN '2' THEN '外部分包' END ) as SubcontractingMethod,
(CASE Con.IsItACentralizedPurchaseSupplier WHEN '0' then '否'
WHEN '1' THEN '是' END ) as IsItACentralizedPurchaseSupplier,
Pro.ProjectCode,
Pro.ProjectName,
Dep.DepartName,
U.PersonName AS AgentName "
+ @" from PHTGL_ContractReview AS Rev"
+ @" LEFT JOIN PHTGL_Contract AS Con ON Con.ContractId=Rev.ContractId"
//+ @" left join PHTGL_ActionPlanFormation as Act on Act.EPCCode=Con.EPCCode"
+ @" LEFT JOIN Base_Project AS Pro ON Pro.ProjectId = Con.ProjectId"
+ @" LEFT JOIN Base_Depart AS Dep ON Dep.DepartId = Con.DepartId"
+ @" LEFT JOIN Person_Persons AS U ON U.PersonId = Con.Agent WHERE 1=1 and Rev.State=@State";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ContractCreating", Const.ContractCreating.ToString()));
listStr.Add(new SqlParameter("@Contract_countersign", Const.Contract_countersign));
listStr.Add(new SqlParameter("@ContractReviewing", Const.ContractReviewing));
listStr.Add(new SqlParameter("@ContractReview_Complete", Const.ContractReview_Complete));
listStr.Add(new SqlParameter("@ContractReview_Refuse", Const.ContractReview_Refuse));
listStr.Add(new SqlParameter("@State", Const.ContractReview_Complete));
if (!(this.CurrUser.PersonId == Const.sysglyId))
{
strSql += " and Con.ProjectId =@ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
}
if (!string.IsNullOrEmpty(this.txtContractName.Text.Trim()))
{
strSql += " AND Con.ContractName LIKE @ContractName";
listStr.Add(new SqlParameter("@ContractName", "%" + this.txtContractName.Text.Trim() + "%"));
}
if (! string .IsNullOrEmpty(drpDepartId.SelectedValue))
{
strSql += " AND Con.DepartId = @DepartId";
listStr.Add(new SqlParameter("@DepartId", drpDepartId.SelectedValue));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
#endregion
#region 分页 排序
@@ -112,7 +202,7 @@ namespace FineUIPro.Web.PHTGL.Filing
protected void btnRset_Click(object sender, EventArgs e)
{
txtActionPlanCode.Text = "";
txtContractName.Text = "";
BindGrid();
}
@@ -146,24 +236,17 @@ namespace FineUIPro.Web.PHTGL.Filing
#endregion
#region 打印
protected void btnPrinter_Click(object sender, EventArgs e)
protected void btnPrinter_Click1(object sender, EventArgs e)
{
//if (Grid1.SelectedRowIndexArray.Length == 0)
//{
// Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
// return;
//}
//string Id = Grid1.SelectedRowID;
//var Act = PHTGL_ActionPlanReviewService.GetPHTGL_ActionPlanReviewById(Id);
//if (Act == null)
//{
// Alert.ShowInTop("还未创建审批流无法导出！", MessageBoxIcon.Warning);
// return;
//}
//string ActionPlanID = Act.ActionPlanID;
//ActionPlanFormation actionPlanFormation = new ActionPlanFormation();
//actionPlanFormation.Print(ActionPlanID);
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
string Id = Grid1.SelectedRowID;
PHTGL_ContractReviewService.PrintApprovalForm(Id);
}
#endregion
SGGL/FineUIPro.Web/PHTGL/Filing/Files.aspx.designer.cs
Generated
+13 -4
View File
@@ -60,22 +60,22 @@ namespace FineUIPro.Web.PHTGL.Filing
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// DropDownList1 控件。
/// drpDepartId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList1;
protected global::FineUIPro.DropDownList drpDepartId;
/// <summary>
/// txtActionPlanCode 控件。
/// txtContractName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtActionPlanCode;
protected global::FineUIPro.TextBox txtContractName;
/// <summary>
/// btnQuery 控件。
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.PHTGL.Filing
/// </remarks>
protected global::FineUIPro.Button btnRset;
/// <summary>
/// btnPrinter 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPrinter;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSE.aspx
+4 -4
View File
@@ -34,7 +34,7 @@
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="HSSE首页数据表" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="ReportDate"
SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
@@ -99,13 +99,13 @@
FieldType="String" HeaderText="特种作业培训数" TextAlign="Left" HeaderTextAlign="Center" >
</f:RenderField>
<f:RenderField Width="150px" ColumnID="TotalEnergyConsumption" DataField="TotalEnergyConsumption" SortField="TotalEnergyConsumption"
FieldType="String" HeaderText="能耗总量" TextAlign="Left" HeaderTextAlign="Center" >
FieldType="String" HeaderText="能耗总量(万吨标准煤)" TextAlign="Left" HeaderTextAlign="Center" >
</f:RenderField>
<f:RenderField Width="150px" ColumnID="IncomeComprehensiveEnergyConsumption" DataField="IncomeComprehensiveEnergyConsumption" SortField="IncomeComprehensiveEnergyConsumption"
FieldType="String" HeaderText="万元营业收入综合能耗" TextAlign="Left" HeaderTextAlign="Center" >
FieldType="String" HeaderText="万元营业收入综合能耗(吨标准煤/万元)" TextAlign="Left" HeaderTextAlign="Center" >
</f:RenderField>
<f:RenderField Width="150px" ColumnID="NewWaterConsumption" DataField="NewWaterConsumption" SortField="NewWaterConsumption"
FieldType="String" HeaderText="用新水量" TextAlign="Left" HeaderTextAlign="Center" >
FieldType="String" HeaderText="用新水量(万吨)" TextAlign="Left" HeaderTextAlign="Center" >
</f:RenderField>
<f:RenderField Width="150px" ColumnID="HeadOfficeInspectorGeneralNum" DataField="HeadOfficeInspectorGeneralNum" SortField="HeadOfficeInspectorGeneralNum"
FieldType="String" HeaderText="企业总部总监人数" TextAlign="Left" HeaderTextAlign="Center" >
SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSEEdit.aspx
+6 -3
View File
@@ -118,15 +118,15 @@
<Rows>
<f:FormRow>
<Items>
<f:NumberBox ID="txtTotalEnergyConsumption" runat="server" Label="能耗总量" LabelWidth="160" NoDecimal="true" NoNegative="true">
<f:NumberBox ID="txtTotalEnergyConsumption" runat="server" Label="能耗总量(万吨标准煤)" LabelWidth="160" NoDecimal="false" DecimalPrecision="4" NoNegative="true">
</f:NumberBox>
<f:NumberBox ID="txtIncomeComprehensiveEnergyConsumption" runat="server" Label="万元营业收入综合能耗" LabelWidth="160" NoDecimal="true" NoNegative="true">
<f:NumberBox ID="txtIncomeComprehensiveEnergyConsumption" runat="server" Label="万元营业收入综合能耗(吨标准煤/万元)" LabelWidth="160" NoDecimal="false" DecimalPrecision="4" NoNegative="true">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtNewWaterConsumption" runat="server" Label="用新水量" LabelWidth="160" NoDecimal="true" NoNegative="true">
<f:NumberBox ID="txtNewWaterConsumption" runat="server" Label="用新水量(万吨)" LabelWidth="160" NoDecimal="false" DecimalPrecision="4" NoNegative="true">
</f:NumberBox>
<f:Label runat="server"></f:Label>
</Items>
@@ -515,6 +515,9 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:Button ID="btnCopy" Icon="Database" runat="server" ToolTip="复制上次数据" Text ="复制上次数据"
ValidateForms="SimpleForm1" OnClick="btnCopy_Click" MarginLeft="10px">
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" Text="保存" runat="server" ValidateForms="Form15"
OnClick="btnSave_Click">
SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSEEdit.aspx.cs
+300 -6
View File
@@ -334,7 +334,7 @@ namespace FineUIPro.Web.ZHGL.DataSync
}
else
{
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_SEDIN);
var base_Unit = BLL.UnitService.GetUnitByUnitId(Const.UnitId_SEDIN);
txtUnitName.Text = base_Unit.UnitName;
txtCollCropCode.Text = base_Unit.CollCropCode;
txtReportDate.SelectedDate = DateTime.Now;
@@ -389,7 +389,7 @@ namespace FineUIPro.Web.ZHGL.DataSync
}
Model.HSSEData_HSSE table = new Model.HSSEData_HSSE();
table.UnitId = BLL.Const.UnitId_SEDIN;
table.UnitId = Const.UnitId_SEDIN;
table.CollCropCode = this.txtCollCropCode.Text;
table.UnitName = this.txtUnitName.Text;
table.ReportDate = this.txtReportDate.SelectedDate;
@@ -403,9 +403,9 @@ namespace FineUIPro.Web.ZHGL.DataSync
table.SafeTrainNum = Funs.GetNewInt(this.txtSafeTrainNum.Text);
table.SpecialTrainNum = Funs.GetNewInt(this.txtSpecialTrainNum.Text);
table.SpecialOperationTrainNum = Funs.GetNewInt(this.txtSpecialOperationTrainNum.Text);
table.TotalEnergyConsumption = Funs.GetNewInt(this.txtTotalEnergyConsumption.Text);
table.IncomeComprehensiveEnergyConsumption = Funs.GetNewInt(this.txtIncomeComprehensiveEnergyConsumption.Text);
table.NewWaterConsumption = Funs.GetNewInt(this.txtNewWaterConsumption.Text);
table.TotalEnergyConsumption = Funs.GetNewDecimalOrZero(this.txtTotalEnergyConsumption.Text);
table.IncomeComprehensiveEnergyConsumption = Funs.GetNewDecimalOrZero(this.txtIncomeComprehensiveEnergyConsumption.Text);
table.NewWaterConsumption = Funs.GetNewDecimalOrZero(this.txtNewWaterConsumption.Text);
table.HeadOfficeInspectorGeneralNum = Funs.GetNewInt(this.txtHeadOfficeInspectorGeneralNum.Text);
table.HeadOfficeFullTimeNum = Funs.GetNewInt(this.txtHeadOfficeFullTimeNum.Text);
table.BranchInspectorGeneralNum = Funs.GetNewInt(this.txtBranchInspectorGeneralNum.Text);
@@ -551,7 +551,301 @@ namespace FineUIPro.Web.ZHGL.DataSync
}
}
}
#endregion
#endregion
#region 复制数据
/// <summary>
/// 复制报表数据
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnCopy_Click(object sender, EventArgs e)
{
Model.HSSEData_HSSE model = Funs.DB.HSSEData_HSSE.OrderByDescending(x=>x.ReportDate).FirstOrDefault();
if (model != null)
{
if (model.BeUnderConstructionNum.HasValue)
{
this.txtBeUnderConstructionNum.Text = model.BeUnderConstructionNum.Value.ToString();
}
if (model.ShutdownNum.HasValue)
{
this.txtShutdownNum.Text = model.ShutdownNum.Value.ToString();
}
if (model.JoinConstructionPersonNum.HasValue)
{
this.txtJoinConstructionPersonNum.Text = model.JoinConstructionPersonNum.Value.ToString();
}
if (model.MajorProjectsUnderConstructionNum.HasValue)
{
this.txtMajorProjectsUnderConstructionNum.Text = model.MajorProjectsUnderConstructionNum.Value.ToString();
}
if (model.TotalWorkingHour.HasValue)
{
this.txtTotalWorkingHour.Text = model.TotalWorkingHour.Value.ToString();
}
if (model.LostWorkingHour.HasValue)
{
this.txtLostWorkingHour.Text = model.LostWorkingHour.Value.ToString();
}
if (model.SafeWorkingHour.HasValue)
{
this.txtSafeWorkingHour.Text = model.SafeWorkingHour.Value.ToString();
}
if (model.SafeTrainNum.HasValue)
{
this.txtSafeTrainNum.Text = model.SafeTrainNum.Value.ToString();
}
if (model.SpecialTrainNum.HasValue)
{
this.txtSpecialTrainNum.Text = model.SpecialTrainNum.Value.ToString();
}
if (model.SpecialOperationTrainNum.HasValue)
{
this.txtSpecialOperationTrainNum.Text = model.SpecialOperationTrainNum.Value.ToString();
}
if (model.TotalEnergyConsumption.HasValue)
{
this.txtTotalEnergyConsumption.Text = model.TotalEnergyConsumption.Value.ToString();
}
if (model.IncomeComprehensiveEnergyConsumption.HasValue)
{
this.txtIncomeComprehensiveEnergyConsumption.Text = model.IncomeComprehensiveEnergyConsumption.Value.ToString();
}
if (model.NewWaterConsumption.HasValue)
{
this.txtNewWaterConsumption.Text = model.NewWaterConsumption.Value.ToString();
}
if (model.HeadOfficeInspectorGeneralNum.HasValue)
{
this.txtHeadOfficeInspectorGeneralNum.Text = model.HeadOfficeInspectorGeneralNum.Value.ToString();
}
if (model.HeadOfficeFullTimeNum.HasValue)
{
this.txtHeadOfficeFullTimeNum.Text = model.HeadOfficeFullTimeNum.Value.ToString();
}
if (model.BranchInspectorGeneralNum.HasValue)
{
this.txtBranchInspectorGeneralNum.Text = model.BranchInspectorGeneralNum.Value.ToString();
}
if (model.BranchFullTimeNum.HasValue)
{
this.txtBranchFullTimeNum.Text = model.BranchFullTimeNum.Value.ToString();
}
if (model.ProjectInspectorGeneralNum.HasValue)
{
this.txtProjectInspectorGeneralNum.Text = model.ProjectInspectorGeneralNum.Value.ToString();
}
if (model.ProjectFullTimeNum.HasValue)
{
this.txtProjectFullTimeNum.Text = model.ProjectFullTimeNum.Value.ToString();
}
if (model.ProjectSafetyMonitorNum.HasValue)
{
this.txtProjectSafetyMonitorNum.Text = model.ProjectSafetyMonitorNum.Value.ToString();
}
if (model.SafetyInjectionEngineer.HasValue)
{
this.txtSafetyInjectionEngineer.Text = model.SafetyInjectionEngineer.Value.ToString();
}
if (model.CertificateANum.HasValue)
{
this.txtCertificateANum.Text = model.CertificateANum.Value.ToString();
}
if (model.CertificateBNum.HasValue)
{
this.txtCertificateBNum.Text = model.CertificateBNum.Value.ToString();
}
if (model.CertificateCNum.HasValue)
{
this.txtCertificateCNum.Text = model.CertificateCNum.Value.ToString();
}
if (model.SafetyCommitteeMeetingNum.HasValue)
{
this.txtSafetyCommitteeMeetingNum.Text = model.SafetyCommitteeMeetingNum.Value.ToString();
}
if (model.EnterpriseTopicsMeetingNum.HasValue)
{
this.txtEnterpriseTopicsMeetingNum.Text = model.EnterpriseTopicsMeetingNum.Value.ToString();
}
if (model.ProjectSafetyLeadingGroupMeetingNum.HasValue)
{
this.txtProjectSafetyLeadingGroupMeetingNum.Text = model.ProjectSafetyLeadingGroupMeetingNum.Value.ToString();
}
if (model.ProjectSafetyMeetingNum.HasValue)
{
this.txtProjectSafetyMeetingNum.Text = model.ProjectSafetyMeetingNum.Value.ToString();
}
if (model.CompanyLeadShiftCheckNum.HasValue)
{
this.txtCompanyLeadShiftCheckNum.Text = model.CompanyLeadShiftCheckNum.Value.ToString();
}
if (model.CompanyComprehensiveCheckNum.HasValue)
{
this.txtCompanyComprehensiveCheckNum.Text = model.CompanyComprehensiveCheckNum.Value.ToString();
}
if (model.CompanySpecialCheckNum.HasValue)
{
this.txtCompanySpecialCheckNum.Text = model.CompanySpecialCheckNum.Value.ToString();
}
if (model.ProjectLeadShiftCheckNum.HasValue)
{
this.txtProjectLeadShiftCheckNum.Text = model.ProjectLeadShiftCheckNum.Value.ToString();
}
if (model.ProjectSpecialCheckNum.HasValue)
{
this.txtProjectSpecialCheckNum.Text = model.ProjectSpecialCheckNum.Value.ToString();
}
if (model.ProjectMajorCheckNum.HasValue)
{
this.txtProjectMajorCheckNum.Text = model.ProjectMajorCheckNum.Value.ToString();
}
if (model.NearMissNum.HasValue)
{
this.txtNearMissNum.Text = model.NearMissNum.Value.ToString();
}
if (model.RecordableEventNum.HasValue)
{
this.txtRecordableEventNum.Text = model.RecordableEventNum.Value.ToString();
}
if (model.GeneralAccidentNum.HasValue)
{
this.txtGeneralAccidentNum.Text = model.GeneralAccidentNum.Value.ToString();
}
if (model.MajorAccidentNum.HasValue)
{
this.txtMajorAccidentNum.Text = model.MajorAccidentNum.Value.ToString();
}
if (model.SeriousAccidentNum.HasValue)
{
this.txtSeriousAccidentNum.Text = model.SeriousAccidentNum.Value.ToString();
}
if (model.SpecialSeriousAccidentNum.HasValue)
{
this.txtSpecialSeriousAccidentNum.Text = model.SpecialSeriousAccidentNum.Value.ToString();
}
if (model.CompanyComprehensivePlanNum.HasValue)
{
this.txtCompanyComprehensivePlanNum.Text = model.CompanyComprehensivePlanNum.Value.ToString();
}
if (model.CompanySpecialPlanNum.HasValue)
{
this.txtCompanySpecialPlanNum.Text = model.CompanySpecialPlanNum.Value.ToString();
}
if (model.CompanyOnSiteDisposalPlan.HasValue)
{
this.txtCompanyOnSiteDisposalPlan.Text = model.CompanyOnSiteDisposalPlan.Value.ToString();
}
if (model.CompanyDrillNum.HasValue)
{
this.txtCompanyDrillNum.Text = model.CompanyDrillNum.Value.ToString();
}
if (model.ProjectComprehensivePlanNum.HasValue)
{
this.txtProjectComprehensivePlanNum.Text = model.ProjectComprehensivePlanNum.Value.ToString();
}
if (model.ProjectSpecialPlanNum.HasValue)
{
this.txtProjectSpecialPlanNum.Text = model.ProjectSpecialPlanNum.Value.ToString();
}
if (model.ProjectOnSiteDisposalPlan.HasValue)
{
this.txtProjectOnSiteDisposalPlan.Text = model.ProjectOnSiteDisposalPlan.Value.ToString();
}
if (model.ProjectDrillNum.HasValue)
{
this.txtProjectDrillNum.Text = model.ProjectDrillNum.Value.ToString();
}
if (model.CostExtract.HasValue)
{
this.txtCostExtract.Text = model.CostExtract.Value.ToString();
}
if (model.CostUse.HasValue)
{
this.txtCostUse.Text = model.CostUse.Value.ToString();
}
if (model.UseEquipmentNum.HasValue)
{
this.txtUseEquipmentNum.Text = model.UseEquipmentNum.Value.ToString();
}
if (model.SpecialEquipmentNum.HasValue)
{
this.txtSpecialEquipmentNum.Text = model.SpecialEquipmentNum.Value.ToString();
}
if (model.LicensesNum.HasValue)
{
this.txtLicensesNum.Text = model.LicensesNum.Value.ToString();
}
if (model.LicensesCloseNum.HasValue)
{
this.txtLicensesCloseNum.Text = model.LicensesCloseNum.Value.ToString();
}
if (model.GeneralClosedNum.HasValue)
{
this.txtGeneralClosedNum.Text = model.GeneralClosedNum.Value.ToString();
}
if (model.GeneralNotClosedNum.HasValue)
{
this.txtGeneralNotClosedNum.Text = model.GeneralNotClosedNum.Value.ToString();
}
if (model.MajorClosedNum.HasValue)
{
this.txtMajorClosedNum.Text = model.MajorClosedNum.Value.ToString();
}
if (model.MajorNotClosedNum.HasValue)
{
this.txtMajorNotClosedNum.Text = model.MajorNotClosedNum.Value.ToString();
}
if (model.GeneralRiskNum.HasValue)
{
this.txtGeneralRiskNum.Text = model.GeneralRiskNum.Value.ToString();
}
if (model.LowRiskNum.HasValue)
{
this.txtLowRiskNum.Text = model.LowRiskNum.Value.ToString();
}
if (model.MediumRiskNum.HasValue)
{
this.txtMediumRiskNum.Text = model.MediumRiskNum.Value.ToString();
}
if (model.HighRiskNum.HasValue)
{
this.txtHighRiskNum.Text = model.HighRiskNum.Value.ToString();
}
if (model.CompletedNum.HasValue)
{
this.txtCompletedNum.Text = model.CompletedNum.Value.ToString();
}
if (model.TrainPersonNum.HasValue)
{
this.txtTrainPersonNum.Text = model.TrainPersonNum.Value.ToString();
}
if (model.ConstructionNum.HasValue)
{
this.txtConstructionNum.Text = model.ConstructionNum.Value.ToString();
}
if (model.FinishedNum.HasValue)
{
this.txtFinishedNum.Text = model.FinishedNum.Value.ToString();
}
if (model.SuperCompletedNum.HasValue)
{
this.txtSuperCompletedNum.Text = model.SuperCompletedNum.Value.ToString();
}
if (model.SuperTrainPersonNum.HasValue)
{
this.txtSuperTrainPersonNum.Text = model.SuperTrainPersonNum.Value.ToString();
}
if (model.SuperConstructionNum.HasValue)
{
this.txtSuperConstructionNum.Text = model.SuperConstructionNum.Value.ToString();
}
if (model.SuperFinishedNum.HasValue)
{
this.txtSuperFinishedNum.Text = model.SuperFinishedNum.Value.ToString();
}
}
}
#endregion
}
}
SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSEEdit.aspx.designer.cs
Generated
+136 -129
View File
File diff suppressed because it is too large Load Diff
SGGL/FineUIPro.Web/common/Menu_HJGL.xml
-1
View File
@@ -60,6 +60,5 @@
<TreeNode id="5F0969E3-2A0A-473E-92BE-4DD390602556" Text="焊接缺陷分析" NavigateUrl="HJGL/WeldingReport/DefectStatistics.aspx"></TreeNode>
<TreeNode id="EAD61207-E396-45B0-A1D2-7A5F0498AACC" Text="管道预制率分析" NavigateUrl="HJGL/WeldingReport/PipePrefabricationRateStatistics.aspx"></TreeNode>
<TreeNode id="854C79DF-A1C0-4E3C-BCB4-7D5CD044F72B" Text="焊工功效分析" NavigateUrl="HJGL/WeldingReport/WelderEfficacy.aspx"></TreeNode>
<TreeNode id="6035E549-66FF-4B6D-989B-BE99C9EF5EB7" Text="焊接数据" NavigateUrl="ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx"></TreeNode>
</TreeNode>
</Tree>
SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+1
View File
@@ -26,5 +26,6 @@
<TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
<TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
<TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>
<TreeNode id="S89E5EC2-F725-4656-9110-5AF83C18FB6C" Text="实业数据" NavigateUrl="ZHGL/DataSync/SYHSEData_Data.aspx"></TreeNode>
</TreeNode>
</Tree>
SGGL/FineUIPro.Web/common/mainMenu_HSSE2.aspx
+11 -11
View File
@@ -192,16 +192,16 @@
<div class="i-item">
<div class="ii-desc">环保数据</div>
<div class="ii-item bg5">
<div class="desc">能耗总量</div>
<div class="num num-cl3"><%=showData(hSSEData_HSSE.TotalEnergyConsumption,"--") %></div>
<div class="desc">能耗总量<br/>(万吨标准煤)</div>
<div class="num num-cl3"><%=showDecimalData(hSSEData_HSSE.TotalEnergyConsumption,"--") %></div>
</div>
<div class="ii-item bg5">
<div class="desc">万元营业收入综合能耗</div>
<div class="num num-cl3"><%=showData(hSSEData_HSSE.IncomeComprehensiveEnergyConsumption,"--") %></div>
<div class="desc">万元营业收入综合能耗<br/>(吨标准煤/万元)</div>
<div class="num num-cl3"><%=showDecimalData(hSSEData_HSSE.IncomeComprehensiveEnergyConsumption,"--") %></div>
</div>
<div class="ii-item bg5">
<div class="desc">用新水量</div>
<div class="num num-cl3"><%=showData(hSSEData_HSSE.NewWaterConsumption,"--") %></div>
<div class="desc">用新水量<br/>(万吨)</div>
<div class="num num-cl3"><%=showDecimalData(hSSEData_HSSE.NewWaterConsumption,"--") %></div>
</div>
</div>
</div>
@@ -415,7 +415,6 @@
<script src="../res/assets/js/video-7.15.0.min.js"></script>
<script src="../res/assets/js/china.js"></script>
<script>
function initMapEchart() {
// 1. 实例化对象
var myChart = echarts.init(document.querySelector(".sd-map"));
@@ -464,9 +463,9 @@
html += '<div style="font-size:18px;margin-bottom:8px;">' + params.data.name + '</div>'
//html += '<div style="width: 98px;height: 24px;margin-bottom:10px;background: #F24166;border-radius: 12px;text-align:center;">' + '在施危大工程' + '</div>'
html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">监理单位：' + params.data.jLUnit + '</div>'
html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">施工单位：' + params.data.sGUnit + '</div>'
html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">施工单位：' + params.data.SGUnit + '</div>'
html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">建设单位：' + params.data.ownUnit + '</div>'
html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">工程造价：' + params.data.projectMoney + '</div>'
html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">工程造价：' + params.data.ProjectMoney + '</div>'
html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; ">工程地点：' + params.data.address + '</div>'
html += '<div><a style="font-size:12px;color:#1AB1FF;cursor:pointer;" href="../indexProject.aspx?projectId=' + params.data.id +'" target="_blank">项目详情>></a></div>'
html += '</div>'
@@ -1072,7 +1071,8 @@
var xArrYH = [<%=xArrYH%>]
intiYhpczlsj('yhpczlsj', xArrYH, dataYHQ, dataYHZ)
var dataaq = [<%=showData(hSSEData_HSSE.CompanyLeadShiftCheckNum,"0")%>, <%=showData(hSSEData_HSSE.CompanyComprehensiveCheckNum,"0")%>, <%=showData(hSSEData_HSSE.CompanySpecialCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectLeadShiftCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectSpecialCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectMajorCheckNum,"0")%>]
initAqjdjcsj('aqjdjcsj', dataaq, 50)
var max = Math.max(<%=showData(hSSEData_HSSE.CompanyLeadShiftCheckNum,"0")%>, <%=showData(hSSEData_HSSE.CompanyComprehensiveCheckNum,"0")%>, <%=showData(hSSEData_HSSE.CompanySpecialCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectLeadShiftCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectSpecialCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectMajorCheckNum,"0")%>);
initAqjdjcsj('aqjdjcsj', dataaq, max)
var datasg = [
{ value: <%=showData(hSSEData_HSSE.GeneralAccidentNum,"0")%>, name: '一般事故' },
{ value: <%=showData(hSSEData_HSSE.MajorAccidentNum,"0")%>, name: '较大事故' },
@@ -1081,7 +1081,7 @@
]
initSgsjsj('sgsjsj', datasg)
var data = [ // 数据数组，name 为数据项名称，value 为数据项值
{ value: <%=showData(hSSEData_HSSE.CompletedNum,"0")%>, name: '一般' },
{ value: <%=showData(hSSEData_HSSE.GeneralRiskNum,"0")%>, name: '一般' },
{ value: <%=showData(hSSEData_HSSE.LowRiskNum,"0")%>, name: '低风险' },
{ value: <%=showData(hSSEData_HSSE.MediumRiskNum,"0")%>, name: '中风险' },
{ value: <%=showData(hSSEData_HSSE.HighRiskNum,"0")%>, name: '高风险' },
SGGL/FineUIPro.Web/common/mainMenu_HSSE2.aspx.cs
+15 -3
View File
@@ -5,7 +5,6 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
namespace FineUIPro.Web.common
{
public partial class mainMenu_HSSE2 : PageBase
@@ -29,7 +28,8 @@ namespace FineUIPro.Web.common
hSSEData_HSSE = new Model.HSSEData_HSSE();
}
zgl1 = "0";
zgl2 = "0";
if (hSSEData_HSSE.GeneralClosedNum.HasValue && hSSEData_HSSE.GeneralNotClosedNum.HasValue)
{
zgl1 = String.Format("{0:N2}", 100.0 * hSSEData_HSSE.GeneralClosedNum.Value / (hSSEData_HSSE.GeneralClosedNum.Value + hSSEData_HSSE.GeneralNotClosedNum.Value));
@@ -77,7 +77,7 @@ namespace FineUIPro.Web.common
}
var projectList = Funs.DB.Base_Project.ToList();
var projectList = Funs.DB.Base_Project.Where(x => x.MapCoordinates != null).ToList();
if (projectList != null && projectList.Count > 0)
{
foreach (var p in projectList)
@@ -103,5 +103,17 @@ namespace FineUIPro.Web.common
return format;
}
}
public string showDecimalData(decimal? value, string format)
{
if (value.HasValue)
{
return value.Value.ToString();
}
else
{
return format;
}
}
}
}
SGGL/FineUIPro.Web/common/mainMenu_HSSE2.aspx.designer.cs
Generated
+6 -4
View File
@@ -7,9 +7,11 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.common {
public partial class mainMenu_HSSE2 {
namespace FineUIPro.Web.common
{
public partial class mainMenu_HSSE2
{
}
}