diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 66e9549e..d63d4610 100644 Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ diff --git a/DataBase/版本日志/SGGLDB_V2023-08-31.sql b/DataBase/版本日志/SGGLDB_V2023-09-01-lpf.sql similarity index 99% rename from DataBase/版本日志/SGGLDB_V2023-08-31.sql rename to DataBase/版本日志/SGGLDB_V2023-09-01-lpf.sql index fb755b76..cb67e550 100644 --- a/DataBase/版本日志/SGGLDB_V2023-08-31.sql +++ b/DataBase/版本日志/SGGLDB_V2023-09-01-lpf.sql @@ -27,3 +27,4 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType], INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) VALUES ( N'C1708178-C52B-4D32-9849-C69622D96105',N'D9BAB30E-3255-4EA0-8631-EF15C9203EFD',N'',1) GO + diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 6037c38e..7e8c9b4c 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -106,9 +106,6 @@ ..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll - - ..\packages\Quartz.3.7.0\lib\netstandard2.0\Quartz.dll - ..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs index 61e730bf..4e3841e5 100644 --- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs +++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs @@ -24,17 +24,7 @@ namespace BLL (string.IsNullOrEmpty(table.ContractTrackProgressId) || x.ContractTrackProgressId.Contains(table.ContractTrackProgressId)) && (string.IsNullOrEmpty(table.ContractTrackId) || - x.ContractTrackId.Contains(table.ContractTrackId)) && - (string.IsNullOrEmpty(table.BCWS_Quantity) || x.BCWS_Quantity.Contains(table.BCWS_Quantity)) && - (string.IsNullOrEmpty(table.BCWS_OutputValue) || - x.BCWS_OutputValue.Contains(table.BCWS_OutputValue)) && - (string.IsNullOrEmpty(table.BCWS_Percentage) || - x.BCWS_Percentage.Contains(table.BCWS_Percentage)) && - (string.IsNullOrEmpty(table.ACWP_Quantity) || x.ACWP_Quantity.Contains(table.ACWP_Quantity)) && - (string.IsNullOrEmpty(table.ACWP_OutputValue) || - x.ACWP_OutputValue.Contains(table.ACWP_OutputValue)) && - (string.IsNullOrEmpty(table.ACWP_Percentage) || - x.ACWP_Percentage.Contains(table.ACWP_Percentage)) && + x.ContractTrackId.Contains(table.ContractTrackId)) && (string.IsNullOrEmpty(table.Date) || x.Date.Contains(table.Date)) orderby x.Date diff --git a/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs b/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs index 13fefb1b..d80bdfd3 100644 --- a/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs +++ b/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs @@ -1,6 +1,12 @@ -using System; +using NPOI.SS.Formula.Functions; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Data; using System.Drawing; +using System.Linq; +using System.Reflection; using System.Web.UI.DataVisualization.Charting; namespace Web.Controls @@ -367,5 +373,124 @@ namespace Web.Controls Controls.Add(chart1); } + + public void CreateMaryChartHTGL(DataTable dt, int width, int height, string projectShortName) + { + Chart chart1 = new Chart(); + chart1.ID = "chart1"; + chart1.BackColor = Color.WhiteSmoke; + chart1.ImageLocation = "~/Images/ChartPic_#SEQ(300,3)"; + chart1.BorderlineDashStyle = ChartDashStyle.Solid; + chart1.Palette = ChartColorPalette.BrightPastel; + chart1.BackSecondaryColor = Color.White; + chart1.BackGradientStyle = GradientStyle.TopBottom; + chart1.BorderWidth = 2; + chart1.BorderColor = Color.FromArgb(26, 59, 105); + chart1.ImageType = ChartImageType.Png; + + chart1.Width = width; + chart1.Height = height; + + Title title = new Title(); + title.Text = "图表分析"; + if (!string.IsNullOrEmpty(projectShortName)) + { + title.Text = projectShortName + "图表分析"; + } + title.Text = BLL.Funs.GetSubStr(title.Text, 30); + title.ToolTip = title.Text; + title.ShadowColor = Color.FromArgb(32, 0, 0, 0); + title.Font = new Font("Trebuchet MS", 10F, FontStyle.Bold); + title.ShadowOffset = 3; + title.ForeColor = Color.FromArgb(26, 59, 105); + chart1.Titles.Add(title); + + Legend legend1 = new Legend(); + legend1.TextWrapThreshold = 1; + legend1.Docking = Docking.Right; + legend1.Alignment = StringAlignment.Center; + legend1.BackColor = Color.Transparent; + legend1.Font = new Font(new FontFamily("Trebuchet MS"), 8); + legend1.LegendStyle = LegendStyle.Column; + legend1.IsEquallySpacedItems = true; + legend1.IsTextAutoFit = false; + chart1.Legends.Add(legend1); + + ChartArea chartArea = new ChartArea(); + chartArea.BackColor = Color.Transparent; + chartArea.AxisX.IsLabelAutoFit = false; + chartArea.AxisY.IsLabelAutoFit = false; + chartArea.AxisX.LabelStyle.Font = new Font("Verdana,Arial,Helvetica,sans-serif", 8F, FontStyle.Regular); + chartArea.AxisY.LabelStyle.Font = new Font("Verdana,Arial,Helvetica,sans-serif", 8F, FontStyle.Regular); + //chartArea.AxisY.LabelStyle.Format = "#(万元)"; + chartArea.AxisY.LineColor = Color.FromArgb(64, 64, 64, 64); + chartArea.AxisX.LineColor = Color.FromArgb(64, 64, 64, 64); + chartArea.AxisY.MajorGrid.LineColor = Color.FromArgb(64, 64, 64, 64); + chartArea.AxisX.MajorGrid.LineColor = Color.FromArgb(64, 64, 64, 64); + chartArea.AxisX.Interval = 1; + chartArea.Area3DStyle.Enable3D = false; + chart1.ChartAreas.Add(chartArea); + + chart1.Series.Add("BCWS工程量"); + chart1.Series.Add("BCWS产值"); + chart1.Series.Add("BCWS百分比"); + chart1.Series.Add("ACWP工程量"); + chart1.Series.Add("ACWP产值"); + chart1.Series.Add("ACWP百分比"); + + DataView dv = dt.DefaultView; + + chart1.Series["BCWS工程量"].Points.DataBindXY(dv, "月份", dv, "BCWS工程量"); + chart1.Series["BCWS工程量"].ChartType = SeriesChartType.Column; + for (int i = 0; i < chart1.Series["BCWS工程量"].Points.Count; i++) + { + chart1.Series["BCWS工程量"].Points[i].ToolTip = "BCWS工程量\n#VALX\n#VALY"; + } + + chart1.Series["BCWS产值"].Points.DataBindXY(dv, "月份", dv, "BCWS产值"); + chart1.Series["BCWS产值"].ChartType = SeriesChartType.Column; + for (int i = 0; i < chart1.Series["BCWS产值"].Points.Count; i++) + { + chart1.Series["BCWS产值"].Points[i].ToolTip = "BCWS产值\n#VALX\n#VALY"; + } + + chart1.Series["BCWS百分比"].Points.DataBindXY(dv, "月份", dv, "BCWS百分比"); + chart1.Series["BCWS百分比"].Color = Color.MediumSeaGreen; + chart1.Series["BCWS百分比"].BorderWidth = 2; + chart1.Series["BCWS百分比"].ChartType =SeriesChartType.Spline; + + for (int i = 0; i < chart1.Series["BCWS百分比"].Points.Count; i++) + { + chart1.Series["BCWS百分比"].Points[i].ToolTip = "BCWS百分比\n#VALX\n#VALY"; + } + + + chart1.Series["ACWP工程量"].Points.DataBindXY(dv, "月份", dv, "ACWP工程量"); + chart1.Series["ACWP工程量"].BorderWidth = 2; + for (int i = 0; i < chart1.Series["ACWP工程量"].Points.Count; i++) + { + chart1.Series["ACWP工程量"].Points[i].ToolTip = "ACWP工程量\n#VALX\n#VALY"; + } + + chart1.Series["ACWP产值"].Points.DataBindXY(dv, "月份", dv, "BCWS工程量"); + chart1.Series["ACWP产值"].ChartType = SeriesChartType.Column; + for (int i = 0; i < chart1.Series["ACWP产值"].Points.Count; i++) + { + chart1.Series["ACWP产值"].Points[i].ToolTip = "ACWP产值\n#VALX\n#VALY"; + } + + chart1.Series["ACWP百分比"].Points.DataBindXY(dv, "月份", dv, "BCWS工程量"); + chart1.Series["ACWP百分比"].ChartType = SeriesChartType.Spline; + // chart1.Series["ACWP百分比"].Color = Color.Red; + chart1.Series["ACWP百分比"].BorderWidth = 2; + for (int i = 0; i < chart1.Series["ACWP百分比"].Points.Count; i++) + { + chart1.Series["ACWP百分比"].Points[i].ToolTip = "ACWP百分比\n#VALX\n#VALY"; + } + + Controls.Add(chart1); + } + + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index d00d86fc..f25e81d7 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1259,6 +1259,7 @@ + @@ -12375,6 +12376,13 @@ ContractTrackMatchWBS.aspx + + ContractTrackProgressChart.aspx + ASPXCodeBehind + + + ContractTrackProgressChart.aspx + GeneralTermsConditions.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.cs index b93222a4..7910fcdc 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.cs @@ -113,7 +113,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile private void SaveGrid1() { - PhtglContracttrackprogressService.DeleteModleByContractTrackId(ID); + /*PhtglContracttrackprogressService.DeleteModleByContractTrackId(ID); JArray EditorArr = Grid1.GetMergedData(); if (EditorArr.Count > 0) { @@ -133,7 +133,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile model.Date = objects["values"]["Date"].ToString(); BLL.PhtglContracttrackprogressService.AddPHTGL_ContractTrackProgress(model); } - } + }*/ } private string GetDeleteScript() diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx index 3bc45eff..4128a8ff 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx @@ -36,7 +36,7 @@ runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ClicksToEdit="1" DataIDField="Id" AllowSorting="true" SortField="Id" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" - AllowPaging="False" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" + AllowPaging="False" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" OnRowClick="Grid1_OnRowClick" EnableRowClickEvent="True"> @@ -45,8 +45,8 @@ LabelWidth="140px" OnSelectedIndexChanged="DropMainContractCode_SelectedIndexChanged"> - + @@ -58,6 +58,21 @@ + + + + + + + + + + + + + @@ -193,7 +208,7 @@ - + @@ -262,7 +277,7 @@ - + @@ -318,46 +333,50 @@ - - + + - - + + - - - + + - - + + - - + + - - - + + @@ -378,12 +397,12 @@ private void BindGrid() { - if (!string.IsNullOrEmpty(ContractId)) + Model.PHTGL_ContractTrack table = new Model.PHTGL_ContractTrack(); + table.ProjectId = this.CurrUser.LoginProjectId; + table.ContractId = this.ContractId; + table.ProjectCode = this.txtProjectCode.Text.Trim(); + table.ProjectName = this.txtProjectName.Text.Trim(); + var tb = BLL.PhtglContractTrackService.GetListData(table, Grid1); + Grid1.RecordCount = PhtglContractTrackService.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + Grid1.DataSource = tb; + Grid1.DataBind(); + if (string.IsNullOrEmpty(ContractId)) { - Model.PHTGL_ContractTrack table = new Model.PHTGL_ContractTrack(); - table.ProjectId = this.CurrUser.LoginProjectId; - table.ContractId = this.ContractId; - var tb = BLL.PhtglContractTrackService.GetListData(table, Grid1); - Grid1.RecordCount = PhtglContractTrackService.Count; - //tb = GetFilteredTable(Grid1.FilteredData, tb); - Grid1.DataSource = tb; - Grid1.DataBind(); - } - else - { - Grid1.DataSource = null; - Grid1.DataBind(); - Grid2.DataSource = null; Grid2.DataBind(); @@ -300,12 +296,12 @@ namespace FineUIPro.Web.PHTGL.ContractCompile model = new Model.PHTGL_ContractTrackProgress(); model.ContractTrackProgressId = SQLHelper.GetNewID(typeof(Model.PHTGL_ContractTrackProgress)); model.ContractTrackId = Grid1.SelectedRowID; - model.BCWS_Quantity = objects["values"]["BCWS_Quantity"].ToString(); - model.BCWS_OutputValue = objects["values"]["BCWS_OutputValue"].ToString(); - model.BCWS_Percentage = objects["values"]["BCWS_Percentage"].ToString(); - model.ACWP_Quantity = objects["values"]["ACWP_Quantity"].ToString(); - model.ACWP_OutputValue = objects["values"]["ACWP_OutputValue"].ToString(); - model.ACWP_Percentage = objects["values"]["ACWP_Percentage"].ToString(); + model.BCWS_Quantity = Funs.GetNewDecimal(objects["values"]["BCWS_Quantity"].ToString()); + model.BCWS_OutputValue = Funs.GetNewDecimal(objects["values"]["BCWS_OutputValue"].ToString()); + model.BCWS_Percentage = Funs.GetNewDecimal(objects["values"]["BCWS_Percentage"].ToString()); + model.ACWP_Quantity = Funs.GetNewDecimal(objects["values"]["ACWP_Quantity"].ToString()); + model.ACWP_OutputValue = Funs.GetNewDecimal(objects["values"]["ACWP_OutputValue"].ToString()); + model.ACWP_Percentage = Funs.GetNewDecimal(objects["values"]["ACWP_Percentage"].ToString()); model.Date = objects["values"]["Date"].ToString(); BLL.PhtglContracttrackprogressService.AddPHTGL_ContractTrackProgress(model); } @@ -377,6 +373,28 @@ namespace FineUIPro.Web.PHTGL.ContractCompile } BindGrid(); } + + protected void btnQuery_OnClick(object sender, EventArgs e) + { + BindGrid(); + } + + protected void btnGetChart_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(ContractId)) + { + var model = ContractService.GetContractByContractNum(DropContractCode.SelectedValue); + if (model != null) + { + PageContext.RegisterStartupScript( + Window2.GetShowReference(string.Format("ContractTrackProgressChart.aspx?ContractId={0}", model.ContractId, "图表 - "))); + } + } + else + { + ShowNotify("请选择施工分包合同", MessageBoxIcon.Question); + } + } #endregion #region 关闭弹出窗 @@ -516,5 +534,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile { BindGrid2(); } + + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs index d2a20143..ee26ef32 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs @@ -122,6 +122,51 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected global::FineUIPro.Button btnSave; + /// + /// Toolbar4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar4; + + /// + /// txtProjectCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectCode; + + /// + /// txtProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// btnGetChart 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnGetChart; + /// /// lblNumber 控件。 /// @@ -519,58 +564,58 @@ namespace FineUIPro.Web.PHTGL.ContractCompile protected global::FineUIPro.TextBox TextBox1; /// - /// txtBCWS_Quantity 控件。 + /// NumberBox4 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtBCWS_Quantity; + protected global::FineUIPro.NumberBox NumberBox4; /// - /// txtBCWS_OutputValue 控件。 + /// NumberBox5 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtBCWS_OutputValue; + protected global::FineUIPro.NumberBox NumberBox5; /// - /// txtBCWS_Percentage 控件。 + /// NumberBox6 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtBCWS_Percentage; + protected global::FineUIPro.NumberBox NumberBox6; /// - /// txtACWP_Quantity 控件。 + /// NumberBox7 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtACWP_Quantity; + protected global::FineUIPro.NumberBox NumberBox7; /// - /// txtACWP_OutputValue 控件。 + /// NumberBox8 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtACWP_OutputValue; + protected global::FineUIPro.NumberBox NumberBox8; /// - /// txtACWP_Percentage 控件。 + /// NumberBox9 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtACWP_Percentage; + protected global::FineUIPro.NumberBox NumberBox9; /// /// Window1 控件。 diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressChart.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressChart.aspx new file mode 100644 index 00000000..5296a176 --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressChart.aspx @@ -0,0 +1,43 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ContractTrackProgressChart.aspx.cs" Inherits="FineUIPro.Web.PHTGL.ContractCompile.ContractTrackProgressChart" %> +<%@ Register Src="~/Controls/ChartControl.ascx" TagName="ChartControl" TagPrefix="uc1" %> + + + + + + 赢得值曲线 + + + + +
+ + + + + + +
+ +
+ + + + + + + + + diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressChart.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressChart.aspx.cs new file mode 100644 index 00000000..f1f0a622 --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressChart.aspx.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using BLL; + +namespace FineUIPro.Web.PHTGL.ContractCompile +{ + public partial class ContractTrackProgressChart : PageBase + { + public string ContractId + { + get => (string)ViewState["ContractId"]; + set => ViewState["ContractId"] = value; + } + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + ContractId = Request.Params["ContractId"]; + BindChart(); + } + } + + void BindChart() + { + if (!string.IsNullOrEmpty(ContractId)) + { + var db = Funs.DB; + var result = (from x in db.PHTGL_ContractTrackProgress + + join y in db.PHTGL_ContractTrack on x.ContractTrackId equals y.Id + + where y.ContractId == ContractId + group x by x.Date into g + select new + + { + 月份 = g.Key, + BCWS工程量 = g.Sum(x => x.BCWS_Quantity), + BCWS产值 = g.Sum(x => x.BCWS_OutputValue), + BCWS百分比 = g.Sum(x => x.BCWS_Percentage), + ACWP工程量 = g.Sum(x => x.ACWP_Quantity), + ACWP产值 = g.Sum(x => x.ACWP_OutputValue), + ACWP百分比 = g.Sum(x => x.ACWP_Percentage) + }).ToList(); + + this.ChartEV.CreateMaryChartHTGL(LINQToDataTable(result), 1020, 420, null); + } + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressChart.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressChart.aspx.designer.cs new file mode 100644 index 00000000..62d01b43 --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackProgressChart.aspx.designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.PHTGL.ContractCompile +{ + + + public partial class ContractTrackProgressChart + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// cpEV 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel cpEV; + + /// + /// ChartEV 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::Web.Controls.ChartControl ChartEV; + } +} diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index f8da4e25..7ae01316 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -11539,7 +11539,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")] public string ApproveIdea { get @@ -149756,7 +149756,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")] public string AttentPerson { get @@ -181179,7 +181179,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")] public System.Nullable WorkPackageEstimate { get @@ -181230,17 +181230,17 @@ namespace Model private string _ContractTrackId; - private string _BCWS_Quantity; + private System.Nullable _BCWS_Quantity; - private string _BCWS_OutputValue; + private System.Nullable _BCWS_OutputValue; - private string _BCWS_Percentage; + private System.Nullable _BCWS_Percentage; - private string _ACWP_Quantity; + private System.Nullable _ACWP_Quantity; - private string _ACWP_OutputValue; + private System.Nullable _ACWP_OutputValue; - private string _ACWP_Percentage; + private System.Nullable _ACWP_Percentage; private string _Date; @@ -181252,17 +181252,17 @@ namespace Model partial void OnContractTrackProgressIdChanged(); partial void OnContractTrackIdChanging(string value); partial void OnContractTrackIdChanged(); - partial void OnBCWS_QuantityChanging(string value); + partial void OnBCWS_QuantityChanging(System.Nullable value); partial void OnBCWS_QuantityChanged(); - partial void OnBCWS_OutputValueChanging(string value); + partial void OnBCWS_OutputValueChanging(System.Nullable value); partial void OnBCWS_OutputValueChanged(); - partial void OnBCWS_PercentageChanging(string value); + partial void OnBCWS_PercentageChanging(System.Nullable value); partial void OnBCWS_PercentageChanged(); - partial void OnACWP_QuantityChanging(string value); + partial void OnACWP_QuantityChanging(System.Nullable value); partial void OnACWP_QuantityChanged(); - partial void OnACWP_OutputValueChanging(string value); + partial void OnACWP_OutputValueChanging(System.Nullable value); partial void OnACWP_OutputValueChanged(); - partial void OnACWP_PercentageChanging(string value); + partial void OnACWP_PercentageChanging(System.Nullable value); partial void OnACWP_PercentageChanged(); partial void OnDateChanging(string value); partial void OnDateChanged(); @@ -181313,8 +181313,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BCWS_Quantity", DbType="NVarChar(50)")] - public string BCWS_Quantity + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BCWS_Quantity", DbType="Decimal(18,2)")] + public System.Nullable BCWS_Quantity { get { @@ -181333,8 +181333,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BCWS_OutputValue", DbType="NVarChar(50)")] - public string BCWS_OutputValue + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BCWS_OutputValue", DbType="Decimal(18,2)")] + public System.Nullable BCWS_OutputValue { get { @@ -181353,8 +181353,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BCWS_Percentage", DbType="NVarChar(50)")] - public string BCWS_Percentage + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BCWS_Percentage", DbType="Decimal(18,2)")] + public System.Nullable BCWS_Percentage { get { @@ -181373,8 +181373,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ACWP_Quantity", DbType="NVarChar(50)")] - public string ACWP_Quantity + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ACWP_Quantity", DbType="Decimal(18,2)")] + public System.Nullable ACWP_Quantity { get { @@ -181393,8 +181393,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ACWP_OutputValue", DbType="NVarChar(50)")] - public string ACWP_OutputValue + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ACWP_OutputValue", DbType="Decimal(18,2)")] + public System.Nullable ACWP_OutputValue { get { @@ -181413,8 +181413,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ACWP_Percentage", DbType="NVarChar(50)")] - public string ACWP_Percentage + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ACWP_Percentage", DbType="Decimal(18,2)")] + public System.Nullable ACWP_Percentage { get {