提交代码

This commit is contained in:
2024-06-14 16:52:37 +08:00
parent 0860e6b9b1
commit 2a16ec833a
60 changed files with 114585 additions and 1272 deletions
+22 -22
View File
@@ -50,7 +50,7 @@ namespace FineUIPro.Web.common
int wHours = 0;
DateTime? sDate = Funs.GetNewDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString());
wHours = (from x in db.T_d_EmployInOutRecord where x.ProjectId == ProjectId select x.ManHours ?? 0).ToList().Sum();
this.divSafeWorkTime.InnerHtml = wHours.ToString();
//this.divSafeWorkTime.InnerHtml = wHours.ToString();
//本月安全人工时
int wHoursMonth = 0;
@@ -59,14 +59,14 @@ namespace FineUIPro.Web.common
{
wHoursMonth = Convert.ToInt32(dayReports[0].DayWorkTime);
}
this.divSafeWorkTimeMonth.InnerHtml = wHoursMonth.ToString();
//this.divSafeWorkTimeMonth.InnerHtml = wHoursMonth.ToString();
//安全培训累计人员
var getTrainRecord = db.EduTrain_TrainRecord.Where(x => x.ProjectId == ProjectId).Sum(x => x.TrainPersonNum) ?? 0;
//修改:增加博晟教育中的人数
var boShengCount = db.Bo_Sheng_TrainPerson.Where(x => x.ProjectId == ProjectId && (x.DeleteTag == "False" || x.DeleteTag == null)).ToList().Count;
this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString();
//this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString();
//安全管理人员
var allSum = from x in Funs.DB.SitePerson_Person
@@ -77,7 +77,7 @@ namespace FineUIPro.Web.common
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where y.IsHsse == true && x.ProjectId == ProjectId //安管人员
select x;
this.divSafeManagePersonNum.InnerHtml = glAllPerson.Count().ToString();
//this.divSafeManagePersonNum.InnerHtml = glAllPerson.Count().ToString();
//未遂事故
var wsAccidentList1 = from x in db.Accident_AccidentPersonRecord
@@ -88,7 +88,7 @@ namespace FineUIPro.Web.common
join y in db.Sys_Const on x.AccidentTypeId equals y.ConstValue
where y.ConstText.Contains("未遂") && x.ProjectId == ProjectId
select x;
this.divWS.InnerHtml = (wsAccidentList1.Count() + wsAccidentList2.Count()).ToString();
//this.divWS.InnerHtml = (wsAccidentList1.Count() + wsAccidentList2.Count()).ToString();
//整改数据
getZgsj();
@@ -104,12 +104,12 @@ namespace FineUIPro.Web.common
int CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson
where x.IsTrain == true && x.ProjectId == ProjectId
select x).Count();
divCqmsPxNum.InnerHtml = CqmsPxNum.ToString();
//divCqmsPxNum.InnerHtml = CqmsPxNum.ToString();
//施工审批量
int sgspl = Funs.DB.Comprehensive_GeneralPlanApproval.Where(x => x.ProjectId == ProjectId && x.AuditMan != null && x.AuditMan != "" && x.ApprovalMan != null && x.ApprovalMan != "").Count()
+ Funs.DB.Comprehensive_MajorPlanApproval.Where(x => x.ProjectId == ProjectId && x.AuditMan != null && x.AuditMan != "" && x.ApprovalMan != null && x.ApprovalMan != "").Count();
div_sgfaSpl.InnerHtml = sgspl.ToString();
//div_sgfaSpl.InnerHtml = sgspl.ToString();
GetJD();
//质量共检
getZlgj();
@@ -150,11 +150,11 @@ namespace FineUIPro.Web.common
if (AllCount > 0)
{
////当前现场总人数
div_xcrs.InnerHtml = AllCount.ToString();
//div_xcrs.InnerHtml = AllCount.ToString();
//作业人数
div_zyxcrs.InnerHtml = (AllCount - MCount).ToString();
//div_zyxcrs.InnerHtml = (AllCount - MCount).ToString();
//管理人数
div_glxcrs.InnerHtml = MCount.ToString();
//div_glxcrs.InnerHtml = MCount.ToString();
}
}
#endregion
@@ -182,10 +182,10 @@ namespace FineUIPro.Web.common
#region
protected void getZgsj()
{
div_zgsj.InnerHtml = (GetGeneralClosedNum() + GetGeneralNotClosedNum()).ToString();
div_zgywc.InnerHtml = GetGeneralClosedNum().ToString();
div_zgwwc.InnerHtml = GetGeneralNotClosedNum().ToString();
div_zgwcl.InnerHtml = String.Format("{0:N2}", 100.0 * GetGeneralClosedNum() / (GetGeneralNotClosedNum() + GetGeneralClosedNum())).Replace("NaN", "0") + "%";
//div_zgsj.InnerHtml = (GetGeneralClosedNum() + GetGeneralNotClosedNum()).ToString();
//div_zgywc.InnerHtml = GetGeneralClosedNum().ToString();
//div_zgwwc.InnerHtml = GetGeneralNotClosedNum().ToString();
//div_zgwcl.InnerHtml = String.Format("{0:N2}", 100.0 * GetGeneralClosedNum() / (GetGeneralNotClosedNum() + GetGeneralClosedNum())).Replace("NaN", "0") + "%";
}
/// <summary>
@@ -288,18 +288,18 @@ namespace FineUIPro.Web.common
//this.divProjectMoney.InnerHtml = divProjectMoneyTitle = project.ProjectMoney.ToString() + "万元";
if (project.EndDate.HasValue)
{
this.divEndDate.InnerHtml = string.Format("{0:yyyy-MM-dd}", project.EndDate);
//this.divEndDate.InnerHtml = string.Format("{0:yyyy-MM-dd}", project.EndDate);
int endDays = (project.EndDate.Value - DateTime.Now).Days;
if (endDays >= 0)
{
this.divRemainingDays.InnerHtml = endDays.ToString() + "<span>天</span>";
//this.divRemainingDays.InnerHtml = endDays.ToString() + "<span>天</span>";
}
if (project.StartDate.HasValue)
{
int pdays = (project.EndDate.Value - project.StartDate.Value).Days;
if (pdays >= 0)
{
this.divProjectDays.InnerHtml = pdays.ToString() + "<span>天</span>";
//this.divProjectDays.InnerHtml = pdays.ToString() + "<span>天</span>";
}
}
}
@@ -987,12 +987,12 @@ namespace FineUIPro.Web.common
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
var Gjsxcount = tb.Rows.Count;
div_gjsx.InnerHtml = Gjsxcount.ToString();
//div_gjsx.InnerHtml = Gjsxcount.ToString();
var getDataList = Funs.DB.Sp_Project_GetToDoItems(this.CurrUser.LoginProjectId, this.CurrUser.UserId).ToList();
//待办事项、个人流程
div_dbsx.InnerHtml = getDataList.Count().ToString();
div_grlc.InnerHtml = getDataList.Count().ToString();
//div_dbsx.InnerHtml = getDataList.Count().ToString();
//div_grlc.InnerHtml = getDataList.Count().ToString();
foreach (var item in getDataList)
{
returnDbHtml += "<div class=\"li\" style=\"cursor:pointer\" onclick=\"returnWindows('" + item.PCUrl + "')\"><span>" + item.MenuName + "</span><span>" + item.Content + "</span><span>" +
@@ -1003,7 +1003,7 @@ namespace FineUIPro.Web.common
{
returnDbHtml = "<div></div>";
}
this.div_dbsxlist.InnerHtml = returnDbHtml;
//this.div_dbsxlist.InnerHtml = returnDbHtml;
}
@@ -1051,7 +1051,7 @@ namespace FineUIPro.Web.common
{
returnDbHtml = "<div></div>";
}
this.div_gjsxlist.InnerHtml = returnDbHtml;
//this.div_gjsxlist.InnerHtml = returnDbHtml;
List<SqlParameter> listStaticListStr = new List<SqlParameter>();