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

2023-03-09 安全首页修改

This commit is contained in:
李鹏飞 2023-03-09 15:23:32 +08:00
parent 3f158f1a70
commit 4d4d4dfdd0
15 changed files with 775 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/SGGL_CD/v17/.wsuo Normal file
View File

Binary file not shown.

4
DataBase/版本日志/SGGLDB_CD_V2023-03-09.sql Normal file
View File

@ -0,0 +1,4 @@
alter table [dbo].[HSSEData_HSSE] alter column [TotalEnergyConsumption] decimal(18,4) null
alter table [dbo].[HSSEData_HSSE] alter column [IncomeComprehensiveEnergyConsumption] decimal(18,4) null
alter table [dbo].[HSSEData_HSSE] alter column [NewWaterConsumption] decimal(18,4) null
go

8
SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSE.aspx
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" >

9
SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSEEdit.aspx
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">

304
SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSEEdit.aspx.cs
View File

@ -334,7 +334,7 @@ namespace FineUIPro.Web.ZHGL.DataSync
}
else
{
var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_CD);
var base_Unit = BLL.UnitService.GetUnitByUnitId(Const.UnitId_CD);
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_CD;
table.UnitId = Const.UnitId_CD;
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);
@ -553,5 +553,299 @@ namespace FineUIPro.Web.ZHGL.DataSync
}
#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
}
}

15
SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSEEdit.aspx.designer.cs generated
View File

@ -7,12 +7,10 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.ZHGL.DataSync
{
namespace FineUIPro.Web.ZHGL.DataSync {
public partial class HSSEData_HSSEEdit
{
public partial class HSSEData_HSSEEdit {
/// <summary>
/// form1 控件。
@ -1085,6 +1083,15 @@ namespace FineUIPro.Web.ZHGL.DataSync
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnCopy 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnCopy;
/// <summary>
/// btnSave 控件。
/// </summary>

22
SGGL/FineUIPro.Web/common/mainMenu_HSSE2.aspx
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: '高风险' },

18
SGGL/FineUIPro.Web/common/mainMenu_HSSE2.aspx.cs
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;
}
}
}
}

6
SGGL/FineUIPro.Web/common/mainMenu_HSSE2.aspx.designer.cs generated
View File

