zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并最新

Browse Source
This commit is contained in:
李超
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/JDGL/CostAnalysis/EarnedValueCurve.aspx
+8 -8
View File
@@ -18,7 +18,7 @@
EnableCollapse="true" Width="300" Title="赢得值曲线" TitleToolTip="赢得值曲线" ShowBorder="true"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Toolbars>
<f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left">
<f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left" Hidden="true">
<Items>
<f:DropDownList ID="drpUnit" runat="server" Label="单位" LabelWidth="50px" Width="265px"
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
@@ -27,7 +27,7 @@
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="trWBS" Width="250" EnableCollapse="true" ShowHeader="true" OnNodeCommand="trWBS_NodeCommand" EnableMultiSelect="true" KeepCurrentSelection="true"
<f:Tree ID="trWBS" Width="250" EnableCollapse="true" ShowHeader="true" OnNodeCommand="trWBS_NodeCommand" KeepCurrentSelection="true"
OnNodeExpand="trWBS_NodeExpand" AutoLeafIdentification="true" runat="server">
</f:Tree>
</Items>
@@ -44,20 +44,20 @@
<f:RenderField Width="109px" ColumnID="计划值" DataField="计划值"
FieldType="String" HeaderText="计划值" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="109px" ColumnID="计划累积值" DataField="计划累积值"
FieldType="String" HeaderText="计划累积值" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="109px" ColumnID="累计计划值" DataField="累计计划值"
FieldType="String" HeaderText="累计计划值" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="109px" ColumnID="完成值" DataField="完成值"
FieldType="String" HeaderText="完成值" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="109px" ColumnID="完成累积值" DataField="完成累积值"
FieldType="String" HeaderText="完成累积值" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="109px" ColumnID="累计完成值" DataField="累计完成值"
FieldType="String" HeaderText="累计完成值" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="109px" ColumnID="实耗值" DataField="实耗值"
FieldType="String" HeaderText="实耗值" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="109px" ColumnID="实耗累积值" DataField="实耗累积值"
FieldType="String" HeaderText="实耗累积值" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="109px" ColumnID="累计实耗值" DataField="累计实耗值"
FieldType="String" HeaderText="累计实耗值" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</Columns>
</f:Grid>
SGGL/FineUIPro.Web/JDGL/CostAnalysis/EarnedValueCurve.aspx.cs
+8 -15
View File
@@ -47,14 +47,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
rootNode.CommandArgument = installation.UnitId;
rootNode.ToolTip = installation.InstallationCode;
rootNode.EnableClickEvent = true;
if (installation.InstallationName != "总图")
{
rootNode.Expanded = true;
}
else
{
rootNode.EnableExpandEvent = true;
}
rootNode.EnableExpandEvent = true;
this.trWBS.Nodes.Add(rootNode);
var installation1s = from x in Funs.DB.Project_Installation
where x.SuperInstallationId == installation.InstallationId
@@ -254,7 +247,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
}
else //不存在子单位工程，加载分部工程
{
var wbsSet1s = from x in Funs.DB.Wbs_WbsSet where x.Flag == 1 && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
var wbsSet1s = from x in Funs.DB.Wbs_WbsSet where x.SuperWbsSetId == null && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
if (wbsSet1s.Count() > 0)
{
foreach (var wbsSet1 in wbsSet1s)
@@ -280,7 +273,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
}
else //单位工程下直接是分项内容，如质量行为
{
var wbsSet3s = from x in Funs.DB.Wbs_WbsSet where x.Flag == 3 && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
var wbsSet3s = from x in Funs.DB.Wbs_WbsSet where x.SuperWbsSetId == null && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
if (wbsSet3s.Count() > 0)
{
foreach (var wbsSet3 in wbsSet3s)
@@ -309,7 +302,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
}
else if (e.Node.CommandName == "childUnitProject") //展开子单位工程节点
{
var wbsSet1s = from x in Funs.DB.Wbs_WbsSet where x.Flag == 1 && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
var wbsSet1s = from x in Funs.DB.Wbs_WbsSet where x.SuperWbsSetId == null && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
foreach (var wbsSet1 in wbsSet1s)
{
TreeNode newNode = new TreeNode();
@@ -420,11 +413,11 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
toWbs += nodeId + ",";
}
string strSql = "select distinct (cast(YEAR(Months) as varchar(4))+'.'+cast(MONTH(Months) as varchar(2))) as 月份,t.Months, (select SUM(PlanValue) from dbo.WbsDetail where Months=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 计划值," +
"(select SUM(PlanValue) from dbo.WbsDetail where Months<=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 计划累积值 ," +
"(select SUM(PlanValue) from dbo.WbsDetail where Months<=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 累计计划值 ," +
"(select SUM(CompleteValue) from dbo.WbsDetail where Months=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 完成值," +
"(select SUM(CompleteValue) from dbo.WbsDetail where Months<=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 完成累积值," +
"(select SUM(CompleteValue) from dbo.WbsDetail where Months<=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 累计完成值," +
"(select SUM(RealValue) from dbo.WbsDetail where Months=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 实耗值," +
"(select SUM(RealValue) from dbo.WbsDetail where Months<=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 实耗累积值 " +
"(select SUM(RealValue) from dbo.WbsDetail where Months<=t.Months and CHARINDEX(ToWbs,@ToWbs)>0) as 累计实耗值 " +
"from dbo.WbsDetail as t where CHARINDEX(t.ToWbs,@ToWbs)>0 order by t.Months";
string date = DateTime.Now.Year + "-" + DateTime.Now.Month + "-01";
SqlParameter[] parameter = new SqlParameter[]
@@ -435,7 +428,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
this.Grid1.DataSource = dt;
this.Grid1.DataBind();
this.ChartEV.CreateMaryChart(dt, 820, 320, null);
this.ChartEV.CreateMaryChart(dt, 920, 420, null);
}
#endregion
SGGL/FineUIPro.Web/JDGL/CostAnalysis/PlanAdjust.aspx
+11 -10
View File
@@ -76,9 +76,12 @@
</f:SimpleForm>
</PopPanel>
</f:DropDownBox>
<f:Button ID="Button1" Text="查询" MarginLeft="40px" EnablePostBack="true" runat="server"
OnClick="btnNew_Click">
</f:Button>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" Hidden="true">
<Items>
<f:CheckBoxList ID="CheckBoxList1" runat="server" OnSelectedIndexChanged="CheckBoxList1_SelectedIndexChanged"
AutoPostBack="true">
@@ -104,9 +107,7 @@
AutoPostBack="true">
<f:CheckItem Text="子分项工程" Value="6" />
</f:CheckBoxList>
<f:Button ID="Button1" Text="查询" MarginLeft="40px" EnablePostBack="true" runat="server"
OnClick="btnNew_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
@@ -121,10 +122,10 @@
<f:GroupField EnableLock="true" HeaderText="测量标志（权重）" TextAlign="Center">
<Columns>
<f:BoundField Width="100px" DataField="Weights" HeaderText="占比" DataToolTipField="RectificationMeasureNames" TextAlign="Center" />
<f:BoundField Width="100px" DataField="WeightsMoneyTotal" HeaderText="费用（万元）" DataToolTipField="RectificationMeasureNames" TextAlign="Center" />
<f:BoundField Width="100px" DataField="WeightsMoneyTotal" HeaderText="费用（元）" DataToolTipField="RectificationMeasureNames" TextAlign="Center" />
</Columns>
</f:GroupField>
<f:GroupField EnableLock="true" HeaderText="完成值（万元）（BCWP）" TextAlign="Center">
<f:GroupField EnableLock="true" HeaderText="完成值（元）（BCWP）" TextAlign="Center">
<Columns>
<f:BoundField Width="100px" DataField="CompleteValue" HeaderText="月费用" DataToolTipField="RectificationMeasureNames" TextAlign="Center" />
<f:BoundField Width="100px" DataField="CompleteValueTotal" HeaderText="累计费用" DataToolTipField="RectificationMeasureNames" TextAlign="Center" />
@@ -132,7 +133,7 @@
TextAlign="Center" />
</Columns>
</f:GroupField>
<f:GroupField EnableLock="true" HeaderText="实耗值（万元）（ACWP）" TextAlign="Center">
<f:GroupField EnableLock="true" HeaderText="实耗值（元）（ACWP）" TextAlign="Center">
<Columns>
<f:BoundField Width="100px" DataField="RealValue" HeaderText="月实耗" DataToolTipField="RectificationMeasureNames" TextAlign="Center" />
<f:BoundField Width="100px" DataField="RealValueTotal" HeaderText="累计实耗" DataToolTipField="RectificationMeasureNames" TextAlign="Center" />
@@ -142,12 +143,12 @@
<Columns>
<f:GroupField EnableLock="true" HeaderText="进度（SV）" TextAlign="Center">
<Columns>
<f:BoundField Width="100px" DataField="SVCost" HeaderText="费用（万元）" TextAlign="Center" />
<f:BoundField Width="100px" DataField="SVCost" HeaderText="费用（元）" TextAlign="Center" />
</Columns>
</f:GroupField>
<f:GroupField EnableLock="true" HeaderText="费用（CV）" TextAlign="Center">
<Columns>
<f:BoundField Width="100px" DataField="CVCost" HeaderText="费用（万元）" TextAlign="Center" />
<f:BoundField Width="100px" DataField="CVCost" HeaderText="费用（元）" TextAlign="Center" />
</Columns>
</f:GroupField>
</Columns>
@@ -158,7 +159,7 @@
<f:BoundField Width="100px" DataField="EndDate" HeaderText="结束日期" DataToolTipField="RectificationMeasureNames" TextAlign="Center" />
</Columns>
</f:GroupField>
<f:GroupField EnableLock="true" HeaderText="计划值（BCWS）（万元）" TextAlign="Center">
<f:GroupField EnableLock="true" HeaderText="计划值（BCWS）（元）" TextAlign="Center">
<Columns>
<f:BoundField Width="100px" DataField="PlanValue" HeaderText="月计划" DataToolTipField="RectificationMeasureNames" TextAlign="Center" />
<f:BoundField Width="100px" DataField="PlanValueTotal" HeaderText="累计计划" DataToolTipField="RectificationMeasureNames" TextAlign="Center" />
SGGL/FineUIPro.Web/JDGL/CostAnalysis/PlanAdjust.aspx.designer.cs
Generated
+9 -9
View File
@@ -174,6 +174,15 @@ namespace FineUIPro.Web.JDGL.CostAnalysis {
/// </remarks>
protected global::FineUIPro.CheckBoxList drpCnProfession;
/// <summary>
/// Button1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button Button1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -237,15 +246,6 @@ namespace FineUIPro.Web.JDGL.CostAnalysis {
/// </remarks>
protected global::FineUIPro.CheckBoxList CheckBoxList6;
/// <summary>
/// Button1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button Button1;
/// <summary>
/// Window1 控件。
/// </summary>