diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 9fc55c34..f50b26d3 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,7 +12,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx b/SGGL/FineUIPro.Web/common/mainProject2.aspx index 2fb63341..7587e2f2 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx @@ -310,7 +310,8 @@ 进度统计
-
+ <%--
--%> +
@@ -1204,7 +1205,7 @@ - +--%> + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs index 347a25ba..1bd00c04 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs @@ -751,6 +751,8 @@ namespace FineUIPro.Web.common } } + + protected string Two { get @@ -871,6 +873,47 @@ namespace FineUIPro.Web.common return JsonConvert.SerializeObject(businessColumn); } } + + #region 赢得值曲线 + protected string Tree + { + get + { + List series = new List(); + Model.BusinessColumn businessColumn = new Model.BusinessColumn(); + List listCategories = new List(); + 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 listdata = new List(); + List listdata2 = new List(); + List listdata3 = new List(); + List listdata4 = new List(); + 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 #endregion #region 人力情况