@ -7,9 +7,11 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.common {
namespace FineUIPro.Web.common
{
public partial class mainMenu_HSSE2 {
public partial class mainMenu_HSSE2
{
}
}

180
SGGL/Model/DoorServer/RealNamePersonItem.cs Normal file
View File

@ -0,0 +1,180 @@
using System;
using System.Collections.Generic;
using System.Data.Linq;
using System.Linq;
using System.Text;
namespace Model
{
/// <summary>
/// 实名制人员项
/// </summary>
public class RealNamePersonItem
{
/// <summary>
/// 项目号
/// </summary>
public string projectCode
{
get;
set;
}
/// <summary>
///
/// </summary>
public string projectName
{
get;
set;
}
public string unitName
{
get;
set;
}
public string collCropCode
{
get;
set;
}
public string teamGroupName
{
get;
set;
}
public string name
{
get;
set;
}
public string workPostName{
get;
set;
}
public string idcardType
{
get;
set;
}
public string idcardNumber
{
get;
set;
}
public string idcardStartDate
{
get;
set;
}
public string idcardEndDate
{
get;
set;
}
public string idcardForever
{
get;
set;
}
public string politicsStatus
{
get;
set;
}
public string eduLevel
{
get;
set;
}
public string maritalStatus
{
get;
set;
}
public string sex
{
get;
set;
}
public string idcardAddress
{
get;
set;
}
public string homeAddress
{
get;
set;
}
public string birthday
{
get;
set;
}
public string nation
{
get;
set;
}
public string countryCode
{
get;
set;
}
public string provinceCode
{
get;
set;
}
public Binary positiveIdcardImage
{
get;
set;
}
public Binary negativeIdcardImage
{
get;
set;
}
public Binary headImage
{
get;
set;
}
public string mobile
{
get;
set;
}
public string teamLeaderFlag
{
get;
set;
}
public string userType
{
get;
set;
}
public string workType
{
get;
set;
}
public string isLeave
{
get;
set;
}
public string entryTime
{
get;
set;
}
public string exitTime
{
get;
set;
}
}
}

24
SGGL/Model/Model.cs
View File

@ -167349,11 +167349,11 @@ namespace Model
private System.Nullable<int> _SpecialOperationTrainNum;
private System.Nullable<int> _TotalEnergyConsumption;
private System.Nullable<decimal> _TotalEnergyConsumption;
private System.Nullable<int> _IncomeComprehensiveEnergyConsumption;
private System.Nullable<decimal> _IncomeComprehensiveEnergyConsumption;
private System.Nullable<int> _NewWaterConsumption;
private System.Nullable<decimal> _NewWaterConsumption;
private System.Nullable<int> _HeadOfficeInspectorGeneralNum;
@ -167509,11 +167509,11 @@ namespace Model
partial void OnSpecialTrainNumChanged();
partial void OnSpecialOperationTrainNumChanging(System.Nullable<int> value);
partial void OnSpecialOperationTrainNumChanged();
partial void OnTotalEnergyConsumptionChanging(System.Nullable<int> value);
partial void OnTotalEnergyConsumptionChanging(System.Nullable<decimal> value);
partial void OnTotalEnergyConsumptionChanged();
partial void OnIncomeComprehensiveEnergyConsumptionChanging(System.Nullable<int> value);
partial void OnIncomeComprehensiveEnergyConsumptionChanging(System.Nullable<decimal> value);
partial void OnIncomeComprehensiveEnergyConsumptionChanged();
partial void OnNewWaterConsumptionChanging(System.Nullable<int> value);
partial void OnNewWaterConsumptionChanging(System.Nullable<decimal> value);
partial void OnNewWaterConsumptionChanged();
partial void OnHeadOfficeInspectorGeneralNumChanging(System.Nullable<int> value);
partial void OnHeadOfficeInspectorGeneralNumChanged();
@ -167942,8 +167942,8 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalEnergyConsumption", DbType="Int")]
public System.Nullable<int> TotalEnergyConsumption
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalEnergyConsumption", DbType="Decimal(18,4)")]
public System.Nullable<decimal> TotalEnergyConsumption
{
get
{
@ -167962,8 +167962,8 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IncomeComprehensiveEnergyConsumption", DbType="Int")]
public System.Nullable<int> IncomeComprehensiveEnergyConsumption
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IncomeComprehensiveEnergyConsumption", DbType="Decimal(18,4)")]
public System.Nullable<decimal> IncomeComprehensiveEnergyConsumption
{
get
{
@ -167982,8 +167982,8 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NewWaterConsumption", DbType="Int")]
public System.Nullable<int> NewWaterConsumption
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NewWaterConsumption", DbType="Decimal(18,4)")]
public System.Nullable<decimal> NewWaterConsumption
{
get
{

1
SGGL/Model/Model.csproj
View File

@ -175,6 +175,7 @@
<Compile Include="DoorServer\attendanceItem.cs" />
<Compile Include="DoorServer\attendanceItems.cs" />
<Compile Include="DoorServer\InOutListItem.cs" />
<Compile Include="DoorServer\RealNamePersonItem.cs" />
<Compile Include="DoorServer\t_d_departmentItem.cs" />
<Compile Include="DoorServer\t_d_employinfoItem.cs" />
<Compile Include="DoorServer\InOutstatisticsItem.cs" />

6
SGGL/Model/ZHGL/DataSync/HSSEDataItem.cs
View File

@ -48,7 +48,7 @@ namespace Model
public int? HeadOfficeInspectorGeneralNum { get; set; }
public int? HighRiskNum { get; set; }
public string Id { get; set; }
public int? IncomeComprehensiveEnergyConsumption { get; set; }
public decimal? IncomeComprehensiveEnergyConsumption { get; set; }
public int? JoinConstructionPersonNum { get; set; }
public int? LicensesCloseNum { get; set; }
public int? LicensesNum { get; set; }
@ -61,7 +61,7 @@ namespace Model
public string MajorRate { get; set; }
public int? MediumRiskNum { get; set; }
public int? NearMissNum { get; set; }
public int? NewWaterConsumption { get; set; }
public decimal? NewWaterConsumption { get; set; }
public int? ProjectComprehensivePlanNum { get; set; }
public int? ProjectDrillNum { get; set; }
public int? ProjectFullTimeNum { get; set; }
@ -90,7 +90,7 @@ namespace Model
public int? SuperConstructionNum { get; set; }
public int? SuperFinishedNum { get; set; }
public int? SuperTrainPersonNum { get; set; }
public int? TotalEnergyConsumption { get; set; }
public decimal? TotalEnergyConsumption { get; set; }
public int? TotalWorkingHour { get; set; }
public int? TrainPersonNum { get; set; }
public string UnitId { get; set; }

80
SGGL/WebAPI/Controllers/DoorProject/DoorServiceController.cs
View File

@ -498,5 +498,85 @@ namespace WebAPI.Controllers
return responeData;
}
#endregion
#region 获取在岗人员
/// <summary>
/// 获取在岗人员
/// </summary>
/// <param name="projectCode"></param>
/// <returns></returns>
public Model.ResponeData getRealNamePersons(string projectCode)
{
var responeData = new Model.ResponeData();
try
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var getProject = db.Base_Project.FirstOrDefault(e => e.ProjectCode == projectCode);
if (getProject != null)
{
responeData.data = (from x in db.SitePerson_Person
join y in db.Base_Unit on x.UnitId equals y.UnitId
join T in db.ProjectData_TeamGroup on x.TeamGroupId equals T.TeamGroupId
join w in db.Base_WorkPost on x.WorkPostId equals w.WorkPostId
where x.ProjectId == getProject.ProjectId && (!x.ExchangeTime.HasValue || !x.ExchangeTime2.HasValue)
//&& (!x.OutTime.HasValue || x.OutTime > DateTime.Now)
//&& x.InTime.HasValue && x.InTime < DateTime.Now
&& x.IsUsed == 1
&& x.PhotoUrl != null
select new Model.RealNamePersonItem
{
projectCode = getProject.ProjectCode,
projectName = getProject.ProjectName,
unitName = y.UnitName,
collCropCode = y.CollCropCode,
teamGroupName = T.TeamGroupName,
name = x.PersonName,
idcardType = "SHENFEN_ZHENGJIAN",
idcardNumber = x.IdentityCard,
idcardStartDate = x.IdcardStartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", x.IdcardStartDate) : null,
idcardEndDate = x.IdcardEndDate.HasValue ? string.Format("{0:yyyy-MM-dd}", x.IdcardEndDate) : (x.IdcardStartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", x.IdcardStartDate.Value.AddYears(30)) : null),
idcardForever = x.IdcardStartDate.HasValue ? "N" : "Y",
politicsStatus = x.PoliticsStatus,
eduLevel = x.EduLevel,
maritalStatus = x.MaritalStatus,
sex = (x.Sex == "2" ? "F" : "M"),
idcardAddress = x.IdcardAddress,
homeAddress = x.Address,
birthday = x.Birthday.HasValue ? string.Format("{0:yyyy-MM-dd}", x.Birthday) : null,
nation = x.Nation,
countryCode = x.CountryCode,
provinceCode = x.ProvinceCode,
positiveIdcardImage = db.AttachFile.First(t => (x.PersonId + "#1") == t.ToKeyId).ImageByte,
negativeIdcardImage = db.AttachFile.First(t => (x.PersonId + "#5") == t.ToKeyId).ImageByte,
headImage = x.HeadImage,
mobile = x.Telephone,
teamLeaderFlag = (T.GroupLeaderId == x.PersonId ? "Y" : "N"),
userType = ((w.PostType == "1" || w.PostType == "4") ? "LAB_USER_MANAGE" : "LAB_USER_BULIDER"),
workType = w.WorkPostCode,
workPostName = w.WorkPostName,
isLeave = x.OutTime.HasValue ? "Y" : "N",
entryTime = x.InTime.HasValue ? string.Format("{0:yyyy-MM-dd}", x.InTime) : null,
exitTime = x.OutTime.HasValue ? string.Format("{0:yyyy-MM-dd}", x.OutTime) : null,
}).ToList();
}
else
{
responeData.code = 0;
responeData.message = "数据为空！";
}
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
ErrLogInfo.WriteLog(ex, "WX接口-获取人员下发门禁", "DoorServiceController.getPersons");
}
return responeData;
}
#endregion
}
}

17
SGGL/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<DeleteExistingFiles>false</DeleteExistingFiles>
<ExcludeApp_Data>false</ExcludeApp_Data>
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
<PublishUrl>bin\app.publish\</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<_TargetId>Folder</_TargetId>
</PropertyGroup>
</Project>