劳务人员看板
This commit is contained in:
geh
@@ -18,6 +18,9 @@
|
||||
[v-cloak] {
|
||||
display: none;
|
||||
}
|
||||
.content-body::-webkit-scrollbar{
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
@@ -246,6 +249,15 @@
|
||||
<div class="center">
|
||||
<div class="map">
|
||||
<div class="project-box" style="margin-top: 0.25rem;">
|
||||
<div class="p-item js-hover" data-type="manHour" style="border: 1px solid rgba(180, 199, 228, 0.164);margin-right: 0.125rem;">
|
||||
<i></i>
|
||||
<div class="p-row">
|
||||
<h6 style="white-space: nowrap;">累计人工时(实名制)</h6>
|
||||
<p>
|
||||
<span>{{form.manHour.totalManHour}}</span><span></span>
|
||||
</p >
|
||||
</div>
|
||||
</div>
|
||||
<div class="p-item js-hover" data-type="BeUnderConstructionNum" >
|
||||
<i></i>
|
||||
<div class="p-row">
|
||||
@@ -253,13 +265,13 @@
|
||||
<p><span>{{form.projectInfo.projectsUnderConstruction}}</span><span>项</span></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="p-item js-hover" data-type="ShutdownNum">
|
||||
<%--<div class="p-item js-hover" data-type="ShutdownNum">
|
||||
<i></i>
|
||||
<div class="p-row">
|
||||
<h6>停工项目</h6>
|
||||
<p><span>{{form.projectInfo.shutdownProject}}</span><span>项</span></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>--%>
|
||||
<div class="p-item js-hover" data-type="JoinConstructionPersonNum">
|
||||
<i></i>
|
||||
<div class="p-row">
|
||||
@@ -688,6 +700,9 @@
|
||||
participateInNum: 0,//参建人数
|
||||
dangerousProject: 0,//在施危大工程
|
||||
},
|
||||
manHour:{
|
||||
totalManHour: 0,
|
||||
},
|
||||
dangerousProject:
|
||||
{//危大工程管控数据
|
||||
approvalCompleted: 0,//审批完成
|
||||
@@ -762,7 +777,7 @@
|
||||
// 组件挂载后执行的操作
|
||||
this.show = true; // 显示内容
|
||||
this.loadData(); // 加载数据
|
||||
this.createChinaMap();
|
||||
// this.createChinaMap();
|
||||
this.createMap1();
|
||||
this.createMap2();
|
||||
this.startTimer(); //启动时间定时器
|
||||
@@ -1014,6 +1029,12 @@
|
||||
}
|
||||
this.chainaMap.setOption(chinaOption);
|
||||
this.chainaMap.on('click', function (params) {
|
||||
// 控制台打印点击的地区名称
|
||||
if (params.seriesType == "effectScatter") {
|
||||
var projectId = params.data && params.data.id ? params.data.id : '';
|
||||
var jumpUrl = "../HSSE/KqShowScreen/KqShowScreen.aspx?projectId=" + encodeURIComponent(projectId);
|
||||
window.open(jumpUrl)
|
||||
}
|
||||
// 控制台打印点击的地区名称
|
||||
//if (params.seriesType == 'effectScatter') {
|
||||
// alert('点击了' + params.name);
|
||||
@@ -1493,6 +1514,11 @@
|
||||
else if (type == 'AccidentEventData') {
|
||||
$('iframe').attr('src', '../DataShow/Accident.aspx') //事故事件数据
|
||||
window.open("../DataShow/Accident.aspx")
|
||||
}else if (type == 'manHour') {
|
||||
// $('.container').hide()
|
||||
// $('#contentContainer').show()
|
||||
// $('#contentFrame').attr('src', '../DataShow/kq.aspx')
|
||||
window.open("../DataShow/kq.aspx")
|
||||
}
|
||||
else {
|
||||
// $('iframe').attr('src', '../SysManage/Unit.aspx')
|
||||
|
||||
@@ -203,6 +203,47 @@ namespace FineUIPro.Web.common
|
||||
|
||||
#endregion
|
||||
|
||||
#region 累计人工时
|
||||
//累计人工时
|
||||
var allProjectsDetails = (from detail in db.SitePerson_DayReportDetail
|
||||
join report in db.SitePerson_DayReport
|
||||
on detail.DayReportId equals report.DayReportId
|
||||
join unit in db.Base_Unit
|
||||
on detail.UnitId equals unit.UnitId
|
||||
join project in db.Base_Project
|
||||
on report.ProjectId equals project.ProjectId
|
||||
where BaseDataService.BeUnderConstructionList.Contains(report.ProjectId) &&
|
||||
report.CompileDate == (from r in db.SitePerson_DayReport
|
||||
where r.ProjectId == report.ProjectId
|
||||
select r.CompileDate).Max()
|
||||
orderby project.ShortName, unit.UnitCode
|
||||
select new
|
||||
{
|
||||
detail.DayReportDetailId,
|
||||
report.ProjectId,
|
||||
ProjectName = project.ShortName,
|
||||
unit.UnitName,
|
||||
detail.PersonWorkTime,
|
||||
// 当年累计
|
||||
YearPersonWorkTime = (from d in db.SitePerson_DayReportDetail
|
||||
join r in db.SitePerson_DayReport on d.DayReportId equals r.DayReportId
|
||||
where r.ProjectId == report.ProjectId
|
||||
&& d.UnitId == detail.UnitId
|
||||
&& r.CompileDate <= report.CompileDate
|
||||
&& r.CompileDate.Value.Year == report.CompileDate.Value.Year
|
||||
select d.PersonWorkTime ?? 0).Sum(),
|
||||
// 总累计
|
||||
TotalPersonWorkTime = (from d in db.SitePerson_DayReportDetail
|
||||
join r in db.SitePerson_DayReport on d.DayReportId equals r.DayReportId
|
||||
where r.ProjectId == report.ProjectId
|
||||
&& d.UnitId == detail.UnitId
|
||||
&& r.CompileDate <= report.CompileDate
|
||||
select d.PersonWorkTime ?? 0).Sum()
|
||||
}).ToList();
|
||||
// 计算所有项目累计人工时总和
|
||||
var totalManHour = allProjectsDetails.Sum(x => x.TotalPersonWorkTime);
|
||||
|
||||
#endregion
|
||||
// 构造返回数据
|
||||
var returnData = new
|
||||
{
|
||||
@@ -350,6 +391,10 @@ namespace FineUIPro.Web.common
|
||||
useNum = inspectionMachineList.Where(x => x.InspectionType == "计量").Sum(x => x.UnitsCount ?? 0),
|
||||
okNum = inspectionMachineList.Where(x => x.InspectionType == "计量" && x.IsCheckOK.HasValue && x.IsCheckOK == true).Sum(x => x.UnitsCount ?? 0),
|
||||
},
|
||||
manHour = new
|
||||
{//工时数
|
||||
totalManHour = totalManHour,
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user