20210520
This commit is contained in:
@@ -51,30 +51,70 @@ namespace FineUIPro.Web.common
|
||||
var designChangeOrders = from x in db.Comprehensive_DesignChangeOrder where x.ProjectId == this.CurrUser.LoginProjectId select x;
|
||||
this.divBG.InnerHtml = designChangeOrders.Count().ToString();
|
||||
//工程量完成情况
|
||||
//string quantityCompletionStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>类型</div><div class='item jd-title'>单位</div><div class='item jd-title'>设计数量</div><div class='item jd-title'>计划完成</div><div class='item jd-title'>实际完成</div><div class='item jd-title'>计划完成率</div><div class='item jd-title'>累计计划完成</div><div class='item jd-title'>累计实际完成</div><div class='item jd-title'>累计计划完成率</div><div class='item jd-title'>总完成率</div></div>";
|
||||
//DateTime months = Convert.ToDateTime(DateTime.Now.Year + "-" + DateTime.Now.Month + "-01");
|
||||
//var quantityCompletions = from x in Funs.DB.View_JDGL_QuantityCompletion where x.ProjectId == this.CurrUser.LoginProjectId && x.Months == months orderby x.SortIndex,x.Name select x;
|
||||
//int i = 1;
|
||||
//foreach (var item in quantityCompletions)
|
||||
//{
|
||||
// quantityCompletionStr += "<div class='jd-item'><div class='item'>"
|
||||
// + i + "</div><div class='item'>"
|
||||
// + item.Name + "</div><div class='item'>"
|
||||
// + item.Unit + "</div><div class='item'>"
|
||||
// + item.DesignNum + "</div><div class='item'>"
|
||||
// + item.PlanNum + "</div><div class='item'>"
|
||||
// + item.RealNum + "</div><div class='item'>"
|
||||
// + item.Rate + "</div><div class='item'>"
|
||||
// + item.TotalPlanNum + "</div><div class='item'>"
|
||||
// + item.TotalRealNum + "</div><div class='item'>"
|
||||
// + item.TotalRate + "</div><div class='item'>"
|
||||
// + item.SumRate + "</div></div>";
|
||||
// i++;
|
||||
//}
|
||||
//divGZL.InnerHtml = quantityCompletionStr;
|
||||
string quantityCompletionStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>类型</div><div class='item jd-title'>单位</div><div class='item jd-title'>设计数量</div><div class='item jd-title'>计划完成</div><div class='item jd-title'>实际完成</div><div class='item jd-title'>计划完成率</div><div class='item jd-title'>累计计划完成</div><div class='item jd-title'>累计实际完成</div><div class='item jd-title'>累计计划完成率</div><div class='item jd-title'>总完成率</div></div>";
|
||||
var quantityCompletions = from x in Funs.DB.View_JDGL_QuantityCompletion where x.ProjectId == this.CurrUser.LoginProjectId orderby x.Name select x;
|
||||
int i = 1;
|
||||
foreach (var item in quantityCompletions)
|
||||
{
|
||||
quantityCompletionStr += "<div class='jd-item'><div class='item'>"
|
||||
+ i + "</div><div class='item'>"
|
||||
+ item.Name + "</div><div class='item'>"
|
||||
+ item.Unit + "</div><div class='item'>"
|
||||
+ item.DesignNum + "</div><div class='item'>"
|
||||
+ item.PlanNum + "</div><div class='item'>"
|
||||
+ item.RealNum + "</div><div class='item'>"
|
||||
+ item.Rate + "</div><div class='item'>"
|
||||
+ item.TotalPlanNum + "</div><div class='item'>"
|
||||
+ item.TotalRealNum + "</div><div class='item'>"
|
||||
+ item.TotalRate + "</div><div class='item'>"
|
||||
+ item.SumRate + "</div></div>";
|
||||
i++;
|
||||
}
|
||||
divGZL.InnerHtml = quantityCompletionStr;
|
||||
}
|
||||
}
|
||||
|
||||
#region 赢得值曲线
|
||||
protected string Two
|
||||
{
|
||||
get
|
||||
{
|
||||
List<Model.SingleSerie> series = new List<Model.SingleSerie>();
|
||||
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
|
||||
List<string> listCategories = new List<string>();
|
||||
businessColumn.title = "赢得值曲线";
|
||||
var views = (from x in Funs.DB.View_JDGL_ProgressCompletion where x.ProjectId == this.CurrUser.LoginProjectId orderby x.Months select x).ToList();
|
||||
Model.SingleSerie s = new Model.SingleSerie();
|
||||
Model.SingleSerie s2 = new Model.SingleSerie();
|
||||
Model.SingleSerie s3 = new Model.SingleSerie();
|
||||
Model.SingleSerie s4 = new Model.SingleSerie();
|
||||
List<double> listdata = new List<double>();
|
||||
List<double> listdata2 = new List<double>();
|
||||
List<double> listdata3 = new List<double>();
|
||||
List<double> listdata4 = new List<double>();
|
||||
for (int i = 0; i < views.Count; i++)
|
||||
{
|
||||
listCategories.Add(views[i].MonthStr);
|
||||
listdata.Add(Convert.ToDouble(views[i].PlanNum));
|
||||
listdata2.Add(Convert.ToDouble(views[i].TotalPlanNum));
|
||||
listdata3.Add(Convert.ToDouble(views[i].RealNum));
|
||||
listdata4.Add(Convert.ToDouble(views[i].TotalRealNum));
|
||||
}
|
||||
s.data = listdata;
|
||||
s2.data = listdata2;
|
||||
s3.data = listdata3;
|
||||
s4.data = listdata4;
|
||||
series.Add(s);
|
||||
series.Add(s2);
|
||||
series.Add(s3);
|
||||
series.Add(s4);
|
||||
businessColumn.categories = listCategories;
|
||||
businessColumn.series = series;
|
||||
return JsonConvert.SerializeObject(businessColumn);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 人力情况
|
||||
protected string Person
|
||||
{
|
||||
@@ -90,12 +130,64 @@ namespace FineUIPro.Web.common
|
||||
select y).Distinct().ToList();
|
||||
Model.SingleSerie s = new Model.SingleSerie();
|
||||
List<double> listdata = new List<double>();
|
||||
foreach (var post in posts)
|
||||
{
|
||||
listCategories.Add(post.WorkPostName);
|
||||
int workPostCount = persons.Count(x => x.WorkPostId == post.WorkPostId);
|
||||
listdata.Add(workPostCount);
|
||||
}
|
||||
//木工
|
||||
listCategories.Add("木工");
|
||||
int workPostCount1 = persons.Count(x => x.WorkPostId == Const.WorkPost_Carpentry);
|
||||
listdata.Add(workPostCount1);
|
||||
//钢筋工
|
||||
listCategories.Add("钢筋工");
|
||||
int workPostCount2 = persons.Count(x => x.WorkPostId == Const.WorkPost_SteelWorker);
|
||||
listdata.Add(workPostCount2);
|
||||
//瓦工
|
||||
listCategories.Add("瓦工");
|
||||
int workPostCount3 = persons.Count(x => x.WorkPostId == Const.WorkPost_Bricklayer);
|
||||
listdata.Add(workPostCount3);
|
||||
//混凝土工
|
||||
listCategories.Add("混凝土工");
|
||||
int workPostCount4 = persons.Count(x => x.WorkPostId == Const.WorkPost_ConcreteWorker);
|
||||
listdata.Add(workPostCount4);
|
||||
//钳工
|
||||
listCategories.Add("钳工");
|
||||
int workPostCount5 = persons.Count(x => x.WorkPostId == Const.WorkPost_Fitter1 || x.WorkPostId == Const.WorkPost_Fitter2);
|
||||
listdata.Add(workPostCount5);
|
||||
//焊工
|
||||
listCategories.Add("焊工");
|
||||
int workPostCount6 = persons.Count(x => x.WorkPostId == Const.WorkPost_Welder1 || x.WorkPostId == Const.WorkPost_Welder2 ||
|
||||
x.WorkPostId == Const.WorkPost_Welder3 || x.WorkPostId == Const.WorkPost_Welder4 || x.WorkPostId == Const.WorkPost_Welder5);
|
||||
listdata.Add(workPostCount6);
|
||||
//铆工
|
||||
listCategories.Add("铆工");
|
||||
int workPostCount7 = persons.Count(x => x.WorkPostId == Const.WorkPost_Riveter);
|
||||
listdata.Add(workPostCount7);
|
||||
//管工
|
||||
listCategories.Add("管工");
|
||||
int workPostCount8 = persons.Count(x => x.WorkPostId == Const.WorkPost_Foreman);
|
||||
listdata.Add(workPostCount8);
|
||||
//电工
|
||||
listCategories.Add("电工");
|
||||
int workPostCount9 = persons.Count(x => x.WorkPostId == Const.WorkPost_Electrician1 || x.WorkPostId == Const.WorkPost_Electrician2
|
||||
|| x.WorkPostId == Const.WorkPost_Electrician3);
|
||||
listdata.Add(workPostCount9);
|
||||
//仪表工
|
||||
listCategories.Add("仪表工");
|
||||
int workPostCount10 = persons.Count(x => x.WorkPostId == Const.WorkPost_Instrumentalist);
|
||||
listdata.Add(workPostCount10);
|
||||
//防腐保温工
|
||||
listCategories.Add("防腐保温工");
|
||||
int workPostCount11 = persons.Count(x => x.WorkPostId == Const.WorkPost_AnticorrosionWorker);
|
||||
listdata.Add(workPostCount11);
|
||||
//防腐保温工
|
||||
listCategories.Add("管理人员");
|
||||
int workPostCount12 = (from x in persons
|
||||
join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId
|
||||
where y.PostType == Const.PostType_1
|
||||
select x).Count();
|
||||
listdata.Add(workPostCount12);
|
||||
//其他
|
||||
listCategories.Add("其他");
|
||||
int workPostCount13 = persons.Count()- workPostCount1- workPostCount2- workPostCount3- workPostCount4- workPostCount5- workPostCount6- workPostCount7
|
||||
- workPostCount8- workPostCount9- workPostCount10- workPostCount11- workPostCount12;
|
||||
listdata.Add(workPostCount13);
|
||||
s.data = listdata;
|
||||
series.Add(s);
|
||||
businessColumn.categories = listCategories;
|
||||
@@ -113,7 +205,7 @@ namespace FineUIPro.Web.common
|
||||
{
|
||||
var getGJSX = (from x in Funs.DB.GJSX
|
||||
join y in Funs.DB.Base_QuestionType on x.QuestionTypeID equals y.QuestionTypeID
|
||||
where x.ProjectId==this.CurrUser.LoginProjectId
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
orderby x.CreateDate
|
||||
select new { x.GJSXID, x.Detail, x.CreateDate, x.ProjectId, y.QuestionTypeName }).Distinct().Take(20);
|
||||
string strNoticeHtml = string.Empty;
|
||||
|
||||
Reference in New Issue
Block a user